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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-03-27 17:18:32 +02:00
parent 75fb5a697e c9fa7b055c
commit c74cdb922f
16 changed files with 275 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtgui/options.cc
View File

@@ -433,6 +433,7 @@ void Options::setDefaults ()
#endif
filledProfile = false;
maxInspectorBuffers = 2; // a rather conservative value for low specced systems...
inspectorDelay = 0;
serializeTiffRead = true;
FileBrowserToolbarSingleRow = false;
@@ -609,6 +610,8 @@ void Options::setDefaults ()
rtSettings.lensfunDbDirectory = ""; // set also in main.cc and main-cli.cc
cropGuides = CROP_GUIDE_FULL;
cropAutoFit = false;
rtSettings.thumbnail_inspector_mode = rtengine::Settings::ThumbnailInspectorMode::JPEG;
}
Options* Options::copyFrom (Options* other)
@@ -1092,6 +1095,10 @@ void Options::readFromFile (Glib::ustring fname)
maxInspectorBuffers = keyFile.get_integer ("Performance", "MaxInspectorBuffers");
}
if (keyFile.has_key ("Performance", "InspectorDelay")) {
inspectorDelay = keyFile.get_integer("Performance", "InspectorDelay");
}
if (keyFile.has_key ("Performance", "PreviewDemosaicFromSidecar")) {
prevdemo = (prevdemo_t)keyFile.get_integer ("Performance", "PreviewDemosaicFromSidecar");
}
@@ -1111,6 +1118,10 @@ void Options::readFromFile (Glib::ustring fname)
if (keyFile.has_key ("Performance", "SerializeTiffRead")) {
serializeTiffRead = keyFile.get_boolean ("Performance", "SerializeTiffRead");
}
if (keyFile.has_key("Performance", "ThumbnailInspectorMode")) {
rtSettings.thumbnail_inspector_mode = static_cast<rtengine::Settings::ThumbnailInspectorMode>(keyFile.get_integer("Performance", "ThumbnailInspectorMode"));
}
}
if (keyFile.has_group ("GUI")) {
@@ -1899,10 +1910,12 @@ void Options::saveToFile (Glib::ustring fname)
keyFile.set_integer ("Performance", "SIMPLNRAUT", rtSettings.leveldnautsimpl);
keyFile.set_integer ("Performance", "ClutCacheSize", clutCacheSize);
keyFile.set_integer ("Performance", "MaxInspectorBuffers", maxInspectorBuffers);
keyFile.set_integer ("Performance", "InspectorDelay", inspectorDelay);
keyFile.set_integer ("Performance", "PreviewDemosaicFromSidecar", prevdemo);
keyFile.set_boolean ("Performance", "Daubechies", rtSettings.daubech);
keyFile.set_boolean ("Performance", "SerializeTiffRead", serializeTiffRead);
keyFile.set_integer ("Performance", "Localajustqual", locaaju);
keyFile.set_integer("Performance", "ThumbnailInspectorMode", int(rtSettings.thumbnail_inspector_mode));
keyFile.set_string ("Output", "Format", saveFormat.format);