From 97cf2a796c7e22adbfb3508a7e7c96e975cb5012 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 10 Oct 2014 18:13:02 +0200 Subject: [PATCH] Load branding component name from Settings. --- src/libcalamaresui/Settings.cpp | 9 +++++++++ src/libcalamaresui/Settings.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/libcalamaresui/Settings.cpp b/src/libcalamaresui/Settings.cpp index 7b57aff57..204b895fe 100644 --- a/src/libcalamaresui/Settings.cpp +++ b/src/libcalamaresui/Settings.cpp @@ -91,6 +91,8 @@ Settings::Settings( const QString& settingsFilePath, config[ "prepare" ] >> m_modulesPrepareList; config[ "install" ] >> m_modulesInstallList; config[ "postinstall" ] >> m_modulesPostInstallList; + m_brandingComponentName = QString::fromStdString( config[ "branding" ] + .as< std::string >() ); } catch ( YAML::Exception& e ) { @@ -130,6 +132,13 @@ Settings::modules( Phase phase ) const } +QString +Settings::brandingComponentName() const +{ + return m_brandingComponentName; +} + + bool Settings::debugMode() const { diff --git a/src/libcalamaresui/Settings.h b/src/libcalamaresui/Settings.h index 1c374489a..5b3757ada 100644 --- a/src/libcalamaresui/Settings.h +++ b/src/libcalamaresui/Settings.h @@ -44,6 +44,8 @@ public: QStringList modules( Phase phase ) const; + QString brandingComponentName() const; + bool debugMode() const; private: @@ -56,6 +58,8 @@ private: QStringList m_modulesPrepareList; QStringList m_modulesInstallList; QStringList m_modulesPostInstallList; + + QString m_brandingComponentName; }; }