[packagechooserq] adding packagechooserq

QML is not using a model as is now, pkgc option is used for setting the default state

src/modules/packagechooserq/CMakeLists.txt

@@ -0,0 +1,69 @@
+# === This file is part of Calamares - <https://calamares.io> ===
+#
+#   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+#   SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
+#   SPDX-License-Identifier: BSD-2-Clause
+#
+if( NOT WITH_QML )
+    calamares_skip_module( "packagechooserq (QML is not supported in this build)" )
+    return()
+endif()
+
+find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core )
+
+# Add optional libraries here
+set( USER_EXTRA_LIB )
+
+# include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser )
+set( _packagechooser ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser )
+include_directories( ${_packagechooser} )
+
+### OPTIONAL AppData XML support in PackageModel
+#
+#
+# TODO:3.3:WITH->BUILD (this doesn't affect the ABI offered by Calamares)
+option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON )
+if ( WITH_APPDATA )
+    find_package(Qt5 COMPONENTS Xml)
+    if ( Qt5Xml_FOUND )
+        add_definitions( -DHAVE_APPDATA )
+        list( APPEND _extra_libraries Qt5::Xml )
+        list( APPEND _extra_src ItemAppData.cpp )
+    endif()
+endif()
+
+### OPTIONAL AppStream support in PackageModel
+#
+#
+option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON )
+if ( WITH_APPSTREAM )
+    find_package(AppStreamQt)
+    set_package_properties(
+        AppStreamQt PROPERTIES
+        DESCRIPTION "Support for AppStream (cache) data"
+        URL "https://github.com/ximion/appstream"
+        PURPOSE "AppStream provides package data"
+        TYPE OPTIONAL
+    )
+    if ( AppStreamQt_FOUND )
+        add_definitions( -DHAVE_APPSTREAM )
+        list( APPEND _extra_libraries AppStreamQt )
+        list( APPEND _extra_src ItemAppStream.cpp )
+    endif()
+endif()
+
+calamares_add_plugin( packagechooserq
+    TYPE viewmodule
+    EXPORT_MACRO PLUGINDLLEXPORT_PRO
+    SOURCES
+        PackageChooserQmlViewStep.cpp
+        ${_packagechooser}/Config.cpp
+        ${_packagechooser}/PackageModel.cpp
+        ${_packagechooser}/ItemAppData.cpp
+    RESOURCES
+        packagechooserq.qrc
+    LINK_PRIVATE_LIBRARIES
+        calamaresui
+        ${_extra_libraries}
+    SHARED_LIB
+)

src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

@@ -0,0 +1,86 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "PackageChooserQmlViewStep.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "locale/TranslatableConfiguration.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+#include "utils/Variant.h"
+
+CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserQmlViewStepFactory, registerPlugin< PackageChooserQmlViewStep >(); )
+
+PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent )
+    : Calamares::QmlViewStep( parent )
+    , m_config( new Config( this ) )
+{
+    emit nextStatusChanged( true );
+}
+
+QString
+PackageChooserQmlViewStep::prettyName() const
+{
+    return tr( "Packages" );
+}
+
+QString
+PackageChooserQmlViewStep::prettyStatus() const
+{
+    //QString option = m_pkgc;
+    //return tr( "Install option: %1" ).arg( option );
+    return m_config->prettyStatus();
+}
+
+bool
+PackageChooserQmlViewStep::isNextEnabled() const
+{
+    return true;
+}
+
+bool
+PackageChooserQmlViewStep::isBackEnabled() const
+{
+    return true;
+}
+
+bool
+PackageChooserQmlViewStep::isAtBeginning() const
+{
+    return true;
+}
+
+bool
+PackageChooserQmlViewStep::isAtEnd() const
+{
+    return true;
+}
+
+Calamares::JobList
+PackageChooserQmlViewStep::jobs() const
+{
+    Calamares::JobList l;
+    return l;
+}
+
+void
+PackageChooserQmlViewStep::onLeave()
+{
+    m_config->fillGSSecondaryConfiguration();
+}
+
+void
+PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
+{
+    m_config->setDefaultId( moduleInstanceKey() );
+    m_config->setConfigurationMap( configurationMap );
+    Calamares::QmlViewStep::setConfigurationMap( configurationMap );  // call parent implementation last
+}

src/modules/packagechooserq/PackageChooserQmlViewStep.h

@@ -0,0 +1,58 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef PACKAGECHOOSERQMLVIEWSTEP_H
+#define PACKAGECHOOSERQMLVIEWSTEP_H
+
+// Config from packagechooser module
+#include "Config.h"
+
+#include "DllMacro.h"
+#include "locale/TranslatableConfiguration.h"
+#include "utils/PluginFactory.h"
+#include "viewpages/QmlViewStep.h"
+
+#include <QVariantMap>
+
+class Config;
+class PackageChooserPage;
+
+class PLUGINDLLEXPORT PackageChooserQmlViewStep : public Calamares::QmlViewStep
+{
+    Q_OBJECT
+
+public:
+    explicit PackageChooserQmlViewStep( QObject* parent = nullptr );
+
+    QString prettyName() const override;
+    QString prettyStatus() const override;
+
+    bool isNextEnabled() const override;
+    bool isBackEnabled() const override;
+
+    bool isAtBeginning() const override;
+    bool isAtEnd() const override;
+
+    //void onActivate() override;
+    void onLeave() override;
+
+    Calamares::JobList jobs() const override;
+
+    void setConfigurationMap( const QVariantMap& configurationMap ) override;
+
+    QObject* getConfig() override { return m_config; }
+
+private:
+    Config* m_config;
+};
+
+CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserQmlViewStepFactory )
+
+#endif  // PACKAGECHOOSERQMLVIEWSTEP_H

src/modules/packagechooserq/images/libreoffice.jpg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2020 demmm <anke62@gmail.com>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/packagechooserq/images/no-selection.png.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2020 demmm <anke62@gmail.com>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/packagechooserq/images/plasma.png.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021 pngegg <https://www.pngegg.com/>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/packagechooserq/packagechooserq.conf

@@ -0,0 +1,48 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the low-density software chooser
+---
+# Software selection mode, to set whether the software packages
+# can be chosen singly, or multiply.
+#
+# Possible modes are "optional", "required" (for zero-or-one or exactly-one)
+# or "optionalmultiple", "requiredmultiple" (for zero-or-more
+# or one-or-more).
+mode: required
+
+# Software installation method:
+#
+# - "legacy" or "custom" or "contextualprocess"
+#   When set to "legacy", writes a GlobalStorage value for the choice that
+#   has been made. The key is *packagechooser_<id>*. Normally, the module's
+#   instance name is used; see the *instances* section of `settings.conf`.
+#   If there is just one packagechooser module, and no special instance is set,
+#   resulting GS key is probably *packagechooser@packagechooser*.
+#   You can set *id* to change that, but it is not recommended.
+#
+#   The GS value is a comma-separated list of the IDs of the selected
+#   packages, or an empty string if none is selected.
+#
+#   With "legacy" installation, you should have a contextualprocess or similar
+#   module somewhere in the `exec` phase to process the GlobalStorage key
+#   and actually **do** something for the packages.
+#
+# - "packages"
+#   When set to "packages", writes GlobalStorage values suitable for
+#   consumption by the *packages* module (which should appear later
+#   in the `exec` section. These package settings will then be handed
+#   off to whatever package manager is configured there.
+#   The *id* key is not used.
+#
+# There is no need to put this module in the `exec` section. There
+# are no jobs that this module provides. You should put **other**
+# modules, either *contextualprocess* or *packages* or some custom
+# module, in the `exec` section to do the actual work.
+method: legacy
+# The *id* key is used only in "legacy" mode
+# id: ""
+
+# The *pkgc* is used for setting the default selection in the QML view
+pkgc: libreoffice
+

src/modules/packagechooserq/packagechooserq.qml

@@ -0,0 +1,254 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+import io.calamares.core 1.0
+import io.calamares.ui 1.0
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.3
+
+Item {
+    width:  parent.width
+    height: parent.height
+
+    Rectangle {
+        anchors.fill: parent
+        color: "#f2f2f2"
+
+        ButtonGroup {
+            id: switchGroup
+        }
+
+        Column {
+            id: column
+            anchors.centerIn: parent
+            spacing: 5
+
+            Rectangle {
+                //id: rectangle
+                width: 700
+                height: 150
+                color: "#ffffff"
+                radius: 10
+                border.width: 0
+                Text {
+                    width: 450
+                    height: 104
+                    anchors.centerIn: parent
+                    text: qsTr("LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.")
+                    font.pointSize: 10
+                    anchors.verticalCenterOffset: -10
+                    anchors.horizontalCenterOffset: 100
+                    wrapMode: Text.WordWrap
+                }
+
+                Switch {
+                    id: element2
+                    x: 500
+                    y: 110
+                    width: 187
+                    height: 14
+                    text: qsTr("LibreOffice")
+                    checked: true
+                    hoverEnabled: true
+                    ButtonGroup.group: switchGroup
+
+                    indicator: Rectangle {
+                        implicitWidth: 40
+                        implicitHeight: 14
+                        radius: 10
+                        color: element2.checked ? "#3498db" : "#B9B9B9"
+                        border.color: element2.checked ? "#3498db" : "#cccccc"
+
+                        Rectangle {
+                            x: element2.checked ? parent.width - width : 0
+                            y: (parent.height - height) / 2
+                            width: 20
+                            height: 20
+                            radius: 10
+                            color: element2.down ? "#cccccc" : "#ffffff"
+                            border.color: element2.checked ? (element1.down ? "#3498db" : "#3498db") : "#999999"
+                        }
+                    }
+
+                    onCheckedChanged: {
+                        if ( ! checked ) {
+                            print("L not used")
+                        }
+                        else {
+                            config.pkgc = "libreoffice"
+                            print( config.pkgc )
+                        }
+                    }
+                }
+
+                Image {
+                    id: image2
+                    x: 8
+                    y: 25
+                    height: 100
+                    fillMode: Image.PreserveAspectFit
+                    source: "images/libreoffice.jpg"
+                }
+            }
+
+            Rectangle {
+                width: 700
+                height: 150
+                radius: 10
+                border.width: 0
+                Text {
+                    width: 450
+                    height: 104
+                    anchors.centerIn: parent
+                    text: qsTr("If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.")
+                    font.pointSize: 10
+                    anchors.verticalCenterOffset: -10
+                    anchors.horizontalCenterOffset: 100
+                    wrapMode: Text.WordWrap
+                }
+
+                Switch {
+                    id: element1
+                    x: 500
+                    y: 110
+                    width: 187
+                    height: 14
+                    text: qsTr("No Office Suite")
+                    checked: false
+                    hoverEnabled: true
+                    ButtonGroup.group: switchGroup
+
+                    indicator: Rectangle {
+                        implicitWidth: 40
+                        implicitHeight: 14
+                        radius: 10
+                        color: element1.checked ? "#3498db" : "#B9B9B9"
+                        border.color: element1.checked ? "#3498db" : "#cccccc"
+
+                        Rectangle {
+                            x: element1.checked ? parent.width - width : 0
+                            y: (parent.height - height) / 2
+                            width: 20
+                            height: 20
+                            radius: 10
+                            color: element1.down ? "#cccccc" : "#ffffff"
+                            border.color: element1.checked ? (element1.down ? "#3498db" : "#3498db") : "#999999"
+                        }
+                    }
+
+                    onCheckedChanged: {
+                        if ( ! checked ) {
+                            print("not used")
+                            //console.log("removed")
+                        }
+                        else {
+                            print("No Office Suite")
+                            config.pkgc = "no_office_suite"
+                        }
+                    }
+                }
+
+                Image {
+                    id: image
+                    x: 8
+                    y: 25
+                    height: 100
+                    fillMode: Image.PreserveAspectFit
+                    source: "images/no-selection.png"
+                }
+
+            }
+
+            Rectangle {
+                width: 700
+                height: 150
+                color: "#ffffff"
+                radius: 10
+                border.width: 0
+                Text {
+                    width: 450
+                    height: 104
+                    anchors.centerIn: parent
+                    text: qsTr("Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.")
+                    font.pointSize: 10
+                    anchors.verticalCenterOffset: -10
+                    anchors.horizontalCenterOffset: 100
+                    wrapMode: Text.WordWrap
+                }
+
+                Switch {
+                    id: element3
+                    x: 500
+                    y: 110
+                    width: 187
+                    height: 14
+                    text: qsTr("Minimal Install")
+                    checked: false
+                    hoverEnabled: true
+                    ButtonGroup.group: switchGroup
+
+                    indicator: Rectangle {
+                        implicitWidth: 40
+                        implicitHeight: 14
+                        radius: 10
+                        color: element3.checked ? "#3498db" : "#B9B9B9"
+                        border.color: element3.checked ? "#3498db" : "#cccccc"
+
+                        Rectangle {
+                            x: element3.checked ? parent.width - width : 0
+                            y: (parent.height - height) / 2
+                            width: 20
+                            height: 20
+                            radius: 10
+                            color: element3.down ? "#cccccc" : "#ffffff"
+                            border.color: element3.checked ? (element3.down ? "#3498db" : "#3498db") : "#999999"
+                        }
+                    }
+
+                    onCheckedChanged: {
+                        if ( ! checked ) {
+                            print("M not used")
+                        }
+                        else {
+                            print("minimal")
+                            config.pkgc = "minimal_install"
+                        }
+                    }
+                }
+
+                Image {
+                    id: image3
+                    x: 8
+                    y: 25
+                    height: 100
+                    fillMode: Image.PreserveAspectFit
+                    source: "images/plasma.png"
+                }
+            }
+
+            Rectangle {
+                width: 700
+                height: 25
+                color: "#f2f2f2"
+                border.width: 0
+                Text {
+                    height: 25
+                    anchors.centerIn: parent
+                    text: qsTr("Please select an option for your install, or use the default: LibreOffice included.")
+                    font.pointSize: 10
+                    wrapMode: Text.WordWrap
+                }
+            }
+        }
+    }
+
+}

src/modules/packagechooserq/packagechooserq.qrc

@@ -0,0 +1,8 @@
+<RCC>
+    <qresource>
+        <file>packagechooserq.qml</file>
+        <file>images/libreoffice.jpg</file>
+        <file>images/no-selection.png</file>
+        <file>images/plasma.png</file>
+    </qresource>
+</RCC>