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

Merge branch 'dev' into custom-tool-panel

Browse Source
This commit is contained in:
heckflosse
2018-12-17 11:24:33 +01:00
parent ac5f3dde2e aa6b74dab3
commit 8e7522dd5c
161 changed files with 2866 additions and 9628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtgui/options.cc
View File

@@ -1288,27 +1288,27 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_key("GUI", "HistogramPosition")) {
histogramPosition = keyFile.get_integer("GUI", "HistogramPosition");
}
if (keyFile.has_key("GUI", "HistogramRed")) {
histogramRed = keyFile.get_boolean("GUI", "HistogramRed");
}
if (keyFile.has_key("GUI", "HistogramGreen")) {
histogramGreen = keyFile.get_boolean("GUI", "HistogramGreen");
}
if (keyFile.has_key("GUI", "HistogramBlue")) {
histogramBlue = keyFile.get_boolean("GUI", "HistogramBlue");
}
if (keyFile.has_key("GUI", "HistogramLuma")) {
histogramLuma = keyFile.get_boolean("GUI", "HistogramLuma");
}
if (keyFile.has_key("GUI", "HistogramChroma")) {
histogramChroma = keyFile.get_boolean("GUI", "HistogramChroma");
}
if (keyFile.has_key("GUI", "HistogramRAW")) {
histogramRAW = keyFile.get_boolean("GUI", "HistogramRAW");
}
@@ -1316,11 +1316,11 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_key("GUI", "HistogramBar")) {
histogramBar = keyFile.get_boolean("GUI", "HistogramBar");
}
if (keyFile.has_key ("GUI", "HistogramHeight")) {
histogramHeight = keyFile.get_integer ("GUI", "HistogramHeight");
}
if (keyFile.has_key ("GUI", "HistogramDrawMode")) {
histogramDrawMode = keyFile.get_integer ("GUI", "HistogramDrawMode");
}
@@ -1512,7 +1512,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")) {
@@ -1520,7 +1520,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")) {
@@ -1598,6 +1598,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);
}
}