From b3f59cee256e1110b412297e29a6f3fb84accd6e Mon Sep 17 00:00:00 2001
From: demmm <anke62@gmail.com>
Date: Wed, 1 Apr 2020 16:19:00 +0200
Subject: [PATCH 1/2] filling About in QML, button still disabled using Loader,
 can be reused for other widgets conversion leave onClick example with full
 path, commneted out title text for About is hardcoded, discuss option to make
 this configurable in welcome.conf background color hardcoded, tested to work
 well in dark themes too

---
 src/modules/welcomeq/about.qml                | 121 ++++++++++++++++++
 .../welcomeq/img/chevron-left-solid.svg       |   1 +
 src/modules/welcomeq/img/squid.png            | Bin 0 -> 8313 bytes
 src/modules/welcomeq/welcomeq.qml             |  17 ++-
 src/modules/welcomeq/welcomeq.qrc             |   3 +
 5 files changed, 138 insertions(+), 4 deletions(-)
 create mode 100644 src/modules/welcomeq/about.qml
 create mode 100644 src/modules/welcomeq/img/chevron-left-solid.svg
 create mode 100644 src/modules/welcomeq/img/squid.png

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 - <https://github.com/calamares> ===
+ *
+ *   Copyright 2020, Anke Boersma <demm@kaosx.us>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+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("<h1>%1</h1><br/>
+                        <strong>%2<br/>
+                        for %3</strong><br/><br/>
+                        Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>
+                        Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>
+                        Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> 
+                        and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares 
+                        translators team</a>.<br/><br/>
+                        <a href='https://calamares.io/'>Calamares</a> 
+                        development is sponsored by <br/>
+                        <a href='http://www.blue-systems.com/'>Blue Systems</a> - 
+                        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 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chevron-left" class="svg-inline--fa fa-chevron-left fa-w-10" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="currentColor" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"></path></svg>
\ 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 0000000000000000000000000000000000000000..452e4450c56c10cda33dcc9c5d03753ace458862
GIT binary patch
literal 8313
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

literal 0
HcmV?d00001

diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml
index 77f379da6..0de01f333 100644
--- a/src/modules/welcomeq/welcomeq.qml
+++ b/src/modules/welcomeq/welcomeq.qml
@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2020, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2020, Anke Boersma <demm@kaosx.us>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -32,7 +33,7 @@ Page
     {
         width: parent.width
         height: parent.height
-
+        
         Text
         {
             id: welcomeTopText
@@ -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
+                
+                visible: true
+                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 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
   <file alias="welcomeq.qml">welcomeq.qml</file>
+  <file alias="about.qml">about.qml</file>
+  <file>img/squid.png</file>
+  <file>img/chevron-left-solid.svg</file>
 </qresource>
 </RCC>

From 2c2bba5525acfd746eac30495e412ccb8cbf53c9 Mon Sep 17 00:00:00 2001
From: demmm <anke62@gmail.com>
Date: Wed, 1 Apr 2020 16:21:43 +0200
Subject: [PATCH 2/2] actually set About button to false...

---
 src/modules/welcomeq/welcomeq.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml
index 0de01f333..90de189d3 100644
--- a/src/modules/welcomeq/welcomeq.qml
+++ b/src/modules/welcomeq/welcomeq.qml
@@ -33,7 +33,7 @@ Page
     {
         width: parent.width
         height: parent.height
-        
+
         Text
         {
             id: welcomeTopText
@@ -77,7 +77,7 @@ Page
                 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
+                visible: false
                 onClicked: { 
                     //onClicked: load.source = "file:/usr/share/calamares/branding/kaos_branding/show.qml"
                     onClicked: load.source = "about.qml"