From 9d026862a87748d3caeeabd88be92c8c981e10e6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 23:20:45 +0200
Subject: [PATCH 01/16] [packagechooser] Provide names for selection mode

---
 src/modules/packagechooser/PackageModel.cpp | 20 ++++++++++++++++++++
 src/modules/packagechooser/PackageModel.h   |  4 ++++
 2 files changed, 24 insertions(+)

diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 7798b33bd..3546d9e42 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -20,6 +20,26 @@
 
 #include "utils/Logger.h"
 
+const NamedEnumTable< PackageChooserMode >&
+roleNames()
+{
+    static const NamedEnumTable< PackageChooserMode > names {
+        { "optional", PackageChooserMode::Optional },
+        { "exclusive", PackageChooserMode::Exclusive },
+        { "multiple", PackageChooserMode::Multiple },
+        { "requiredmultiple",
+        PackageChooserMode::RequiredMultiple },
+        // and a bunch of aliases
+        { "zero-or-one", PackageChooserMode::Optional },
+        { "radio", PackageChooserMode::Exclusive },
+        { "one", PackageChooserMode::Exclusive },
+        { "set", PackageChooserMode::Multiple },
+        { "zero-or-more", PackageChooserMode::Multiple },
+        { "required", PackageChooserMode::RequiredMultiple },
+        { "one-or-more", PackageChooserMode::RequiredMultiple } };
+    return names;
+}
+
 PackageItem
 PackageItem::fromAppStream( const QString& filename )
 {
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 7db668df4..ed5ac4b24 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -19,6 +19,8 @@
 #ifndef PACKAGEMODEL_H
 #define PACKAGEMODEL_H
 
+#include "utils/NamedEnum.h"
+
 #include <QAbstractListModel>
 #include <QObject>
 #include <QPixmap>
@@ -32,6 +34,8 @@ enum class PackageChooserMode
     RequiredMultiple  // one or more
 };
 
+const NamedEnumTable< PackageChooserMode >& roleNames();
+
 struct PackageItem
 {
     QString id;

From fb3204262c596343a1bea200fc7af0d8555c3b44 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 23:24:35 +0200
Subject: [PATCH 02/16] [packagechooser] Remove unneeded forward declaration

---
 src/modules/packagechooser/PackageChooserViewStep.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
index ed33c3e46..3947298ba 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.h
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -30,7 +30,6 @@
 #include <QVariantMap>
 
 class PackageChooserPage;
-class PackageListModel;
 
 class PLUGINDLLEXPORT PackageChooserViewStep : public Calamares::ViewStep
 {

From 042852218f53dbf491a68c75f9e727d3a66e2f2d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 14:52:38 +0200
Subject: [PATCH 03/16] [license] Apply current coding style

---
 src/modules/license/LicensePage.cpp     | 80 +++++++++++++------------
 src/modules/license/LicensePage.h       |  4 +-
 src/modules/license/LicenseViewStep.cpp | 18 +++---
 src/modules/license/LicenseViewStep.h   |  4 +-
 src/modules/license/LicenseWidget.cpp   | 65 ++++++++++----------
 src/modules/license/LicenseWidget.h     |  4 +-
 6 files changed, 89 insertions(+), 86 deletions(-)

diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp
index 3c241e467..2cc025f83 100644
--- a/src/modules/license/LicensePage.cpp
+++ b/src/modules/license/LicensePage.cpp
@@ -21,11 +21,11 @@
 
 #include "LicensePage.h"
 
-#include "ui_LicensePage.h"
 #include "LicenseWidget.h"
+#include "ui_LicensePage.h"
 
-#include "JobQueue.h"
 #include "GlobalStorage.h"
+#include "JobQueue.h"
 #include "ViewManager.h"
 
 #include "utils/CalamaresUtilsGui.h"
@@ -36,10 +36,10 @@
 
 #include <QApplication>
 #include <QBoxLayout>
+#include <QComboBox>
 #include <QDesktopServices>
 #include <QFocusEvent>
 #include <QLabel>
-#include <QComboBox>
 #include <QMessageBox>
 
 #include <algorithm>
@@ -47,11 +47,11 @@
 const NamedEnumTable< LicenseEntry::Type >&
 LicenseEntry::typeNames()
 {
-    static const NamedEnumTable< LicenseEntry::Type > names{
-        { QStringLiteral( "software" ), LicenseEntry::Type::Software},
+    static const NamedEnumTable< LicenseEntry::Type > names {
+        { QStringLiteral( "software" ), LicenseEntry::Type::Software },
         { QStringLiteral( "driver" ), LicenseEntry::Type::Driver },
         { QStringLiteral( "gpudriver" ), LicenseEntry::Type::GpuDriver },
-        { QStringLiteral( "browserplugin" ), LicenseEntry::Type::BrowserPlugin},
+        { QStringLiteral( "browserplugin" ), LicenseEntry::Type::BrowserPlugin },
         { QStringLiteral( "codec" ), LicenseEntry::Type::Codec },
         { QStringLiteral( "package" ), LicenseEntry::Type::Package }
     };
@@ -59,10 +59,12 @@ LicenseEntry::typeNames()
     return names;
 }
 
-LicenseEntry::LicenseEntry(const QVariantMap& conf)
+LicenseEntry::LicenseEntry( const QVariantMap& conf )
 {
     if ( !conf.contains( "id" ) || !conf.contains( "name" ) || !conf.contains( "url" ) )
+    {
         return;
+    }
 
     m_id = conf[ "id" ].toString();
     m_prettyName = conf[ "name" ].toString();
@@ -75,7 +77,9 @@ LicenseEntry::LicenseEntry(const QVariantMap& conf)
     QString typeString = conf.value( "type", "software" ).toString();
     m_type = typeNames().find( typeString, ok );
     if ( !ok )
+    {
         cWarning() << "License entry" << m_id << "has unknown type" << typeString << "(using 'software')";
+    }
 }
 
 bool
@@ -85,7 +89,7 @@ LicenseEntry::isLocal() const
 }
 
 
-LicensePage::LicensePage(QWidget *parent)
+LicensePage::LicensePage( QWidget* parent )
     : QWidget( parent )
     , m_isNextEnabled( false )
     , m_allLicensesOptional( false )
@@ -119,9 +123,7 @@ LicensePage::LicensePage(QWidget *parent)
 
     connect( ui->acceptCheckBox, &QCheckBox::toggled, this, &LicensePage::checkAcceptance );
 
-    CALAMARES_RETRANSLATE(
-        ui->acceptCheckBox->setText( tr( "I accept the terms and conditions above." ) );
-    )
+    CALAMARES_RETRANSLATE( ui->acceptCheckBox->setText( tr( "I accept the terms and conditions above." ) ); )
 }
 
 
@@ -132,41 +134,40 @@ LicensePage::setEntries( const QList< LicenseEntry >& entriesList )
     m_entries.clear();
     m_entries.reserve( entriesList.count() );
 
-    const bool required = std::any_of( entriesList.cbegin(), entriesList.cend(), []( const LicenseEntry& e ){ return e.m_required; });
+    const bool required
+        = std::any_of( entriesList.cbegin(), entriesList.cend(), []( const LicenseEntry& e ) { return e.m_required; } );
     if ( entriesList.isEmpty() )
+    {
         m_allLicensesOptional = true;
+    }
     else
+    {
         m_allLicensesOptional = !required;
+    }
 
     checkAcceptance( false );
 
-    CALAMARES_RETRANSLATE(
-        if ( required )
-        {
-            ui->mainText->setText( tr( "<h1>License Agreement</h1>"
-                "This setup procedure will install proprietary "
-                "software that is subject to licensing terms." ) );
-            ui->additionalText->setText( tr( "Please review the End User License "
-                "Agreements (EULAs) above.<br/>"
-                "If you do not agree with the terms, the setup procedure cannot continue." ) );
-        }
-        else
-        {
-            ui->mainText->setText( tr( "<h1>License Agreement</h1>"
-                "This setup procedure can install proprietary "
-                "software that is subject to licensing terms "
-                "in order to provide additional features and enhance the user "
-                "experience." ) );
-            ui->additionalText->setText( tr( "Please review the End User License "
-                "Agreements (EULAs) above.<br/>"
-                "If you do not agree with the terms, proprietary software will not "
-                "be installed, and open source alternatives will be used instead." ) );
-        }
-        ui->retranslateUi( this );
+    CALAMARES_RETRANSLATE( if ( required ) {
+        ui->mainText->setText( tr( "<h1>License Agreement</h1>"
+                                   "This setup procedure will install proprietary "
+                                   "software that is subject to licensing terms." ) );
+        ui->additionalText->setText( tr( "Please review the End User License "
+                                         "Agreements (EULAs) above.<br/>"
+                                         "If you do not agree with the terms, the setup procedure cannot continue." ) );
+    } else {
+        ui->mainText->setText( tr( "<h1>License Agreement</h1>"
+                                   "This setup procedure can install proprietary "
+                                   "software that is subject to licensing terms "
+                                   "in order to provide additional features and enhance the user "
+                                   "experience." ) );
+        ui->additionalText->setText( tr( "Please review the End User License "
+                                         "Agreements (EULAs) above.<br/>"
+                                         "If you do not agree with the terms, proprietary software will not "
+                                         "be installed, and open source alternatives will be used instead." ) );
+    } ui->retranslateUi( this );
 
-        for ( const auto& w : m_entries )
-            w->retranslateUi();
-    )
+                           for ( const auto& w
+                                 : m_entries ) w->retranslateUi(); )
 
     for ( const LicenseEntry& entry : entriesList )
     {
@@ -190,7 +191,8 @@ LicensePage::updateGlobalStorage( bool v )
     Calamares::JobQueue::instance()->globalStorage()->insert( "licenseAgree", v );
 }
 
-void LicensePage::checkAcceptance( bool checked )
+void
+LicensePage::checkAcceptance( bool checked )
 {
     updateGlobalStorage( checked );
 
diff --git a/src/modules/license/LicensePage.h b/src/modules/license/LicensePage.h
index e595f7ad8..bd9543937 100644
--- a/src/modules/license/LicensePage.h
+++ b/src/modules/license/LicensePage.h
@@ -24,8 +24,8 @@
 
 #include "utils/NamedEnum.h"
 
-#include <QWidget>
 #include <QUrl>
+#include <QWidget>
 
 namespace Ui
 {
@@ -101,4 +101,4 @@ private:
     QList< LicenseWidget* > m_entries;
 };
 
-#endif //LICENSEPAGE_H
+#endif  //LICENSEPAGE_H
diff --git a/src/modules/license/LicenseViewStep.cpp b/src/modules/license/LicenseViewStep.cpp
index f5f4b6e2b..89cddf27f 100644
--- a/src/modules/license/LicenseViewStep.cpp
+++ b/src/modules/license/LicenseViewStep.cpp
@@ -19,29 +19,30 @@
 
 #include "LicenseViewStep.h"
 
-#include "LicensePage.h"
-#include "JobQueue.h"
 #include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "LicensePage.h"
 #include "utils/Logger.h"
 
 #include <QVariantMap>
 
-CALAMARES_PLUGIN_FACTORY_DEFINITION( LicenseViewStepFactory, registerPlugin<LicenseViewStep>(); )
+CALAMARES_PLUGIN_FACTORY_DEFINITION( LicenseViewStepFactory, registerPlugin< LicenseViewStep >(); )
 
 LicenseViewStep::LicenseViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( new LicensePage )
 {
     emit nextStatusChanged( false );
-    connect( m_widget, &LicensePage::nextStatusChanged,
-             this, &LicenseViewStep::nextStatusChanged );
+    connect( m_widget, &LicensePage::nextStatusChanged, this, &LicenseViewStep::nextStatusChanged );
 }
 
 
 LicenseViewStep::~LicenseViewStep()
 {
     if ( m_widget && m_widget->parent() == nullptr )
+    {
         m_widget->deleteLater();
+    }
 }
 
 
@@ -97,18 +98,21 @@ void
 LicenseViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
     QList< LicenseEntry > entriesList;
-    if ( configurationMap.contains( "entries" ) &&
-         configurationMap.value( "entries" ).type() == QVariant::List )
+    if ( configurationMap.contains( "entries" ) && configurationMap.value( "entries" ).type() == QVariant::List )
     {
         const auto entries = configurationMap.value( "entries" ).toList();
         for ( const QVariant& entryV : entries )
         {
             if ( entryV.type() != QVariant::Map )
+            {
                 continue;
+            }
 
             LicenseEntry entry( entryV.toMap() );
             if ( entry.isValid() )
+            {
                 entriesList.append( entry );
+            }
         }
     }
 
diff --git a/src/modules/license/LicenseViewStep.h b/src/modules/license/LicenseViewStep.h
index a4fabc8e1..957110f3d 100644
--- a/src/modules/license/LicenseViewStep.h
+++ b/src/modules/license/LicenseViewStep.h
@@ -20,9 +20,9 @@
 #ifndef LICENSEPAGEPLUGIN_H
 #define LICENSEPAGEPLUGIN_H
 
+#include <PluginDllMacro.h>
 #include <utils/PluginFactory.h>
 #include <viewpages/ViewStep.h>
-#include <PluginDllMacro.h>
 
 #include <QObject>
 #include <QUrl>
@@ -58,4 +58,4 @@ private:
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( LicenseViewStepFactory )
 
-#endif // LICENSEPAGEPLUGIN_H
+#endif  // LICENSEPAGEPLUGIN_H
diff --git a/src/modules/license/LicenseWidget.cpp b/src/modules/license/LicenseWidget.cpp
index 238d57b07..25509be95 100644
--- a/src/modules/license/LicenseWidget.cpp
+++ b/src/modules/license/LicenseWidget.cpp
@@ -34,10 +34,12 @@ static QString
 loadLocalFile( const QUrl& u )
 {
     if ( !u.isLocalFile() )
+    {
         return QString();
+    }
 
     QFile file( u.path() );
-    if ( !file.open(QIODevice::ReadOnly | QIODevice::Text) )
+    if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) )
     {
         cWarning() << "Could not load license file" << u.path();
         return QString();
@@ -108,11 +110,10 @@ LicenseWidget::LicenseWidget( LicenseEntry entry, QWidget* parent )
     retranslateUi();
 }
 
-LicenseWidget::~LicenseWidget()
-{
-}
+LicenseWidget::~LicenseWidget() {}
 
-void LicenseWidget::retranslateUi()
+void
+LicenseWidget::retranslateUi()
 {
     QString productDescription;
     switch ( m_entry.m_type )
@@ -120,40 +121,40 @@ void LicenseWidget::retranslateUi()
     case LicenseEntry::Type::Driver:
         //: %1 is an untranslatable product name, example: Creative Audigy driver
         productDescription = tr( "<strong>%1 driver</strong><br/>"
-                                    "by %2" )
-                                .arg( m_entry.m_prettyName )
-                                .arg( m_entry.m_prettyVendor );
+                                 "by %2" )
+                                 .arg( m_entry.m_prettyName )
+                                 .arg( m_entry.m_prettyVendor );
         break;
     case LicenseEntry::Type::GpuDriver:
         //: %1 is usually a vendor name, example: Nvidia graphics driver
         productDescription = tr( "<strong>%1 graphics driver</strong><br/>"
-                                    "<font color=\"Grey\">by %2</font>" )
-                                .arg( m_entry.m_prettyName )
-                                .arg( m_entry.m_prettyVendor );
+                                 "<font color=\"Grey\">by %2</font>" )
+                                 .arg( m_entry.m_prettyName )
+                                 .arg( m_entry.m_prettyVendor );
         break;
     case LicenseEntry::Type::BrowserPlugin:
         productDescription = tr( "<strong>%1 browser plugin</strong><br/>"
-                                    "<font color=\"Grey\">by %2</font>" )
-                                .arg( m_entry.m_prettyName )
-                                .arg( m_entry.m_prettyVendor );
+                                 "<font color=\"Grey\">by %2</font>" )
+                                 .arg( m_entry.m_prettyName )
+                                 .arg( m_entry.m_prettyVendor );
         break;
     case LicenseEntry::Type::Codec:
         productDescription = tr( "<strong>%1 codec</strong><br/>"
-                                    "<font color=\"Grey\">by %2</font>" )
-                                .arg( m_entry.m_prettyName )
-                                .arg( m_entry.m_prettyVendor );
+                                 "<font color=\"Grey\">by %2</font>" )
+                                 .arg( m_entry.m_prettyName )
+                                 .arg( m_entry.m_prettyVendor );
         break;
     case LicenseEntry::Type::Package:
         productDescription = tr( "<strong>%1 package</strong><br/>"
-                                    "<font color=\"Grey\">by %2</font>" )
-                                .arg( m_entry.m_prettyName )
-                                .arg( m_entry.m_prettyVendor );
+                                 "<font color=\"Grey\">by %2</font>" )
+                                 .arg( m_entry.m_prettyName )
+                                 .arg( m_entry.m_prettyVendor );
         break;
     case LicenseEntry::Type::Software:
         productDescription = tr( "<strong>%1</strong><br/>"
-                                    "<font color=\"Grey\">by %2</font>" )
-                                .arg( m_entry.m_prettyName )
-                                .arg( m_entry.m_prettyVendor );
+                                 "<font color=\"Grey\">by %2</font>" )
+                                 .arg( m_entry.m_prettyName )
+                                 .arg( m_entry.m_prettyVendor );
     }
     m_label->setText( productDescription );
     updateExpandToolTip();
@@ -173,7 +174,9 @@ LicenseWidget::expandClicked()
 
     // Show/hide based on the new arrow direction.
     if ( m_fullText )
+    {
         m_fullText->setHidden( m_expandLicenseButton->arrowType() == Qt::UpArrow );
+    }
 
     updateExpandToolTip();
 }
@@ -186,21 +189,15 @@ LicenseWidget::updateExpandToolTip()
     {
         const bool isNowCollapsed = m_expandLicenseButton->arrowType() == Qt::UpArrow;
 
-        m_expandLicenseButton->setToolTip(
-            isNowCollapsed
-            ? tr( "Shows the complete license text" )
-            : tr( "Hide license text" )
-            ) ;
-        m_viewLicenseLabel->setText(
-            isNowCollapsed
-            ? tr( "Show license agreement" )
-            : tr( "Hide license agreement" ) );
+        m_expandLicenseButton->setToolTip( isNowCollapsed ? tr( "Shows the complete license text" )
+                                                          : tr( "Hide license text" ) );
+        m_viewLicenseLabel->setText( isNowCollapsed ? tr( "Show license agreement" ) : tr( "Hide license agreement" ) );
     }
     else
     {
         m_expandLicenseButton->setToolTip( tr( "Opens the license agreement in a browser window." ) );
-        m_viewLicenseLabel->setText( tr( "<a href=\"%1\">View license agreement</a>" )
-                                .arg( m_entry.m_url.toString() ) );
+        m_viewLicenseLabel->setText(
+            tr( "<a href=\"%1\">View license agreement</a>" ).arg( m_entry.m_url.toString() ) );
     }
 }
 
diff --git a/src/modules/license/LicenseWidget.h b/src/modules/license/LicenseWidget.h
index c43233da4..e11d7a746 100644
--- a/src/modules/license/LicenseWidget.h
+++ b/src/modules/license/LicenseWidget.h
@@ -39,7 +39,7 @@ public:
 
 private:
     void expandClicked();  // "slot" to toggle show/hide of local license text
-    void viewClicked();    // "slot" to open link
+    void viewClicked();  // "slot" to open link
     void updateExpandToolTip();
 
     LicenseEntry m_entry;
@@ -47,5 +47,5 @@ private:
     QLabel* m_viewLicenseLabel;
     QToolButton* m_expandLicenseButton;
     QLabel* m_fullText;
-} ;
+};
 #endif

From 76077743afdd838739cdf80cacf4c2ce26c3f54c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 15:45:00 +0200
Subject: [PATCH 04/16] [packagechooser] Add configuration setting for
 selection mode

 - Add a *mode* key to the configuration file
 - Change some names around to be more consistent (not user-visible)
---
 .../packagechooser/PackageChooserViewStep.cpp   | 10 ++++++++++
 src/modules/packagechooser/PackageModel.cpp     | 17 ++++++++---------
 src/modules/packagechooser/PackageModel.h       |  4 ++--
 src/modules/packagechooser/packagechooser.conf  |  9 +++++++++
 4 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 src/modules/packagechooser/packagechooser.conf

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 9b3c174da..09fa488aa 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -150,6 +150,16 @@ void
 PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
     // TODO: use the configurationMap
+    QString mode = CalamaresUtils::getString( configurationMap, "mode" );
+    bool ok = false;
+    if ( !mode.isEmpty() )
+    {
+        m_mode = roleNames().find( mode, ok );
+    }
+    if ( !ok )
+    {
+        m_mode = PackageChooserMode::Required;
+    }
 
     if ( !m_model )
     {
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 3546d9e42..484b4de3b 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -25,17 +25,16 @@ roleNames()
 {
     static const NamedEnumTable< PackageChooserMode > names {
         { "optional", PackageChooserMode::Optional },
-        { "exclusive", PackageChooserMode::Exclusive },
-        { "multiple", PackageChooserMode::Multiple },
-        { "requiredmultiple",
-        PackageChooserMode::RequiredMultiple },
+        { "required", PackageChooserMode::Required },
+        { "optionalmultiple", PackageChooserMode::OptionalMultiple },
+        { "requiredmultiple", PackageChooserMode::RequiredMultiple },
         // and a bunch of aliases
         { "zero-or-one", PackageChooserMode::Optional },
-        { "radio", PackageChooserMode::Exclusive },
-        { "one", PackageChooserMode::Exclusive },
-        { "set", PackageChooserMode::Multiple },
-        { "zero-or-more", PackageChooserMode::Multiple },
-        { "required", PackageChooserMode::RequiredMultiple },
+        { "radio", PackageChooserMode::Required },
+        { "one", PackageChooserMode::Required },
+        { "set", PackageChooserMode::OptionalMultiple },
+        { "zero-or-more", PackageChooserMode::OptionalMultiple },
+        { "multiple", PackageChooserMode::RequiredMultiple },
         { "one-or-more", PackageChooserMode::RequiredMultiple } };
     return names;
 }
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index ed5ac4b24..76e43ef44 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -29,8 +29,8 @@
 enum class PackageChooserMode
 {
     Optional,  // zero or one
-    Exclusive,  // exactly one
-    Multiple,  // zero or more
+    Required,  // exactly one
+    OptionalMultiple,  // zero or more
     RequiredMultiple  // one or more
 };
 
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
new file mode 100644
index 000000000..f08d07895
--- /dev/null
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -0,0 +1,9 @@
+# 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 "optionalmultiple", "requiredmultiple" (for zero-or-more
+# or one-or-more).
+mode: required

From 2fd2e90bf02ecf1704d1795ccde3057cac1e0eca Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 21:29:28 +0200
Subject: [PATCH 05/16] [calamares] Always run module tester with verbose
 logging

---
 src/calamares/testmain.cpp | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 5671a591e..bf03d771d 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -51,13 +51,14 @@ struct ModuleConfig
     QString m_jobConfig;
     QString m_globalConfig;
     QString m_language;
+    QString m_branding;
 };
 
 static ModuleConfig
 handle_args( QCoreApplication& a )
 {
     QCommandLineOption debugLevelOption(
-        QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8).", "level" );
+        QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8), ignored.", "level" );
     QCommandLineOption globalOption( QStringList() << QStringLiteral( "g" ) << QStringLiteral( "global " ),
                                      QStringLiteral( "Global settings document" ),
                                      "global.yaml" );
@@ -82,21 +83,7 @@ handle_args( QCoreApplication& a )
 
     parser.process( a );
 
-    if ( parser.isSet( debugLevelOption ) )
-    {
-        bool ok = true;
-        unsigned int l = parser.value( debugLevelOption ).toUInt( &ok );
-        unsigned int dlevel = 0;
-        if ( !ok )
-        {
-            dlevel = Logger::LOGVERBOSE;
-        }
-        else
-        {
-            dlevel = l;
-        }
-        Logger::setupLogLevel( dlevel );
-    }
+    Logger::setupLogLevel( Logger::LOGVERBOSE );
 
     const QStringList args = parser.positionalArguments();
     if ( args.isEmpty() )

From f53aaa8bf3af14902495ce2a376c388d41c35726 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 21:52:15 +0200
Subject: [PATCH 06/16] [calamares] Fix module loader for ViewModules

 - The ViewManager needs branding information, which wasn't
   initialized -- leading to crashes. Add -b option to give
   a specific branding, and default to something take makes
   sense when testing modules from the build directory.
 - Allows the module to load; doesn't show the UI though.
---
 src/calamares/testmain.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index bf03d771d..17a05d6de 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -26,6 +26,7 @@
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 
+#include "Branding.h"
 #include "GlobalStorage.h"
 #include "Job.h"
 #include "JobQueue.h"
@@ -68,6 +69,10 @@ handle_args( QCoreApplication& a )
     QCommandLineOption langOption( QStringList() << QStringLiteral( "l" ) << QStringLiteral( "language" ),
                                    QStringLiteral( "Language (global)" ),
                                    "languagecode" );
+    QCommandLineOption brandOption( QStringList() << QStringLiteral( "b" ) << QStringLiteral( "branding" ),
+                                    QStringLiteral( "Branding directory" ),
+                                    "path/to/branding.desc",
+                                    "src/branding/default/branding.desc" );
 
     QCommandLineParser parser;
     parser.setApplicationDescription( "Calamares module tester" );
@@ -78,6 +83,7 @@ handle_args( QCoreApplication& a )
     parser.addOption( globalOption );
     parser.addOption( jobOption );
     parser.addOption( langOption );
+    parser.addOption( brandOption );
     parser.addPositionalArgument( "module", "Path or name of module to run." );
     parser.addPositionalArgument( "job.yaml", "Path of job settings document to use.", "[job.yaml]" );
 
@@ -104,7 +110,11 @@ handle_args( QCoreApplication& a )
             jobSettings = args.at( 1 );
         }
 
-        return ModuleConfig { args.first(), jobSettings, parser.value( globalOption ), parser.value( langOption ) };
+        return ModuleConfig { args.first(),
+                              jobSettings,
+                              parser.value( globalOption ),
+                              parser.value( langOption ),
+                              parser.value( brandOption ) };
     }
 }
 
@@ -211,6 +221,7 @@ main( int argc, char* argv[] )
     if ( m->type() == Calamares::Module::Type::View )
     {
         aw = new QApplication( argc, argv );
+        (void)new Calamares::Branding( module.m_branding );
         (void)Calamares::ViewManager::instance( nullptr );
     }
 

From e8f342c0a526f3fdeaa9f84a82048b21808e17d7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 22:22:21 +0200
Subject: [PATCH 07/16] [calamares] Add test-loader option for UI

---
 src/calamares/testmain.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 17a05d6de..bdd271c81 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -38,6 +38,7 @@
 #include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QFileInfo>
+#include <QMainWindow>
 
 #include <memory>
 
@@ -53,6 +54,7 @@ struct ModuleConfig
     QString m_globalConfig;
     QString m_language;
     QString m_branding;
+    bool m_ui;
 };
 
 static ModuleConfig
@@ -73,6 +75,8 @@ handle_args( QCoreApplication& a )
                                     QStringLiteral( "Branding directory" ),
                                     "path/to/branding.desc",
                                     "src/branding/default/branding.desc" );
+    QCommandLineOption uiOption( QStringList() << QStringLiteral( "U" ) << QStringLiteral( "ui" ),
+                                 QStringLiteral( "Enable UI" ) );
 
     QCommandLineParser parser;
     parser.setApplicationDescription( "Calamares module tester" );
@@ -84,6 +88,7 @@ handle_args( QCoreApplication& a )
     parser.addOption( jobOption );
     parser.addOption( langOption );
     parser.addOption( brandOption );
+    parser.addOption( uiOption );
     parser.addPositionalArgument( "module", "Path or name of module to run." );
     parser.addPositionalArgument( "job.yaml", "Path of job settings document to use.", "[job.yaml]" );
 
@@ -114,7 +119,8 @@ handle_args( QCoreApplication& a )
                               jobSettings,
                               parser.value( globalOption ),
                               parser.value( langOption ),
-                              parser.value( brandOption ) };
+                              parser.value( brandOption ),
+                              parser.isSet( uiOption ) };
     }
 }
 
@@ -221,8 +227,9 @@ main( int argc, char* argv[] )
     if ( m->type() == Calamares::Module::Type::View )
     {
         aw = new QApplication( argc, argv );
+        QMainWindow* mw = module.m_ui ? new QMainWindow() : nullptr;
         (void)new Calamares::Branding( module.m_branding );
-        (void)Calamares::ViewManager::instance( nullptr );
+        (void)Calamares::ViewManager::instance( mw );
     }
 
     if ( !m->isLoaded() )

From f2fb49ce2664320730c3ebdcaa705631c92c8f45 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 22:27:06 +0200
Subject: [PATCH 08/16] [calamares] Fix test-loader runtime

 - Some view steps expect the module manager to be there, avoid
   startup warnings by creating one.
---
 src/calamares/testmain.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index bdd271c81..57f466e65 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -33,6 +33,8 @@
 #include "Settings.h"
 #include "ViewManager.h"
 
+#include "modulesystem/ModuleManager.h"
+
 #include <QApplication>
 #include <QCommandLineOption>
 #include <QCommandLineParser>
@@ -229,6 +231,7 @@ main( int argc, char* argv[] )
         aw = new QApplication( argc, argv );
         QMainWindow* mw = module.m_ui ? new QMainWindow() : nullptr;
         (void)new Calamares::Branding( module.m_branding );
+        (void)new Calamares::ModuleManager( QStringList(), nullptr );
         (void)Calamares::ViewManager::instance( mw );
     }
 

From ff6c6a360b1058c243c9a3f3561b7909a5e19c3d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 23:06:39 +0200
Subject: [PATCH 09/16] [calamares] Make UI work for test-loader

 - Need to create just one QApplication (subclass) with the right
   parameters for the UI to work.
 - If the UI is enabled and it's a View module, then show the widget
   rather than running the jobs.
---
 src/calamares/testmain.cpp | 49 ++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 57f466e65..885915041 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -40,6 +40,7 @@
 #include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QFileInfo>
+#include <QLabel>
 #include <QMainWindow>
 
 #include <memory>
@@ -96,8 +97,6 @@ handle_args( QCoreApplication& a )
 
     parser.process( a );
 
-    Logger::setupLogLevel( Logger::LOGVERBOSE );
-
     const QStringList args = parser.positionalArguments();
     if ( args.isEmpty() )
     {
@@ -189,13 +188,38 @@ load_module( const ModuleConfig& moduleConfig )
     return module;
 }
 
+/** @brief Create the right kind of QApplication
+ *
+ * Does primitive parsing of argv[] to find the --ui option and returns
+ * a UI-enabled application if it does.
+ *
+ * @p argc must be a reference (to main's argc) because the QCoreApplication
+ * constructors take a reference as well, and that would otherwise be a
+ * reference to a temporary.
+ */
+QCoreApplication*
+createApplication( int& argc, char* argv[] )
+{
+    for ( int i = 1; i < argc; ++i )
+    {
+        if ( !qstrcmp( argv[ i ], "--ui" ) || !qstrcmp( argv[ i ], "-U" ) )
+        {
+            auto* aw = new QApplication( argc, argv );
+            aw->setQuitOnLastWindowClosed( true );
+            return aw;
+        }
+    }
+    return new QCoreApplication( argc, argv );
+}
+
 int
 main( int argc, char* argv[] )
 {
-    QCoreApplication a( argc, argv );
-    QApplication* aw = nullptr;
+    QCoreApplication* aw = createApplication( argc, argv );
 
-    ModuleConfig module = handle_args( a );
+    Logger::setupLogLevel( Logger::LOGVERBOSE );
+
+    ModuleConfig module = handle_args( *aw );
     if ( module.moduleName().isEmpty() )
     {
         return 1;
@@ -203,6 +227,7 @@ main( int argc, char* argv[] )
 
     std::unique_ptr< Calamares::Settings > settings_p( new Calamares::Settings( QString(), true ) );
     std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) );
+    QMainWindow* mw = nullptr;
 
     auto gs = jobqueue_p->globalStorage();
     if ( !module.globalConfigFile().isEmpty() )
@@ -228,8 +253,8 @@ main( int argc, char* argv[] )
     cDebug() << " .. got" << m->name() << m->typeString() << m->interfaceString();
     if ( m->type() == Calamares::Module::Type::View )
     {
-        aw = new QApplication( argc, argv );
-        QMainWindow* mw = module.m_ui ? new QMainWindow() : nullptr;
+        mw = module.m_ui ? new QMainWindow() : nullptr;
+
         (void)new Calamares::Branding( module.m_branding );
         (void)new Calamares::ModuleManager( QStringList(), nullptr );
         (void)Calamares::ViewManager::instance( mw );
@@ -246,6 +271,16 @@ main( int argc, char* argv[] )
         return 1;
     }
 
+    if ( mw )
+    {
+        QWidget* w = Calamares::ViewManager::instance()->currentStep()->widget();
+        w->setParent( mw );
+        mw->setCentralWidget( w );
+        w->show();
+        mw->show();
+        return aw->exec();
+    }
+
     using TR = Logger::DebugRow< const char*, const QString >;
 
     cDebug() << "Module metadata" << TR( "name", m->name() ) << TR( "type", m->typeString() )

From 87d7b2a5c072966422f19985a450449420ecdd31 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 23:24:30 +0200
Subject: [PATCH 10/16] [packagechooser] Allow setting an ID for the module's
 GS key

---
 src/modules/packagechooser/PackageChooserViewStep.cpp | 6 ++++--
 src/modules/packagechooser/PackageChooserViewStep.h   | 3 +++
 src/modules/packagechooser/packagechooser.conf        | 9 +++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 09fa488aa..a8dd0e8d0 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -149,7 +149,6 @@ PackageChooserViewStep::jobs() const
 void
 PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    // TODO: use the configurationMap
     QString mode = CalamaresUtils::getString( configurationMap, "mode" );
     bool ok = false;
     if ( !mode.isEmpty() )
@@ -160,7 +159,10 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
     {
         m_mode = PackageChooserMode::Required;
     }
-
+    
+    m_id = CalamaresUtils::getString( configurationMap, "id" );
+    
+    // TODO: replace this hard-coded model
     if ( !m_model )
     {
 
diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
index 3947298ba..e410e547b 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.h
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -60,7 +60,10 @@ private:
 
     PackageChooserPage* m_widget;
     PackageListModel* m_model;
+    
+    // Configuration
     PackageChooserMode m_mode;
+    QString m_id;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory )
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index f08d07895..fd100ab27 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -1,5 +1,14 @@
 # Configuration for the low-density software chooser
 ---
+# The packagechooser writes a GlobalStorage value for the choice that
+# has been made. The key is *packagechooser_<id>*. If *id* is set here,
+# it is substituted into the key name. If it is not set, the module's
+# instance name is used; see the *instances* section of `settings.conf`.
+# If there is just one packagechooser module, and no *id* is set,
+# resulting GS key is probably *packagechooser_packagechooser*.
+#
+# id: ""
+
 # Software selection mode, to set whether the software packages
 # can be chosen singly, or multiply.
 #

From b711c791bdb9cc4f660a0cd3546391c4dd16eba0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 23:28:55 +0200
Subject: [PATCH 11/16] [packagechooser] Fix build, tidy code

---
 src/modules/packagechooser/PackageChooserPage.cpp  |  4 ++--
 .../packagechooser/PackageChooserViewStep.cpp      | 14 +++++++-------
 .../packagechooser/PackageChooserViewStep.h        |  2 +-
 src/modules/packagechooser/PackageModel.cpp        |  3 ++-
 src/modules/packagechooser/PackageModel.h          |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index f0f7cb04c..d267e4885 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -42,9 +42,9 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
     switch ( mode )
     {
     case PackageChooserMode::Optional:
-    case PackageChooserMode::Exclusive:
+    case PackageChooserMode::Required:
         ui->products->setSelectionMode( QAbstractItemView::SingleSelection );
-    case PackageChooserMode::Multiple:
+    case PackageChooserMode::OptionalMultiple:
     case PackageChooserMode::RequiredMultiple:
         ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
     }
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index a8dd0e8d0..47b6f84d0 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -37,7 +37,7 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( nullptr )
     , m_model( nullptr )
-    , m_mode( PackageChooserMode::Exclusive )
+    , m_mode( PackageChooserMode::Required )
 {
     emit nextStatusChanged( false );
 }
@@ -100,10 +100,10 @@ PackageChooserViewStep::isNextEnabled() const
     switch ( m_mode )
     {
     case PackageChooserMode::Optional:
-    case PackageChooserMode::Multiple:
+    case PackageChooserMode::OptionalMultiple:
         // zero or one OR zero or more
         return true;
-    case PackageChooserMode::Exclusive:
+    case PackageChooserMode::Required:
     case PackageChooserMode::RequiredMultiple:
         // exactly one OR one or more
         return m_widget->hasSelection();
@@ -159,17 +159,17 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
     {
         m_mode = PackageChooserMode::Required;
     }
-    
+
     m_id = CalamaresUtils::getString( configurationMap, "id" );
-    
+
     // TODO: replace this hard-coded model
     if ( !m_model )
     {
 
         m_model = new PackageListModel( nullptr );
         m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop", ":/images/kde.png" } );
-        m_model->addPackage(
-            PackageItem { "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } );
+        m_model->addPackage( PackageItem {
+            "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } );
 
 
         if ( m_widget )
diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
index e410e547b..55ed2d4d5 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.h
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -60,7 +60,7 @@ private:
 
     PackageChooserPage* m_widget;
     PackageListModel* m_model;
-    
+
     // Configuration
     PackageChooserMode m_mode;
     QString m_id;
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 484b4de3b..eb783259b 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -35,7 +35,8 @@ roleNames()
         { "set", PackageChooserMode::OptionalMultiple },
         { "zero-or-more", PackageChooserMode::OptionalMultiple },
         { "multiple", PackageChooserMode::RequiredMultiple },
-        { "one-or-more", PackageChooserMode::RequiredMultiple } };
+        { "one-or-more", PackageChooserMode::RequiredMultiple }
+    };
     return names;
 }
 
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 76e43ef44..dfb922e59 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -73,7 +73,7 @@ class PackageListModel : public QAbstractListModel
 public:
     PackageListModel( PackageList&& items, QObject* parent );
     PackageListModel( QObject* parent );
-    virtual ~PackageListModel();
+    virtual ~PackageListModel() override;
 
     void addPackage( PackageItem&& p );
 

From c59ffc77652231f67bc0ba93240532927b1b321c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 23:33:34 +0200
Subject: [PATCH 12/16] [packagechooser] Set default ID as documented

---
 src/modules/packagechooser/PackageChooserViewStep.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 47b6f84d0..9edfa9416 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -161,6 +161,12 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
     }
 
     m_id = CalamaresUtils::getString( configurationMap, "id" );
+    if ( m_id.isEmpty() )
+    {
+        // Not set, so use the instance id
+        // TODO: use a stronger type than QString for structured IDs
+        m_id = moduleInstanceKey().split( '@' ).last();
+    }
 
     // TODO: replace this hard-coded model
     if ( !m_model )

From 140c0db7a48b89af9e7a6b4c36a7a0ee0ae9467c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 23:51:00 +0200
Subject: [PATCH 13/16] [packagechooser] Set GlobalStorage packagechooser_<id>

---
 .../packagechooser/PackageChooserPage.cpp     | 21 +++++++++++++++++++
 .../packagechooser/PackageChooserPage.h       |  6 ++++++
 .../packagechooser/PackageChooserViewStep.cpp |  9 ++++++++
 src/modules/packagechooser/PackageModel.cpp   |  4 ++++
 src/modules/packagechooser/PackageModel.h     |  3 ++-
 .../packagechooser/packagechooser.conf        |  3 +++
 6 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index d267e4885..265ce3b53 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -98,3 +98,24 @@ PackageChooserPage::hasSelection() const
 {
     return ui && ui->products && ui->products->selectionModel() && ui->products->selectionModel()->hasSelection();
 }
+
+QStringList
+PackageChooserPage::selectedPackageIds() const
+{
+    if ( !( ui && ui->products && ui->products->selectionModel() ) )
+    {
+        return QStringList();
+    }
+
+    const auto* model = ui->products->model();
+    QStringList ids;
+    for ( const auto& index : ui->products->selectionModel()->selectedIndexes() )
+    {
+        QString pid = model->data( index, PackageListModel::IdRole ).toString();
+        if ( !pid.isEmpty() )
+        {
+            ids.append( pid );
+        }
+    }
+    return ids;
+}
diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h
index 8f9fde11f..401de903b 100644
--- a/src/modules/packagechooser/PackageChooserPage.h
+++ b/src/modules/packagechooser/PackageChooserPage.h
@@ -37,7 +37,13 @@ public:
 
     void setModel( QAbstractItemModel* model );
 
+    /// @brief Is anything selected?
     bool hasSelection() const;
+    /** @brief Get the list of selected ids
+     *
+     * This list may be empty (if none is selected).
+     */
+    QStringList selectedPackageIds() const;
 
 public slots:
     void currentChanged( const QModelIndex& index );
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 9edfa9416..9d32884c7 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -137,6 +137,15 @@ PackageChooserViewStep::isAtEnd() const
 void
 PackageChooserViewStep::onLeave()
 {
+    QString key = QStringLiteral( "packagechooser_%1" ).arg( m_id );
+    QString value;
+    if ( m_widget->hasSelection() )
+    {
+        value = m_widget->selectedPackageIds().join( ',' );
+    }
+    Calamares::JobQueue::instance()->globalStorage()->insert( key, value );
+    
+    cDebug() << "PackageChooser" << key << "selected" << value;
 }
 
 Calamares::JobList
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index eb783259b..aa8dd39fc 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -128,6 +128,10 @@ PackageListModel::data( const QModelIndex& index, int role ) const
     {
         return m_packages[ row ].screenshot;
     }
+    else if ( role == IdRole )
+    {
+        return m_packages[ row ].id;
+    }
 
     return QVariant();
 }
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index dfb922e59..7f8fff8ec 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -84,7 +84,8 @@ public:
     {
         NameRole = Qt::DisplayRole,
         DescriptionRole = Qt::UserRole,
-        ScreenshotRole
+        ScreenshotRole,
+        IdRole
     };
 
 private:
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index fd100ab27..b4e48c995 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -7,6 +7,9 @@
 # If there is just one packagechooser module, and no *id* is set,
 # resulting GS key is probably *packagechooser_packagechooser*.
 #
+# The GS value is a comma-separated list of the IDs of the selected
+# packages, or an empty string if none is selected.
+#
 # id: ""
 
 # Software selection mode, to set whether the software packages

From 047a300a5181a03dd11c1a3b6862f3301236f301 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 23:55:29 +0200
Subject: [PATCH 14/16] [packagechooser] Remove unneeded debug

---
 src/modules/packagechooser/PackageChooserPage.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 265ce3b53..63307d095 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -34,7 +34,6 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
                       tr( "Please pick a product from the list. The selected product will be installed." ) )
 {
     m_introduction.screenshot = QPixmap( QStringLiteral( ":/images/no-selection.png" ) );
-    cDebug() << m_introduction.screenshot;
 
     ui->setupUi( this );
     CALAMARES_RETRANSLATE( updateLabels(); )

From d5275d5e10cac56db5f3f573a5ecf54b681850e4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 4 Aug 2019 00:08:41 +0200
Subject: [PATCH 15/16] [packagechooser] Allow the model to set the
 introductory text

---
 .../packagechooser/PackageChooserPage.cpp     | 20 +++++++++++++++++++
 .../packagechooser/PackageChooserViewStep.cpp | 11 ++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 63307d095..60becf64f 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -86,6 +86,26 @@ void
 PackageChooserPage::setModel( QAbstractItemModel* model )
 {
     ui->products->setModel( model );
+
+    // Check if any of the items in the model is the "none" option.
+    // If so, copy its values into the introduction / none item.
+    for ( int r = 0; r < model->rowCount(); ++r )
+    {
+        auto index = model->index( r, 0 );
+        if ( index.isValid() )
+        {
+            QVariant v = model->data( index, PackageListModel::IdRole );
+            if ( v.isValid() && v.toString().isEmpty() )
+            {
+                m_introduction.name = model->data( index, PackageListModel::NameRole ).toString();
+                m_introduction.description = model->data( index, PackageListModel::DescriptionRole ).toString();
+                m_introduction.screenshot = model->data( index, PackageListModel::ScreenshotRole ).value< QPixmap >();
+                currentChanged( QModelIndex() );
+                break;
+            }
+        }
+    }
+
     connect( ui->products->selectionModel(),
              &QItemSelectionModel::selectionChanged,
              this,
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 9d32884c7..8515d03a9 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -144,7 +144,7 @@ PackageChooserViewStep::onLeave()
         value = m_widget->selectedPackageIds().join( ',' );
     }
     Calamares::JobQueue::instance()->globalStorage()->insert( key, value );
-    
+
     cDebug() << "PackageChooser" << key << "selected" << value;
 }
 
@@ -180,8 +180,15 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
     // TODO: replace this hard-coded model
     if ( !m_model )
     {
-
         m_model = new PackageListModel( nullptr );
+        m_model->addPackage( PackageItem { QString(),
+                                           QString(),
+                                           "No Desktop",
+                                           "Please pick a desktop environment from the list. "
+                                           "If you don't want to install a desktop, that's fine, "
+                                           "your system will start up in text-only mode and you can "
+                                           "install a desktop environment later.",
+                                           ":/images/no-selection.png" } );
         m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop", ":/images/kde.png" } );
         m_model->addPackage( PackageItem {
             "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } );

From adb939b2e82617003b16a81d0622d1bd45192843 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 4 Aug 2019 00:11:50 +0200
Subject: [PATCH 16/16] [packagechooser] Word-wrap package descriptions

---
 src/modules/packagechooser/page_package.ui | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui
index 1ba032ed2..17a960549 100644
--- a/src/modules/packagechooser/page_package.ui
+++ b/src/modules/packagechooser/page_package.ui
@@ -53,6 +53,12 @@
          <property name="text">
           <string>TextLabel</string>
          </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>