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

[welcome] Move languageIcon loading into the Config object

Browse Source 
- The QML module had an additional check that the normal one
  did not; add it in the merged code.
This commit is contained in:
Adriaan de Groot 2020-05-06 15:24:08 +02:00
parent a7a6c937ea
commit 6434374bf3
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/welcome/Config.cpp
View File

@ -22,6 +22,7 @@
#include "Settings.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "utils/Variant.h"
Config::Config( QObject* parent )
: QObject( parent )
@ -289,4 +290,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
setReleaseNotesUrl(
jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) );
setDonateUrl( jobOrBrandingSetting( Branding::DonateUrl, configurationMap, "showDonateUrl" ) );
QString language = CalamaresUtils::getString( configurationMap, "languageIcon" );
if ( !language.isEmpty() )
{
auto icon = Calamares::Branding::instance()->image( language, QSize( 48, 48 ) );
if ( !icon.isNull() )
{
setLanguageIcon( language );
}
}
}

6
src/modules/welcome/WelcomeViewStep.cpp
View File

@ -151,12 +151,6 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
}
}
QString language = CalamaresUtils::getString( configurationMap, "languageIcon" );
if ( !language.isEmpty() )
{
m_conf->setLanguageIcon( language );
}
//here init the qml or qwidgets needed bits
m_widget->init();
}

10
src/modules/welcomeq/WelcomeQmlViewStep.cpp
View File

@ -144,16 +144,6 @@ WelcomeQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
}
}
QString language = CalamaresUtils::getString( configurationMap, "languageIcon" );
if ( !language.isEmpty() )
{
auto icon = Calamares::Branding::instance()->image( language, QSize( 48, 48 ) );
if ( !icon.isNull() )
{
m_config->setLanguageIcon(language);
}
}
Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last
setContextProperty( "Welcome", m_config );
}