mirror of
https://github.com/parchlinux/calamares.git
synced 2025-06-29 02:15:36 -04:00
Load branding component name from Settings.
This commit is contained in:
parent
f952b44922
commit
97cf2a796c
2 changed files with 13 additions and 0 deletions
|
@ -91,6 +91,8 @@ Settings::Settings( const QString& settingsFilePath,
|
||||||
config[ "prepare" ] >> m_modulesPrepareList;
|
config[ "prepare" ] >> m_modulesPrepareList;
|
||||||
config[ "install" ] >> m_modulesInstallList;
|
config[ "install" ] >> m_modulesInstallList;
|
||||||
config[ "postinstall" ] >> m_modulesPostInstallList;
|
config[ "postinstall" ] >> m_modulesPostInstallList;
|
||||||
|
m_brandingComponentName = QString::fromStdString( config[ "branding" ]
|
||||||
|
.as< std::string >() );
|
||||||
}
|
}
|
||||||
catch ( YAML::Exception& e )
|
catch ( YAML::Exception& e )
|
||||||
{
|
{
|
||||||
|
@ -130,6 +132,13 @@ Settings::modules( Phase phase ) const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString
|
||||||
|
Settings::brandingComponentName() const
|
||||||
|
{
|
||||||
|
return m_brandingComponentName;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
Settings::debugMode() const
|
Settings::debugMode() const
|
||||||
{
|
{
|
||||||
|
|
|
@ -44,6 +44,8 @@ public:
|
||||||
|
|
||||||
QStringList modules( Phase phase ) const;
|
QStringList modules( Phase phase ) const;
|
||||||
|
|
||||||
|
QString brandingComponentName() const;
|
||||||
|
|
||||||
bool debugMode() const;
|
bool debugMode() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -56,6 +58,8 @@ private:
|
||||||
QStringList m_modulesPrepareList;
|
QStringList m_modulesPrepareList;
|
||||||
QStringList m_modulesInstallList;
|
QStringList m_modulesInstallList;
|
||||||
QStringList m_modulesPostInstallList;
|
QStringList m_modulesPostInstallList;
|
||||||
|
|
||||||
|
QString m_brandingComponentName;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue