blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-11-01 14:20:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding map settings

Browse source
This commit is contained in:
Dan Paulat 2022-06-08 23:31:39 -05:00
parent 0ab89060e9
commit bcf2d7bffc
7 changed files with 330 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,12 @@ namespace SettingsManager
static const std::string logPrefix_ = "scwx::qt::manager::settings_manager";
static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
static const std::string kGeneralKey = "general";
static const std::string kMapKey = "maps";
static const std::string kPaletteKey = "palette";
static std::shared_ptr<settings::GeneralSettings> generalSettings_ = nullptr;
static std::shared_ptr<settings::MapSettings> mapSettings_ = nullptr;
static std::shared_ptr<settings::PaletteSettings> paletteSettings_ = nullptr;
static boost::json::value ConvertSettingsToJson();
@ -79,6 +84,11 @@ std::shared_ptr<settings::GeneralSettings> general_settings()
return generalSettings_;
}
std::shared_ptr<settings::MapSettings> map_settings()
{
return mapSettings_;
}
std::shared_ptr<settings::PaletteSettings> palette_settings()
{
return paletteSettings_;
@ -88,8 +98,9 @@ static boost::json::value ConvertSettingsToJson()
{
boost::json::object settingsJson;
settingsJson["general"] = generalSettings_->ToJson();
settingsJson["palette"] = paletteSettings_->ToJson();
settingsJson[kGeneralKey] = generalSettings_->ToJson();
settingsJson[kMapKey] = mapSettings_->ToJson();
settingsJson[kPaletteKey] = paletteSettings_->ToJson();
return settingsJson;
}
@ -99,6 +110,7 @@ static void GenerateDefaultSettings()
logger_->info("Generating default settings");
generalSettings_ = settings::GeneralSettings::Create();
mapSettings_ = settings::MapSettings::Create();
paletteSettings_ = settings::PaletteSettings::Create();
}
@ -109,9 +121,11 @@ static bool LoadSettings(const boost::json::object& settingsJson)
bool jsonDirty = false;
generalSettings_ = settings::GeneralSettings::Load(
settingsJson.if_contains("general"), jsonDirty);
settingsJson.if_contains(kGeneralKey), jsonDirty);
mapSettings_ =
settings::MapSettings::Load(settingsJson.if_contains(kMapKey), jsonDirty);
paletteSettings_ = settings::PaletteSettings::Load(
settingsJson.if_contains("palette"), jsonDirty);
settingsJson.if_contains(kPaletteKey), jsonDirty);
return jsonDirty;
}

2
scwx-qt/source/scwx/qt/manager/settings_manager.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include <scwx/qt/settings/general_settings.hpp>
#include <scwx/qt/settings/map_settings.hpp>
#include <scwx/qt/settings/palette_settings.hpp>
namespace scwx
@ -16,6 +17,7 @@ void Initialize();
void ReadSettings(const std::string& settingsPath);
std::shared_ptr<settings::GeneralSettings> general_settings();
std::shared_ptr<settings::MapSettings> map_settings();
std::shared_ptr<settings::PaletteSettings> palette_settings();
} // namespace SettingsManager