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

[calamares] Give the fake ExecutionViewModule a name

Browse Source 
- This is needed for addModule() so the module manager knows there
  is a module by the name x@x.
- Tell the ExecutionViewStep to run jobs from x@x.
This commit is contained in:
Adriaan de Groot 2020-05-20 10:59:43 +02:00
parent 28500de2f8
commit 376cb3c042
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calamares/testmain.cpp
View File

@ -187,7 +187,6 @@ public:
virtual Calamares::JobList jobs() const override; virtual Calamares::JobList jobs() const override;
protected: protected:
void initFrom( const QVariantMap& ) override; void initFrom( const QVariantMap& ) override;
}; };
@ -195,6 +194,9 @@ protected:
ExecViewModule::ExecViewModule() ExecViewModule::ExecViewModule()
: Calamares::Module() : Calamares::Module()
{ {
QVariantMap m;
m.insert( "name", "x" );
Calamares::Module::initFrom(m, "x" );
} }
ExecViewModule::~ExecViewModule() {} ExecViewModule::~ExecViewModule() {}
@ -210,6 +212,7 @@ ExecViewModule::loadSelf()
auto* viewStep = new Calamares::ExecutionViewStep(); auto* viewStep = new Calamares::ExecutionViewStep();
viewStep->setModuleInstanceKey( instanceKey() ); viewStep->setModuleInstanceKey( instanceKey() );
viewStep->setConfigurationMap( m_configurationMap ); viewStep->setConfigurationMap( m_configurationMap );
viewStep->appendJobModuleInstanceKey( "x@x" );
Calamares::ViewManager::instance()->addViewStep( viewStep ); Calamares::ViewManager::instance()->addViewStep( viewStep );
m_loaded = true; m_loaded = true;
} }