diff --git a/src/modules/welcomeq/about.qml b/src/modules/welcomeq/about.qml deleted file mode 100644 index bb7b06056..000000000 --- a/src/modules/welcomeq/about.qml +++ /dev/null @@ -1,95 +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.0 -import QtQuick.Layouts 1.3 - -Item { - width: parent.width - height: parent.height - focus: true - - 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: config.aboutMessage.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/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml index 02b5424c7..acb1cebf2 100644 --- a/src/modules/welcomeq/welcomeq.qml +++ b/src/modules/welcomeq/welcomeq.qml @@ -61,20 +61,6 @@ Page spacing: Kirigami.Units.largeSpacing* 2 - Button { - Layout.fillWidth: true - text: qsTr("About") - 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: true - onClicked: { - //onClicked: load.source = "file:/usr/share/calamares/branding/default/show.qml" - onClicked: load.source = "about.qml" - } - } - Button { Layout.fillWidth: true text: qsTr("Support") diff --git a/src/modules/welcomeq/welcomeq.qrc b/src/modules/welcomeq/welcomeq.qrc index ef41f816a..6f7a9c5df 100644 --- a/src/modules/welcomeq/welcomeq.qrc +++ b/src/modules/welcomeq/welcomeq.qrc @@ -1,7 +1,6 @@ welcomeq.qml - about.qml release_notes.qml Recommended.qml Requirements.qml