nathan/slide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

- Move new overlay color string into appconfig struct

Browse Source
This commit is contained in:
Alfred Reynolds
2021-09-08 11:23:39 +12:00
parent 90581ec1f9
commit 7fef2e5a68
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/appconfig.cpp
View File

@@ -117,6 +117,15 @@ Config loadConfiguration(const std::string &configFilePath, const Config &curren
}
AppConfig loadConfiguration(const std::string &configFilePath, const AppConfig &currentConfig) {
AppConfig userConfig = currentConfig;
// make sure to only update the base members, preserve the ones from the copy above
(Config &)userConfig = loadConfiguration(configFilePath, (const Config &)userConfig);
return userConfig;
}
QString getAppConfigFilePath(const std::string &configPath) {
std::string userConfigFolder = "~/.config/slide/";
std::string systemConfigFolder = "/etc/slide";
@@ -217,7 +226,7 @@ AppConfig loadAppConfiguration(const AppConfig &commandLineConfig) {
}
AppConfig loadedConfig = loadConfiguration(jsonFile.toStdString(), commandLineConfig);
QString val;
QFile file;
file.setFileName(jsonFile);