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

[localeq] Pick up Config changes before showing the module

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-06 15:49:55 +02:00
parent 32c8338a9c
commit 71ca1e1544
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/localeq/LocaleQmlViewStep.cpp
View File

@ -79,9 +79,16 @@ LocaleQmlViewStep::jobs() const
return m_config->createJobs(); return m_config->createJobs();
} }
void
LocaleQmlViewStep::onActivate()
{
m_config->setCurrentLocation(); // Finalize the location
QmlViewStep::onActivate();
}
void void
LocaleQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) LocaleQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
m_config->setConfigurationMap( configurationMap ); m_config->setConfigurationMap( configurationMap );
Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last
} }

2
src/modules/localeq/LocaleQmlViewStep.h
View File

@ -43,6 +43,8 @@ public:
bool isAtBeginning() const override; bool isAtBeginning() const override;
bool isAtEnd() const override; bool isAtEnd() const override;
virtual void onActivate() override;
Calamares::JobList jobs() const override; Calamares::JobList jobs() const override;
void setConfigurationMap( const QVariantMap& configurationMap ) override; void setConfigurationMap( const QVariantMap& configurationMap ) override;