Big update: implemented toggling between three modes. Button does not yet update when double clicking. Completely removed fullMode-related code.

This commit is contained in:
Thanatomanic
2018-06-15 23:16:20 +02:00
parent 658d975fa1
commit dec54d00ad
4 changed files with 175 additions and 139 deletions

View File

@@ -415,7 +415,8 @@ void Options::setDefaults ()
multiDisplayMode = 0;
histogramPosition = 1;
histogramBar = true;
histogramFullMode = false;
//histogramFullMode = false;
histogramDrawMode = 0;
curvebboxpos = 1;
prevdemo = PD_Sidecar;
rgbDenoiseThreadLimit = 0;
@@ -1290,8 +1291,12 @@ void Options::readFromFile (Glib::ustring fname)
histogramBar = keyFile.get_boolean ("GUI", "HistogramBar");
}
if (keyFile.has_key ("GUI", "HistogramFullMode")) {
histogramFullMode = keyFile.get_boolean ("GUI", "HistogramFullMode");
//if (keyFile.has_key ("GUI", "HistogramFullMode")) {
// histogramFullMode = keyFile.get_boolean ("GUI", "HistogramFullMode");
//}
if (keyFile.has_key ("GUI", "HistogramDrawMode")) {
histogramDrawMode = keyFile.get_integer ("GUI", "HistogramDrawMode");
}
if (keyFile.has_key ("GUI", "NavigatorRGBUnit")) {
@@ -1938,7 +1943,8 @@ void Options::saveToFile (Glib::ustring fname)
keyFile.set_double_list ("GUI", "NavGuideBrush", navGuideBrush);
keyFile.set_integer ("GUI", "HistogramPosition", histogramPosition);
keyFile.set_boolean ("GUI", "HistogramBar", histogramBar);
keyFile.set_boolean ("GUI", "HistogramFullMode", histogramFullMode);
//keyFile.set_boolean ("GUI", "HistogramFullMode", histogramFullMode);
keyFile.set_integer ("GUI", "HistogramDrawMode", histogramDrawMode);
keyFile.set_integer ("GUI", "NavigatorRGBUnit", (int)navRGBUnit);
keyFile.set_integer ("GUI", "NavigatorHSVUnit", (int)navHSVUnit);
keyFile.set_boolean ("GUI", "ShowFilmStripToolBar", showFilmStripToolBar);