napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[calamares] Fix test-loader for modules after ViewManager API

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

See 7393198f7b
This commit is contained in:
Adriaan de Groot 2020-04-05 00:06:50 +02:00
parent 9db7dd3f3e
commit a97f4771d6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calamares/testmain.cpp
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();