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(); diff --git a/src/modules/localeq/localeq.qml b/src/modules/localeq/localeq.qml index 534c8952c..0e00d1b1b 100644 --- a/src/modules/localeq/localeq.qml +++ b/src/modules/localeq/localeq.qml @@ -27,9 +27,9 @@ RowLayout Layout.fillWidth: true ColumnLayout { id: zones - Repeater { + ListView { model: config.zonesModel - Text { + delegate: Text { text: label } } 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 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