Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:37:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refuse to update a setting if it is gui only

Browse source
This commit is contained in:
Stephen Birarda 2015-05-11 13:49:35 -07:00
parent 5afb0792dc
commit 55338a2b0f
1 changed files with 51 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -258,62 +258,64 @@ bool DomainServerSettingsManager::settingExists(const QString& groupName, const
void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap, void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
const QJsonObject& settingDescription) { const QJsonObject& settingDescription) {
if (newValue.isString()) { if (!settingDescription[VALUE_GUI_ONLY_FLAG_KEY].toBool()) {
if (newValue.toString().isEmpty()) { if (newValue.isString()) {
// this is an empty value, clear it in settings variant so the default is sent if (newValue.toString().isEmpty()) {
settingMap.remove(key); // this is an empty value, clear it in settings variant so the default is sent
} else { settingMap.remove(key);
// make sure the resulting json value has the right type
QString settingType = settingDescription[SETTING_DESCRIPTION_TYPE_KEY].toString();
const QString INPUT_DOUBLE_TYPE = "double";
const QString INPUT_INTEGER_TYPE = "int";
if (settingType == INPUT_DOUBLE_TYPE) {
settingMap[key] = newValue.toString().toDouble();
} else if (settingType == INPUT_INTEGER_TYPE) {
settingMap[key] = newValue.toString().toInt();
} else { } else {
settingMap[key] = newValue.toString(); // make sure the resulting json value has the right type
QString settingType = settingDescription[SETTING_DESCRIPTION_TYPE_KEY].toString();
const QString INPUT_DOUBLE_TYPE = "double";
const QString INPUT_INTEGER_TYPE = "int";
if (settingType == INPUT_DOUBLE_TYPE) {
settingMap[key] = newValue.toString().toDouble();
} else if (settingType == INPUT_INTEGER_TYPE) {
settingMap[key] = newValue.toString().toInt();
} else {
settingMap[key] = newValue.toString();
}
} }
} } else if (newValue.isBool()) {
} else if (newValue.isBool()) { settingMap[key] = newValue.toBool();
settingMap[key] = newValue.toBool(); } else if (newValue.isObject()) {
} else if (newValue.isObject()) { if (!settingMap.contains(key)) {
if (!settingMap.contains(key)) { // we don't have a map below this key yet, so set it up now
// we don't have a map below this key yet, so set it up now settingMap[key] = QVariantMap();
settingMap[key] = QVariantMap(); }
}
QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingMap[key].data());
QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingMap[key].data()); foreach(const QString childKey, newValue.toObject().keys()) {
foreach(const QString childKey, newValue.toObject().keys()) {
QJsonObject childDescriptionObject = settingDescription; QJsonObject childDescriptionObject = settingDescription;
// is this the key? if so we have the description already // is this the key? if so we have the description already
if (key != settingDescription[DESCRIPTION_NAME_KEY].toString()) { if (key != settingDescription[DESCRIPTION_NAME_KEY].toString()) {
// otherwise find the description object for this childKey under columns // otherwise find the description object for this childKey under columns
foreach(const QJsonValue& column, settingDescription[DESCRIPTION_COLUMNS_KEY].toArray()) { foreach(const QJsonValue& column, settingDescription[DESCRIPTION_COLUMNS_KEY].toArray()) {
if (column.isObject()) { if (column.isObject()) {
QJsonObject thisDescription = column.toObject(); QJsonObject thisDescription = column.toObject();
if (thisDescription[DESCRIPTION_NAME_KEY] == childKey) { if (thisDescription[DESCRIPTION_NAME_KEY] == childKey) {
childDescriptionObject = column.toObject(); childDescriptionObject = column.toObject();
break; break;
}
} }
} }
} }
updateSetting(childKey, newValue.toObject()[childKey], thisMap, childDescriptionObject);
} }
updateSetting(childKey, newValue.toObject()[childKey], thisMap, childDescriptionObject); if (settingMap[key].toMap().isEmpty()) {
// we've cleared all of the settings below this value, so remove this one too
settingMap.remove(key);
}
} else if (newValue.isArray()) {
// we just assume array is replacement
// TODO: we still need to recurse here with the description in case values in the array have special types
settingMap[key] = newValue.toArray().toVariantList();
} }
if (settingMap[key].toMap().isEmpty()) {
// we've cleared all of the settings below this value, so remove this one too
settingMap.remove(key);
}
} else if (newValue.isArray()) {
// we just assume array is replacement
// TODO: we still need to recurse here with the description in case values in the array have special types
settingMap[key] = newValue.toArray().toVariantList();
} }
} }