From d41d8df2a55c794cbb74204dcb3978c54c88de28 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 13 Dec 2019 13:19:38 +0100
Subject: [PATCH] [welcome] Put Config object into context

---
 src/modules/welcome/Config.cpp  |  1 +
 src/modules/welcome/Config.h    |  2 +-
 src/modules/welcome/qmlmain.cpp |  9 ++++++++-
 src/modules/welcome/welcome.qml | 10 +++++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index 35ce99184..b46b85bf3 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -19,6 +19,7 @@
 #include "Config.h"
 
 Config::Config()
+    : m_helpUrl( "https://www.kde.org/" )
 {
 }
 
diff --git a/src/modules/welcome/Config.h b/src/modules/welcome/Config.h
index 91f5bec5c..7b0cfd734 100644
--- a/src/modules/welcome/Config.h
+++ b/src/modules/welcome/Config.h
@@ -25,7 +25,7 @@
 class Config : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY( QUrl helpUrl READ helpUrl WRITE setHelpUrl )
+    Q_PROPERTY( QUrl helpUrl READ helpUrl WRITE setHelpUrl CONSTANT )
 public:
     Config();
     virtual ~Config();
diff --git a/src/modules/welcome/qmlmain.cpp b/src/modules/welcome/qmlmain.cpp
index cc538747a..0aca1ddcd 100644
--- a/src/modules/welcome/qmlmain.cpp
+++ b/src/modules/welcome/qmlmain.cpp
@@ -5,6 +5,7 @@
 #include <QApplication>
 #include <QLabel>
 #include <QMainWindow>
+#include <QQmlEngine>
 #include <QQuickWidget>
 #include <QString>
 #include <QTimer>
@@ -18,6 +19,12 @@
 
 #include "Config.h"
 
+static Config* theConfig()
+{
+    static Config* cnf = new Config();
+    return cnf;
+}
+
 int main(int argc, char **argv)
 {
     QApplication a( argc, argv );
@@ -54,7 +61,7 @@ int main(int argc, char **argv)
         cnf.setHelpUrl( QUrl( argv[1] ) );
     }
 
-    qmlRegisterType< Config >( "io.calamares.modules.welcome", 1, 0, "Config" );
+    qmlRegisterSingletonType< Config >( "io.calamares.modules.welcome", 1, 0, "PotatoConfig", [](QQmlEngine*, QJSEngine*) -> QObject* { return theConfig(); });
 
     qqw.setSource( QUrl::fromLocalFile("../src/modules/welcome/welcome.qml") );
 
diff --git a/src/modules/welcome/welcome.qml b/src/modules/welcome/welcome.qml
index d442bfa11..ba28d660b 100644
--- a/src/modules/welcome/welcome.qml
+++ b/src/modules/welcome/welcome.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.0;
+import QtQuick.Controls 2.3;
 import io.calamares.modules.welcome 1.0;
 
 Rectangle {
@@ -6,8 +7,15 @@ Rectangle {
     height: 200;
     color: "pink";
 
-    Text {
+    Label {
+        id: label;
         anchors.centerIn: parent;
         text: "Welcome to Calamares";
     }
+
+    Button {
+        anchors.top: label.bottom;
+        text: PotatoConfig.helpUrl;
+
+    }
 }