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

Merge branch 'origin/navigator-units'

Browse Source
This commit is contained in:
Hombre
2016-08-31 13:42:56 +02:00
parent 6a19178e52 f3d46f4c37
commit d52b627c68
4 changed files with 132 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/options.cc
View File

@@ -353,6 +353,8 @@ void Options::setDefaults ()
fbShowExpComp = false;
fbShowHidden = false;
fbArrangement = 2; // was 0
navRGBUnit = NavigatorUnit::PERCENT;
navHSVUnit = NavigatorUnit::PERCENT;
multiUser = true;
profilePath = "profiles";
loadSaveProfilePath = ""; // will be corrected in load as otherwise construction fails
@@ -1405,6 +1407,14 @@ int Options::readFromFile (Glib::ustring fname)
histogramFullMode = keyFile.get_boolean ("GUI", "HistogramFullMode");
}
if (keyFile.has_key ("GUI", "NavigatorRGBUnit")) {
navRGBUnit = (NavigatorUnit)keyFile.get_integer ("GUI", "NavigatorRGBUnit");
}
if (keyFile.has_key ("GUI", "NavigatorHSVUnit")) {
navHSVUnit = (NavigatorUnit)keyFile.get_integer ("GUI", "NavigatorHSVUnit");
}
if (keyFile.has_key ("GUI", "ShowFilmStripToolBar")) {
showFilmStripToolBar = keyFile.get_boolean ("GUI", "ShowFilmStripToolBar");
}
@@ -2004,6 +2014,8 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_integer ("GUI", "HistogramPosition", histogramPosition);
keyFile.set_boolean ("GUI", "HistogramBar", histogramBar);
keyFile.set_boolean ("GUI", "HistogramFullMode", histogramFullMode);
keyFile.set_integer ("GUI", "NavigatorRGBUnit", (int)navRGBUnit);
keyFile.set_integer ("GUI", "NavigatorHSVUnit", (int)navHSVUnit);
keyFile.set_boolean ("GUI", "ShowFilmStripToolBar", showFilmStripToolBar);
keyFile.set_boolean ("GUI", "FileBrowserToolbarSingleRow", FileBrowserToolbarSingleRow);
keyFile.set_boolean ("GUI", "HideTPVScrollbar", hideTPVScrollbar);