diff --git a/README.md b/README.md new file mode 100644 index 0000000..c396f43 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# Parch Linux Calamares branding and config + diff --git a/etc/calamares/branding/parchiso/branding.desc b/etc/calamares/branding/parchiso/branding.desc deleted file mode 100644 index 449d7fd..0000000 --- a/etc/calamares/branding/parchiso/branding.desc +++ /dev/null @@ -1,43 +0,0 @@ ---- -componentName: ParchLinux - -welcomeStyleCalamares: false - -welcomeExpandingLogo: true - -windowExpanding: noexpand - -windowSize: 1050px,700px - -windowPlacement: center - -sidebar: widget - -navigation: widget - -strings: - productName: ParchLinux - shortProductName: Parch - version: Rolling - shortVersion: Rolling - versionedName: Parch Linux Rolling - shortVersionedName: ParchLinux - -images: - productIcon: "logo.png" - productLogo: "squid.png" - productWelcome: "idioma.png" - -style: - sidebarBackground: "#FFFFFF" - sidebarText: "#292F34" - sidebarTextSelect: "#ffffff" - sidebarTextHighlight: "#2093d1" - -slideshow: "show.qml" - -slideshowAPI: 2 - -uploadServer : - type : "fiche" - url : "http://termbin.com:9999" diff --git a/etc/calamares/branding/parchiso/show.qml b/etc/calamares/branding/parchiso/show.qml deleted file mode 100644 index 22b5c7a..0000000 --- a/etc/calamares/branding/parchiso/show.qml +++ /dev/null @@ -1,53 +0,0 @@ - - -import QtQuick 2.0; -import calamares.slideshow 1.0; -import io.calamares.ui 1.0 // Calamares internals: Branding - -Presentation -{ - id: presentation - - Timer { - interval: 5000 - running: presentation.activatedInCalamares - repeat: true - onTriggered: presentation.goToNextSlide() - } - - function onActivate() { } - function onLeave() { } - - Rectangle { - id: mybackground - anchors.fill: parent - color: Branding.styleString(Branding.SidebarBackground) - z: -1 - } - - ImageSlide { - src: "slide01.png" - } - - ImageSlide { - src: "slide02.png" - } - - ImageSlide { - src: "slide03.png" - } - - ImageSlide { - src: "slide04.png" - } - - ImageSlide { - src: "slide05.png" - } - - ImageSlide { - src: "slide06.png" - } - - -} diff --git a/etc/calamares/branding/parchlinux/FadeBehavior.qml b/etc/calamares/branding/parchlinux/FadeBehavior.qml deleted file mode 100644 index 7bdc559..0000000 --- a/etc/calamares/branding/parchlinux/FadeBehavior.qml +++ /dev/null @@ -1,59 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Pierre-Yves Siret - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import QtQuick 2.15 -import QtQml 2.15 - -Behavior { - id: root - - property QtObject fadeTarget: targetProperty.object - property string fadeProperty: "opacity" - property int fadeDuration: 150 - property var fadeValue: 0 - property string easingType: "Quad" - - property alias exitAnimation: exitAnimation - property alias enterAnimation: enterAnimation - - SequentialAnimation { - NumberAnimation { - id: exitAnimation - target: root.fadeTarget - property: root.fadeProperty - duration: root.fadeDuration - to: root.fadeValue - easing.type: root.easingType === "Linear" ? Easing.Linear : Easing["In"+root.easingType] - } - PropertyAction { } - NumberAnimation { - id: enterAnimation - target: root.fadeTarget - property: root.fadeProperty - duration: root.fadeDuration - to: target[property] - easing.type: root.easingType === "Linear" ? Easing.Linear : Easing["Out"+root.easingType] - } - } -} diff --git a/etc/calamares/branding/parchiso/ImageSlide.qml b/etc/calamares/branding/parchlinux/ImageSlide.qml similarity index 100% rename from etc/calamares/branding/parchiso/ImageSlide.qml rename to etc/calamares/branding/parchlinux/ImageSlide.qml diff --git a/etc/calamares/branding/parchlinux/ItemSection.qml b/etc/calamares/branding/parchlinux/ItemSection.qml deleted file mode 100644 index f93eac5..0000000 --- a/etc/calamares/branding/parchlinux/ItemSection.qml +++ /dev/null @@ -1,45 +0,0 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import org.kde.kirigami 2.7 as Kirigami - -Item -{ - id: control - default property alias content: _content.data - implicitHeight: _content.implicitHeight + (Kirigami.Units.largeSpacing * 2.5) - - property alias title : _label1.text - property alias subtitle :_label2.text - - Rectangle - { - anchors.fill: parent - color: Qt.lighter(control.Kirigami.Theme.backgroundColor) - opacity: 0.7 - } - - Column - { - id: _content - anchors.fill: parent - anchors.margins: Kirigami.Units.largeSpacing - spacing: Kirigami.Units.smallSpacing - - Label - { - id: _label1 - width: parent.width - wrapMode: Text.WordWrap - } - - Label - { - id: _label2 - visible: text.length - width: parent.width - font.weight: Font.Thin - font.pointSize: 8 - wrapMode: Text.WordWrap - } - } -} diff --git a/etc/calamares/branding/parchlinux/ListItemDelegate.qml b/etc/calamares/branding/parchlinux/ListItemDelegate.qml deleted file mode 100644 index 482ea90..0000000 --- a/etc/calamares/branding/parchlinux/ListItemDelegate.qml +++ /dev/null @@ -1,65 +0,0 @@ -import io.calamares.ui 1.0 - -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Layouts 1.3 -import org.kde.kirigami 2.7 as Kirigami - -ItemDelegate -{ - id: control - - - property alias label1 : _label1 - property alias label2 : _label2 - - hoverEnabled: true - - property bool isCurrentItem: ListView.isCurrentItem - background: Rectangle - { - color: isCurrentItem || hovered ? Kirigami.Theme.highlightColor : Qt.lighter(Kirigami.Theme.backgroundColor) - opacity: isCurrentItem || hovered ? 1 : 0.4 - } - - implicitWidth: ListView.view.width - implicitHeight: Math.max(48, _layout.implicitHeight + Kirigami.Units.largeSpacing *2) - - contentItem: RowLayout - { - id: _layout - anchors.fill: parent - anchors.margins: Kirigami.Units.largeSpacing - - Label - { - id: _label1 - Layout.fillHeight: true - Layout.fillWidth: true - horizontalAlignment: Qt.AlignLeft - color: isCurrentItem ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor - } - - Label - { - id: _label2 - visible: text.length - Layout.fillHeight: true - Layout.maximumWidth: parent.width * 0.4 - horizontalAlignment: Qt.AlignRight - color: isCurrentItem ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor - opacity: isCurrentItem ? 1 : 0.7 - font.weight: Font.Light - wrapMode: Text.Wrap - } - - Kirigami.Icon - { - source: "emblem-default" - Layout.preferredWidth: 22 - Layout.preferredHeight: 22 - color: Kirigami.Theme.highlightedTextColor - visible: isCurrentItem - } - } -} diff --git a/etc/calamares/branding/parchlinux/ListViewTemplate.qml b/etc/calamares/branding/parchlinux/ListViewTemplate.qml deleted file mode 100644 index 9b47921..0000000 --- a/etc/calamares/branding/parchlinux/ListViewTemplate.qml +++ /dev/null @@ -1,53 +0,0 @@ -import QtQuick 2.13 -import QtQuick.Controls 2.13 -import QtQuick.Layouts 1.3 -import org.kde.kirigami 2.7 as Kirigami - -Item -{ - id: control - property alias model : _listView.model - property alias delegate : _listView.delegate - property alias contentHeight : _listView.contentHeight - property alias currentIndex : _listView.currentIndex - property alias currentItem : _listView.currentItem - property alias listView : _listView - - default property alias content : _content.data - - implicitHeight: _content.implicitHeight - - ColumnLayout - { - id: _content - anchors.fill: parent - - spacing: Kirigami.Units.largeSpacing - - ListView - { - id: _listView - Layout.minimumHeight: 0 - Layout.preferredHeight: contentHeight - Layout.maximumHeight: 500 - Layout.fillWidth: true - Layout.fillHeight: true - Layout.alignment: Qt.AlignCenter - spacing: Kirigami.Units.smallSpacing - clip: true - boundsBehavior: Flickable.StopAtBounds - - Rectangle - { - z: control.z - 1 - anchors.fill: parent - color: Qt.lighter(Kirigami.Theme.backgroundColor) - radius: 5 - opacity: 0.5 - } - - } - } - -} - diff --git a/etc/calamares/branding/parchlinux/Map.qml b/etc/calamares/branding/parchlinux/Map.qml deleted file mode 100644 index 238d0e4..0000000 --- a/etc/calamares/branding/parchlinux/Map.qml +++ /dev/null @@ -1,237 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2020, Anke Boersma - * - * Calamares is Free Software: see the License-Identifier above. - * - */ - -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Window 2.14 -import QtQuick.Layouts 1.3 - -import org.kde.kirigami 2.7 as Kirigami - -import QtLocation 5.14 -import QtPositioning 5.14 - -Column { - width: parent.width - - //Needs to come from .conf/geoip - property var configCity: "New York" - property var configCountry: "USA" - property var configTimezone: "America/New York" - property var geoipCity: "" //"Amsterdam" - property var geoipCountry: "" //"Netherlands" - property var geoipTimezone: "" //"Europe/Amsterdam" - // vars that will stay once connected - property var cityName: (geoipCity != "") ? geoipCity : configCity - property var countryName: (geoipCountry != "") ? geoipCountry : configCountry - property var timeZone: (geoipTimezone != "") ? geoipTimezone : configTimezone - - function getIp() { - var xhr = new XMLHttpRequest - - xhr.onreadystatechange = function() { - if (xhr.readyState === XMLHttpRequest.DONE) { - var responseJSON = JSON.parse(xhr.responseText) - var tz = responseJSON.timezone - var ct = responseJSON.city - var cy = responseJSON.country - - tzText.text = qsTr("Timezone: ") + tz - cityName = ct - countryName = cy - - //config.setCurrentLocation(tz) - } - } - - // Define the target of the request - xhr.open("GET", "https://get.geojs.io/v1/ip/geo.json") - // Execute the request - xhr.send() - } - - function getTz() { - var xhr = new XMLHttpRequest - var latC = map.center.latitude - var lonC = map.center.longitude - - xhr.onreadystatechange = function() { - if (xhr.readyState === XMLHttpRequest.DONE) { - var responseJSON = JSON.parse(xhr.responseText) - var tz2 = responseJSON.timezoneId - - tzText.text = qsTr("Timezone: ") + tz2 - config.setCurrentLocation(tz2) - } - } - - // Needs to move to localeq.conf, each distribution will need their own account - xhr.open("GET", "http://api.geonames.org/timezoneJSON?lat=" + latC + "&lng=" + lonC + "&username=demm") - xhr.send() - } - - Rectangle { - width: parent.width - height: parent.height / 1.28 - - Plugin { - id: mapPlugin - name: "esri" // "esri", "here", "itemsoverlay", "mapbox", "mapboxgl", "osm" - } - - Map { - id: map - anchors.fill: parent - plugin: mapPlugin - activeMapType: supportedMapTypes[0] - //might be desirable to set zoom level configurable? - zoomLevel: 5 - bearing: 0 - tilt: 0 - copyrightsVisible : true - fieldOfView : 0 - - GeocodeModel { - id: geocodeModel - plugin: Plugin { name: "osm" } - autoUpdate: true - query: Address { - id: address - city: cityName - country: countryName - } - - onLocationsChanged: { - if (count ) { - map.center.latitude = get(0).coordinate.latitude - //console.log('changed:', count); - map.center.longitude = get(0).coordinate.longitude - } - } - } - - MapQuickItem { - id: marker - anchorPoint.x: image.width/4 - anchorPoint.y: image.height - coordinate: QtPositioning.coordinate( - map.center.latitude, - map.center.longitude) - //coordinate: QtPositioning.coordinate(40.730610, -73.935242) // New York - - sourceItem: Image { - id: image - width: 32 - height: 32 - source: "img/pin.svg" - } - } - - MouseArea { - acceptedButtons: Qt.LeftButton - anchors.fill: map - hoverEnabled: true - property var coordinate: map.toCoordinate(Qt.point(mouseX, mouseY)) - Label { - x: parent.mouseX - width - y: parent.mouseY - height - 5 - text: "%1, %2".arg( - parent.coordinate.latitude).arg(parent.coordinate.longitude) - } - - onClicked: { - marker.coordinate = coordinate - map.center.latitude = coordinate.latitude - map.center.longitude = coordinate.longitude - - getTz(); - - console.log(coordinate.latitude, coordinate.longitude) - } - } - } - - Column { - anchors.bottom: parent.bottom - anchors.right: parent.right - anchors.bottomMargin: 5 - anchors.rightMargin: 10 - - MouseArea { - width: 32 - height:32 - cursorShape: Qt.PointingHandCursor - Image { - source: "img/plus.png" - anchors.centerIn: parent - width: 36 - height: 36 - } - - onClicked: map.zoomLevel++ - } - - MouseArea { - width: 32 - height:32 - cursorShape: Qt.PointingHandCursor - Image { - source: "img/minus.png" - anchors.centerIn: parent - width: 32 - height: 32 - } - - onClicked: map.zoomLevel-- - } - } - } - - Rectangle { - width: parent.width - height: 100 - anchors.horizontalCenter: parent.horizontalCenter - - Item { - id: location - Kirigami.Theme.inherit: false - Kirigami.Theme.colorSet: Kirigami.Theme.Complementary - anchors.horizontalCenter: parent.horizontalCenter - - Rectangle { - anchors.centerIn: parent - width: 300 - height: 30 - color: Kirigami.Theme.backgroundColor - - Text { - id: tzText - text: tzText.text - //text: qsTr("Timezone: %1").arg(config.currentTimezoneName) - color: Kirigami.Theme.textColor - anchors.centerIn: parent - } - - Component.onCompleted: getIp(); - } - } - - Text { - anchors.top: location.bottom - anchors.topMargin: 20 - padding: 10 - width: parent.width - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignHCenter - Kirigami.Theme.backgroundColor: Kirigami.Theme.backgroundColor - text: qsTr("Please select your preferred location on the map so the installer can suggest the locale - and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging - to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.") - } - } -} diff --git a/etc/calamares/branding/parchlinux/Offline.qml b/etc/calamares/branding/parchlinux/Offline.qml deleted file mode 100644 index 5a0d4eb..0000000 --- a/etc/calamares/branding/parchlinux/Offline.qml +++ /dev/null @@ -1,232 +0,0 @@ -/* === This file is part of Calamares - === - * - * SPDX-FileCopyrightText: 2020 Anke Boersma - * SPDX-License-Identifier: GPL-3.0-or-later - * - * Calamares is Free Software: see the License-Identifier above. - * - */ - -import io.calamares.core 1.0 -import io.calamares.ui 1.0 - -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Window 2.14 -import QtQuick.Layouts 1.3 - -import org.kde.kirigami 2.7 as Kirigami - -Page { - width: 800 //parent.width - height: 500 - - StackView { - id: stack - anchors.fill: parent - clip: true - - initialItem: Item { - - Label { - - id: region - anchors.horizontalCenter: parent.horizontalCenter - color: Kirigami.Theme.textColor - horizontalAlignment: Text.AlignCenter - text: qsTr("Select your preferred Region, or use the default one based on your current location.") - } - - ListView { - - id: list - ScrollBar.vertical: ScrollBar { - active: true - } - - width: parent.width / 2 - height: 250 - anchors.centerIn: parent - anchors.verticalCenterOffset: -30 - focus: true - clip: true - boundsBehavior: Flickable.StopAtBounds - spacing: 2 - - Rectangle { - - z: parent.z - 1 - anchors.fill: parent - color: "#BDC3C7" - radius: 5 - opacity: 0.7 - } - - // model loads, dozens of variations tried for currentIndex all fail - model: config.regionModel - currentIndex: config.currentIndex - delegate: ItemDelegate { - - hoverEnabled: true - width: parent.width - highlighted: ListView.isCurrentItem - - Label { - - text: name - Layout.fillHeight: true - Layout.fillWidth: true - width: parent.width - height: 30 - color: highlighted ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor - - background: Rectangle { - - color: highlighted || hovered ? Kirigami.Theme.highlightColor : "white" //Kirigami.Theme.backgroundColor - opacity: highlighted || hovered ? 0.5 : 0.3 - } - } - - onClicked: { - - list.model.currentIndex = index - // correct to use config.currentTimezoneName when index is updated? - tztext.text = qsTr("Timezone: %1").arg(config.currentTimezoneName) - stack.push(zoneView) - } - } - } - } - - Component { - id: zoneView - - Item { - - Label { - - id: zone - anchors.horizontalCenter: parent.horizontalCenter - color: Kirigami.Theme.textColor - text: qsTr("Select your preferred Zone within your Region.") - } - - ListView { - - id: list2 - ScrollBar.vertical: ScrollBar { - active: true - } - - width: parent.width / 2 - height: 250 - anchors.centerIn: parent - anchors.verticalCenterOffset: -30 - focus: true - clip: true - boundsBehavior: Flickable.StopAtBounds - spacing: 2 - - Rectangle { - - z: parent.z - 1 - anchors.fill: parent - color: "#BDC3C7" - radius: 5 - opacity: 0.7 - } - - // model loads, dozens of variations tried for currentIndex all fail - model: config.regionalZonesModel - currentIndex: config.currentIndex - delegate: ItemDelegate { - - hoverEnabled: true - width: parent.width - highlighted: ListView.isCurrentItem - - Label { - - text: name - Layout.fillHeight: true - Layout.fillWidth: true - width: parent.width - height: 30 - color: highlighted ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor - - background: Rectangle { - - color: highlighted || hovered ? Kirigami.Theme.highlightColor : "white" //Kirigami.Theme.backgroundColor - opacity: highlighted || hovered ? 0.5 : 0.3 - } - } - - onClicked: { - - list2.model.currentIndex = index - list2.positionViewAtIndex(index, ListView.Center) - // correct to use config.currentTimezoneName when index is updated? - tztext.text = qsTr("Timezone: %1").arg(config.currentTimezoneName) - } - } - } - - Button { - - Layout.fillWidth: true - anchors.verticalCenter: parent.verticalCenter - anchors.verticalCenterOffset: -30 - anchors.left: parent.left - anchors.leftMargin: parent.width / 15 - icon.name: "go-previous" - text: qsTr("Zones") - onClicked: stack.pop() - } - } - } - } - - Rectangle { - - width: parent.width - height: 60 - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - - Item { - - id: location - Kirigami.Theme.inherit: false - Kirigami.Theme.colorSet: Kirigami.Theme.Complementary - anchors.horizontalCenter: parent.horizontalCenter - - Rectangle { - - anchors.centerIn: parent - width: 300 - height: 30 - color: Kirigami.Theme.backgroundColor - - Text { - - id: tztext - text: qsTr("Timezone: %1").arg(config.currentTimezoneName) - color: Kirigami.Theme.textColor - anchors.centerIn: parent - } - } - } - - Text { - - anchors.top: location.bottom - anchors.topMargin: 20 - padding: 10 - width: parent.width - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignHCenter - Kirigami.Theme.backgroundColor: Kirigami.Theme.backgroundColor - text: qsTr("You can fine-tune Language and Locale settings below.") - } - } -} diff --git a/etc/calamares/branding/parchlinux/Offline_orig.qml b/etc/calamares/branding/parchlinux/Offline_orig.qml deleted file mode 100644 index 8936213..0000000 --- a/etc/calamares/branding/parchlinux/Offline_orig.qml +++ /dev/null @@ -1,84 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2020, Anke Boersma - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . - */ - -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Window 2.14 -import QtQuick.Layouts 1.3 - -//import org.kde.kirigami 2.7 as Kirigami - -Column { - width: 800 - height: 480 - - //Needs to come from localeq.conf - property var configTimezone: "America/New York" - - Rectangle { - width: parent.width - height: parent.height / 1.28 - - Image { - id: image - anchors.fill: parent - source: "img/worldmap.png" - width: parent.width - } - } - - Rectangle { - width: parent.width - height: 100 - anchors.horizontalCenter: parent.horizontalCenter - - Item { - id: location - //Kirigami.Theme.inherit: false - //Kirigami.Theme.colorSet: Kirigami.Theme.Complementary - anchors.horizontalCenter: parent.horizontalCenter - - Rectangle { - anchors.centerIn: parent - width: 300 - height: 30 - //color: Kirigami.Theme.backgroundColor - color: "#050505" - - Text { - text: qsTr("Timezone: %1").arg(configTimezone) - //text: qsTr("Timezone: %1").arg(config.currentTimezoneName) - //color: Kirigami.Theme.textColor - color: "#fcfcfc" - anchors.centerIn: parent - } - } - } - - Text { - anchors.top: location.bottom - anchors.topMargin: 20 - padding: 10 - width: parent.width - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignHCenter - //Kirigami.Theme.backgroundColor: Kirigami.Theme.backgroundColor - text: qsTr("To be able to select a timezone, make sure you are connected to the internet. Restart the installer after connecting. You can fine-tune Language and Locale settings below.") - } - } -} diff --git a/etc/calamares/branding/parchlinux/ResponsiveBase.qml b/etc/calamares/branding/parchlinux/ResponsiveBase.qml deleted file mode 100644 index 1301433..0000000 --- a/etc/calamares/branding/parchlinux/ResponsiveBase.qml +++ /dev/null @@ -1,343 +0,0 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Layouts 1.3 - -import org.kde.kirigami 2.7 as Kirigami - -import QtGraphicalEffects 1.0 - -import "." - -import io.calamares.ui 1.0 -import io.calamares.core 1.0 - -Page -{ - id: control - - property string subtitle - property string message - property alias icon : _icon - - property alias stackView: _stackView - - default property alias content : _card.data - - property alias backButton : _backButton - - signal goBack() - - background: Rectangle - { - id: _background - color: control.Kirigami.Theme.backgroundColor - - Image - { - id: _wallpaper - height: parent.height - width: parent.width - - sourceSize.height: 600 - sourceSize.width: 800 - - fillMode: Image.PreserveAspectCrop - antialiasing: false - smooth: false - asynchronous: true - cache: true - source: "./calamares_bg_image.png" - } - - FastBlur - { - id: fastBlur - anchors.fill: parent - source: _wallpaper - radius: 130 - transparentBorder: false - cached: true - } - - OpacityMask - { - source: mask - maskSource: parent - } - - LinearGradient - { - id: mask - anchors.fill: parent - gradient: Gradient - { - GradientStop { position: 0.6; color: "transparent"} - GradientStop { position: 0.9; color: _background.color} - } - - start: Qt.point(0, 0) - end: Qt.point(0, control.height-48) - } - } - - ColumnLayout - { - anchors.centerIn: parent - height: Math.min(800, parent.height * 0.95) - width: Math.min(1200, parent.width * 0.95) - Page - { - id: _card - clip: true - - Layout.fillWidth: true - Layout.fillHeight: true - - Component.onCompleted: fadeIn.start() - - NumberAnimation on opacity - { - id: fadeIn - duration: 150 - from: 0 - to: 1.0 - easing.type: Easing.OutQuad - } - - header: ToolBar - { - visible: _stackView.depth > 1 - background: null - - ToolButton - { - id:_backButton - text: _stackView.get(Math.max(0, _stackView.currentItem.StackView.index - 1), StackView.DontLoad).title - icon.name: "go-previous" - flat: true - onClicked: - { - if(_stackView.depth > 1) - { - _stackView.pop() - } - - control.goBack() - - } - } - } - - background: Rectangle - { - color: Kirigami.Theme.backgroundColor - radius: 20 - } - - RowLayout - { - anchors.fill: parent - anchors.margins: Kirigami.Units.largeSpacing * 6 - spacing: Kirigami.Units.largeSpacing * 2 - - ColumnLayout - { - id: _content - Layout.fillHeight: true - Layout.fillWidth: true - Layout.margins: Kirigami.Units.largeSpacing * 2 - Layout.maximumWidth: 400 - Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter - - spacing: Kirigami.Units.largeSpacing * 2 - - Item - { - Layout.fillWidth: true - Layout.preferredHeight: 100 - - Kirigami.Icon - { - id: _icon - height: 80 - width: height - anchors.centerIn: parent - FadeBehavior on source { fadeProperty: "scale" } - } - } - - Label - { - Layout.fillWidth: true - Layout.preferredHeight: Math.min(implicitHeight, 200) - horizontalAlignment: Qt.AlignHCenter - wrapMode: Text.Wrap - elide: Text.ElideMiddle - text: control.title - font.bold: true - font.weight: Font.Bold - font.pointSize: 24 - FadeBehavior on text { } - } - - Label - { - Layout.fillWidth: true - Layout.preferredHeight: Math.min(implicitHeight, 200) - horizontalAlignment: Qt.AlignHCenter - wrapMode: Text.Wrap - elide: Text.ElideMiddle - text: control.subtitle - font.weight: Font.Light - font.pointSize: 12 - FadeBehavior on text { } - } - - Label - { - Layout.fillWidth: true - Layout.preferredHeight: Math.min(implicitHeight, 200) - horizontalAlignment: Qt.AlignHCenter - wrapMode: Text.Wrap - elide: Text.ElideMiddle - text: control.message - font.weight: Font.Light - font.pointSize: 10 - FadeBehavior on text { } - } - } - - StackView - { - id: _stackView - Layout.fillHeight: true - Layout.fillWidth: true - - Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter - - Layout.margins: Kirigami.Units.largeSpacing * 2 - - Layout.minimumWidth: 300 - Layout.maximumWidth: 500 - - Layout.maximumHeight: currentItem.implicitHeight - Layout.minimumHeight: 200 - - - clip: true - - pushEnter: Transition - { - NumberAnimation { - property: "opacity" - duration: 150 - to: 1 - easing.type: Easing.OutQuad - } - } - - popEnter: Transition - { - NumberAnimation { - property: "opacity" - duration: 150 - to: 1 - easing.type: Easing.OutQuad - } - } - - popExit: Transition - { - NumberAnimation { - property: "opacity" - duration: 150 - to: 0 - easing.type: Easing.InQuad - } - } - - pushExit: Transition - { - NumberAnimation { - property: "opacity" - duration: 150 - to: 0 - easing.type: Easing.InQuad - } - } - } - } - } - - ViewStepsBar - { - Layout.fillWidth: true - Layout.maximumWidth: 900 - Layout.minimumWidth: 400 - Layout.alignment: Qt.AlignCenter - } - - } - - //footer: Column - //{ - //width: parent.width - - //Item - //{ - //height: 100 - //width: parent.width - - //Row - //{ - //spacing: Kirigami.Units.largeSpacing - //anchors.centerIn: parent - - //Button - //{ - ////text: ViewManager.quitLabel; - //icon.name: ViewManager.quitIcon; - - //ToolTip.visible: hovered - //ToolTip.timeout: 5000 - //ToolTip.delay: 1000 - //ToolTip.text: ViewManager.quitTooltip; - - //enabled: ViewManager.quitEnabled; - //visible: ViewManager.quitVisible; - //onClicked: { ViewManager.quit(); } - //} - - //Button - //{ - //text: ViewManager.backLabel; - //icon.name: ViewManager.backIcon; - - //enabled: ViewManager.backEnabled; - //visible: true; - //onClicked: { ViewManager.back(); } - - //height: implicitHeight - //Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) - //Kirigami.Theme.textColor: "#fff" - //} - - //Button - //{ - - //height: implicitHeight - - //text: ViewManager.nextLabel; - //icon.name: ViewManager.nextIcon; - - //// enabled: ViewManager.nextEnabled; - //enabled: true; - //visible: true; - //onClicked: { ViewManager.next(); } - //Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) - //Kirigami.Theme.textColor: "#fff" - //} - //} - //} - //} -} diff --git a/etc/calamares/branding/parchlinux/ViewStepsBar.qml b/etc/calamares/branding/parchlinux/ViewStepsBar.qml deleted file mode 100644 index b24d7fc..0000000 --- a/etc/calamares/branding/parchlinux/ViewStepsBar.qml +++ /dev/null @@ -1,71 +0,0 @@ - import QtQuick 2.10 - import QtQuick.Controls 2.10 - import QtQuick.Layouts 1.3 - import org.kde.kirigami 2.7 as Kirigami - import QtGraphicalEffects 1.0 - - import io.calamares.ui 1.0 - import io.calamares.core 1.0 - - Item - { - implicitHeight: 80 - - RowLayout - { - anchors.fill: parent - anchors.margins: Kirigami.Units.largeSpacing - spacing: 0 - - Repeater - { - id: _viewManagerRepeater - model: ViewManager - - RowLayout - { - opacity: index !== _viewManagerRepeater.count-1 ? 1 : 0 - Layout.fillWidth: true - Layout.fillHeight: true - spacing: 0 - - Rectangle - { - Layout.alignment: Qt.AlignCenter - Layout.fillWidth: true - Layout.preferredHeight: 4 - anchors.verticalCenter: parent.verticalCenter - color: index !== 0 ? (ViewManager.currentStepIndex >= index ? Kirigami.Theme.highlightColor : Kirigami.Theme.textColor) : "transparent" - } - - Column - { - Layout.alignment: Qt.AlignCenter - Layout.preferredWidth: 22 - Layout.preferredHeight: 22 - spacing: Kirigami.Units.largeSpacing - - Rectangle - { - id: _bgCheck - height: 22 - width: height - radius: height - border.color: ViewManager.currentStepIndex === index ? Kirigami.Theme.textColor : (ViewManager.currentStepIndex >= index ? Kirigami.Theme.highlightColor : Kirigami.Theme.textColor) - border.width: 4 - color: ViewManager.currentStepIndex >= index ? Kirigami.Theme.highlightColor : "transparent" - } - - Label - { - text: display - horizontalAlignment: Qt.AlignHCenter - anchors.horizontalCenter: parent.horizontalCenter - color: Kirigami.Theme.textColor - font.bold: true - } - } - } - } - } - } diff --git a/etc/calamares/branding/parchlinux/branding.desc b/etc/calamares/branding/parchlinux/branding.desc index f65dbee..ca9c221 100644 --- a/etc/calamares/branding/parchlinux/branding.desc +++ b/etc/calamares/branding/parchlinux/branding.desc @@ -1,50 +1,41 @@ --- -componentName: parchlinux +componentName: ParchLinux -# This selects between different welcome texts. When false, uses -# the traditional "Welcome to the %1 installer.", and when true, -# uses "Welcome to the Calamares installer for %1." This allows -# to distinguish this installer from other installers for the -# same distribution. welcomeStyleCalamares: false -# Should the welcome image (productWelcome, below) be scaled -# up beyond its natural size? welcomeExpandingLogo: true +windowExpanding: fullscreen + +windowPlacement: center + +sidebar: none + +navigation: widget + strings: - productName: Parch Linux + productName: ParchLinux shortProductName: Parch version: Rolling shortVersion: Rolling versionedName: Parch Linux Rolling - shortVersionedName: Parch Linux Rolling - bootloaderEntryName: Parch - productUrl: https://parchlinux.ir - supportUrl: https://github.com/parchlinux - knownIssuesUrl: https://parchlinux.ir - releaseNotesUrl: https://blog.parchlinux.ir + shortVersionedName: ParchLinux images: - productLogo: "calamares_product_icon.svg" - productIcon: "calamares_product_logo.svg" - productWelcome: "calamares_welcome_logo.svg" + productIcon: "logo.png" + productLogo: "squid.png" + productWelcome: "idioma.png" + +style: + sidebarBackground: "#FFFFFF" + sidebarText: "#292F34" + sidebarTextSelect: "#ffffff" + sidebarTextHighlight: "#2093d1" slideshow: "show.qml" -# Colors for text and background components. -# -# - sidebarBackground is the background of the sidebar -# - sidebarText is the (foreground) text color -# - sidebarTextHighlight sets the background of the selected (current) step. -# Optional, and defaults to the application palette. -# - sidebarSelect is the text color of the selected step. -# -style: - sidebarBackground: "#231F20" - sidebarText: "#FFFFFF" - sidebarTextSelect: "#FFFFFF" - sidebarTextHighlight: "#26C6DA" +slideshowAPI: 2 -sidebar: none -windowExpanding: fullscreen +uploadServer : + type : "fiche" + url : "http://termbin.com:9999" diff --git a/etc/calamares/branding/parchlinux/calamares-sidebar.qml b/etc/calamares/branding/parchlinux/calamares-sidebar.qml deleted file mode 100644 index 80b7736..0000000 --- a/etc/calamares/branding/parchlinux/calamares-sidebar.qml +++ /dev/null @@ -1,86 +0,0 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Layouts 1.3 -import org.kde.kirigami 2.7 as Kirigami -import QtGraphicalEffects 1.0 -import io.calamares.ui 1.0 -import io.calamares.core 1.0 - -import "." - -Page -{ - id: control - width: parent.width - height: parent.height - background: Item - { - id: _background - - Image - { - id: _wallpaper - height: parent.height - width: parent.width - - sourceSize.height: 600 - sourceSize.width: 800 - - fillMode: Image.PreserveAspectCrop - antialiasing: false - smooth: false - asynchronous: true - cache: true - - source: Branding.imagePath(Branding.ProductWallpaper) - } - - FastBlur - { - id: fastBlur - anchors.fill: parent - source: _wallpaper - radius: 130 - transparentBorder: false - cached: true - } - } - - Column -{ -anchors.fill: parent -Rectangle -{ - id: hello - width: 200 - height: 100 - color: "red" - - Text { - anchors.centerIn: parent - text: Branding.string(Branding.VersionedName) - } -} - -/* perhaps we could show a branding image here */ - -Repeater -{ - model: ViewManager - Rectangle { - width: 200 - height: 75 - color: "black" - - Text { - color: completed ? "green" : "yellow" - text: display - } - } -} - -} - -} - - diff --git a/etc/calamares/branding/parchlinux/calamares_background.svg b/etc/calamares/branding/parchlinux/calamares_background.svg deleted file mode 100644 index 622fe80..0000000 --- a/etc/calamares/branding/parchlinux/calamares_background.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/etc/calamares/branding/parchlinux/calamares_bg_image.png.jpg b/etc/calamares/branding/parchlinux/calamares_bg_image.png.jpg deleted file mode 100644 index 2ec5a02..0000000 Binary files a/etc/calamares/branding/parchlinux/calamares_bg_image.png.jpg and /dev/null differ diff --git a/etc/calamares/branding/parchlinux/calamares_install_image.svg b/etc/calamares/branding/parchlinux/calamares_install_image.svg deleted file mode 100644 index 439a27f..0000000 --- a/etc/calamares/branding/parchlinux/calamares_install_image.svg +++ /dev/null @@ -1,119 +0,0 @@ - -image/svg+xml diff --git a/etc/calamares/branding/parchlinux/calamares_product_icon.svg b/etc/calamares/branding/parchlinux/calamares_product_icon.svg deleted file mode 100644 index 6aeed52..0000000 --- a/etc/calamares/branding/parchlinux/calamares_product_icon.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/etc/calamares/branding/parchlinux/calamares_product_logo.svg b/etc/calamares/branding/parchlinux/calamares_product_logo.svg deleted file mode 100644 index 6aeed52..0000000 --- a/etc/calamares/branding/parchlinux/calamares_product_logo.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/etc/calamares/branding/parchlinux/calamares_welcome_logo.svg b/etc/calamares/branding/parchlinux/calamares_welcome_logo.svg deleted file mode 100644 index 6aeed52..0000000 --- a/etc/calamares/branding/parchlinux/calamares_welcome_logo.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/etc/calamares/branding/parchlinux/finishedq.qml b/etc/calamares/branding/parchlinux/finishedq.qml deleted file mode 100644 index 56b2d37..0000000 --- a/etc/calamares/branding/parchlinux/finishedq.qml +++ /dev/null @@ -1,68 +0,0 @@ -import io.calamares.core 1.0 -import io.calamares.ui 1.0 - -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Layouts 1.3 - -import org.kde.kirigami 2.7 as Kirigami -import "." - -ResponsiveBase -{ - id: control - - title: qsTr("Finished") - subtitle: qsTr("Installation process has finished") - message: qsTr("

A full log of the install is available as installation.log in the home directory of the Live user.
- This log is copied to /var/log/installation.log of the target system.

") - icon.source: "cala-qml-finished" - - - stackView.initialItem: Item - { - - Column - { - width: parent.width * 0.7 - anchors.centerIn: parent - spacing: Kirigami.Units.largeSpacing * 3 - Label - { - width: parent.width - horizontalAlignment: Text.AlignHCenter - wrapMode: Text.Wrap - text: qsTr("%1 has been installed on your computer.
- You may now restart into your new system, or continue using the Live environment.").arg(Branding.string(Branding.ProductName)) - } - - - Row - { - anchors.horizontalCenter: parent.horizontalCenter - spacing: 6 - - Button { - text: qsTr("Close Installer") - icon.name: "application-exit" - onClicked: { ViewManager.quit(); } - } - - Button { - text: qsTr("Restart System") - icon.name: "document-revert" - onClicked: { config.doRestart(true); } - } - } - } - } - - function onActivate() - { - } - - function onLeave() - { - } - -} diff --git a/etc/calamares/branding/parchlinux/i18n.qml b/etc/calamares/branding/parchlinux/i18n.qml deleted file mode 100644 index 63cad8b..0000000 --- a/etc/calamares/branding/parchlinux/i18n.qml +++ /dev/null @@ -1,173 +0,0 @@ -/* === This file is part of Calamares - === - * - * SPDX-FileCopyrightText: 2020 Anke Boersma - * SPDX-License-Identifier: GPL-3.0-or-later - * - * Calamares is Free Software: see the License-Identifier above. - * - */ - -import io.calamares.ui 1.0 - -import QtQuick 2.7 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.3 - -import org.kde.kirigami 2.7 as Kirigami - -Item { - width: parent.width - height: parent.height - focus: true - MouseArea { - anchors.fill: parent - } - - Rectangle { - id: textArea - x: 28 - y: 14 - anchors.fill: parent - Kirigami.Theme.backgroundColor: Kirigami.Theme.backgroundColor - - Column { - id: languages - x: 130 - y: 40 - - Rectangle { - width: 250 - height: 140 - color: "#d3d3d3" - Text { - anchors.top: parent.top - width: 240 - wrapMode: Text.WordWrap - text: qsTr("

Languages


- The system locale setting affects the language and character set for some command line user interface elements. The current setting is %1.").arg(config.currentLanguageCode) - font.pointSize: 10 - } - } - - Rectangle { - width: 250 - height: 300 - - ScrollView { - id: scroll1 - anchors.fill: parent - contentHeight: 800 - clip: true - - ListView { - id: list1 - focus: true - - model: config.supportedLocales - - currentIndex: -1 - highlight: Rectangle { - color: Kirigami.Theme.highlightColor - } - delegate: Text { - text: modelData - - MouseArea { - hoverEnabled: true - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onEntered: { - color: "#0000ff" - } - onClicked: { - list1.currentIndex = index - } - } - } - onCurrentItemChanged: { config.currentLanguageCode = model[currentIndex] } /* This works because model is a stringlist */ - } - } - } - } - - Column { - id: lc_numeric - x: 430 - y: 40 - - Rectangle { - width: 250 - height: 140 - color: "#d3d3d3" - Text { - anchors.top: parent.top - width: 240 - wrapMode: Text.WordWrap - text: qsTr("

Locales


- The system locale setting affects the numbers and dates format. The current setting is %1.").arg(config.currentLCCode) - font.pointSize: 10 - } - } - - Rectangle { - width: 250 - height: 300 - - ScrollView { - id: scroll2 - anchors.fill: parent - contentHeight: 800 - clip: true - - ListView { - id: list2 - width: 180; height: 200 - focus: true - - model: config.supportedLocales - - currentIndex: -1 - highlight: Rectangle { - color: Kirigami.Theme.highlightColor - } - delegate: Text { - text: modelData - - MouseArea { - hoverEnabled: true - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onClicked: { - list2.currentIndex = index - } - } - } - onCurrentItemChanged: { config.currentLCCode = model[currentIndex]; } /* This works because model is a stringlist */ - } - } - } - - } - - ToolButton { - id: toolButton - x: 19 - y: 29 - width: 105 - height: 48 - text: qsTr("Back") - hoverEnabled: true - onClicked: load.source = "" - - Image { - id: image1 - x: 0 - y: 13 - width: 22 - height: 22 - source: "img/chevron-left-solid.svg" - fillMode: Image.PreserveAspectFit - } - } - } -} diff --git a/etc/calamares/branding/parchiso/idioma.png b/etc/calamares/branding/parchlinux/idioma.png similarity index 100% rename from etc/calamares/branding/parchiso/idioma.png rename to etc/calamares/branding/parchlinux/idioma.png diff --git a/etc/calamares/branding/parchlinux/keyboardq.qml b/etc/calamares/branding/parchlinux/keyboardq.qml deleted file mode 100644 index fb40b5d..0000000 --- a/etc/calamares/branding/parchlinux/keyboardq.qml +++ /dev/null @@ -1,121 +0,0 @@ -import io.calamares.ui 1.0 - -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Layouts 1.3 -import org.kde.kirigami 2.7 as Kirigami - -ResponsiveBase -{ - id: control - - title: stackView.currentItem.title - subtitle: stackView.currentItem.subtitle - icon.source: stackView.currentItem.icon - - stackView.initialItem: ListViewTemplate - { - id: _keyboardModelListView - property string title: qsTr("Keyboard Model") - property string subtitle: qsTr("Pick your preferred keyboard model or use the default one based on the detected hardware") - property string icon : "cala-qml-keyboard-model" - - currentIndex: model.currentIndex - - model: config.keyboardModelsModel - - delegate: ListItemDelegate - { - id: _delegate - label1.text: model.label - onClicked: - { - _keyboardModelListView.model.currentIndex = index - control.stackView.push(_keyboardLayoutsComponent) - } - } - - Button - { - Layout.fillWidth: true - text: qsTr("Layouts") - icon.name: "go-previous" - onClicked: control.stackView.push(_keyboardLayoutsComponent) - } - } - - Component - { - id: _keyboardLayoutsComponent - - ListViewTemplate - { - id: _layoutsListView - property string title: qsTr("Keyboard Layout") - property string subtitle: config.prettyStatus - property string icon : "cala-qml-keyboard-layout" - - currentIndex: model.currentIndex - - model: config.keyboardLayoutsModel - - delegate: ListItemDelegate - { - id: _delegate - label1.text: model.label - onClicked: - { - _layoutsListView.model.currentIndex = index - _layoutsListView.positionViewAtIndex(index, ListView.Center) - control.stackView.push(_keyboardVariantsComponent) - } - } - - - TextField - { - placeholderText: qsTr("Test your keyboard") - - Layout.fillWidth: true - Layout.alignment: Qt.AlignCenter - } - - Button - { - Layout.fillWidth: true - icon.name: "go-next" - text: qsTr("Variants") - onClicked: control.stackView.push(_keyboardVariantsComponent) - } - } - } - - Component - { - id: _keyboardVariantsComponent - - ListViewTemplate - { - id: _variantsListView - - property string title: qsTr("Keyboard Layout Variant") - property string subtitle: config.prettyStatus - property string icon : "cala-qml-keyboard-layout-variant" - - currentIndex: model.currentIndex - - model: config.keyboardVariantsModel - - delegate: ListItemDelegate - { - id: _delegate - label1.text: model.label - onClicked: - { - _variantsListView.model.currentIndex = index - _variantsListView.positionViewAtIndex(index, ListView.Center) - } - } - } - } -} diff --git a/etc/calamares/branding/parchiso/lang/calamares-default_ar.ts b/etc/calamares/branding/parchlinux/lang/calamares-default_ar.ts similarity index 100% rename from etc/calamares/branding/parchiso/lang/calamares-default_ar.ts rename to etc/calamares/branding/parchlinux/lang/calamares-default_ar.ts diff --git a/etc/calamares/branding/parchiso/lang/calamares-default_en.ts b/etc/calamares/branding/parchlinux/lang/calamares-default_en.ts similarity index 100% rename from etc/calamares/branding/parchiso/lang/calamares-default_en.ts rename to etc/calamares/branding/parchlinux/lang/calamares-default_en.ts diff --git a/etc/calamares/branding/parchiso/lang/calamares-default_eo.ts b/etc/calamares/branding/parchlinux/lang/calamares-default_eo.ts similarity index 100% rename from etc/calamares/branding/parchiso/lang/calamares-default_eo.ts rename to etc/calamares/branding/parchlinux/lang/calamares-default_eo.ts diff --git a/etc/calamares/branding/parchiso/lang/calamares-default_fa.ts b/etc/calamares/branding/parchlinux/lang/calamares-default_fa.ts similarity index 100% rename from etc/calamares/branding/parchiso/lang/calamares-default_fa.ts rename to etc/calamares/branding/parchlinux/lang/calamares-default_fa.ts diff --git a/etc/calamares/branding/parchiso/lang/calamares-default_fr.ts b/etc/calamares/branding/parchlinux/lang/calamares-default_fr.ts similarity index 100% rename from etc/calamares/branding/parchiso/lang/calamares-default_fr.ts rename to etc/calamares/branding/parchlinux/lang/calamares-default_fr.ts diff --git a/etc/calamares/branding/parchiso/lang/calamares-default_nl.ts b/etc/calamares/branding/parchlinux/lang/calamares-default_nl.ts similarity index 100% rename from etc/calamares/branding/parchiso/lang/calamares-default_nl.ts rename to etc/calamares/branding/parchlinux/lang/calamares-default_nl.ts diff --git a/etc/calamares/branding/parchlinux/localeq.qml b/etc/calamares/branding/parchlinux/localeq.qml deleted file mode 100644 index 0391214..0000000 --- a/etc/calamares/branding/parchlinux/localeq.qml +++ /dev/null @@ -1,89 +0,0 @@ -import io.calamares.ui 1.0 - -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Layouts 1.3 -import org.kde.kirigami 2.7 as Kirigami - -import "." - -ResponsiveBase -{ - id: control - - title: stackView.currentItem.title - subtitle: stackView.currentItem.subtitle - message: stackView.currentItem.message - icon.source: stackView.currentItem.icon - - property string currentRegion - property string currentZone - - stackView.initialItem: ListViewTemplate - { - id: _regionListView - - property string title: qsTr("Region") - property string subtitle: qsTr("Pick your preferred region or use the default one based on your current location") - property string message: qsTr("Select your preferred zone within your location to continue with the installation") - property string icon : "cala-qml-region" - - model: config.regionModel - currentIndex : -1 - - delegate: ListItemDelegate - { - id: _delegate - label1.text: model.name - onClicked: - { - _regionListView.currentIndex = index - control.currentRegion = model.name - config.regionalZonesModel.region = control.currentRegion - control.stackView.push(_zonesListComponent) - } - } - - Button - { - Layout.fillWidth: true - text: qsTr("Timezones") - icon.name: "go-previous" - onClicked: control.stackView.push(_zonesListComponent) - } - } - - Component - { - id: _zonesListComponent - - ListViewTemplate - { - id: _zonesListView - property string title: qsTr("Timezone") - property string subtitle: config.prettyStatus - property string message: "" - property string icon : "cala-qml-timezone" - - model: config.regionalZonesModel - currentIndex : -1 - - delegate: ListItemDelegate - { - id: _delegate - label1.text: model.name - onClicked: - { - _zonesListView.currentIndex = index - control.currentZone = model.name - - _zonesListView.listView.positionViewAtIndex(index, ListView.Center) - - config.setCurrentLocation(control.currentRegion, control.currentZone) - - } - } - } - } -} - diff --git a/etc/calamares/branding/parchiso/logo.png b/etc/calamares/branding/parchlinux/logo.png similarity index 100% rename from etc/calamares/branding/parchiso/logo.png rename to etc/calamares/branding/parchlinux/logo.png diff --git a/etc/calamares/branding/parchlinux/show.qml b/etc/calamares/branding/parchlinux/show.qml index 846ef0f..22b5c7a 100644 --- a/etc/calamares/branding/parchlinux/show.qml +++ b/etc/calamares/branding/parchlinux/show.qml @@ -1,8 +1,8 @@ -import QtQuick 2.0; -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.2 + +import QtQuick 2.0; import calamares.slideshow 1.0; +import io.calamares.ui 1.0 // Calamares internals: Branding Presentation { @@ -10,136 +10,44 @@ Presentation Timer { interval: 5000 - running: false + running: presentation.activatedInCalamares repeat: true onTriggered: presentation.goToNextSlide() } - - Image { - id: background - source: "calamares_background.svg" + + function onActivate() { } + function onLeave() { } + + Rectangle { + id: mybackground anchors.fill: parent - } - - Image { - id: image - source: "calamares_install_image.svg" - width: 256 - height: 256 - fillMode: Image.PreserveAspectFit - anchors.left: parent.horizontalCenter - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter + color: Branding.styleString(Branding.SidebarBackground) + z: -1 } - Slide { - - ColumnLayout { - anchors.leftMargin: 18 - anchors.left: parent.left - anchors.right: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - - Label { - Layout.fillWidth: true - - text: qsTr("Welcome to the Parch Linux!") - font.pixelSize: 22 - font.bold: true - color: "white" - } - - Rectangle { - height: 3 - width: 24 - radius: 2 - - color: "white" - } - - Text { - Layout.fillWidth: true - Layout.topMargin: 16 - - font.pixelSize: 12 - color: "white" - text: qsTr("Yet another distro based on Arch!") - wrapMode: Text.WordWrap - } - } + ImageSlide { + src: "slide01.png" } - Slide { - - ColumnLayout { - anchors.leftMargin: 18 - anchors.left: parent.left - anchors.right: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - - Label { - Layout.fillWidth: true - - text: qsTr("Everything you need to get started.") - font.pixelSize: 22 - font.bold: true - color: "white" - } - - Rectangle { - height: 3 - width: 24 - radius: 2 - - color: "white" - } - - Text { - Layout.fillWidth: true - Layout.topMargin: 16 - - font.pixelSize: 12 - color: "white" - text: qsTr("Parch is a complete Operating System that ships the essential apps and services for the daily use: office applications, PDF reader, image editor") - wrapMode: Text.WordWrap - } - } + ImageSlide { + src: "slide02.png" } - Slide { - - ColumnLayout { - anchors.leftMargin: 18 - anchors.left: parent.left - anchors.right: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - - Label { - Layout.fillWidth: true - - text: qsTr("Explore a universe of apps with AUR.") - font.pixelSize: 22 - font.bold: true - color: "white" - } - - Rectangle { - height: 3 - width: 24 - radius: 2 - - color: "white" - } - - Text { - Layout.fillWidth: true - Layout.topMargin: 16 - - font.pixelSize: 12 - color: "white" - text: qsTr("Thanks for using Parch Linux") - wrapMode: Text.WordWrap - } - } + ImageSlide { + src: "slide03.png" } + + ImageSlide { + src: "slide04.png" + } + + ImageSlide { + src: "slide05.png" + } + + ImageSlide { + src: "slide06.png" + } + + } diff --git a/etc/calamares/branding/parchiso/slide01.png b/etc/calamares/branding/parchlinux/slide01.png similarity index 100% rename from etc/calamares/branding/parchiso/slide01.png rename to etc/calamares/branding/parchlinux/slide01.png diff --git a/etc/calamares/branding/parchiso/slide02.png b/etc/calamares/branding/parchlinux/slide02.png similarity index 100% rename from etc/calamares/branding/parchiso/slide02.png rename to etc/calamares/branding/parchlinux/slide02.png diff --git a/etc/calamares/branding/parchiso/slide03.png b/etc/calamares/branding/parchlinux/slide03.png similarity index 100% rename from etc/calamares/branding/parchiso/slide03.png rename to etc/calamares/branding/parchlinux/slide03.png diff --git a/etc/calamares/branding/parchiso/slide04.png b/etc/calamares/branding/parchlinux/slide04.png similarity index 100% rename from etc/calamares/branding/parchiso/slide04.png rename to etc/calamares/branding/parchlinux/slide04.png diff --git a/etc/calamares/branding/parchiso/slide05.png b/etc/calamares/branding/parchlinux/slide05.png similarity index 100% rename from etc/calamares/branding/parchiso/slide05.png rename to etc/calamares/branding/parchlinux/slide05.png diff --git a/etc/calamares/branding/parchiso/slide06.png b/etc/calamares/branding/parchlinux/slide06.png similarity index 100% rename from etc/calamares/branding/parchiso/slide06.png rename to etc/calamares/branding/parchlinux/slide06.png diff --git a/etc/calamares/branding/parchiso/squid.png b/etc/calamares/branding/parchlinux/squid.png similarity index 100% rename from etc/calamares/branding/parchiso/squid.png rename to etc/calamares/branding/parchlinux/squid.png diff --git a/etc/calamares/branding/parchiso/stylesheet.qss b/etc/calamares/branding/parchlinux/stylesheet.qss similarity index 100% rename from etc/calamares/branding/parchiso/stylesheet.qss rename to etc/calamares/branding/parchlinux/stylesheet.qss diff --git a/etc/calamares/branding/parchlinux/summaryq.qml b/etc/calamares/branding/parchlinux/summaryq.qml deleted file mode 100644 index 47e4a61..0000000 --- a/etc/calamares/branding/parchlinux/summaryq.qml +++ /dev/null @@ -1,47 +0,0 @@ -import io.calamares.core 1.0 -import io.calamares.ui 1.0 - -import QtQuick 2.10 -import QtQuick.Controls 2.10 - -import org.mauikit.controls 1.3 as Maui -import org.kde.kirigami 2.7 as Kirigami -import "." - -ResponsiveBase -{ - id: control - - title: qsTr("Summary") - subtitle: qsTr("Summary of the installation") - message: qsTr("

Review the steps that will be taken before the system installation starts.

") - icon.source: "cala-qml-summary" - - - stackView.initialItem: ListViewTemplate - { - currentIndex: -1 - model: config.summaryModel - delegate: Maui.ItemDelegate - { - id: _delegate - - width: ListView.view.width - height: _template.implicitHeight + Maui.Style.space.medium - - Maui.ListItemTemplate - { - id: _template - anchors.fill: parent - anchors.margins: Maui.Style.space.medium - iconSource: "documentinfo" - iconSizeHint: 32 - headerSizeHint: iconSizeHint - label1.text: model.title - label2.text: model.message - label2.wrapMode: Text.Wrap - label2.textFormat: Text.AutoText - } - } - } -} diff --git a/etc/calamares/branding/parchlinux/usersq.qml b/etc/calamares/branding/parchlinux/usersq.qml deleted file mode 100644 index 2543c6e..0000000 --- a/etc/calamares/branding/parchlinux/usersq.qml +++ /dev/null @@ -1,264 +0,0 @@ -import io.calamares.ui 1.0 - -import QtQuick 2.10 -import QtQuick.Controls 2.10 -import QtQuick.Layouts 1.3 - -import QtGraphicalEffects 1.0 -import QtQuick.Window 2.3 -import "." - -import org.kde.kirigami 2.7 as Kirigami - - -ResponsiveBase -{ - id: control - - // nextButton.enabled: config.isNextEnabled - - title: qsTr("Users") - subtitle: qsTr("Pick your user name and credentials to login and perform admin tasks") - message: config.status.message - icon.source: "cala-qml-user" - - stackView.initialItem: ScrollView - { - id: _userPage - contentWidth: availableWidth - padding: 0 - background: Rectangle - { - color: Qt.lighter(control.Kirigami.Theme.backgroundColor) - radius: 5 - opacity: 0.5 - } - - Flickable - { - contentHeight: _formLayout.implicitHeight - - Column - { - id: _formLayout - width: parent.width - height: parent.height - - spacing: Kirigami.Units.smallSpacing - - ItemSection - { - width: parent.width - - title: qsTr("What is your name?") - - TextField - { - id: _userNameField - width: parent.width - enabled: config.isEditable("fullName") - placeholderText: qsTr("Your Full Name") - text: config.fullName - onTextChanged: config.setFullName(text) - background: Rectangle - { - color: Kirigami.Theme.backgroundColor - radius: 5 - opacity: 0.5 - border.color: _userNameField.text.length ? Kirigami.Theme.backgroundColor : ( config.fullNameChanged ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - } - } - } - - ItemSection - { - width: parent.width - - title: qsTr("What name do you want to use to log in?") - subtitle: qsTr("If more than one person will use this computer, you can create multiple accounts after installation.") - - TextField - { - id: _userLoginField - enabled: config.isEditable("loginName") - width: parent.width - placeholderText: qsTr("Login Name") - text: config.loginName - onTextChanged: config.setLoginName(text) - - background: Rectangle - { - color: Kirigami.Theme.backgroundColor - radius: 5 - opacity: 0.5 - border.color: _userLoginField.text.length ? Kirigami.Theme.backgroundColor : (config.loginNameStatusChanged ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - - } - } - } - - ItemSection - { - width: parent.width - - title: qsTr("What is the name of this computer?") - subtitle: qsTr("This name will be used if you make the computer visible to others on a network.") - - TextField - { - id: _hostName - width: parent.width - placeholderText: qsTr("Computer Name") - text: config.hostName - onTextChanged: config.setHostName(text) - background: Rectangle - { - color: Kirigami.Theme.backgroundColor - radius: 5 - opacity: 0.5 - border.color: _hostName.text.length ? Kirigami.Theme.backgroundColor : ( config.hostNameStatusChanged ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - } - } - } - - ItemSection - { - width: parent.width - - title: qsTr("Choose a password to keep your account safe.") - subtitle: qsTr("Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.") - - TextField - { - id: _passwordField - width: parent.width - placeholderText: qsTr("Password") - text: config.userPassword - - echoMode: TextInput.Password - passwordMaskDelay: 300 - inputMethodHints: Qt.ImhNoAutoUppercase - onTextChanged: config.setUserPassword(text) - - background: Rectangle - { - color: Kirigami.Theme.backgroundColor - radius: 5 - opacity: 0.5 - border.color: ( config.userPasswordStatusChanged ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - } - - } - - TextField - { - id: _verificationPasswordField - width: parent.width - placeholderText: qsTr("Repeat Password") - text: config.userPasswordSecondary - onTextChanged: config.setUserPasswordSecondary(text) - - echoMode: TextInput.Password - passwordMaskDelay: 300 - inputMethodHints: Qt.ImhNoAutoUppercase - - background: Rectangle - { - color: Kirigami.Theme.backgroundColor - radius: 5 - opacity: 0.5 - border.color: config.userPasswordSecondaryChanged ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor - } - } - - CheckBox - { - visible: config.writeRootPassword - text: qsTr("Reuse user password as root password") - checked: config.reuseUserPasswordForRoot - onCheckedChanged: config.setReuseUserPasswordForRoot(checked) - } - - } - - - ItemSection - { - width: parent.width - visible: !config.reuseUserPasswordForRoot - - title: qsTr("Choose a root password to keep your account safe.") - - TextField - { - id: _rootPasswordField - width: parent.width - placeholderText: qsTr("Root Password") - echoMode: TextInput.Password - passwordMaskDelay: 300 - inputMethodHints: Qt.ImhNoAutoUppercase - text: config.rootPassword - onTextChanged: config.setRootPassword(text) - - background: Rectangle - { - color: Kirigami.Theme.backgroundColor - radius: 5 - opacity: 0.5 - border.color: _rootPasswordField.text.length ? Kirigami.Theme.backgroundColor : ( config.rootPasswordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - - } - } - - TextField - { - id: _verificationRootPasswordField - width: parent.width - placeholderText: qsTr("Repeat Root Password") - echoMode: TextInput.Password - passwordMaskDelay: 300 - inputMethodHints: Qt.ImhNoAutoUppercase - text: config.rootPasswordSecondary - onTextChanged: config.setRootPasswordSecondary(text) - - background: Rectangle - { - color: Kirigami.Theme.backgroundColor - radius: 5 - opacity: 0.5 - border.color: _verificationRootPasswordField.text.length ? Kirigami.Theme.backgroundColor : ( config.rootPasswordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - } - } - } - - - ItemSection - { - width: parent.width - title: qsTr("More options.") - - - CheckBox - { - visible: config.permitWeakPasswords - text: qsTr("Validate passwords quality") - checked: config.requireStrongPasswords - onCheckedChanged: config.setRequireStrongPasswords(checked) - } - - - - CheckBox - { - text: qsTr("Log in automatically without asking for the password") - checked: config.doAutoLogin - onCheckedChanged: config.setAutoLogin(checked) - } - } - - } - } - - } - -} diff --git a/etc/calamares/branding/parchlinux/welcomeq.qml b/etc/calamares/branding/parchlinux/welcomeq.qml deleted file mode 100644 index f7e71c4..0000000 --- a/etc/calamares/branding/parchlinux/welcomeq.qml +++ /dev/null @@ -1,175 +0,0 @@ -import io.calamares.ui 1.0 -import io.calamares.core 1.0 - -import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.3 - -import org.kde.kirigami 2.7 as Kirigami - -import "." - -ResponsiveBase -{ - id: control - - title: stackView.currentItem.title - subtitle: stackView.currentItem.subtitle - message: stackView.currentItem.message - icon.source: stackView.currentItem.icon - - stackView.initialItem: ListViewTemplate - { - id: _requirementsList - property string title: qsTr("Welcome to ") + Branding.string(Branding.ProductName) - property string subtitle: config.genericWelcomeMessage - property string message: config.requirementsModel.satisfiedRequirements ? "All requirements have been satisfied." : qsTr("

Please ensure this computer has enough storage, RAM, and a working Internet connection. %1.
- Setup can continue, but some features might be disabled.

").arg(Branding.string(Branding.VersionedName)) - property string icon : Branding.imagePath(Branding.ProductWelcome) - model: config.unsatisfiedRequirements - - delegate: Control - { - id: _delegate - - background: Rectangle - { - color: model.satisfied ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.negativeTextColor - opacity: 0.2 - } - - width: ListView.view.width - height: 72 - - RowLayout - { - id: _template - anchors.fill: parent - - Item - { - Layout.alignment: Qt.AlignCenter - implicitWidth: 48 - implicitHeight: 48 - Kirigami.Icon - { - source: model.satisfied ? "checkmark" : (model.mandatory ? "error" : "emblem-info") - height: 22 - width: 22 - anchors.centerIn: parent - } - } - - ColumnLayout - { - Layout.fillWidth: true - Layout.alignment: Qt.AlignCenter - Layout.margins: Kirigami.Units.smallSpacing - spacing : 0 - - Label - { - Layout.fillWidth: true - text: model.name - font.bold: true - } - - Label - { - Layout.fillWidth: true - text: !model.satisfied ? model.negatedText : model.details - wrapMode: Text.Wrap - } - } - - - } - } - - RowLayout - { - Layout.fillWidth: true - Layout.preferredHeight: 64 - - spacing: Kirigami.Units.largeSpacing* 2 - - Button - { - Layout.fillWidth: true - text: "About" - icon.name: "documentinfo" - Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) - Kirigami.Theme.textColor: "#fff" - - visible: Branding.string(Branding.ProductUrl).length - onClicked: Qt.openUrlExternally(Branding.string(Branding.ProductUrl)) - } - - Button - { - Layout.fillWidth: true - text: qsTr("Support") - icon.name: "help-contents" - Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) - Kirigami.Theme.textColor: "#fff" - visible: Branding.string(Branding.SupportUrl).length - onClicked: Qt.openUrlExternally(Branding.string(Branding.SupportUrl)) - } - - Button - { - Layout.fillWidth: true - text: qsTr("Known issues") - icon.name: "tools-report-bug" - Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) - Kirigami.Theme.textColor: "#fff" - visible: Branding.string(Branding.KnownIssuesUrl).length - onClicked: Qt.openUrlExternally(Branding.string(Branding.KnownIssuesUrl)) - } - - Button - { - Layout.fillWidth: true - text: qsTr("Release notes") - icon.name: "document-edit" - Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) - Kirigami.Theme.textColor: "#fff" - visible: Branding.string(Branding.ReleaseNotesUrl).length - onClicked: Qt.openUrlExternally(Branding.string(Branding.ReleaseNotesUrl)) - } - } - - Button - { - Layout.fillWidth: true - text: qsTr("Language") - onClicked: control.stackView.push(_langComponent) - enabled: true - } - } - - - Component - { - id: _langComponent - ListViewTemplate - { - id: _langList - - property string title : qsTr("Language") - property string subtitle: qsTr("Select your preferred language to continue with the installation") - property string icon : "cala-qml-language" - - currentIndex: config.localeIndex - model: config.languagesModel - delegate: ListItemDelegate - { - id: _delegate - label1.text: model.label - label2.text: model.englishLabel - - onClicked: config.localeIndex = index - } - } - } -} diff --git a/etc/calamares/settings.conf b/etc/calamares/settings.conf index 8d84f9d..03e36e8 100644 --- a/etc/calamares/settings.conf +++ b/etc/calamares/settings.conf @@ -55,7 +55,7 @@ sequence: - finished -branding: parchiso +branding: parchlinux prompt-install: false