blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 19:00:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Inheriting GeneralSettings from SettingsCategory, making generic read/write JSON functions

Browse source
This commit is contained in:
Dan Paulat 2022-12-17 23:05:00 -06:00
parent 78739cd627
commit c93e776137
7 changed files with 184 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scwx-qt/source/scwx/qt/manager/settings_manager.cpp
View file

@ -98,7 +98,7 @@ static boost::json::value ConvertSettingsToJson()
{
boost::json::object settingsJson;
settingsJson[kGeneralKey] = generalSettings_->ToJson();
generalSettings_->WriteJson(settingsJson);
settingsJson[kMapKey] = mapSettings_->ToJson();
settingsJson[kPaletteKey] = paletteSettings_->ToJson();
@ -109,7 +109,7 @@ static void GenerateDefaultSettings()
{
logger_->info("Generating default settings");
generalSettings_ = settings::GeneralSettings::Create();
generalSettings_ = std::make_shared<settings::GeneralSettings>();
mapSettings_ = settings::MapSettings::Create();
paletteSettings_ = settings::PaletteSettings::Create();
}
@ -120,8 +120,9 @@ static bool LoadSettings(const boost::json::object& settingsJson)
bool jsonDirty = false;
generalSettings_ = settings::GeneralSettings::Load(
settingsJson.if_contains(kGeneralKey), jsonDirty);
generalSettings_ = std::make_shared<settings::GeneralSettings>();
jsonDirty |= !generalSettings_->ReadJson(settingsJson);
mapSettings_ =
settings::MapSettings::Load(settingsJson.if_contains(kMapKey), jsonDirty);
paletteSettings_ = settings::PaletteSettings::Load(