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

Load additional module-specific configuration into a Module object.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-07-14 18:10:48 +02:00
parent 3879087c4a
commit c7c4e52849
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamaresui/modulesystem/Module.cpp
View File

@ -51,6 +51,12 @@ operator>>( const YAML::Node& node, Calamares::Module* m )
{ {
node[ "requires" ] >> m->m_requiredModules; node[ "requires" ] >> m->m_requiredModules;
} }
// Module-specific configuration
if ( node[ "configuration" ] && node[ "configuration" ].IsMap() )
{
m->m_configurationMap = CalamaresUtils::yamlMapToVariant( node[ "configuration" ] ).toMap();
}
} }
namespace Calamares namespace Calamares

2
src/libcalamaresui/modulesystem/Module.h
View File

@ -22,6 +22,7 @@
#include "UiDllMacro.h" #include "UiDllMacro.h"
#include <QStringList> #include <QStringList>
#include <QVariant>
namespace YAML namespace YAML
@ -79,6 +80,7 @@ private:
Interface m_interface; Interface m_interface;
QStringList m_requiredModules; QStringList m_requiredModules;
QString m_directory; QString m_directory;
QVariantMap m_configurationMap;
friend void ::operator>>( const YAML::Node& node, Calamares::Module* m ); friend void ::operator>>( const YAML::Node& node, Calamares::Module* m );
}; };