adding notesqml, copy of dummyqml

included in settings.conf, commented out

settings.conf

@@ -87,6 +87,7 @@ modules-search: [ local ]
 sequence:
 - show:
   - welcome
+#  - notesqml
 #  - dummypythonqt
   - locale
   - keyboard

src/modules/notesqml/CMakeLists.txt

@@ -0,0 +1,11 @@
+calamares_add_plugin( notesqml
+    TYPE viewmodule
+    EXPORT_MACRO PLUGINDLLEXPORT_PRO
+    SOURCES
+        NotesQmlViewStep.cpp
+    RESOURCES
+        notesqml.qrc
+    LINK_PRIVATE_LIBRARIES
+        calamaresui
+    SHARED_LIB
+)

src/modules/notesqml/NotesQmlViewStep.cpp

@@ -0,0 +1,52 @@
+/* === 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
+ *   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/>.
+ */
+
+#include "NotesQmlViewStep.h"
+
+#include <QVariant>
+
+NotesQmlViewStep::NotesQmlViewStep( QObject* parent )
+    : Calamares::QmlViewStep( "notesqml", parent )
+{
+}
+
+NotesQmlViewStep::~NotesQmlViewStep() {}
+
+QString
+NotesQmlViewStep::prettyName() const
+{
+    return m_notesName ? m_notesName->get() : tr( "Notes" );
+}
+
+void
+NotesQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
+{ 
+    Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation
+    
+    bool qmlLabel_ok = false;
+    auto qmlLabel = CalamaresUtils::getSubMap( configurationMap, "qmlLabel", qmlLabel_ok );
+
+    if ( qmlLabel.contains( "notes" ) )
+    {
+        m_notesName = new CalamaresUtils::Locale::TranslatedString( qmlLabel, "notes" );
+    }
+    
+}
+
+CALAMARES_PLUGIN_FACTORY_DEFINITION( NotesQmlViewStepFactory, registerPlugin< NotesQmlViewStep >(); )

src/modules/notesqml/NotesQmlViewStep.h

@@ -0,0 +1,48 @@
+/* === 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
+ *   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/>.
+ */
+
+#ifndef NOTESQMLVIEWSTEP_H
+#define NOTESQMLVIEWSTEP_H
+
+#include "PluginDllMacro.h"
+#include "locale/TranslatableConfiguration.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Variant.h"
+#include "utils/PluginFactory.h"
+#include "viewpages/QmlViewStep.h"
+
+class PLUGINDLLEXPORT NotesQmlViewStep : public Calamares::QmlViewStep
+{
+    Q_OBJECT
+
+public:
+    NotesQmlViewStep( QObject* parent = nullptr );
+    virtual ~NotesQmlViewStep() override;
+
+    QString prettyName() const override;
+    
+    void setConfigurationMap( const QVariantMap& configurationMap ) override;
+
+private:
+    CalamaresUtils::Locale::TranslatedString* m_notesName;  // As it appears in the sidebar
+};
+
+CALAMARES_PLUGIN_FACTORY_DECLARATION( NotesQmlViewStepFactory )
+
+#endif

src/modules/notesqml/notesqml.conf

@@ -0,0 +1,25 @@
+# QML modules can search for the QML inside the Qt resources
+# (QRC) which are compiled into the module, or in the branding
+# setup for Calamares, (or both of them, with branding taking
+# precedence). This allows the module to ship a default UI and
+# branding to optionally introduce a replacement file.
+#
+# Generally, leave the search method set to "both" because if
+# you don't want to brand the UI, just don't ship a branding
+# QML file for it.
+#
+# To support instanced QML modules, searches in the branding
+# directory look for the full module@instanceid name as well.
+---
+# Search mode. Valid values are "both", "qrc" and "branding"
+search: both
+
+# Name of the QML file. If not set, uses the name of the instance
+# of the module (e.g. if you list this module in `settings.conf`
+# in the *instances* section, you get *id*, otherwise it would
+# normally be "notesqml").
+#filename: notesqml
+
+qmlLabel:
+    notes: "Release Notes"
+    notes[nl]: "Opmerkingen"

src/modules/notesqml/notesqml.qml

@@ -0,0 +1,74 @@
+/* === 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 QtQuick 2.7
+import QtQuick.Controls 2.2
+import QtQuick.Window 2.2
+import QtQuick.Layouts 1.3
+import QtQuick.Controls.Material 2.1
+
+Item {
+    width: 740
+    height: 420
+
+    Flickable {
+        id: flick
+        anchors.fill: parent
+        contentHeight: 800
+        
+        ScrollBar.vertical: ScrollBar {
+            width: 10
+            policy: ScrollBar.AlwaysOn
+        }
+
+        TextArea {
+            id: intro
+            x: 1
+            y: 0
+            width: 720
+            font.pointSize: 14
+            textFormat: Text.RichText
+            antialiasing: true
+            activeFocusOnPress: false
+            wrapMode: Text.WordWrap
+
+            text: qsTr("<h3>Generic GNU/Linux 2020.2 LTS <quote>Turgid Tuba</quote></h3>
+            <p>This an example QML file, showing options in RichText with Flickable content.</p>
+            
+            <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p>
+            
+            <p><b>This is bold text</b></p>
+            <p><i>This is italic text</i></p>
+            <p><u>This is underlined text</u></p>
+            <p><center>This text will be center-aligned.</center></p>
+            <p><s>This is strikethrough</s></p>
+            
+            <p>Code example:
+            <code>ls -l /home</code></p>
+            
+            <p><b>Lists:</b></p>
+            <ul>
+                <li>Intel CPU systems</li>
+                <li>AMD CPU systems</li>
+            </ul>
+            
+            <p>The vertical scrollbar is adjustable, current width set to 10.</p>")
+
+        }
+    }
+}

src/modules/notesqml/notesqml.qrc

@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+  <file alias="notesqml.qml">notesqml.qml</file>
+</qresource>
+</RCC>