liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-12-19 15:16:18 +01:00
parent 9f28cdf5ba 39d37a6ded
commit c3bd22f337
122 changed files with 1277 additions and 8235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/options.cc
View File

@@ -403,6 +403,7 @@ void Options::setDefaults()
autoSaveTpOpen = true;
//crvOpen.clear ();
parseExtensions.clear();
favorites.clear();
parseExtensionsEnabled.clear();
parsedExtensions.clear();
renameUseTemplates = false;
@@ -1104,6 +1105,10 @@ void Options::readFromFile(Glib::ustring fname)
}
if (keyFile.has_group("GUI")) {
if (keyFile.has_key("GUI", "Favorites")) {
favorites = keyFile.get_string_list("GUI", "Favorites");
}
if (keyFile.has_key("GUI", "WindowWidth")) {
windowWidth = keyFile.get_integer("GUI", "WindowWidth");
}
@@ -1536,7 +1541,7 @@ void Options::readFromFile(Glib::ustring fname)
if (rtSettings.ACESp0 == "RTv4_ACES-AP0") {
rtSettings.ACESp0 = "RTv2_ACES-AP0";
}
}
if (keyFile.has_key("Color Management", "ACES-AP1")) {
@@ -1544,7 +1549,7 @@ void Options::readFromFile(Glib::ustring fname)
if (rtSettings.ACESp1 == "RTv4_ACES-AP1") {
rtSettings.ACESp1 = "RTv2_ACES-AP1";
}
}
if (keyFile.has_key("Color Management", "GamutLch")) {
@@ -1636,6 +1641,7 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_group("Batch Processing")) {
if (keyFile.has_key("Batch Processing", "AdjusterBehavior")) {
baBehav = keyFile.get_integer_list("Batch Processing", "AdjusterBehavior");
baBehav.resize(ADDSET_PARAM_NUM);
}
}
@@ -2024,6 +2030,8 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_string("Profiles", "CustomProfileBuilderPath", CPBPath);
keyFile.set_integer("Profiles", "CustomProfileBuilderKeys", CPBKeys);
Glib::ArrayHandle<Glib::ustring> ahfavorites = favorites;
keyFile.set_string_list("GUI", "Favorites", ahfavorites);
keyFile.set_integer("GUI", "WindowWidth", windowWidth);
keyFile.set_integer("GUI", "WindowHeight", windowHeight);
keyFile.set_integer("GUI", "WindowX", windowX);