merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-10-07 09:58:43 +02:00
156 changed files with 1988 additions and 2059 deletions

View File

@@ -426,6 +426,9 @@ void Options::setDefaults()
histogramRed = true;
histogramGreen = true;
histogramBlue = true;
histogramLuma = false;
histogramChroma = false;
histogramRAW = false;
histogramBar = true;
histogramHeight = 200;
histogramDrawMode = 0;
@@ -447,7 +450,6 @@ void Options::setDefaults()
FileBrowserToolbarSingleRow = false;
hideTPVScrollbar = false;
UseIconNoText = true;
whiteBalanceSpotSize = 8;
showFilmStripToolBar = false;
showdelimspot = false;
@@ -1389,10 +1391,6 @@ void Options::readFromFile(Glib::ustring fname)
#endif
if (keyFile.has_key("GUI", "UseIconNoText")) {
UseIconNoText = keyFile.get_boolean("GUI", "UseIconNoText");
}
if (keyFile.has_key("GUI", "HistogramWorking")) {
rtSettings.HistogramWorking = keyFile.get_boolean("GUI", "HistogramWorking");
}
@@ -2096,7 +2094,6 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_boolean ("GUI", "ShowFilmStripToolBar", showFilmStripToolBar);
keyFile.set_boolean ("GUI", "FileBrowserToolbarSingleRow", FileBrowserToolbarSingleRow);
keyFile.set_boolean ("GUI", "HideTPVScrollbar", hideTPVScrollbar);
keyFile.set_boolean ("GUI", "UseIconNoText", UseIconNoText);
keyFile.set_boolean ("GUI", "HistogramWorking", rtSettings.HistogramWorking);
keyFile.set_integer ("GUI", "CurveBBoxPosition", curvebboxpos);