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

merge with dev - I hope no error

Browse Source
This commit is contained in:
Desmis
2018-01-02 19:58:42 +01:00
parent f1e8aeefcb e229b9519e
commit 63073b470d
66 changed files with 2796 additions and 2393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/options.cc
View File

@@ -430,7 +430,6 @@ void Options::setDefaults ()
tabbedUI = false;
mainNBVertical = true;
multiDisplayMode = 0;
tunnelMetaData = true;
histogramPosition = 1;
histogramBar = true;
histogramFullMode = false;
@@ -906,10 +905,6 @@ void Options::readFromFile (Glib::ustring fname)
if (keyFile.has_key ("Output", "OverwriteOutputFile")) {
overwriteOutputFile = keyFile.get_boolean ("Output", "OverwriteOutputFile");
}
if (keyFile.has_key ("Output", "TunnelMetaData")) {
tunnelMetaData = keyFile.get_boolean ("Output", "TunnelMetaData");
}
}
if (keyFile.has_group ("Profiles")) {
@@ -2002,7 +1997,6 @@ void Options::saveToFile (Glib::ustring fname)
keyFile.set_boolean ("Output", "UsePathTemplate", saveUsePathTemplate);
keyFile.set_string ("Output", "LastSaveAsPath", lastSaveAsPath);
keyFile.set_boolean ("Output", "OverwriteOutputFile", overwriteOutputFile);
keyFile.set_boolean ("Output", "TunnelMetaData", tunnelMetaData);
keyFile.set_string ("Profiles", "Directory", profilePath);
keyFile.set_boolean ("Profiles", "UseBundledProfiles", useBundledProfiles);