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

[users] Use base Config and its Preset-handling

Browse Source
This commit is contained in:
Adriaan de Groot 2021-03-12 13:54:06 +01:00
parent 0be5e04c2e
commit 448e478b6d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "modulesystem/Preset.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/String.h" #include "utils/String.h"
#include "utils/Variant.h" #include "utils/Variant.h"
@ -92,7 +91,7 @@ hostNameActionNames()
} }
Config::Config( QObject* parent ) Config::Config( QObject* parent )
: QObject( parent ) : Calamares::ModuleSystem::Config( parent )
{ {
emit readyChanged( m_isReady ); // false emit readyChanged( m_isReady ); // false
@ -838,9 +837,11 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
updateGSAutoLogin( doAutoLogin(), loginName() ); updateGSAutoLogin( doAutoLogin(), loginName() );
checkReady(); checkReady();
bool bogus = true; loadPresets( configurationMap,
Calamares::ModuleSystem::Presets p( CalamaresUtils::getSubMap( configurationMap, "presets", bogus ), {
{ "fullname", "loginname", } ); "fullname",
"loginname",
} );
} }
void void

5
src/modules/users/Config.h
View File

@ -13,6 +13,7 @@
#include "CheckPWQuality.h" #include "CheckPWQuality.h"
#include "Job.h" #include "Job.h"
#include "modulesystem/Config.h"
#include "utils/NamedEnum.h" #include "utils/NamedEnum.h"
#include <QList> #include <QList>
@ -85,7 +86,7 @@ private:
}; };
class PLUGINDLLEXPORT Config : public QObject class PLUGINDLLEXPORT Config : public Calamares::ModuleSystem::Config
{ {
Q_OBJECT Q_OBJECT
@ -161,7 +162,7 @@ public:
Config( QObject* parent = nullptr ); Config( QObject* parent = nullptr );
~Config() override; ~Config() override;
void setConfigurationMap( const QVariantMap& ); void setConfigurationMap( const QVariantMap& ) override;
/** @brief Fill Global Storage with some settings /** @brief Fill Global Storage with some settings
* *