CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix settings objects, instances can be started from the GUI now

Browse Source
This commit is contained in:
Petr Mrázek
2013-03-24 15:36:00 +01:00
parent e4f86893a8
commit 40570c3210
8 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsettings/src/basicsettingsobject.cpp
View File

@ -26,7 +26,10 @@ void BasicSettingsObject::changeSetting(const Setting &setting, QVariant value)
{
if (contains(setting.id()))
{
config.setValue(setting.configKey(), value);
if(value.isValid())
config.setValue(setting.configKey(), value);
else
config.remove(setting.configKey());
}
}

5
libsettings/src/inisettingsobject.cpp
View File

@ -32,7 +32,10 @@ void INISettingsObject::changeSetting(const Setting &setting, QVariant value)
{
if (contains(setting.id()))
{
m_ini.set(setting.configKey(), value);
if(value.isValid())
m_ini.set(setting.configKey(), value);
else
m_ini.remove(setting.configKey());
}
}

9
libsettings/src/setting.cpp
View File

@ -26,9 +26,16 @@ QVariant Setting::get() const
{
SettingsObject *sbase = qobject_cast<SettingsObject *>(parent());
if (!sbase)
{
return defValue();
}
else
return sbase->retrieveValue(*this);
{
QVariant test = sbase->retrieveValue(*this);
if(!test.isValid())
return defValue();
return test;
}
}
QVariant Setting::defValue() const