diff --git a/src/modules/welcomeq/about.qml b/src/modules/welcomeq/about.qml new file mode 100644 index 000000000..f301c6659 --- /dev/null +++ b/src/modules/welcomeq/about.qml @@ -0,0 +1,121 @@ +/* === 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 io.calamares.ui 1.0 + +import QtQuick 2.7 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.3 + +Item { + width: parent.width + height: parent.height + focus: true + + property var appName: "Calamares" + property var appVersion: "3.2.22" + + Rectangle { + id: textArea + x: 28 + y: 14 + anchors.fill: parent + color: "#f2f2f2" + + Column { + id: column + x: 130 + y: 40 + + + Rectangle { + width: 560 + height: 250 + radius: 10 + border.width: 0 + + Text { + width: 400 + height: 250 + anchors.centerIn: parent + text: qsTr("

%1


+ %2
+ for %3


+ Copyright 2014-2017 Teo Mrnjavac <teo@kde.org>
+ Copyright 2017-2020 Adriaan de Groot <groot@kde.org>
+ Thanks to the Calamares team + and the Calamares + translators team.

+ Calamares + development is sponsored by
+ Blue Systems - + Liberating Software." ) + .arg(appName) + .arg(appVersion) + .arg(Branding.string(Branding.VersionedName)) + + onLinkActivated: Qt.openUrlExternally(link) + + MouseArea { + anchors.fill: parent + acceptedButtons: Qt.NoButton + cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor + } + + font.pointSize: 10 + anchors.verticalCenterOffset: 10 + anchors.horizontalCenterOffset: 40 + wrapMode: Text.WordWrap + } + + Image { + id: image + x: 8 + y: 12 + height: 100 + fillMode: Image.PreserveAspectFit + source: "img/squid.png" + } + + } + + } + + 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/src/modules/welcomeq/img/chevron-left-solid.svg b/src/modules/welcomeq/img/chevron-left-solid.svg new file mode 100644 index 000000000..41061c287 --- /dev/null +++ b/src/modules/welcomeq/img/chevron-left-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/modules/welcomeq/img/squid.png b/src/modules/welcomeq/img/squid.png new file mode 100644 index 000000000..452e4450c Binary files /dev/null and b/src/modules/welcomeq/img/squid.png differ diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml index 77f379da6..90de189d3 100644 --- a/src/modules/welcomeq/welcomeq.qml +++ b/src/modules/welcomeq/welcomeq.qml @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2020, Adriaan de Groot + * 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 @@ -75,9 +76,12 @@ Page icon.name: "dialog-information" Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) Kirigami.Theme.textColor: Kirigami.Theme.textColor - + visible: false - onClicked: { } // TODO: show an about-Calamares window + onClicked: { + //onClicked: load.source = "file:/usr/share/calamares/branding/kaos_branding/show.qml" + onClicked: load.source = "about.qml" + } } Button { @@ -124,5 +128,10 @@ Page onClicked: Qt.openUrlExternally(config.donateUrl) } } + Loader + { + id:load + anchors.fill: parent + } } } diff --git a/src/modules/welcomeq/welcomeq.qrc b/src/modules/welcomeq/welcomeq.qrc index 772bf7e88..84e598a27 100644 --- a/src/modules/welcomeq/welcomeq.qrc +++ b/src/modules/welcomeq/welcomeq.qrc @@ -1,5 +1,8 @@ welcomeq.qml + about.qml + img/squid.png + img/chevron-left-solid.svg