From 8a49fde0163c6660784d2ea11da817e721a8f36b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 3 Sep 2021 21:15:57 +0200
Subject: [PATCH] [packagechooserq] Apply renaming also to distro-visible code

- The distro-visible key is renamed *pkgc* to *packageChoice*
- Read *packageChoice* only if there are no items to use
---
 src/modules/packagechooser/Config.cpp         | 27 ++++++++++---------
 .../packagechooserq/packagechooserq.conf      | 10 +++++--
 .../packagechooserq/packagechooserq.qml       |  8 +++---
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp
index 2c798ea03..11288bde6 100644
--- a/src/modules/packagechooser/Config.cpp
+++ b/src/modules/packagechooser/Config.cpp
@@ -204,7 +204,6 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
                                              PackageChooserMode::Required );
     m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ),
                                                  PackageChooserMethod::Legacy );
-    setPackageChoice( CalamaresUtils::getString( configurationMap, "pkgc" ) );
 
     if ( m_method == PackageChooserMethod::Legacy )
     {
@@ -233,21 +232,25 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     if ( configurationMap.contains( "items" ) )
     {
         fillModel( m_model, configurationMap.value( "items" ).toList() );
-    }
 
-    QString default_item_id = CalamaresUtils::getString( configurationMap, "default" );
-    if ( !default_item_id.isEmpty() )
-    {
-        for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n )
+        QString default_item_id = CalamaresUtils::getString( configurationMap, "default" );
+        if ( !default_item_id.isEmpty() )
         {
-            QModelIndex item_idx = m_model->index( item_n, 0 );
-            QVariant item_id = m_model->data( item_idx, PackageListModel::IdRole );
-
-            if ( item_id.toString() == default_item_id )
+            for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n )
             {
-                m_defaultModelIndex = item_idx;
-                break;
+                QModelIndex item_idx = m_model->index( item_n, 0 );
+                QVariant item_id = m_model->data( item_idx, PackageListModel::IdRole );
+
+                if ( item_id.toString() == default_item_id )
+                {
+                    m_defaultModelIndex = item_idx;
+                    break;
+                }
             }
         }
     }
+    else
+    {
+        setPackageChoice( CalamaresUtils::getString( configurationMap, "packageChoice" ) );
+    }
 }
diff --git a/src/modules/packagechooserq/packagechooserq.conf b/src/modules/packagechooserq/packagechooserq.conf
index ecf9ed1a6..8fd3a08f6 100644
--- a/src/modules/packagechooserq/packagechooserq.conf
+++ b/src/modules/packagechooserq/packagechooserq.conf
@@ -45,6 +45,12 @@ method: legacy
 #
 # id: ""
 
-# The *pkgc* is used for setting the default selection in the QML view
-pkgc: libreoffice
+# The *packageChoice* value is used for setting the default selection
+# in the QML view; this should match one of the keys used in the QML
+# module for package names.
+#
+# (e.g. the sample QML uses "no_office_suite", "minimal_install" and
+# "libreoffice" as possible choices).
+#
+packageChoice: libreoffice
 
diff --git a/src/modules/packagechooserq/packagechooserq.qml b/src/modules/packagechooserq/packagechooserq.qml
index cf7454fe9..98f7b8038 100644
--- a/src/modules/packagechooserq/packagechooserq.qml
+++ b/src/modules/packagechooserq/packagechooserq.qml
@@ -84,8 +84,8 @@ Item {
                             print("L not used")
                         }
                         else {
-                            config.pkgc = "libreoffice"
-                            print( config.pkgc )
+                            config.packageChoice = "libreoffice"
+                            print( config.packageChoice )
                         }
                     }
                 }
@@ -152,7 +152,7 @@ Item {
                         }
                         else {
                             print("No Office Suite")
-                            config.pkgc = "no_office_suite"
+                            config.packageChoice = "no_office_suite"
                         }
                     }
                 }
@@ -220,7 +220,7 @@ Item {
                         }
                         else {
                             print("minimal")
-                            config.pkgc = "minimal_install"
+                            config.packageChoice = "minimal_install"
                         }
                     }
                 }