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-01-06 08:01:11 +01:00
parent 7a714e5093 2d37fd6676
commit 3008d5d90d
48 changed files with 809 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/options.cc
View File

@@ -631,6 +631,8 @@ void Options::setDefaults ()
gimpPluginShowInfoDialog = true;
maxRecentFolders = 15;
rtSettings.lensfunDbDirectory = ""; // set also in main.cc and main-cli.cc
cropGuides = CROP_GUIDE_FULL;
cropAutoFit = false;
}
Options* Options::copyFrom (Options* other)
@@ -1436,6 +1438,12 @@ void Options::readFromFile (Glib::ustring fname)
if (keyFile.has_key ("Crop Settings", "PPI")) {
cropPPI = keyFile.get_integer ("Crop Settings", "PPI");
}
if (keyFile.has_key("Crop Settings", "GuidesMode")) {
cropGuides = CropGuidesMode(std::max(int(CROP_GUIDE_NONE), std::min(keyFile.get_integer("Crop Settings", "GuidesMode"), int(CROP_GUIDE_FULL))));
}
if (keyFile.has_key("Crop Settings", "AutoFit")) {
cropAutoFit = keyFile.get_boolean("Crop Settings", "AutoFit");
}
}
if (keyFile.has_group ("Color Management")) {
@@ -2080,6 +2088,8 @@ void Options::saveToFile (Glib::ustring fname)
//keyFile.set_integer_list ("GUI", "CurvePanelsExpanded", crvopen);
keyFile.set_integer ("Crop Settings", "PPI", cropPPI);
keyFile.set_integer("Crop Settings", "GuidesMode", cropGuides);
keyFile.set_boolean("Crop Settings", "AutoFit", cropAutoFit);
keyFile.set_string ("Color Management", "PrinterProfile", rtSettings.printerProfile);
keyFile.set_integer ("Color Management", "PrinterIntent", rtSettings.printerIntent);