Merge branch 'master' of https://github.com/calamares/calamares into development

This commit is contained in:
Philip Müller 2020-04-06 00:07:29 +02:00
commit 963e2f46b8
4 changed files with 15 additions and 5 deletions

View File

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

View File

@ -27,9 +27,9 @@ RowLayout
Layout.fillWidth: true Layout.fillWidth: true
ColumnLayout { ColumnLayout {
id: zones id: zones
Repeater { ListView {
model: config.zonesModel model: config.zonesModel
Text { delegate: Text {
text: label text: label
} }
} }

View File

@ -88,6 +88,8 @@ NetInstallPage::expandGroups()
ui->groupswidget->setExpanded( index, true ); ui->groupswidget->setExpanded( index, true );
} }
} }
// Make sure all the group names are visible
ui->groupswidget->resizeColumnToContents(0);
} }
void void

View File

@ -95,3 +95,10 @@ groups:
- kernel - kernel
- kernel-debugsym - kernel-debugsym
- kernel-nvidia - kernel-nvidia
- name: Communications
description: "Communications Software"
packages:
- ruqola
- konversation
- nheko
- quaternion