|
|
@ -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();
|
|
|
|