From 735d5d2683454cc84cd77f57f0f92e7f517f9e6b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 10:57:12 +0200
Subject: [PATCH 01/44] [packagechooser] Add stub of module

Package chooser is a **low density** package selector -- unlike
netinstall which offers a high density tree view -- for picking
zero, one, or more items from a small collection of packages.

This can be used, e.g., for "pick exactly one desktop environment",
"pick zero or more text editors" which can then be installed
by another module. The UI is big and shiny (rather than netinstall's
text-based tree view) and isn't suitable for more than a dozen or
so items.
---
 src/modules/packagechooser/CMakeLists.txt     |  27 +++++
 .../packagechooser/PackageChooserPage.cpp     |  33 +++++
 .../packagechooser/PackageChooserPage.h       |  39 ++++++
 .../packagechooser/PackageChooserViewStep.cpp | 113 ++++++++++++++++++
 .../packagechooser/PackageChooserViewStep.h   |  60 ++++++++++
 src/modules/packagechooser/Tests.cpp          |  38 ++++++
 src/modules/packagechooser/Tests.h            |  36 ++++++
 src/modules/packagechooser/page_package.ui    |  59 +++++++++
 8 files changed, 405 insertions(+)
 create mode 100644 src/modules/packagechooser/CMakeLists.txt
 create mode 100644 src/modules/packagechooser/PackageChooserPage.cpp
 create mode 100644 src/modules/packagechooser/PackageChooserPage.h
 create mode 100644 src/modules/packagechooser/PackageChooserViewStep.cpp
 create mode 100644 src/modules/packagechooser/PackageChooserViewStep.h
 create mode 100644 src/modules/packagechooser/Tests.cpp
 create mode 100644 src/modules/packagechooser/Tests.h
 create mode 100644 src/modules/packagechooser/page_package.ui

diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt
new file mode 100644
index 000000000..0c739012a
--- /dev/null
+++ b/src/modules/packagechooser/CMakeLists.txt
@@ -0,0 +1,27 @@
+find_package( Qt5 COMPONENTS Core Gui Widgets REQUIRED )
+
+calamares_add_plugin( packagechooser
+    TYPE viewmodule
+    EXPORT_MACRO PLUGINDLLEXPORT_PRO
+    SOURCES
+        PackageChooserPage.cpp
+        PackageChooserViewStep.cpp
+    UI
+        page_package.ui
+    LINK_PRIVATE_LIBRARIES
+        calamaresui
+    SHARED_LIB
+)
+
+if( ECM_FOUND AND BUILD_TESTING )
+    ecm_add_test(
+            Tests.cpp
+        TEST_NAME
+            packagechooosertest
+        LINK_LIBRARIES
+            ${CALAMARES_LIBRARIES}
+            Qt5::Core
+            Qt5::Test
+    )
+    calamares_automoc( packagechooosertest)
+endif()
diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
new file mode 100644
index 000000000..2f83e6728
--- /dev/null
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -0,0 +1,33 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   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 "PackageChooserPage.h"
+
+#include "ui_page_package.h"
+
+#include "utils/Logger.h"
+#include "utils/Retranslator.h"
+
+#include <QLabel>
+
+PackageChooserPage::PackageChooserPage( QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::PackageChooserPage )
+{
+    ui->setupUi( this );
+}
diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h
new file mode 100644
index 000000000..1bc46bef3
--- /dev/null
+++ b/src/modules/packagechooser/PackageChooserPage.h
@@ -0,0 +1,39 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   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 PACKAGECHOOSERPAGE_H
+#define PACKAGECHOOSERPAGE_H
+
+#include <QWidget>
+
+namespace Ui
+{
+class PackageChooserPage;
+}
+
+class PackageChooserPage : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit PackageChooserPage( QWidget* parent = nullptr );
+
+private:
+    Ui::PackageChooserPage* ui;
+};
+
+#endif  // PACKAGECHOOSERPAGE_H
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
new file mode 100644
index 000000000..db45bea0b
--- /dev/null
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -0,0 +1,113 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   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 "PackageChooserViewStep.h"
+
+#include "PackageChooserPage.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+#include "utils/Variant.h"
+
+#include <QDesktopServices>
+#include <QVariantMap>
+
+CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserViewStepFactory, registerPlugin< PackageChooserViewStep >(); )
+
+PackageChooserViewStep::PackageChooserViewStep( QObject* parent )
+    : Calamares::ViewStep( parent )
+    , m_widget( nullptr )
+{
+    emit nextStatusChanged( false );
+}
+
+
+PackageChooserViewStep::~PackageChooserViewStep()
+{
+    if ( m_widget && m_widget->parent() == nullptr )
+    {
+        m_widget->deleteLater();
+    }
+}
+
+
+QString
+PackageChooserViewStep::prettyName() const
+{
+    return tr( "Packages" );
+}
+
+
+QWidget*
+PackageChooserViewStep::widget()
+{
+    if ( !m_widget )
+    {
+        m_widget = new PackageChooserPage( nullptr );
+    }
+    return m_widget;
+}
+
+
+bool
+PackageChooserViewStep::isNextEnabled() const
+{
+    return true;
+}
+
+
+bool
+PackageChooserViewStep::isBackEnabled() const
+{
+    return true;
+}
+
+
+bool
+PackageChooserViewStep::isAtBeginning() const
+{
+    return true;
+}
+
+
+bool
+PackageChooserViewStep::isAtEnd() const
+{
+    return true;
+}
+
+
+void
+PackageChooserViewStep::onLeave()
+{
+}
+
+Calamares::JobList
+PackageChooserViewStep::jobs() const
+{
+    Calamares::JobList l;
+    return l;
+}
+
+void
+PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap )
+{
+}
diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
new file mode 100644
index 000000000..a32d4caab
--- /dev/null
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -0,0 +1,60 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   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 PACKAGECHOOSERVIEWSTEP_H
+#define PACKAGECHOOSERVIEWSTEP_H
+
+#include <PluginDllMacro.h>
+#include <utils/PluginFactory.h>
+#include <viewpages/ViewStep.h>
+
+#include <QObject>
+#include <QUrl>
+#include <QVariantMap>
+
+class PLUGINDLLEXPORT PackageChooserViewStep : public Calamares::ViewStep
+{
+    Q_OBJECT
+
+public:
+    explicit PackageChooserViewStep( QObject* parent = nullptr );
+    virtual ~PackageChooserViewStep() override;
+
+    QString prettyName() const override;
+
+    QWidget* widget() override;
+
+    bool isNextEnabled() const override;
+    bool isBackEnabled() const override;
+
+    bool isAtBeginning() const override;
+    bool isAtEnd() const override;
+
+    void onLeave() override;
+
+    Calamares::JobList jobs() const override;
+
+    void setConfigurationMap( const QVariantMap& configurationMap ) override;
+
+private:
+    QWidget* m_widget;
+};
+
+CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory )
+
+#endif  // PACKAGECHOOSERVIEWSTEP_H
diff --git a/src/modules/packagechooser/Tests.cpp b/src/modules/packagechooser/Tests.cpp
new file mode 100644
index 000000000..c016f1808
--- /dev/null
+++ b/src/modules/packagechooser/Tests.cpp
@@ -0,0 +1,38 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   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 "Tests.h"
+
+#include <QtTest/QtTest>
+
+QTEST_GUILESS_MAIN( PackageChooserTests )
+
+PackageChooserTests::PackageChooserTests() {}
+
+PackageChooserTests::~PackageChooserTests() {}
+
+void
+PackageChooserTests::initTestCase()
+{
+}
+
+void
+PackageChooserTests::testBogus()
+{
+    QVERIFY( true );
+}
diff --git a/src/modules/packagechooser/Tests.h b/src/modules/packagechooser/Tests.h
new file mode 100644
index 000000000..bc257f5a5
--- /dev/null
+++ b/src/modules/packagechooser/Tests.h
@@ -0,0 +1,36 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   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 PACKAGECHOOSERTESTS_H
+#define PACKAGECHOOSERTESTS_H
+
+#include <QObject>
+
+class PackageChooserTests : public QObject
+{
+    Q_OBJECT
+public:
+    PackageChooserTests();
+    ~PackageChooserTests() override;
+
+private Q_SLOTS:
+    void initTestCase();
+    void testBogus();
+};
+
+#endif
diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui
new file mode 100644
index 000000000..18c2f81fd
--- /dev/null
+++ b/src/modules/packagechooser/page_package.ui
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PackageChooserPage</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QWidget" name="horizontalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>19</y>
+     <width>341</width>
+     <height>261</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QListView" name="products"/>
+    </item>
+    <item>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QLabel" name="productName">
+        <property name="text">
+         <string>TextLabel</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="productScreenshot">
+        <property name="text">
+         <string>TextLabel</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="productDescription">
+        <property name="text">
+         <string>TextLabel</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

From 727290f75e9286e6819122295f5955c117f8406b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 11:09:12 +0200
Subject: [PATCH 02/44] [packagechooser] Handle translation events (stub)

---
 src/modules/packagechooser/PackageChooserPage.cpp | 11 +++++++++++
 src/modules/packagechooser/PackageChooserPage.h   |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 2f83e6728..5524bd103 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -30,4 +30,15 @@ PackageChooserPage::PackageChooserPage( QWidget* parent )
     , ui( new Ui::PackageChooserPage )
 {
     ui->setupUi( this );
+    CALAMARES_RETRANSLATE(
+        updateLabels();
+    )
+}
+
+void
+PackageChooserPage::updateLabels()
+{
+    ui->productName->setText( QString() );
+    ui->productScreenshot->hide();
+    ui->productDescription->setText( tr( "Please pick a product from the list." ) );
 }
diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h
index 1bc46bef3..02c46fc3e 100644
--- a/src/modules/packagechooser/PackageChooserPage.h
+++ b/src/modules/packagechooser/PackageChooserPage.h
@@ -32,6 +32,9 @@ class PackageChooserPage : public QWidget
 public:
     explicit PackageChooserPage( QWidget* parent = nullptr );
 
+public slots:
+    void updateLabels();
+
 private:
     Ui::PackageChooserPage* ui;
 };

From d1a85ba5ca5f333e1564d3a5f7a8e29127ccf8ff Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 13:05:46 +0200
Subject: [PATCH 03/44] [packagechooser] Add a model for the list to use

 - Model contents currently hard-coded
---
 src/modules/packagechooser/CMakeLists.txt     |  1 +
 .../packagechooser/PackageChooserPage.cpp     | 18 +++-
 .../packagechooser/PackageChooserPage.h       |  4 +
 .../packagechooser/PackageChooserViewStep.cpp | 35 +++++++
 .../packagechooser/PackageChooserViewStep.h   | 14 ++-
 src/modules/packagechooser/PackageModel.cpp   | 93 +++++++++++++++++++
 src/modules/packagechooser/PackageModel.h     | 62 +++++++++++++
 7 files changed, 220 insertions(+), 7 deletions(-)
 create mode 100644 src/modules/packagechooser/PackageModel.cpp
 create mode 100644 src/modules/packagechooser/PackageModel.h

diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt
index 0c739012a..525921602 100644
--- a/src/modules/packagechooser/CMakeLists.txt
+++ b/src/modules/packagechooser/CMakeLists.txt
@@ -6,6 +6,7 @@ calamares_add_plugin( packagechooser
     SOURCES
         PackageChooserPage.cpp
         PackageChooserViewStep.cpp
+        PackageModel.cpp
     UI
         page_package.ui
     LINK_PRIVATE_LIBRARIES
diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 5524bd103..215adeeef 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -30,9 +30,7 @@ PackageChooserPage::PackageChooserPage( QWidget* parent )
     , ui( new Ui::PackageChooserPage )
 {
     ui->setupUi( this );
-    CALAMARES_RETRANSLATE(
-        updateLabels();
-    )
+    CALAMARES_RETRANSLATE( updateLabels(); )
 }
 
 void
@@ -42,3 +40,17 @@ PackageChooserPage::updateLabels()
     ui->productScreenshot->hide();
     ui->productDescription->setText( tr( "Please pick a product from the list." ) );
 }
+
+void
+PackageChooserPage::setModel( QAbstractItemModel* model )
+{
+    ui->products->setModel( model );
+}
+
+void
+PackageChooserPage::currentChanged( const QModelIndex& current )
+{
+    updateLabels();
+    cDebug() << "Current updated to" << current.row();
+    cDebug() << ui->products->model()->data( current, Qt::DisplayRole );
+}
diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h
index 02c46fc3e..db5540312 100644
--- a/src/modules/packagechooser/PackageChooserPage.h
+++ b/src/modules/packagechooser/PackageChooserPage.h
@@ -19,6 +19,7 @@
 #ifndef PACKAGECHOOSERPAGE_H
 #define PACKAGECHOOSERPAGE_H
 
+#include <QAbstractItemModel>
 #include <QWidget>
 
 namespace Ui
@@ -32,8 +33,11 @@ class PackageChooserPage : public QWidget
 public:
     explicit PackageChooserPage( QWidget* parent = nullptr );
 
+    void setModel( QAbstractItemModel* model );
+
 public slots:
     void updateLabels();
+    void currentChanged( const QModelIndex& current );
 
 private:
     Ui::PackageChooserPage* ui;
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index db45bea0b..3ff2ac636 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -19,6 +19,7 @@
 #include "PackageChooserViewStep.h"
 
 #include "PackageChooserPage.h"
+#include "PackageModel.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
@@ -35,6 +36,7 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserViewStepFactory, registerPlug
 PackageChooserViewStep::PackageChooserViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( nullptr )
+    , m_model( nullptr )
 {
     emit nextStatusChanged( false );
 }
@@ -46,6 +48,7 @@ PackageChooserViewStep::~PackageChooserViewStep()
     {
         m_widget->deleteLater();
     }
+    delete m_model;
 }
 
 
@@ -62,6 +65,10 @@ PackageChooserViewStep::widget()
     if ( !m_widget )
     {
         m_widget = new PackageChooserPage( nullptr );
+        if ( m_model )
+        {
+            hookupModel();
+        }
     }
     return m_widget;
 }
@@ -110,4 +117,32 @@ PackageChooserViewStep::jobs() const
 void
 PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
+    // TODO: use the configurationMap
+
+    if ( !m_model )
+    {
+
+        m_model = new PackageListModel( nullptr );
+        m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop" } );
+        m_model->addPackage(
+            PackageItem { "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop" } );
+
+
+        if ( m_widget )
+        {
+            hookupModel();
+        }
+    }
+}
+
+void
+PackageChooserViewStep::hookupModel()
+{
+    if ( !m_model || !m_widget )
+    {
+        cError() << "Can't hook up model until widget and model both exist.";
+        return;
+    }
+
+    m_widget->setModel( m_model );
 }
diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
index a32d4caab..56fbf5d3a 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.h
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -19,14 +19,17 @@
 #ifndef PACKAGECHOOSERVIEWSTEP_H
 #define PACKAGECHOOSERVIEWSTEP_H
 
-#include <PluginDllMacro.h>
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "PluginDllMacro.h"
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
 #include <QObject>
 #include <QUrl>
 #include <QVariantMap>
 
+class PackageChooserPage;
+class PackageListModel;
+
 class PLUGINDLLEXPORT PackageChooserViewStep : public Calamares::ViewStep
 {
     Q_OBJECT
@@ -52,7 +55,10 @@ public:
     void setConfigurationMap( const QVariantMap& configurationMap ) override;
 
 private:
-    QWidget* m_widget;
+    void hookupModel();
+
+    PackageChooserPage* m_widget;
+    PackageListModel* m_model;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory )
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
new file mode 100644
index 000000000..1f6346666
--- /dev/null
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -0,0 +1,93 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   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 "PackageModel.h"
+
+#include "utils/Logger.h"
+
+PackageItem
+PackageItem::fromAppStream( const QString& filename )
+{
+    // TODO: implement this
+    return PackageItem {};
+}
+
+PackageItem::PackageItem() {}
+
+PackageItem::PackageItem( const QString& a_id,
+                          const QString& a_package,
+                          const QString& a_name,
+                          const QString& a_description )
+    : id( a_id )
+    , package( a_package )
+    , name( a_name )
+    , description( a_description )
+{
+}
+
+
+PackageListModel::PackageListModel( QObject* parent )
+    : QAbstractListModel( parent )
+{
+}
+
+PackageListModel::PackageListModel( PackageList&& items, QObject* parent )
+    : QAbstractListModel( parent )
+    , m_packages( std::move( items ) )
+{
+}
+
+PackageListModel::~PackageListModel() {}
+
+void
+PackageListModel::addPackage( PackageItem&& p )
+{
+    int c = m_packages.count();
+    beginInsertRows( QModelIndex(), c, c );
+    m_packages.append( p );
+    endInsertRows();
+}
+
+int
+PackageListModel::rowCount( const QModelIndex& index ) const
+{
+    // For lists, valid indexes have zero children; only the root index has them
+    return index.isValid() ? 0 : m_packages.count();
+}
+
+QVariant
+PackageListModel::data( const QModelIndex& index, int role ) const
+{
+    cDebug() << "Data" << m_packages.count() << index.isValid() << ( index.isValid() ? index.row() : -1 );
+    if ( !index.isValid() )
+    {
+        return QVariant();
+    }
+    int row = index.row();
+    if ( row >= m_packages.count() || row < 0 )
+    {
+        return QVariant();
+    }
+
+    if ( role == Qt::DisplayRole )
+    {
+        return m_packages[ row ].name;
+    }
+
+    return QVariant();
+}
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
new file mode 100644
index 000000000..c00e55c0a
--- /dev/null
+++ b/src/modules/packagechooser/PackageModel.h
@@ -0,0 +1,62 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   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 PACKAGEMODEL_H
+#define PACKAGEMODEL_H
+
+#include <QAbstractListModel>
+#include <QObject>
+#include <QVector>
+
+struct PackageItem
+{
+    QString id;
+    // TODO: may need more than one
+    QString package;
+    // TODO: name and description are localized
+    QString name;
+    QString description;
+    // TODO: may be more than one
+    // QPixmap screenshot;
+
+    PackageItem();
+    PackageItem( const QString& id, const QString& package, const QString& name, const QString& description );
+
+    // TODO: implement this
+    PackageItem fromAppStream( const QString& filename );
+};
+
+using PackageList = QVector< PackageItem >;
+
+class PackageListModel : public QAbstractListModel
+{
+public:
+    PackageListModel( PackageList&& items, QObject* parent );
+    PackageListModel( QObject* parent );
+    virtual ~PackageListModel();
+
+    void addPackage( PackageItem&& p );
+
+    int rowCount( const QModelIndex& index ) const override;
+    QVariant data( const QModelIndex& index, int role ) const override;
+
+private:
+    PackageList m_packages;
+};
+
+#endif

From f8d159dfa49dbd820ed3a3945e0d46da4e953a61 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 15:32:14 +0200
Subject: [PATCH 04/44] [packagechooser] Massage layout a bit

---
 src/modules/packagechooser/page_package.ui | 91 ++++++++++++----------
 1 file changed, 49 insertions(+), 42 deletions(-)

diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui
index 18c2f81fd..1ba032ed2 100644
--- a/src/modules/packagechooser/page_package.ui
+++ b/src/modules/packagechooser/page_package.ui
@@ -1,58 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PackageChooserPage</class>
- <widget class="QWidget" name="Form">
+ <widget class="QWidget" name="PackageChooserPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>300</height>
+    <height>500</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>1</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="QWidget" name="horizontalLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>9</x>
-     <y>19</y>
-     <width>341</width>
-     <height>261</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <item>
-     <widget class="QListView" name="products"/>
-    </item>
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QLabel" name="productName">
-        <property name="text">
-         <string>TextLabel</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="productScreenshot">
-        <property name="text">
-         <string>TextLabel</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="productDescription">
-        <property name="text">
-         <string>TextLabel</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
+  <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2">
+     <item>
+      <widget class="QListView" name="products">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>1</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout" stretch="1,3,1">
+       <item>
+        <widget class="QLabel" name="productName">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="productScreenshot">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="productDescription">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections/>

From dc5cdbb38cad5206b03893beba169506529f507c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 16:07:47 +0200
Subject: [PATCH 05/44] [packagechooser] Update other parts of the window on
 selection

---
 .../packagechooser/PackageChooserPage.cpp     | 42 ++++++++++++++-----
 .../packagechooser/PackageChooserPage.h       |  5 ++-
 src/modules/packagechooser/PackageModel.cpp   |  1 -
 src/modules/packagechooser/PackageModel.h     |  9 +++-
 4 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 215adeeef..a474e7536 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -28,29 +28,51 @@
 PackageChooserPage::PackageChooserPage( QWidget* parent )
     : QWidget( parent )
     , ui( new Ui::PackageChooserPage )
+    , m_introduction( QString(),
+                      QString(),
+                      tr( "Package Selection" ),
+                      tr( "Please pick a product from the list. The selected product will be installed." ) )
 {
     ui->setupUi( this );
     CALAMARES_RETRANSLATE( updateLabels(); )
 }
 
 void
-PackageChooserPage::updateLabels()
+PackageChooserPage::currentChanged( const QModelIndex& index )
 {
-    ui->productName->setText( QString() );
-    ui->productScreenshot->hide();
-    ui->productDescription->setText( tr( "Please pick a product from the list." ) );
+    if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() )
+    {
+        ui->productName->setText( m_introduction.name );
+        ui->productScreenshot->setPixmap( m_introduction.screenshot );
+        ui->productDescription->setText( m_introduction.description );
+    }
+    else
+    {
+        ui->productName->setText( QString::number( index.row() ) );
+        ui->productScreenshot->hide();
+        ui->productDescription->setText( "derp" );
+    }
 }
 
 void
-PackageChooserPage::setModel( QAbstractItemModel* model )
+PackageChooserPage::updateLabels()
 {
-    ui->products->setModel( model );
+    if ( ui && ui->products && ui->products->selectionModel() )
+    {
+        currentChanged( ui->products->selectionModel()->currentIndex() );
+    }
+    else
+    {
+        currentChanged( QModelIndex() );
+    }
 }
 
 void
-PackageChooserPage::currentChanged( const QModelIndex& current )
+PackageChooserPage::setModel( QAbstractItemModel* model )
 {
-    updateLabels();
-    cDebug() << "Current updated to" << current.row();
-    cDebug() << ui->products->model()->data( current, Qt::DisplayRole );
+    ui->products->setModel( model );
+    connect( ui->products->selectionModel(),
+             &QItemSelectionModel::selectionChanged,
+             this,
+             &PackageChooserPage::updateLabels );
 }
diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h
index db5540312..031abad69 100644
--- a/src/modules/packagechooser/PackageChooserPage.h
+++ b/src/modules/packagechooser/PackageChooserPage.h
@@ -19,6 +19,8 @@
 #ifndef PACKAGECHOOSERPAGE_H
 #define PACKAGECHOOSERPAGE_H
 
+#include "PackageModel.h"
+
 #include <QAbstractItemModel>
 #include <QWidget>
 
@@ -36,11 +38,12 @@ public:
     void setModel( QAbstractItemModel* model );
 
 public slots:
+    void currentChanged( const QModelIndex& index );
     void updateLabels();
-    void currentChanged( const QModelIndex& current );
 
 private:
     Ui::PackageChooserPage* ui;
+    PackageItem m_introduction;
 };
 
 #endif  // PACKAGECHOOSERPAGE_H
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 1f6346666..86e18aa88 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -73,7 +73,6 @@ PackageListModel::rowCount( const QModelIndex& index ) const
 QVariant
 PackageListModel::data( const QModelIndex& index, int role ) const
 {
-    cDebug() << "Data" << m_packages.count() << index.isValid() << ( index.isValid() ? index.row() : -1 );
     if ( !index.isValid() )
     {
         return QVariant();
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index c00e55c0a..67715e197 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -21,6 +21,7 @@
 
 #include <QAbstractListModel>
 #include <QObject>
+#include <QPixmap>
 #include <QVector>
 
 struct PackageItem
@@ -32,9 +33,15 @@ struct PackageItem
     QString name;
     QString description;
     // TODO: may be more than one
-    // QPixmap screenshot;
+    QPixmap screenshot;
 
+    /// @brief Create blank PackageItem
     PackageItem();
+    /** @brief Creates a PackageItem from given strings
+     *
+     * This constructor sets all the text members,
+     * but leaves the screenshot blank. Set that separately.
+     */
     PackageItem( const QString& id, const QString& package, const QString& name, const QString& description );
 
     // TODO: implement this

From a32dcdad869d1544e46d6e7651d2768967e2983d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 16:25:26 +0200
Subject: [PATCH 06/44] [packagechooser] Support multiple selection modes

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

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index a474e7536..307b1b861 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -25,7 +25,7 @@
 
 #include <QLabel>
 
-PackageChooserPage::PackageChooserPage( QWidget* parent )
+PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent )
     : QWidget( parent )
     , ui( new Ui::PackageChooserPage )
     , m_introduction( QString(),
@@ -35,6 +35,16 @@ PackageChooserPage::PackageChooserPage( QWidget* parent )
 {
     ui->setupUi( this );
     CALAMARES_RETRANSLATE( updateLabels(); )
+
+    switch( mode )
+    {
+        case PackageChooserMode::Optional:
+        case PackageChooserMode::Exclusive:
+            ui->products->setSelectionMode( QAbstractItemView::SingleSelection );
+        case PackageChooserMode::Multiple:
+        case PackageChooserMode::RequiredMultiple:
+            ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
+    }
 }
 
 void
diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h
index 031abad69..483fd5d0a 100644
--- a/src/modules/packagechooser/PackageChooserPage.h
+++ b/src/modules/packagechooser/PackageChooserPage.h
@@ -33,7 +33,7 @@ class PackageChooserPage : public QWidget
 {
     Q_OBJECT
 public:
-    explicit PackageChooserPage( QWidget* parent = nullptr );
+    explicit PackageChooserPage( PackageChooserMode mode, QWidget* parent = nullptr );
 
     void setModel( QAbstractItemModel* model );
 
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 3ff2ac636..2a5cc8073 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -37,6 +37,7 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( nullptr )
     , m_model( nullptr )
+    , m_mode( PackageChooserMode::Optional )
 {
     emit nextStatusChanged( false );
 }
@@ -64,7 +65,7 @@ PackageChooserViewStep::widget()
 {
     if ( !m_widget )
     {
-        m_widget = new PackageChooserPage( nullptr );
+        m_widget = new PackageChooserPage( m_mode, nullptr );
         if ( m_model )
         {
             hookupModel();
@@ -77,7 +78,34 @@ PackageChooserViewStep::widget()
 bool
 PackageChooserViewStep::isNextEnabled() const
 {
-    return true;
+    if ( !m_model )
+    {
+        return false;
+    }
+
+    if ( !m_widget )
+    {
+        // No way to have changed anything
+        return true;
+    }
+
+    switch( m_mode )
+    {
+        case PackageChooserMode::Optional:
+            // zero or one
+            return false;
+        case PackageChooserMode::Exclusive:
+            // exactly one
+            return false;
+        case PackageChooserMode::Multiple:
+            // zero or more
+            return true;
+        case PackageChooserMode::RequiredMultiple:
+            // one or more
+            return false;
+    }
+
+    NOTREACHED return true;
 }
 
 
diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
index 56fbf5d3a..ed33c3e46 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.h
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -23,6 +23,8 @@
 #include "utils/PluginFactory.h"
 #include "viewpages/ViewStep.h"
 
+#include "PackageModel.h"
+
 #include <QObject>
 #include <QUrl>
 #include <QVariantMap>
@@ -59,6 +61,7 @@ private:
 
     PackageChooserPage* m_widget;
     PackageListModel* m_model;
+    PackageChooserMode m_mode;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory )
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 67715e197..6d150802f 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -24,6 +24,14 @@
 #include <QPixmap>
 #include <QVector>
 
+enum class PackageChooserMode
+{
+    Optional,  // zero or one
+    Exclusive, // exactly one
+    Multiple,  // zero or more
+    RequiredMultiple  // one or more
+};
+
 struct PackageItem
 {
     QString id;

From 86e2e6242f999c79650d60d7d9cddffe5f666ec9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 16:26:10 +0200
Subject: [PATCH 07/44] [packagechooser] Warn about weird calling orders

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

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 2a5cc8073..705958849 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -70,6 +70,10 @@ PackageChooserViewStep::widget()
         {
             hookupModel();
         }
+        else
+        {
+            cWarning() << "PackageChooser Widget created before model.";
+        }
     }
     return m_widget;
 }

From 2272d2ab430d866e21c4cd6291a212fbea56a2ed Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 16:43:10 +0200
Subject: [PATCH 08/44] [packagechooser] Add selection modes

 - Introduce different selection modes (most don't work yet)
 - Use model data in the main widget
---
 .../packagechooser/PackageChooserPage.cpp     | 22 +++++++++-------
 .../packagechooser/PackageChooserViewStep.cpp | 26 +++++++++----------
 src/modules/packagechooser/PackageModel.cpp   | 10 ++++++-
 src/modules/packagechooser/PackageModel.h     |  9 ++++++-
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 307b1b861..174f7efe1 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -36,14 +36,14 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
     ui->setupUi( this );
     CALAMARES_RETRANSLATE( updateLabels(); )
 
-    switch( mode )
+    switch ( mode )
     {
-        case PackageChooserMode::Optional:
-        case PackageChooserMode::Exclusive:
-            ui->products->setSelectionMode( QAbstractItemView::SingleSelection );
-        case PackageChooserMode::Multiple:
-        case PackageChooserMode::RequiredMultiple:
-            ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
+    case PackageChooserMode::Optional:
+    case PackageChooserMode::Exclusive:
+        ui->products->setSelectionMode( QAbstractItemView::SingleSelection );
+    case PackageChooserMode::Multiple:
+    case PackageChooserMode::RequiredMultiple:
+        ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
     }
 }
 
@@ -58,9 +58,11 @@ PackageChooserPage::currentChanged( const QModelIndex& index )
     }
     else
     {
-        ui->productName->setText( QString::number( index.row() ) );
-        ui->productScreenshot->hide();
-        ui->productDescription->setText( "derp" );
+        const auto* model = ui->products->model();
+
+        ui->productName->setText( model->data( index, PackageListModel::NameRole ).toString() );
+        ui->productScreenshot->setPixmap( model->data( index, PackageListModel::ScreenshotRole ).value< QPixmap >() );
+        ui->productDescription->setText( model->data( index, PackageListModel::DescriptionRole ).toString() );
     }
 }
 
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 705958849..e125cdba4 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -93,20 +93,20 @@ PackageChooserViewStep::isNextEnabled() const
         return true;
     }
 
-    switch( m_mode )
+    switch ( m_mode )
     {
-        case PackageChooserMode::Optional:
-            // zero or one
-            return false;
-        case PackageChooserMode::Exclusive:
-            // exactly one
-            return false;
-        case PackageChooserMode::Multiple:
-            // zero or more
-            return true;
-        case PackageChooserMode::RequiredMultiple:
-            // one or more
-            return false;
+    case PackageChooserMode::Optional:
+        // zero or one
+        return false;
+    case PackageChooserMode::Exclusive:
+        // exactly one
+        return false;
+    case PackageChooserMode::Multiple:
+        // zero or more
+        return true;
+    case PackageChooserMode::RequiredMultiple:
+        // one or more
+        return false;
     }
 
     NOTREACHED return true;
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 86e18aa88..fc19fda47 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -83,10 +83,18 @@ PackageListModel::data( const QModelIndex& index, int role ) const
         return QVariant();
     }
 
-    if ( role == Qt::DisplayRole )
+    if ( role == Qt::DisplayRole /* Also PackageNameRole */ )
     {
         return m_packages[ row ].name;
     }
+    else if ( role == DescriptionRole )
+    {
+        return m_packages[ row ].description;
+    }
+    else if ( role == ScreenshotRole )
+    {
+        return m_packages[ row ].screenshot;
+    }
 
     return QVariant();
 }
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 6d150802f..61e2864a9 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -27,7 +27,7 @@
 enum class PackageChooserMode
 {
     Optional,  // zero or one
-    Exclusive, // exactly one
+    Exclusive,  // exactly one
     Multiple,  // zero or more
     RequiredMultiple  // one or more
 };
@@ -70,6 +70,13 @@ public:
     int rowCount( const QModelIndex& index ) const override;
     QVariant data( const QModelIndex& index, int role ) const override;
 
+    enum Roles : int
+    {
+        NameRole = Qt::DisplayRole,
+        DescriptionRole = Qt::UserRole,
+        ScreenshotRole
+    };
+
 private:
     PackageList m_packages;
 };

From 7609546d8bebd96d037a1e8eb77c0dc779ca746d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 17:02:02 +0200
Subject: [PATCH 09/44] [packagechooser] Add screenshots for example

---
 src/modules/packagechooser/CMakeLists.txt        |   2 ++
 .../packagechooser/PackageChooserPage.cpp        |   3 +++
 src/modules/packagechooser/images/gnome.png      | Bin 0 -> 5739 bytes
 src/modules/packagechooser/images/kde.png        | Bin 0 -> 4678 bytes
 .../packagechooser/images/no-selection.png       | Bin 0 -> 4618 bytes
 src/modules/packagechooser/packagechooser.qrc    |   7 +++++++
 6 files changed, 12 insertions(+)
 create mode 100644 src/modules/packagechooser/images/gnome.png
 create mode 100644 src/modules/packagechooser/images/kde.png
 create mode 100644 src/modules/packagechooser/images/no-selection.png
 create mode 100644 src/modules/packagechooser/packagechooser.qrc

diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt
index 525921602..483092800 100644
--- a/src/modules/packagechooser/CMakeLists.txt
+++ b/src/modules/packagechooser/CMakeLists.txt
@@ -7,6 +7,8 @@ calamares_add_plugin( packagechooser
         PackageChooserPage.cpp
         PackageChooserViewStep.cpp
         PackageModel.cpp
+    RESOURCES
+        packagechooser.qrc
     UI
         page_package.ui
     LINK_PRIVATE_LIBRARIES
diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 174f7efe1..23d3b837b 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -33,6 +33,9 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
                       tr( "Package Selection" ),
                       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(); )
 
diff --git a/src/modules/packagechooser/images/gnome.png b/src/modules/packagechooser/images/gnome.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f3901e14aeafc94babdf08bb5ffeb99af836a7
GIT binary patch
literal 5739
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
J3*eT){{=a!jIsa#

literal 0
HcmV?d00001

diff --git a/src/modules/packagechooser/images/kde.png b/src/modules/packagechooser/images/kde.png
new file mode 100644
index 0000000000000000000000000000000000000000..02f3e70ea21282afa79d367f05d602c33cb5ddd3
GIT binary patch
literal 4678
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

literal 0
HcmV?d00001

diff --git a/src/modules/packagechooser/images/no-selection.png b/src/modules/packagechooser/images/no-selection.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9dbbbac45d0b03667f66be54664fdc5dce71983
GIT binary patch
literal 4618
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

literal 0
HcmV?d00001

diff --git a/src/modules/packagechooser/packagechooser.qrc b/src/modules/packagechooser/packagechooser.qrc
new file mode 100644
index 000000000..9212c2f93
--- /dev/null
+++ b/src/modules/packagechooser/packagechooser.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/">
+        <file>images/no-selection.png</file>
+        <file>images/kde.png</file>
+        <file>images/gnome.png</file>
+    </qresource>
+</RCC>

From 86d8db6bbf92e77981532d9409a685b953711fe3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 17:06:03 +0200
Subject: [PATCH 10/44] [packagechooser] Enforce selection mode on the
 next-button

---
 .../packagechooser/PackageChooserPage.cpp      |  7 +++++++
 .../packagechooser/PackageChooserPage.h        |  5 +++++
 .../packagechooser/PackageChooserViewStep.cpp  | 18 +++++++++---------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 23d3b837b..f0f7cb04c 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -80,6 +80,7 @@ PackageChooserPage::updateLabels()
     {
         currentChanged( QModelIndex() );
     }
+    emit selectionChanged();
 }
 
 void
@@ -91,3 +92,9 @@ PackageChooserPage::setModel( QAbstractItemModel* model )
              this,
              &PackageChooserPage::updateLabels );
 }
+
+bool
+PackageChooserPage::hasSelection() const
+{
+    return ui && ui->products && ui->products->selectionModel() && ui->products->selectionModel()->hasSelection();
+}
diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h
index 483fd5d0a..8f9fde11f 100644
--- a/src/modules/packagechooser/PackageChooserPage.h
+++ b/src/modules/packagechooser/PackageChooserPage.h
@@ -37,10 +37,15 @@ public:
 
     void setModel( QAbstractItemModel* model );
 
+    bool hasSelection() const;
+
 public slots:
     void currentChanged( const QModelIndex& index );
     void updateLabels();
 
+signals:
+    void selectionChanged();
+
 private:
     Ui::PackageChooserPage* ui;
     PackageItem m_introduction;
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index e125cdba4..1379f5dd6 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::Optional )
+    , m_mode( PackageChooserMode::Exclusive )
 {
     emit nextStatusChanged( false );
 }
@@ -66,6 +66,10 @@ PackageChooserViewStep::widget()
     if ( !m_widget )
     {
         m_widget = new PackageChooserPage( m_mode, nullptr );
+        connect( m_widget, &PackageChooserPage::selectionChanged, [=]() {
+            emit nextStatusChanged( this->isNextEnabled() );
+        } );
+
         if ( m_model )
         {
             hookupModel();
@@ -96,17 +100,13 @@ PackageChooserViewStep::isNextEnabled() const
     switch ( m_mode )
     {
     case PackageChooserMode::Optional:
-        // zero or one
-        return false;
-    case PackageChooserMode::Exclusive:
-        // exactly one
-        return false;
     case PackageChooserMode::Multiple:
-        // zero or more
+        // zero or one OR zero or more
         return true;
+    case PackageChooserMode::Exclusive:
     case PackageChooserMode::RequiredMultiple:
-        // one or more
-        return false;
+        // exactly one OR one or more
+        return m_widget->hasSelection();
     }
 
     NOTREACHED return true;

From ab7374628b9eed73650c0b6260b155499e6fe2cd Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Aug 2019 17:17:53 +0200
Subject: [PATCH 11/44] [packagechooser] Use sample screenshots

---
 .../packagechooser/PackageChooserViewStep.cpp       |  4 ++--
 src/modules/packagechooser/PackageModel.cpp         | 13 +++++++++++++
 src/modules/packagechooser/PackageModel.h           |  6 ++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 1379f5dd6..9b3c174da 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -155,9 +155,9 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
     {
 
         m_model = new PackageListModel( nullptr );
-        m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop" } );
+        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" } );
+            PackageItem { "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } );
 
 
         if ( m_widget )
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index fc19fda47..7798b33bd 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -40,6 +40,19 @@ PackageItem::PackageItem( const QString& a_id,
 {
 }
 
+PackageItem::PackageItem( const QString& a_id,
+                          const QString& a_package,
+                          const QString& a_name,
+                          const QString& a_description,
+                          const QString& screenshotPath )
+    : id( a_id )
+    , package( a_package )
+    , name( a_name )
+    , description( a_description )
+    , screenshot( screenshotPath )
+{
+}
+
 
 PackageListModel::PackageListModel( QObject* parent )
     : QAbstractListModel( parent )
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 61e2864a9..7db668df4 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -52,6 +52,12 @@ struct PackageItem
      */
     PackageItem( const QString& id, const QString& package, const QString& name, const QString& description );
 
+    PackageItem( const QString& id,
+                 const QString& package,
+                 const QString& name,
+                 const QString& description,
+                 const QString& screenshotPath );
+
     // TODO: implement this
     PackageItem fromAppStream( const QString& filename );
 };

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 12/44] [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 13/44] [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 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 14/44] [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 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 15/44] [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 16/44] [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 17/44] [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 18/44] [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 19/44] [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 20/44] [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 21/44] [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>

From 791f9cbccbef3fcbf5433329a313e7b4c28bbaab Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 4 Aug 2019 16:00:55 +0200
Subject: [PATCH 22/44] [packagechooser] Read packages model from config

 - add key *items* which will be used to fill up the model for
   software products.

TODO: needs translation support
---
 .../packagechooser/PackageChooserViewStep.cpp | 55 ++++++++++++++++++-
 .../packagechooser/PackageChooserViewStep.h   |  1 +
 .../packagechooser/packagechooser.conf        | 35 ++++++++++++
 3 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 8515d03a9..4d9ab4f5f 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -177,6 +177,15 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
         m_id = moduleInstanceKey().split( '@' ).last();
     }
 
+    bool first_time = !m_model;
+    
+    ok = false;
+    QVariantMap items = CalamaresUtils::getSubMap( configurationMap, "items", ok );
+    if ( ok )
+    {
+        fillModel( items );
+    }
+
     // TODO: replace this hard-coded model
     if ( !m_model )
     {
@@ -192,12 +201,54 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
         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" } );
+    }
+
+    if ( first_time && m_widget && m_model )
+    {
+        hookupModel();
+    }
+}
+
+void
+PackageChooserViewStep::fillModel( const QVariantMap& items )
+{
+    if ( !m_model )
+    {
+        m_model = new PackageListModel( nullptr );
+    }
 
+    cDebug() << "Loading PackageChooser model items from config";
+    for ( auto item_it = items.constKeyValueBegin(); item_it != items.constKeyValueEnd(); ++item_it )
+    {
+        QString id = ( *item_it ).first;
 
-        if ( m_widget )
+        QVariantMap item_map = ( *item_it ).second.toMap();
+        if ( item_map.isEmpty() )
         {
-            hookupModel();
+            cWarning() << "PackageChooser item" << id << "is not valid.";
+            continue;
         }
+
+        QString package = CalamaresUtils::getString( item_map, "package" );
+        QString name = CalamaresUtils::getString( item_map, "name" );
+        QString description = CalamaresUtils::getString( item_map, "description" );
+        QString screenshot = CalamaresUtils::getString( item_map, "screenshot" );
+
+        if ( name.isEmpty() )
+        {
+            cWarning() << "PackageChooser item" << id << "has an empty name.";
+            continue;
+        }
+        if ( description.isEmpty() )
+        {
+            description = tr( "No description provided." );
+        }
+        if ( screenshot.isEmpty() )
+        {
+            screenshot = QStringLiteral( ":/images/no-selection.png" );
+        }
+
+        m_model->addPackage( PackageItem { id, package, name, description, screenshot } );
     }
 }
 
diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
index 55ed2d4d5..4d5cc346f 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.h
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -56,6 +56,7 @@ public:
     void setConfigurationMap( const QVariantMap& configurationMap ) override;
 
 private:
+    void fillModel( const QVariantMap& items );
     void hookupModel();
 
     PackageChooserPage* m_widget;
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index b4e48c995..f4bab476c 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -19,3 +19,38 @@
 # or "optionalmultiple", "requiredmultiple" (for zero-or-more
 # or one-or-more).
 mode: required
+
+# Items to display in the chooser. In general, this should be a 
+# pretty short list to avoid overwhelming the UI.
+#
+# Each item has a key, which is used as its ID (used in setting
+# the value of *packagechooser_<module-id>*). The following fields
+# are mandatory:
+#
+#  - *package* Package name for the product. While mandatory, this is
+#       not actually used anywhere.
+#  - *name* Human-readable, but untranslated, name of the product.
+#  - *description* Human-readable, but untranslated, description.
+#  - *screenshot* Path to a single screenshot of the product. May be
+#       a filesystem path or a QRC path (e.g. ":/images/no-selection.png").
+#
+# Use the empty string "" as ID / key for the "no selection" item if
+# you want to customize the display of that item as well.
+items:
+    "":
+        package: ""
+        name: "No Desktop"
+        description: "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."
+        screenshot: ":/images/no-selection.png"
+    kde:
+        package: kde
+        name: Plasma Desktop
+        description: "KDE Plasma Desktop, simple by default, a clean work area for real-world usage which intends to stay out of your way. Plasma is powerful when needed, enabling the user to create the workflow that makes them more effective to complete their tasks."
+        screenshot: ":/images/kde.png"
+    gnome:
+        package: gnome
+        name: GNOME
+        description: GNU Networked Object Modeling Environment Desktop
+        screenshot: ":/images/gnome.png"
+
+

From 9a52430e74d8b8b9b763725e01f150d97b378c87 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 4 Aug 2019 20:04:32 +0200
Subject: [PATCH 23/44] [packagechooser] Too many 'o's in test name

---
 src/modules/packagechooser/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt
index 483092800..4663ccce7 100644
--- a/src/modules/packagechooser/CMakeLists.txt
+++ b/src/modules/packagechooser/CMakeLists.txt
@@ -20,11 +20,11 @@ if( ECM_FOUND AND BUILD_TESTING )
     ecm_add_test(
             Tests.cpp
         TEST_NAME
-            packagechooosertest
+            packagechoosertest
         LINK_LIBRARIES
             ${CALAMARES_LIBRARIES}
             Qt5::Core
             Qt5::Test
     )
-    calamares_automoc( packagechooosertest)
+    calamares_automoc( packagechoosertest)
 endif()

From b16354133da0f5873f7eee25d1e1aeec297d2483 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 4 Aug 2019 20:19:56 +0200
Subject: [PATCH 24/44] [packagechooser] Switch to a list form

 - Using id's as keys in a map orders them indeterminately -- in
   practice, alphabetically by key. Switch to a list form so that
   the products stick to the order they have in the config file
   (which means distro's can list "preferred" versions at top).
---
 .../packagechooser/PackageChooserViewStep.cpp | 32 +++++++++------
 .../packagechooser/PackageChooserViewStep.h   |  2 +-
 .../packagechooser/packagechooser.conf        | 40 ++++++++++---------
 3 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 4d9ab4f5f..4476eb9e6 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -178,12 +178,9 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
     }
 
     bool first_time = !m_model;
-    
-    ok = false;
-    QVariantMap items = CalamaresUtils::getSubMap( configurationMap, "items", ok );
-    if ( ok )
+    if ( configurationMap.contains( "items" ) )
     {
-        fillModel( items );
+        fillModel( configurationMap.value( "items" ).toList() );
     }
 
     // TODO: replace this hard-coded model
@@ -210,31 +207,42 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
 }
 
 void
-PackageChooserViewStep::fillModel( const QVariantMap& items )
+PackageChooserViewStep::fillModel( const QVariantList& items )
 {
     if ( !m_model )
     {
         m_model = new PackageListModel( nullptr );
     }
 
-    cDebug() << "Loading PackageChooser model items from config";
-    for ( auto item_it = items.constKeyValueBegin(); item_it != items.constKeyValueEnd(); ++item_it )
+    if ( items.isEmpty() )
     {
-        QString id = ( *item_it ).first;
+        cWarning() << "No *items* for PackageChooser module.";
+        return;
+    }
 
-        QVariantMap item_map = ( *item_it ).second.toMap();
+    cDebug() << "Loading PackageChooser model items from config";
+    int item_index = 0;
+    for ( const auto& item_it : items )
+    {
+        ++item_index;
+        QVariantMap item_map = item_it.toMap();
         if ( item_map.isEmpty() )
         {
-            cWarning() << "PackageChooser item" << id << "is not valid.";
+            cWarning() << "PackageChooser entry" << item_index << "is not valid.";
             continue;
         }
 
+        QString id = CalamaresUtils::getString( item_map, "id" );
         QString package = CalamaresUtils::getString( item_map, "package" );
         QString name = CalamaresUtils::getString( item_map, "name" );
         QString description = CalamaresUtils::getString( item_map, "description" );
         QString screenshot = CalamaresUtils::getString( item_map, "screenshot" );
 
-        if ( name.isEmpty() )
+        if ( name.isEmpty() && id.isEmpty() )
+        {
+            name = tr( "No product" );
+        }
+        else if ( name.isEmpty() )
         {
             cWarning() << "PackageChooser item" << id << "has an empty name.";
             continue;
diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
index 4d5cc346f..e3ffc1d5b 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.h
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -56,7 +56,7 @@ public:
     void setConfigurationMap( const QVariantMap& configurationMap ) override;
 
 private:
-    void fillModel( const QVariantMap& items );
+    void fillModel( const QVariantList& items );
     void hookupModel();
 
     PackageChooserPage* m_widget;
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index f4bab476c..391e1f325 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -21,12 +21,16 @@
 mode: required
 
 # Items to display in the chooser. In general, this should be a 
-# pretty short list to avoid overwhelming the UI.
+# pretty short list to avoid overwhelming the UI. This is a list
+# of objects, and the items are displayed in list order.
 #
-# Each item has a key, which is used as its ID (used in setting
-# the value of *packagechooser_<module-id>*). The following fields
+# Each item has an id, which is used in setting # the value of 
+# *packagechooser_<module-id>*). The following fields
 # are mandatory:
 #
+#  - *id* ID for the product. The ID "" is special, and is used for
+#    "no package selected". Only include this if the mode allows
+#    selecting none.
 #  - *package* Package name for the product. While mandatory, this is
 #       not actually used anywhere.
 #  - *name* Human-readable, but untranslated, name of the product.
@@ -37,20 +41,20 @@ mode: required
 # Use the empty string "" as ID / key for the "no selection" item if
 # you want to customize the display of that item as well.
 items:
-    "":
-        package: ""
-        name: "No Desktop"
-        description: "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."
-        screenshot: ":/images/no-selection.png"
-    kde:
-        package: kde
-        name: Plasma Desktop
-        description: "KDE Plasma Desktop, simple by default, a clean work area for real-world usage which intends to stay out of your way. Plasma is powerful when needed, enabling the user to create the workflow that makes them more effective to complete their tasks."
-        screenshot: ":/images/kde.png"
-    gnome:
-        package: gnome
-        name: GNOME
-        description: GNU Networked Object Modeling Environment Desktop
-        screenshot: ":/images/gnome.png"
+    - id: ""
+      package: ""
+      name: "No Desktop"
+      description: "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."
+      screenshot: ":/images/no-selection.png"
+    - id: kde
+      package: kde
+      name: Plasma Desktop
+      description: "KDE Plasma Desktop, DERP"
+      screenshot: ":/images/kde.png"
+    - id: gnome
+      package: gnome
+      name: GNOME
+      description: GNU Networked Object Modeling Environment Desktop
+      screenshot: ":/images/gnome.png"
 
 

From fd75b3378418efd3106d8b6b874b3fef96447454 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 00:17:30 +0200
Subject: [PATCH 25/44] [libcalamares] Add default constructor to
 TranslatedString

---
 src/libcalamares/locale/TranslatableConfiguration.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libcalamares/locale/TranslatableConfiguration.h b/src/libcalamares/locale/TranslatableConfiguration.h
index 0735a2274..b2f598069 100644
--- a/src/libcalamares/locale/TranslatableConfiguration.h
+++ b/src/libcalamares/locale/TranslatableConfiguration.h
@@ -44,6 +44,9 @@ public:
     /** @brief Not-actually-translated string.
      */
     TranslatedString( const QString& string );
+    /// @brief Empty string
+    TranslatedString()
+        : TranslatedString( QString() ) {}
 
     int count() const { return m_strings.count(); }
 

From 56db9e93412c897bc86be85b2c99ab5379617360 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 00:17:50 +0200
Subject: [PATCH 26/44] [packagechooser] Use translated strings

---
 src/modules/packagechooser/PackageChooserPage.cpp | 4 ++--
 src/modules/packagechooser/PackageModel.cpp       | 4 ++--
 src/modules/packagechooser/PackageModel.h         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 60becf64f..0587af190 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -54,9 +54,9 @@ PackageChooserPage::currentChanged( const QModelIndex& index )
 {
     if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() )
     {
-        ui->productName->setText( m_introduction.name );
+        ui->productName->setText( m_introduction.name.get() );
         ui->productScreenshot->setPixmap( m_introduction.screenshot );
-        ui->productDescription->setText( m_introduction.description );
+        ui->productDescription->setText( m_introduction.description.get() );
     }
     else
     {
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index aa8dd39fc..f133f4fbd 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -118,11 +118,11 @@ PackageListModel::data( const QModelIndex& index, int role ) const
 
     if ( role == Qt::DisplayRole /* Also PackageNameRole */ )
     {
-        return m_packages[ row ].name;
+        return m_packages[ row ].name.get();
     }
     else if ( role == DescriptionRole )
     {
-        return m_packages[ row ].description;
+        return m_packages[ row ].description.get();
     }
     else if ( role == ScreenshotRole )
     {
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 7f8fff8ec..68e19a25d 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -19,6 +19,7 @@
 #ifndef PACKAGEMODEL_H
 #define PACKAGEMODEL_H
 
+#include "locale/TranslatableConfiguration.h"
 #include "utils/NamedEnum.h"
 
 #include <QAbstractListModel>
@@ -41,9 +42,8 @@ struct PackageItem
     QString id;
     // TODO: may need more than one
     QString package;
-    // TODO: name and description are localized
-    QString name;
-    QString description;
+    CalamaresUtils::Locale::TranslatedString name;
+    CalamaresUtils::Locale::TranslatedString description;
     // TODO: may be more than one
     QPixmap screenshot;
 

From fee2297e67639cdcd0a10f4889fec87cc747237c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 00:24:53 +0200
Subject: [PATCH 27/44] [packagechooser] Fix fallthrough situation

 - Add a FALLTHRU macro to annotate fallthrough situations in both
   Clang and GCC,
 - Annotate intentional fallthroughs.
 - Add missing break which meant that the selection mode was
   always multiple-selection.
---
 CMakeLists.txt                                    | 4 ++--
 src/modules/packagechooser/PackageChooserPage.cpp | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e38c1db9b..e28d28f38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,7 +198,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     )
         string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" )
     endforeach()
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='//'" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='//' -DFALLTHRU='[[clang::fallthrough]]'")
 
     # Third-party code where we don't care so much about compiler warnings
     # (because it's uncomfortable to patch) get different flags; use
@@ -225,7 +225,7 @@ else()
     set( SUPPRESS_3RDPARTY_WARNINGS "" )
     set( SUPPRESS_BOOST_WARNINGS "" )
 
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='__builtin_unreachable();'" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='__builtin_unreachable();' -DFALLTHRU='/* */'" )
 endif()
 
 # Use mark_thirdparty_code() to reduce warnings from the compiler
diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 0587af190..6f565c914 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -41,9 +41,12 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
     switch ( mode )
     {
     case PackageChooserMode::Optional:
+        FALLTHRU;
     case PackageChooserMode::Required:
         ui->products->setSelectionMode( QAbstractItemView::SingleSelection );
+        break;
     case PackageChooserMode::OptionalMultiple:
+        FALLTHRU;
     case PackageChooserMode::RequiredMultiple:
         ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
     }

From 6a8e10837d044dc892804a5120ae4b462556f625 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 00:26:04 +0200
Subject: [PATCH 28/44] [libcalamares] Drop unneeded debugging

---
 src/libcalamares/locale/TranslatableConfiguration.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libcalamares/locale/TranslatableConfiguration.cpp b/src/libcalamares/locale/TranslatableConfiguration.cpp
index 82923a5fa..b3b5259c9 100644
--- a/src/libcalamares/locale/TranslatableConfiguration.cpp
+++ b/src/libcalamares/locale/TranslatableConfiguration.cpp
@@ -79,7 +79,6 @@ TranslatedString::get( const QLocale& locale ) const
         localeName = QStringLiteral( "sr@latin" );
     }
 
-    cDebug() << "Getting locale" << localeName;
     if ( m_strings.contains( localeName ) )
     {
         return m_strings[ localeName ];

From 8d3546f0b3a4c1b8ceeb4467f8e80a2b9f8ea503 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 00:31:05 +0200
Subject: [PATCH 29/44] [packagechooser] Expand the example config with
 translated entries

---
 src/modules/packagechooser/packagechooser.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index 391e1f325..7d60b50a4 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -44,12 +44,14 @@ items:
     - id: ""
       package: ""
       name: "No Desktop"
+      name[nl]: "Geen desktop"
       description: "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."
+      description[nl]: "Kies eventueel een desktop-omgeving uit deze lijst. Als u geen desktop-omgeving wenst te gebruiken, kies er dan geen. In dat geval start het systeem straks op in tekst-modus en kunt u later alsnog een desktop-omgeving installeren."
       screenshot: ":/images/no-selection.png"
     - id: kde
       package: kde
       name: Plasma Desktop
-      description: "KDE Plasma Desktop, DERP"
+      description: "KDE Plasma Desktop, simple by default, a clean work area for real-world usage which intends to stay out of your way. Plasma is powerful when needed, enabling the user to create the workflow that makes them more effective to complete their tasks."
       screenshot: ":/images/kde.png"
     - id: gnome
       package: gnome

From 4febe477cf82e1cf27f0c27a7a07822d8ba08131 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 11:53:35 +0200
Subject: [PATCH 30/44] [libcalamares] Add isEmpty() to TranslatedString

 - Massage the implementation a bit, don't insert a meaningless
   copy of the key as the untranslated message.
 - Add isEmpty() to check for presence of the untranslated message.
 - Document API.
 - Update tests.
---
 src/libcalamares/locale/Tests.cpp             | 33 ++++++++++++++++++-
 .../locale/TranslatableConfiguration.cpp      |  4 ---
 .../locale/TranslatableConfiguration.h        | 16 ++++++++-
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/libcalamares/locale/Tests.cpp b/src/libcalamares/locale/Tests.cpp
index 664390511..fa84cd2fb 100644
--- a/src/libcalamares/locale/Tests.cpp
+++ b/src/libcalamares/locale/Tests.cpp
@@ -96,6 +96,10 @@ someLanguages()
 }
 
 
+/** @brief Check consistency of test data
+ * Check that all the languages used in testing, are actually enabled
+ * in Calamares translations.
+ */
 void
 LocaleTests::testTranslatableLanguages()
 {
@@ -108,12 +112,19 @@ LocaleTests::testTranslatableLanguages()
     }
 }
 
+/** @brief Test strings with no translations
+ */
 void
 LocaleTests::testTranslatableConfig1()
 {
+    CalamaresUtils::Locale::TranslatedString ts0;
+    QVERIFY( ts0.isEmpty() );
+    QCOMPARE( ts0.count(), 1 );  // the empty string
+
     QCOMPARE( QLocale().name(), "C" );  // Otherwise plain get() is dubious
     CalamaresUtils::Locale::TranslatedString ts1( "Hello" );
     QCOMPARE( ts1.count(), 1 );
+    QVERIFY( !ts1.isEmpty() );
 
     QCOMPARE( ts1.get(), "Hello" );
     QCOMPARE( ts1.get( QLocale( "nl" ) ), "Hello" );
@@ -122,11 +133,14 @@ LocaleTests::testTranslatableConfig1()
     map.insert( "description", "description (no language)" );
     CalamaresUtils::Locale::TranslatedString ts2( map, "description" );
     QCOMPARE( ts2.count(), 1 );
+    QVERIFY( !ts2.isEmpty() );
 
     QCOMPARE( ts2.get(), "description (no language)" );
     QCOMPARE( ts2.get( QLocale( "nl" ) ), "description (no language)" );
 }
 
+/** @bref Test strings with translations.
+ */
 void
 LocaleTests::testTranslatableConfig2()
 {
@@ -143,11 +157,22 @@ LocaleTests::testTranslatableConfig2()
         }
     }
 
+    // If there's no untranslated string in the map, it is considered empty
+    CalamaresUtils::Locale::TranslatedString ts0( map, "description" );
+    QVERIFY( ts0.isEmpty() );  // Because no untranslated string
+    QCOMPARE( ts0.count(),
+              someLanguages().count() + 1 );  // But there are entries for the translations, plus an empty string
+
+    // expand the map with untranslated entries
+    map.insert( QString( "description" ), "description (no language)" );
+    map.insert( QString( "name" ), "name (no language)" );
+
     CalamaresUtils::Locale::TranslatedString ts1( map, "description" );
     // The +1 is because "" is always also inserted
     QCOMPARE( ts1.count(), someLanguages().count() + 1 );
+    QVERIFY( !ts1.isEmpty() );
 
-    QCOMPARE( ts1.get(), "description" );  // it wasn't set
+    QCOMPARE( ts1.get(), "description (no language)" );  // it wasn't set
     QCOMPARE( ts1.get( QLocale( "nl" ) ), "description (language nl)" );
     for ( const auto& language : someLanguages() )
     {
@@ -167,4 +192,10 @@ LocaleTests::testTranslatableConfig2()
     CalamaresUtils::Locale::TranslatedString ts2( map, "name" );
     // We skipped dutch this time
     QCOMPARE( ts2.count(), someLanguages().count() );
+    QVERIFY( !ts2.isEmpty() );
+
+    // This key doesn't exist
+    CalamaresUtils::Locale::TranslatedString ts3( map, "front" );
+    QVERIFY( ts3.isEmpty() );
+    QCOMPARE( ts3.count(), 1 );  // The empty string
 }
diff --git a/src/libcalamares/locale/TranslatableConfiguration.cpp b/src/libcalamares/locale/TranslatableConfiguration.cpp
index b3b5259c9..7493c836c 100644
--- a/src/libcalamares/locale/TranslatableConfiguration.cpp
+++ b/src/libcalamares/locale/TranslatableConfiguration.cpp
@@ -38,10 +38,6 @@ TranslatedString::TranslatedString( const QVariantMap& map, const QString& key )
 {
     // Get the un-decorated value for the key
     QString value = CalamaresUtils::getString( map, key );
-    if ( value.isEmpty() )
-    {
-        value = key;
-    }
     m_strings[ QString() ] = value;
 
     for ( auto it = map.constKeyValueBegin(); it != map.constKeyValueEnd(); ++it )
diff --git a/src/libcalamares/locale/TranslatableConfiguration.h b/src/libcalamares/locale/TranslatableConfiguration.h
index b2f598069..a055cbfbd 100644
--- a/src/libcalamares/locale/TranslatableConfiguration.h
+++ b/src/libcalamares/locale/TranslatableConfiguration.h
@@ -46,9 +46,23 @@ public:
     TranslatedString( const QString& string );
     /// @brief Empty string
     TranslatedString()
-        : TranslatedString( QString() ) {}
+        : TranslatedString( QString() )
+    {
+    }
 
+    /** @brief How many strings (translations) are there?
+     * 
+     * This is always at least 1 (for the untranslated string),
+     * but may be more than 1 even when isEmpty() is true --
+     * if there is no untranslated version, for instance.
+     */
     int count() const { return m_strings.count(); }
+    /** @brief Consider this string empty?
+     * 
+     * Only the state of the untranslated string is considered,
+     * so count() may be more than 1 even while the string is empty.
+     */
+    bool isEmpty() const { return m_strings[ QString() ].isEmpty(); }
 
     /// @brief Gets the string in the current locale
     QString get() const;

From 6e05a1ef0550e6f8026334383fb2b46754581920 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 12:02:29 +0200
Subject: [PATCH 31/44] [packagechooser] Load translated strings as well

 - This makes it possible to put the translations into the config
   file, and have them displayed when the Calamares language changes.
---
 .../packagechooser/PackageChooserViewStep.cpp | 26 +------------
 src/modules/packagechooser/PackageModel.cpp   | 38 +++++++++++++++++--
 src/modules/packagechooser/PackageModel.h     | 18 +++++++++
 3 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 4476eb9e6..a3b853b39 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -232,31 +232,7 @@ PackageChooserViewStep::fillModel( const QVariantList& items )
             continue;
         }
 
-        QString id = CalamaresUtils::getString( item_map, "id" );
-        QString package = CalamaresUtils::getString( item_map, "package" );
-        QString name = CalamaresUtils::getString( item_map, "name" );
-        QString description = CalamaresUtils::getString( item_map, "description" );
-        QString screenshot = CalamaresUtils::getString( item_map, "screenshot" );
-
-        if ( name.isEmpty() && id.isEmpty() )
-        {
-            name = tr( "No product" );
-        }
-        else if ( name.isEmpty() )
-        {
-            cWarning() << "PackageChooser item" << id << "has an empty name.";
-            continue;
-        }
-        if ( description.isEmpty() )
-        {
-            description = tr( "No description provided." );
-        }
-        if ( screenshot.isEmpty() )
-        {
-            screenshot = QStringLiteral( ":/images/no-selection.png" );
-        }
-
-        m_model->addPackage( PackageItem { id, package, name, description, screenshot } );
+        m_model->addPackage( PackageItem( item_map ) );
     }
 }
 
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index f133f4fbd..3283cbe6f 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -19,6 +19,7 @@
 #include "PackageModel.h"
 
 #include "utils/Logger.h"
+#include "utils/Variant.h"
 
 const NamedEnumTable< PackageChooserMode >&
 roleNames()
@@ -73,6 +74,31 @@ PackageItem::PackageItem( const QString& a_id,
 {
 }
 
+PackageItem::PackageItem::PackageItem( const QVariantMap& item_map )
+    : id( CalamaresUtils::getString( item_map, "id" ) )
+    , package( CalamaresUtils::getString( item_map, "package" ) )
+    , name( CalamaresUtils::Locale::TranslatedString( item_map, "name" ) )
+    , description( CalamaresUtils::Locale::TranslatedString( item_map, "description" ) )
+    , screenshot( CalamaresUtils::getString( item_map, "screenshot" ) )
+{
+    if ( name.isEmpty() && id.isEmpty() )
+    {
+        name = QObject::tr( "No product" );
+    }
+    else if ( name.isEmpty() )
+    {
+        cWarning() << "PackageChooser item" << id << "has an empty name.";
+    }
+    if ( description.isEmpty() )
+    {
+        description = QObject::tr( "No description provided." );
+    }
+    if ( screenshot.isNull() )
+    {
+        screenshot = QPixmap( QStringLiteral( ":/images/no-selection.png" ) );
+    }
+}
+
 
 PackageListModel::PackageListModel( QObject* parent )
     : QAbstractListModel( parent )
@@ -90,10 +116,14 @@ PackageListModel::~PackageListModel() {}
 void
 PackageListModel::addPackage( PackageItem&& p )
 {
-    int c = m_packages.count();
-    beginInsertRows( QModelIndex(), c, c );
-    m_packages.append( p );
-    endInsertRows();
+    // Only add valid packages
+    if ( !p.name.isEmpty() )
+    {
+        int c = m_packages.count();
+        beginInsertRows( QModelIndex(), c, c );
+        m_packages.append( p );
+        endInsertRows();
+    }
 }
 
 int
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 68e19a25d..f42ff3123 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -56,12 +56,26 @@ struct PackageItem
      */
     PackageItem( const QString& id, const QString& package, const QString& name, const QString& description );
 
+    /** @brief Creates a PackageItem from given strings.
+     *
+     * Set all the text members and load the screenshot from the given
+     * @p screenshotPath, which may be a QRC path (:/path/in/qrc) or
+     * a filesystem path, whatever QPixmap understands.
+     */
     PackageItem( const QString& id,
                  const QString& package,
                  const QString& name,
                  const QString& description,
                  const QString& screenshotPath );
 
+    /** @brief Creates a PackageItem from a QVariantMap
+     *
+     * This is intended for use when loading PackageItems from a
+     * configuration map. It will look up the various keys in the map
+     * and handle translation strings as well.
+     */
+    PackageItem( const QVariantMap& map );
+
     // TODO: implement this
     PackageItem fromAppStream( const QString& filename );
 };
@@ -75,6 +89,10 @@ public:
     PackageListModel( QObject* parent );
     virtual ~PackageListModel() override;
 
+    /** @brief Add a package @p to the model
+     *
+     * Only valid packages are added -- that is, they must have a name.
+     */
     void addPackage( PackageItem&& p );
 
     int rowCount( const QModelIndex& index ) const override;

From 6c41151f80dcc9d41553a4f80ed4d4f6de989d88 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 12:38:28 +0200
Subject: [PATCH 32/44] [packagechooser] Just one screenshot, and mark package
 unused

---
 src/modules/packagechooser/PackageModel.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index f42ff3123..ce384096c 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -40,11 +40,10 @@ const NamedEnumTable< PackageChooserMode >& roleNames();
 struct PackageItem
 {
     QString id;
-    // TODO: may need more than one
+    // FIXME: unused
     QString package;
     CalamaresUtils::Locale::TranslatedString name;
     CalamaresUtils::Locale::TranslatedString description;
-    // TODO: may be more than one
     QPixmap screenshot;
 
     /// @brief Create blank PackageItem

From 8329d7d7dc8072d958fc460785d57f53b646acf3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 13:34:32 +0200
Subject: [PATCH 33/44] CI: Add an AppData file

---
 io.calamares.calamares.appdata.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 io.calamares.calamares.appdata.xml

diff --git a/io.calamares.calamares.appdata.xml b/io.calamares.calamares.appdata.xml
new file mode 100644
index 000000000..355f485c2
--- /dev/null
+++ b/io.calamares.calamares.appdata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>io.calamares.calamares.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>Calamares</name>
+  <name xml:lang="da">Calamares</name>
+  <name xml:lang="en-GB">Calamares</name>
+  <name xml:lang="nl">Calamares</name>
+  <summary>Calamares Linux Installer</summary>
+  <summary xml:lang="en-GB">Calamares Linux Installer</summary>
+  <summary xml:lang="nl">Linux Installatieprogramma Calamares</summary>
+  <description>
+    <p>Calamares is an installer program for Linux distributions.</p>
+    <p xml:lang="nl">Calamares is een installatieprogramma voor Linux distributies.</p>
+  </description>
+  <url type="homepage">https://calamares.io</url>
+  <url type="bugtracker">https://https://github.com/calamares/calamares/issues/</url>
+  <url type="help">https://github.com/calamares/calamares/wiki</url>
+  <screenshots>
+    <screenshot type="default">
+      <caption>Calamares Welcome</caption>
+      <image>https://calamares.io/images/cal_640.png</image>
+    </screenshot>
+  </screenshots>
+  <provides>
+    <binary>calamares</binary>
+  </provides>
+</component>

From beb5896fa237f3b6bf8045ee94a8fa7b0d7fcc11 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 14:33:57 +0200
Subject: [PATCH 34/44] [packagechooser] Start implementation of AppData
 loading

 - Doing a manual read of the XML, since existing appdata libraries
   don't seem to have a convenient entry for what I need.
 - Expand tests to loading AppData (currently, they fail).
---
 src/modules/packagechooser/CMakeLists.txt   | 15 +++++
 src/modules/packagechooser/PackageModel.cpp | 64 ++++++++++++++++++---
 src/modules/packagechooser/PackageModel.h   | 14 ++++-
 src/modules/packagechooser/Tests.cpp        | 17 ++++++
 src/modules/packagechooser/Tests.h          |  1 +
 5 files changed, 101 insertions(+), 10 deletions(-)

diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt
index 4663ccce7..70a86a3bb 100644
--- a/src/modules/packagechooser/CMakeLists.txt
+++ b/src/modules/packagechooser/CMakeLists.txt
@@ -1,4 +1,15 @@
 find_package( Qt5 COMPONENTS Core Gui Widgets REQUIRED )
+set( _extra_libraries "" )
+
+### OPTIONAL AppData XML support in PackageModel
+#
+#
+find_package(Qt5 COMPONENTS Xml)
+if ( Qt5Xml_FOUND )
+    add_definitions( -DHAVE_XML )
+    list( APPEND _extra_libraries Qt5::Xml )
+endif()
+    
 
 calamares_add_plugin( packagechooser
     TYPE viewmodule
@@ -13,6 +24,7 @@ calamares_add_plugin( packagechooser
         page_package.ui
     LINK_PRIVATE_LIBRARIES
         calamaresui
+        ${_extra_libraries}
     SHARED_LIB
 )
 
@@ -23,8 +35,11 @@ if( ECM_FOUND AND BUILD_TESTING )
             packagechoosertest
         LINK_LIBRARIES
             ${CALAMARES_LIBRARIES}
+            calamares_viewmodule_packagechooser
             Qt5::Core
             Qt5::Test
+            Qt5::Gui
+            ${_extra_libraries}
     )
     calamares_automoc( packagechoosertest)
 endif()
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 3283cbe6f..f13564d5e 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -21,6 +21,11 @@
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
+#ifdef HAVE_XML
+#include <QDomDocument>
+#include <QFile>
+#endif
+
 const NamedEnumTable< PackageChooserMode >&
 roleNames()
 {
@@ -41,13 +46,6 @@ roleNames()
     return names;
 }
 
-PackageItem
-PackageItem::fromAppStream( const QString& filename )
-{
-    // TODO: implement this
-    return PackageItem {};
-}
-
 PackageItem::PackageItem() {}
 
 PackageItem::PackageItem( const QString& a_id,
@@ -99,6 +97,56 @@ PackageItem::PackageItem::PackageItem( const QVariantMap& item_map )
     }
 }
 
+#ifdef HAVE_XML
+QDomDocument
+loadAppData( const QString& fileName )
+{
+    QFile file( fileName );
+    if ( !file.open( QIODevice::ReadOnly ) )
+    {
+        return QDomDocument();
+    }
+    QDomDocument doc( "AppData" );
+    if ( !doc.setContent( &file ) )
+    {
+        file.close();
+        return QDomDocument();
+    }
+    file.close();
+    return doc;
+}
+
+QString
+getChildText( const QDomNode& n, const QString& tagName )
+{
+    QDomElement e = n.firstChildElement( tagName );
+    return e.isNull() ? QString() : e.text();
+}
+#endif
+
+PackageItem
+PackageItem::fromAppData( const QString& fileName )
+{
+#ifdef HAVE_XML
+    QDomDocument doc = loadAppData( fileName );
+    if ( doc.isNull() )
+    {
+        return PackageItem();
+    }
+
+    QDomElement componentNode = doc.documentElement();
+    if ( !componentNode.isNull() && componentNode.tagName() == "component" )
+    {
+        QString id = getChildText( componentNode, "id" );
+        cDebug() << "Got AppData id" << id;
+    }
+
+    return PackageItem();
+#else
+    return PackageItem();
+#endif
+}
+
 
 PackageListModel::PackageListModel( QObject* parent )
     : QAbstractListModel( parent )
@@ -117,7 +165,7 @@ void
 PackageListModel::addPackage( PackageItem&& p )
 {
     // Only add valid packages
-    if ( !p.name.isEmpty() )
+    if ( p.isValid() )
     {
         int c = m_packages.count();
         beginInsertRows( QModelIndex(), c, c );
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index ce384096c..7e79b98f1 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -75,8 +75,18 @@ struct PackageItem
      */
     PackageItem( const QVariantMap& map );
 
-    // TODO: implement this
-    PackageItem fromAppStream( const QString& filename );
+    /** @brief Is this item valid?
+     *
+     * A valid item has an untranslated name available.
+     */
+    bool isValid() const { return !name.isEmpty(); }
+
+    /** @brief Loads an AppData XML file and returns a PackageItem
+     *
+     * Requires XML support in libcalamares, if not present will
+     * return invalid PackageItems.
+     */
+    static PackageItem fromAppData( const QString& filename );
 };
 
 using PackageList = QVector< PackageItem >;
diff --git a/src/modules/packagechooser/Tests.cpp b/src/modules/packagechooser/Tests.cpp
index c016f1808..6cbab8e38 100644
--- a/src/modules/packagechooser/Tests.cpp
+++ b/src/modules/packagechooser/Tests.cpp
@@ -18,6 +18,8 @@
 
 #include "Tests.h"
 
+#include "PackageModel.h"
+
 #include <QtTest/QtTest>
 
 QTEST_GUILESS_MAIN( PackageChooserTests )
@@ -36,3 +38,18 @@ PackageChooserTests::testBogus()
 {
     QVERIFY( true );
 }
+
+void
+PackageChooserTests::testAppData()
+{
+    // Path from the build-dir
+    QString appdataName( "../io.calamares.calamares.appdata.xml" );
+    QVERIFY( QFile::exists( appdataName ) );
+
+    PackageItem p = PackageItem::fromAppData( appdataName );
+#ifdef HAVE_XML
+    QVERIFY( p.isValid() );
+#else
+    QVERIFY( !p.isValid() );
+#endif
+}
diff --git a/src/modules/packagechooser/Tests.h b/src/modules/packagechooser/Tests.h
index bc257f5a5..62efe92cc 100644
--- a/src/modules/packagechooser/Tests.h
+++ b/src/modules/packagechooser/Tests.h
@@ -31,6 +31,7 @@ public:
 private Q_SLOTS:
     void initTestCase();
     void testBogus();
+    void testAppData();
 };
 
 #endif

From 6821b14d009b92d956f9178232eb24ca3bf4f8cc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 14:41:40 +0200
Subject: [PATCH 35/44] [packagechooser] Enable logging in tests

---
 src/modules/packagechooser/PackageModel.cpp | 4 ++++
 src/modules/packagechooser/Tests.cpp        | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index f13564d5e..9a572f036 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -128,6 +128,8 @@ PackageItem
 PackageItem::fromAppData( const QString& fileName )
 {
 #ifdef HAVE_XML
+    cDebug() << "Loading AppData XML from" << fileName;
+    
     QDomDocument doc = loadAppData( fileName );
     if ( doc.isNull() )
     {
@@ -143,6 +145,8 @@ PackageItem::fromAppData( const QString& fileName )
 
     return PackageItem();
 #else
+    cWarning() << "Loading AppData XML is not supported.";
+    
     return PackageItem();
 #endif
 }
diff --git a/src/modules/packagechooser/Tests.cpp b/src/modules/packagechooser/Tests.cpp
index 6cbab8e38..d9cbbf4ed 100644
--- a/src/modules/packagechooser/Tests.cpp
+++ b/src/modules/packagechooser/Tests.cpp
@@ -20,6 +20,8 @@
 
 #include "PackageModel.h"
 
+#include "utils/Logger.h"
+
 #include <QtTest/QtTest>
 
 QTEST_GUILESS_MAIN( PackageChooserTests )
@@ -31,6 +33,7 @@ PackageChooserTests::~PackageChooserTests() {}
 void
 PackageChooserTests::initTestCase()
 {
+    Logger::setupLogLevel( Logger::LOGDEBUG );
 }
 
 void

From 431c4de77fe2c7d7647be00e5051694c5a2b7805 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 15:19:20 +0200
Subject: [PATCH 36/44] [packagechooser] Use GUI for tests

 - Because we'll be creating Pixmaps, we need to have a GUI main.
---
 src/modules/packagechooser/Tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/packagechooser/Tests.cpp b/src/modules/packagechooser/Tests.cpp
index d9cbbf4ed..e15397613 100644
--- a/src/modules/packagechooser/Tests.cpp
+++ b/src/modules/packagechooser/Tests.cpp
@@ -24,7 +24,7 @@
 
 #include <QtTest/QtTest>
 
-QTEST_GUILESS_MAIN( PackageChooserTests )
+QTEST_MAIN( PackageChooserTests )
 
 PackageChooserTests::PackageChooserTests() {}
 

From fb547364c73c8d36e5b6ed0d2c74ded1e3447513 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 15:36:34 +0200
Subject: [PATCH 37/44] [packagechooser] Complete parsing of AppData

 - Document all the static inline methods that do the work
 - Fill up a QVariantMap from <name>, <summary> and <description><p>
   elements, and use that to initialize the PackageItem.
---
 src/modules/packagechooser/PackageModel.cpp | 152 +++++++++++++++++++-
 1 file changed, 147 insertions(+), 5 deletions(-)

diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 9a572f036..29890ee9b 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -23,6 +23,7 @@
 
 #ifdef HAVE_XML
 #include <QDomDocument>
+#include <QDomNodeList>
 #include <QFile>
 #endif
 
@@ -98,7 +99,12 @@ PackageItem::PackageItem::PackageItem( const QVariantMap& item_map )
 }
 
 #ifdef HAVE_XML
-QDomDocument
+/** @brief try to load the given @p fileName XML document
+ *
+ * Returns a QDomDocument, which will be valid iff the file can
+ * be read and contains valid XML data.
+ */
+static inline QDomDocument
 loadAppData( const QString& fileName )
 {
     QFile file( fileName );
@@ -116,12 +122,138 @@ loadAppData( const QString& fileName )
     return doc;
 }
 
-QString
+/** @brief gets the text of child element @p tagName
+ */
+static inline QString
 getChildText( const QDomNode& n, const QString& tagName )
 {
     QDomElement e = n.firstChildElement( tagName );
     return e.isNull() ? QString() : e.text();
 }
+
+/** @brief Gets a suitable screenshot path
+ *
+ * The <screenshots> element contains zero or more <screenshot>
+ * elements, which can have a *type* associated with them.
+ * Scan the screenshot elements, return the <image> path
+ * for the one labeled with type=default or, if there is no
+ * default, the first element.
+ */
+static inline QString
+getScreenshotPath( const QDomNode& n )
+{
+    QDomElement shotsNode = n.firstChildElement( "screenshots" );
+    if ( shotsNode.isNull() )
+    {
+        return QString();
+    }
+
+    const QDomNodeList shotList = shotsNode.childNodes();
+    int firstScreenshot = -1;  // Use which screenshot node?
+    for ( int i = 0; i < shotList.count(); ++i )
+    {
+        if ( !shotList.at( i ).isElement() )
+        {
+            continue;
+        }
+        QDomElement e = shotList.at( i ).toElement();
+        if ( e.tagName() != "screenshot" )
+        {
+            continue;
+        }
+        // If none has the "type=default" attribute, use the first one
+        if ( firstScreenshot < 0 )
+        {
+            firstScreenshot = i;
+        }
+        // But type=default takes precedence.
+        if ( e.hasAttribute( "type" ) && e.attribute( "type" ) == "default" )
+        {
+            firstScreenshot = i;
+            break;
+        }
+    }
+
+    if ( firstScreenshot >= 0 )
+    {
+        return shotList.at( firstScreenshot ).firstChildElement( "image" ).text();
+    }
+
+    return QString();
+}
+
+/** @brief Returns language of the given element @p e
+ *
+ * Transforms the attribute value for xml:lang to something
+ * suitable for TranslatedString (e.g. [lang]).
+ */
+static inline QString
+getLanguage( const QDomElement& e )
+{
+    QString language = e.attribute( "xml:lang" );
+    if ( !language.isEmpty() )
+    {
+        language.replace( '-', '_' );
+        language.prepend( '[' );
+        language.append( ']' );
+    }
+    return language;
+}
+
+/** @brief Scan the list of @p children for @p tagname elements and add them to the map
+ *
+ * Uses @p mapname instead of @p tagname for the entries in map @p m
+ * to allow renaming from XML to map keys (in particular for
+ * TranslatedString). Also transforms xml:lang attributes to suitable
+ * key-decorations on @p mapname.
+ */
+static inline void
+fillMap( QVariantMap& m, const QDomNodeList& children, const QString& tagname, const QString& mapname )
+{
+    for ( int i = 0; i < children.count(); ++i )
+    {
+        if ( !children.at( i ).isElement() )
+        {
+            continue;
+        }
+
+        QDomElement e = children.at( i ).toElement();
+        if ( e.tagName() != tagname )
+        {
+            continue;
+        }
+
+        m[ mapname + getLanguage( e ) ] = e.text();
+    }
+}
+
+/** @brief gets the <name> and <description> elements
+*
+* Builds up a map of the <name> elements (which may have a *lang*
+* attribute to indicate translations and paragraphs of the
+* <description> element (also with lang). Uses the <summary>
+* elements to supplement the description if no description
+* is available for a given language.
+*
+* Returns a map with keys suitable for use by TranslatedString.
+*/
+static inline QVariantMap
+getNameAndSummary( const QDomNode& n )
+{
+    QVariantMap m;
+
+    const QDomNodeList children = n.childNodes();
+    fillMap( m, children, "name", "name" );
+    fillMap( m, children, "summary", "description" );
+
+    const QDomElement description = n.firstChildElement( "description" );
+    if ( !description.isNull() )
+    {
+        fillMap( m, description.childNodes(), "p", "description" );
+    }
+
+    return m;
+}
 #endif
 
 PackageItem
@@ -129,7 +261,7 @@ PackageItem::fromAppData( const QString& fileName )
 {
 #ifdef HAVE_XML
     cDebug() << "Loading AppData XML from" << fileName;
-    
+
     QDomDocument doc = loadAppData( fileName );
     if ( doc.isNull() )
     {
@@ -140,13 +272,23 @@ PackageItem::fromAppData( const QString& fileName )
     if ( !componentNode.isNull() && componentNode.tagName() == "component" )
     {
         QString id = getChildText( componentNode, "id" );
-        cDebug() << "Got AppData id" << id;
+        if ( id.isEmpty() )
+        {
+            return PackageItem();
+        }
+
+        QString screenshotPath = getScreenshotPath( componentNode );
+
+        QVariantMap map = getNameAndSummary( componentNode );
+        map.insert( "id", id );
+        map.insert( "screenshot", screenshotPath );
+        return PackageItem( map );
     }
 
     return PackageItem();
 #else
     cWarning() << "Loading AppData XML is not supported.";
-    
+
     return PackageItem();
 #endif
 }

From 9a8b2c5a1e189a1870b7ccec49f01b7fedc1d254 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 15:45:14 +0200
Subject: [PATCH 38/44] [packagechooser] CHeck that AppData load was succesful

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

diff --git a/src/modules/packagechooser/Tests.cpp b/src/modules/packagechooser/Tests.cpp
index e15397613..5dec8a288 100644
--- a/src/modules/packagechooser/Tests.cpp
+++ b/src/modules/packagechooser/Tests.cpp
@@ -52,6 +52,13 @@ PackageChooserTests::testAppData()
     PackageItem p = PackageItem::fromAppData( appdataName );
 #ifdef HAVE_XML
     QVERIFY( p.isValid() );
+    QCOMPARE( p.id, "io.calamares.calamares.desktop" );
+    QCOMPARE( p.name.get(), "Calamares" );
+    // The <description> entry has precedence
+    QCOMPARE( p.description.get(), "Calamares is an installer program for Linux distributions." );
+    // .. but en_GB doesn't have an entry in description, so uses <summary>
+    QCOMPARE( p.description.get( QLocale( "en_GB" ) ), "Calamares Linux Installer" );
+    QCOMPARE( p.description.get( QLocale( "nl" ) ), "Calamares is een installatieprogramma voor Linux distributies." );
 #else
     QVERIFY( !p.isValid() );
 #endif

From d72391942ffe6c0bf34482fd1c55566061b45618 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 15:55:27 +0200
Subject: [PATCH 39/44] [packagechooser] Implement AppData loading

 - An item can refer to *appdata* and load that, or provide
   the data in the config file itself.
 - Fix documentation about translations.
---
 .../packagechooser/PackageChooserViewStep.cpp |  9 ++++++-
 .../packagechooser/packagechooser.conf        | 24 +++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index a3b853b39..fadacf8d4 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -232,7 +232,14 @@ PackageChooserViewStep::fillModel( const QVariantList& items )
             continue;
         }
 
-        m_model->addPackage( PackageItem( item_map ) );
+        if ( item_map.contains( "appdata" ) )
+        {
+            m_model->addPackage( PackageItem::fromAppData( CalamaresUtils::getString( item_map, "appdata" ) ) );
+        }
+        else
+        {
+            m_model->addPackage( PackageItem( item_map ) );
+        }
     }
 }
 
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index 7d60b50a4..f20d1da77 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -24,8 +24,11 @@ mode: required
 # pretty short list to avoid overwhelming the UI. This is a list
 # of objects, and the items are displayed in list order.
 #
-# Each item has an id, which is used in setting # the value of 
-# *packagechooser_<module-id>*). The following fields
+# Either provide the data for an item in the list (using the keys
+# below), or use existing AppData XML files as a source for the data.
+#
+# For data provided by the list: the item has an id, which is used in 
+# setting the value of *packagechooser_<module-id>*). The following fields
 # are mandatory:
 #
 #  - *id* ID for the product. The ID "" is special, and is used for
@@ -33,13 +36,24 @@ mode: required
 #    selecting none.
 #  - *package* Package name for the product. While mandatory, this is
 #       not actually used anywhere.
-#  - *name* Human-readable, but untranslated, name of the product.
-#  - *description* Human-readable, but untranslated, description.
+#  - *name* Human-readable name of the product. To provide translations,
+#       add a *[lang]* decoration as part of the key name, e.g. `name[nl]`
+#       for Dutch. The list of usable languages can be found in
+#       `CMakeLists.txt` or as part of the debug output of Calamares.
+#  - *description* Human-readable description. These can be translated
+#       as well.
 #  - *screenshot* Path to a single screenshot of the product. May be
 #       a filesystem path or a QRC path (e.g. ":/images/no-selection.png").
 #
 # Use the empty string "" as ID / key for the "no selection" item if
 # you want to customize the display of that item as well.
+#
+# For data provided by AppData XML: the item has an *appdata*
+# key which points to an AppData XML file in the local filesystem.
+# This file is parsed to provide the id (from AppData id), name
+# (from AppData name), description (from AppData description paragraphs
+# or the summary entries), and a screenshot (the defautl screenshot
+# from AppData). No package is set (but that is unused anyway).
 items:
     - id: ""
       package: ""
@@ -58,5 +72,5 @@ items:
       name: GNOME
       description: GNU Networked Object Modeling Environment Desktop
       screenshot: ":/images/gnome.png"
-
+    - appdata: ../io.calamares.calamares.appdata.xml
 

From 6ddae94628d3c3b9cbae028306c3896727477cde Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 22:36:35 +0200
Subject: [PATCH 40/44] [packagechooser] Allow to override some of AppData

 - The ID and Screenshot entries might be weird in AppData (in particular,
   a remove URL) so put those back under the control of Calamares even
   when using AppData as the source of descriptions.
---
 .../packagechooser/PackageChooserViewStep.cpp |  2 +-
 src/modules/packagechooser/PackageModel.cpp   | 23 ++++++++++++++++---
 src/modules/packagechooser/PackageModel.h     |  8 ++++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index fadacf8d4..6df785a06 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -234,7 +234,7 @@ PackageChooserViewStep::fillModel( const QVariantList& items )
 
         if ( item_map.contains( "appdata" ) )
         {
-            m_model->addPackage( PackageItem::fromAppData( CalamaresUtils::getString( item_map, "appdata" ) ) );
+            m_model->addPackage( PackageItem::fromAppData( item_map ) );
         }
         else
         {
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 29890ee9b..bddc26c7c 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -257,9 +257,15 @@ getNameAndSummary( const QDomNode& n )
 #endif
 
 PackageItem
-PackageItem::fromAppData( const QString& fileName )
+PackageItem::fromAppData( const QVariantMap& item_map )
 {
 #ifdef HAVE_XML
+    QString fileName = CalamaresUtils::getString( item_map, "appdata" );
+    if ( fileName.isEmpty() )
+    {
+        cWarning() << "Can't load AppData without a suitable key.";
+        return PackageItem();
+    }
     cDebug() << "Loading AppData XML from" << fileName;
 
     QDomDocument doc = loadAppData( fileName );
@@ -271,17 +277,28 @@ PackageItem::fromAppData( const QString& fileName )
     QDomElement componentNode = doc.documentElement();
     if ( !componentNode.isNull() && componentNode.tagName() == "component" )
     {
-        QString id = getChildText( componentNode, "id" );
+        // An "id" entry in the Calamares config overrides ID in the AppData
+        QString id = CalamaresUtils::getString( item_map, "id" );
+        if ( id.isEmpty() )
+        {
+            id = getChildText( componentNode, "id" );
+        }
         if ( id.isEmpty() )
         {
             return PackageItem();
         }
 
-        QString screenshotPath = getScreenshotPath( componentNode );
+        // A "screenshot" entry in the Calamares config overrides AppData
+        QString screenshotPath = CalamaresUtils::getString( item_map, "screenshot" );
+        if ( screenshotPath.isEmpty() )
+        {
+            screenshotPath = getScreenshotPath( componentNode );
+        }
 
         QVariantMap map = getNameAndSummary( componentNode );
         map.insert( "id", id );
         map.insert( "screenshot", screenshotPath );
+
         return PackageItem( map );
     }
 
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 7e79b98f1..869e124f0 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -82,11 +82,17 @@ struct PackageItem
     bool isValid() const { return !name.isEmpty(); }
 
     /** @brief Loads an AppData XML file and returns a PackageItem
+     *
+     * The @p map must have a key *appdata*. That is used as the
+     * primary source of information, but keys *id* and *screenshotPath*
+     * may be used to override parts of the AppData -- so that the
+     * ID is under the control of Calamares, and the screenshot can be
+     * forced to a local path available on the installation medium.
      *
      * Requires XML support in libcalamares, if not present will
      * return invalid PackageItems.
      */
-    static PackageItem fromAppData( const QString& filename );
+    static PackageItem fromAppData( const QVariantMap& map );
 };
 
 using PackageList = QVector< PackageItem >;

From 0b72006ffb53fa7ad31a865eb145d8ca5eea34d0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 22:41:50 +0200
Subject: [PATCH 41/44] [packagechooser] Use overrides on AppData for example

---
 src/modules/packagechooser/images/calamares.png | Bin 0 -> 8313 bytes
 src/modules/packagechooser/packagechooser.conf  |  10 +++++++++-
 src/modules/packagechooser/packagechooser.qrc   |   1 +
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 src/modules/packagechooser/images/calamares.png

diff --git a/src/modules/packagechooser/images/calamares.png b/src/modules/packagechooser/images/calamares.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/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index f20d1da77..e9b2d9329 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -54,6 +54,12 @@ mode: required
 # (from AppData name), description (from AppData description paragraphs
 # or the summary entries), and a screenshot (the defautl screenshot
 # from AppData). No package is set (but that is unused anyway).
+#
+# AppData may contain IDs that are not useful inside Calamares,
+# and the screenshot URL may be remote -- a remote URL will not
+# be loaded and the screenshot will be missing. An item with *appdata*
+# **may** specify an ID or screenshot path, as above. This will override
+# the settings from AppData.
 items:
     - id: ""
       package: ""
@@ -72,5 +78,7 @@ items:
       name: GNOME
       description: GNU Networked Object Modeling Environment Desktop
       screenshot: ":/images/gnome.png"
-    - appdata: ../io.calamares.calamares.appdata.xml
+    - id: calamares
+      appdata: ../io.calamares.calamares.appdata.xml
+      screenshot: ":/images/calamares.png"
 
diff --git a/src/modules/packagechooser/packagechooser.qrc b/src/modules/packagechooser/packagechooser.qrc
index 9212c2f93..8f211c1bb 100644
--- a/src/modules/packagechooser/packagechooser.qrc
+++ b/src/modules/packagechooser/packagechooser.qrc
@@ -3,5 +3,6 @@
         <file>images/no-selection.png</file>
         <file>images/kde.png</file>
         <file>images/gnome.png</file>
+        <file>images/calamares.png</file>
     </qresource>
 </RCC>

From 5d4c3ea92c028b7e102cc81dc31ba33e271863a4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 22:46:36 +0200
Subject: [PATCH 42/44] [packagechooser] Don't give a default pixmap

---
 src/modules/packagechooser/PackageModel.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index bddc26c7c..59c6973ba 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -92,10 +92,6 @@ PackageItem::PackageItem::PackageItem( const QVariantMap& item_map )
     {
         description = QObject::tr( "No description provided." );
     }
-    if ( screenshot.isNull() )
-    {
-        screenshot = QPixmap( QStringLiteral( ":/images/no-selection.png" ) );
-    }
 }
 
 #ifdef HAVE_XML

From a4362dac654b154e837d4035027c6980ce47101f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 22:47:37 +0200
Subject: [PATCH 43/44] [packagechooser] Change tests for modified API

---
 src/modules/packagechooser/Tests.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/modules/packagechooser/Tests.cpp b/src/modules/packagechooser/Tests.cpp
index 5dec8a288..15b5792bb 100644
--- a/src/modules/packagechooser/Tests.cpp
+++ b/src/modules/packagechooser/Tests.cpp
@@ -49,7 +49,10 @@ PackageChooserTests::testAppData()
     QString appdataName( "../io.calamares.calamares.appdata.xml" );
     QVERIFY( QFile::exists( appdataName ) );
 
-    PackageItem p = PackageItem::fromAppData( appdataName );
+    QVariantMap m;
+    m.insert( "appdata", appdataName );
+    
+    PackageItem p = PackageItem::fromAppData( m );
 #ifdef HAVE_XML
     QVERIFY( p.isValid() );
     QCOMPARE( p.id, "io.calamares.calamares.desktop" );
@@ -59,6 +62,15 @@ PackageChooserTests::testAppData()
     // .. but en_GB doesn't have an entry in description, so uses <summary>
     QCOMPARE( p.description.get( QLocale( "en_GB" ) ), "Calamares Linux Installer" );
     QCOMPARE( p.description.get( QLocale( "nl" ) ), "Calamares is een installatieprogramma voor Linux distributies." );
+    QVERIFY( p.screenshot.isNull() );
+    
+    m.insert( "id", "calamares" );
+    m.insert( "screenshot", ":/images/calamares.png" );
+    PackageItem p_self = PackageItem::fromAppData( m );
+    QVERIFY( p.isValid() );
+    QCOMPARE( p.id, "calamares" );
+    QCOMPARE( p.description.get( QLocale( "nl" ) ), "Calamares is een installatieprogramma voor Linux distributies." );
+    QVERIFY( !p.screenshot.isNull() );
 #else
     QVERIFY( !p.isValid() );
 #endif

From 194a562727e347a32b246613e05836cc405264e4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Aug 2019 22:51:14 +0200
Subject: [PATCH 44/44] [packagechooser] Expand tests with override features

---
 src/modules/packagechooser/Tests.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/modules/packagechooser/Tests.cpp b/src/modules/packagechooser/Tests.cpp
index 15b5792bb..3e7961b92 100644
--- a/src/modules/packagechooser/Tests.cpp
+++ b/src/modules/packagechooser/Tests.cpp
@@ -52,26 +52,26 @@ PackageChooserTests::testAppData()
     QVariantMap m;
     m.insert( "appdata", appdataName );
     
-    PackageItem p = PackageItem::fromAppData( m );
+    PackageItem p1 = PackageItem::fromAppData( m );
 #ifdef HAVE_XML
-    QVERIFY( p.isValid() );
-    QCOMPARE( p.id, "io.calamares.calamares.desktop" );
-    QCOMPARE( p.name.get(), "Calamares" );
+    QVERIFY( p1.isValid() );
+    QCOMPARE( p1.id, "io.calamares.calamares.desktop" );
+    QCOMPARE( p1.name.get(), "Calamares" );
     // The <description> entry has precedence
-    QCOMPARE( p.description.get(), "Calamares is an installer program for Linux distributions." );
+    QCOMPARE( p1.description.get(), "Calamares is an installer program for Linux distributions." );
     // .. but en_GB doesn't have an entry in description, so uses <summary>
-    QCOMPARE( p.description.get( QLocale( "en_GB" ) ), "Calamares Linux Installer" );
-    QCOMPARE( p.description.get( QLocale( "nl" ) ), "Calamares is een installatieprogramma voor Linux distributies." );
-    QVERIFY( p.screenshot.isNull() );
+    QCOMPARE( p1.description.get( QLocale( "en_GB" ) ), "Calamares Linux Installer" );
+    QCOMPARE( p1.description.get( QLocale( "nl" ) ), "Calamares is een installatieprogramma voor Linux distributies." );
+    QVERIFY( p1.screenshot.isNull() );
     
     m.insert( "id", "calamares" );
     m.insert( "screenshot", ":/images/calamares.png" );
-    PackageItem p_self = PackageItem::fromAppData( m );
-    QVERIFY( p.isValid() );
-    QCOMPARE( p.id, "calamares" );
-    QCOMPARE( p.description.get( QLocale( "nl" ) ), "Calamares is een installatieprogramma voor Linux distributies." );
-    QVERIFY( !p.screenshot.isNull() );
+    PackageItem p2= PackageItem::fromAppData( m );
+    QVERIFY( p2.isValid() );
+    QCOMPARE( p2.id, "calamares" );
+    QCOMPARE( p2.description.get( QLocale( "nl" ) ), "Calamares is een installatieprogramma voor Linux distributies." );
+    QVERIFY( !p2.screenshot.isNull() );
 #else
-    QVERIFY( !p.isValid() );
+    QVERIFY( !p1.isValid() );
 #endif
 }