[users] Use base Config and its Preset-handling
This commit is contained in:
parent
0be5e04c2e
commit
448e478b6d
@ -16,7 +16,6 @@
|
||||
|
||||
#include "GlobalStorage.h"
|
||||
#include "JobQueue.h"
|
||||
#include "modulesystem/Preset.h"
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/String.h"
|
||||
#include "utils/Variant.h"
|
||||
@ -92,7 +91,7 @@ hostNameActionNames()
|
||||
}
|
||||
|
||||
Config::Config( QObject* parent )
|
||||
: QObject( parent )
|
||||
: Calamares::ModuleSystem::Config( parent )
|
||||
{
|
||||
emit readyChanged( m_isReady ); // false
|
||||
|
||||
@ -838,9 +837,11 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
|
||||
updateGSAutoLogin( doAutoLogin(), loginName() );
|
||||
checkReady();
|
||||
|
||||
bool bogus = true;
|
||||
Calamares::ModuleSystem::Presets p( CalamaresUtils::getSubMap( configurationMap, "presets", bogus ),
|
||||
{ "fullname", "loginname", } );
|
||||
loadPresets( configurationMap,
|
||||
{
|
||||
"fullname",
|
||||
"loginname",
|
||||
} );
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -13,6 +13,7 @@
|
||||
#include "CheckPWQuality.h"
|
||||
|
||||
#include "Job.h"
|
||||
#include "modulesystem/Config.h"
|
||||
#include "utils/NamedEnum.h"
|
||||
|
||||
#include <QList>
|
||||
@ -85,7 +86,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
class PLUGINDLLEXPORT Config : public QObject
|
||||
class PLUGINDLLEXPORT Config : public Calamares::ModuleSystem::Config
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@ -161,7 +162,7 @@ public:
|
||||
Config( QObject* parent = nullptr );
|
||||
~Config() override;
|
||||
|
||||
void setConfigurationMap( const QVariantMap& );
|
||||
void setConfigurationMap( const QVariantMap& ) override;
|
||||
|
||||
/** @brief Fill Global Storage with some settings
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user