From 9db7dd3f3e3cd2c33922056832b01cf3d5255c57 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 4 Apr 2020 23:59:58 +0200
Subject: [PATCH 1/3] [netinstall] Add a group with long names

---
 src/modules/netinstall/netinstall.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/modules/netinstall/netinstall.conf b/src/modules/netinstall/netinstall.conf
index 5eeef905c..5368a9edf 100644
--- a/src/modules/netinstall/netinstall.conf
+++ b/src/modules/netinstall/netinstall.conf
@@ -95,3 +95,10 @@ groups:
         - kernel
         - kernel-debugsym
         - kernel-nvidia
+    - name: Communications
+      description: "Communications Software"
+      packages:
+        - ruqola
+        - konversation
+        - nheko
+        - quaternion

From a97f4771d61acd0d97ac4f3163e7414e070b7ef3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 5 Apr 2020 00:06:50 +0200
Subject: [PATCH 2/3] [calamares] Fix test-loader for modules after ViewManager
 API

- The ViewManager needs to be told when loading is done now (because of
  the quit-at-end settings)

See 7393198f7bdba5b4539a842dde54c34555cc269e
---
 src/calamares/testmain.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 8dcf41faa..cd06c5d03 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -229,7 +229,7 @@ main( int argc, char* argv[] )
     std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) );
     QMainWindow* mw = nullptr;
 
-    auto gs = jobqueue_p->globalStorage();
+    auto* gs = jobqueue_p->globalStorage();
     if ( !module.globalConfigFile().isEmpty() )
     {
         gs->loadYaml( module.globalConfigFile() );
@@ -241,7 +241,6 @@ main( int argc, char* argv[] )
         gs->insert( "localeConf", vm );
     }
 
-
     cDebug() << "Calamares module-loader testing" << module.moduleName();
     Calamares::Module* m = load_module( module );
     if ( !m )
@@ -273,7 +272,9 @@ main( int argc, char* argv[] )
 
     if ( mw )
     {
-        QWidget* w = Calamares::ViewManager::instance()->currentStep()->widget();
+        auto* vm = Calamares::ViewManager::instance();
+        vm->onInitComplete();
+        QWidget* w = vm->currentStep()->widget();
         w->setParent( mw );
         mw->setCentralWidget( w );
         w->show();

From 065a506470cc07fc1ee76cf651801c3a990366b7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 5 Apr 2020 00:26:53 +0200
Subject: [PATCH 3/3] [netinstall] Resize name column

- Once group data is loaded and pre-expanded groups are open,
  adjust the column width so that all the names are visible.
---
 src/modules/netinstall/NetInstallPage.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp
index 688e99b09..80689e6d2 100644
--- a/src/modules/netinstall/NetInstallPage.cpp
+++ b/src/modules/netinstall/NetInstallPage.cpp
@@ -88,6 +88,8 @@ NetInstallPage::expandGroups()
             ui->groupswidget->setExpanded( index, true );
         }
     }
+    // Make sure all the group names are visible
+    ui->groupswidget->resizeColumnToContents(0);
 }
 
 void