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

Merge branch 'dev' into libraw-copylib

Browse Source
This commit is contained in:
Lawrence Lee
2024-06-02 18:15:43 -07:00
parent 8d4c12b00d 1aefd200d8
commit 2c1c124d8f
631 changed files with 30451 additions and 39899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
rtgui/options.cc
View File

@@ -358,7 +358,6 @@ void Options::setDefaults()
fontSize = 10;
CPFontFamily = "default";
CPFontSize = 8;
pseudoHiDPISupport = false;
lastScale = 5;
lastShowAllExif = false;
panAccelFactor = 5;
@@ -436,6 +435,10 @@ void Options::setDefaults()
parseExtensionsEnabled.clear();
parsedExtensions.clear();
parsedExtensionsSet.clear();
browseRecursive = false;
browseRecursiveDepth = 10;
browseRecursiveMaxDirs = 100;
browseRecursiveFollowLinks = true;
renameUseTemplates = false;
renameTemplates.clear();
thumbnailZoomRatios.clear();
@@ -467,6 +470,8 @@ void Options::setDefaults()
histogramTraceBrightness = 1;
curvebboxpos = 1;
complexity = 2;
spotmet = 0;
inspectorWindow = false;
zoomOnScroll = true;
prevdemo = PD_Sidecar;
@@ -575,9 +580,9 @@ void Options::setDefaults()
rtSettings.darkFramesPath = "";
rtSettings.flatFieldsPath = "";
rtSettings.cameraProfilesPath = "";
rtSettings.lensProfilesPath = "";
rtSettings.cameraProfilesPath = "";
rtSettings.lensProfilesPath = "";
#ifdef _WIN32
const gchar* sysRoot = g_getenv("SystemRoot"); // Returns e.g. "c:\Windows"
@@ -631,6 +636,7 @@ void Options::setDefaults()
rtSettings.previewselection = 5;//between 1 to 40
rtSettings.cbdlsensi = 1.0;//between 0.001 to 1
rtSettings.fftwsigma = true; //choice between sigma^2 or empirical formula
rtSettings.basecorlog = 0.12;//reduction max Q in Cam16 sigmoid Log encoding between 0.05 and 0.5
// end locallab
rtSettings.itcwb_enable = true;
rtSettings.itcwb_deltaspec = 0.075;
@@ -692,6 +698,7 @@ void Options::setDefaults()
lastICCProfCreatorDir = "";
gimpPluginShowInfoDialog = true;
maxRecentFolders = 15;
thumbnailRankColorMode = Options::ThumbnailPropertyMode::PROCPARAMS;
sortMethod = SORT_BY_NAME;
sortDescending = false;
rtSettings.lensfunDbDirectory = ""; // set also in main.cc and main-cli.cc
@@ -856,7 +863,7 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_key("External Editor", "CustomEditor")) {
customEditorProg = keyFile.get_string("External Editor", "CustomEditor");
}
if (keyFile.has_key("External Editor", "OutputDir")) {
int v = keyFile.get_integer("External Editor", "OutputDir");
if (v < int(EDITOR_OUT_DIR_TEMP) || v > int(EDITOR_OUT_DIR_CUSTOM)) {
@@ -877,7 +884,7 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_key("External Editor", "BypassOutputProfile")) {
editor_bypass_output_profile = keyFile.get_boolean("External Editor", "BypassOutputProfile");
}
}
if (keyFile.has_group("External Editor")) {
@@ -1348,6 +1355,31 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_key("File Browser", "SortDescending")) {
sortDescending = keyFile.get_boolean("File Browser", "SortDescending");
}
if (keyFile.has_key("File Browser", "BrowseRecursive")) {
browseRecursive = keyFile.get_boolean("File Browser", "BrowseRecursive");
}
if (keyFile.has_key("File Browser", "BrowseRecursiveDepth")) {
browseRecursiveDepth = keyFile.get_integer("File Browser", "BrowseRecursiveDepth");
}
if (keyFile.has_key("File Browser", "BrowseRecursiveMaxDirs")) {
browseRecursiveMaxDirs = keyFile.get_integer("File Browser", "BrowseRecursiveMaxDirs");
}
if (keyFile.has_key("File Browser", "BrowseRecursiveFollowLinks")) {
browseRecursiveFollowLinks = keyFile.get_boolean("File Browser", "BrowseRecursiveFollowLinks");
}
if (keyFile.has_key("File Browser", "ThumbnailRankColorMode")) {
std::string val = keyFile.get_string("File Browser", "ThumbnailRankColorMode");
if (val == "xmp") {
thumbnailRankColorMode = ThumbnailPropertyMode::XMP;
} else {
thumbnailRankColorMode = ThumbnailPropertyMode::PROCPARAMS;
}
}
}
if (keyFile.has_group("Clipping Indication")) {
@@ -1555,10 +1587,6 @@ void Options::readFromFile(Glib::ustring fname)
CPFontSize = keyFile.get_integer("GUI", "CPFontSize");
}
if (keyFile.has_key("GUI", "PseudoHiDPISupport")) {
pseudoHiDPISupport = keyFile.get_boolean("GUI", "PseudoHiDPISupport");
}
if (keyFile.has_key("GUI", "LastPreviewScale")) {
lastScale = keyFile.get_integer("GUI", "LastPreviewScale");
}
@@ -1724,6 +1752,10 @@ void Options::readFromFile(Glib::ustring fname)
complexity = keyFile.get_integer("GUI", "Complexity");
}
if (keyFile.has_key("GUI", "Spotmet")) {
spotmet = keyFile.get_integer("GUI", "Spotmet");
}
if (keyFile.has_key("GUI", "InspectorWindow")) {
inspectorWindow = keyFile.get_boolean("GUI", "InspectorWindow");
}
@@ -1971,6 +2003,10 @@ void Options::readFromFile(Glib::ustring fname)
rtSettings.cbdlsensi = keyFile.get_double("Color Management", "Cbdlsensi");
}
if (keyFile.has_key("Color Management", "Besecorlog")) {//sensi base log for Q
rtSettings.basecorlog = keyFile.get_double("Color Management", "Basecorlog");
}
}
@@ -2456,8 +2492,20 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_string_list("File Browser", "RecentFolders", temp);
}
switch (thumbnailRankColorMode) {
case ThumbnailPropertyMode::XMP:
keyFile.set_string("File Browser", "ThumbnailRankColorMode", "xmp");
break;
default: // ThumbnailPropertyMode::PROCPARAMS
keyFile.set_string("File Browser", "ThumbnailRankColorMode", "procparams");
break;
}
keyFile.set_integer("File Browser", "SortMethod", sortMethod);
keyFile.set_boolean("File Browser", "SortDescending", sortDescending);
keyFile.set_boolean("File Browser", "BrowseRecursive", browseRecursive);
keyFile.set_integer("File Browser", "BrowseRecursiveDepth", browseRecursiveDepth);
keyFile.set_integer("File Browser", "BrowseRecursiveMaxDirs", browseRecursiveMaxDirs);
keyFile.set_boolean("File Browser", "BrowseRecursiveFollowLinks", browseRecursiveFollowLinks);
keyFile.set_integer("Clipping Indication", "HighlightThreshold", highlightThreshold);
keyFile.set_integer("Clipping Indication", "ShadowThreshold", shadowThreshold);
keyFile.set_boolean("Clipping Indication", "BlinkClipped", blinkClipped);
@@ -2552,7 +2600,6 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_integer("GUI", "FontSize", fontSize);
keyFile.set_string("GUI", "CPFontFamily", CPFontFamily);
keyFile.set_integer("GUI", "CPFontSize", CPFontSize);
keyFile.set_boolean("GUI", "PseudoHiDPISupport", pseudoHiDPISupport);
keyFile.set_integer("GUI", "LastPreviewScale", lastScale);
keyFile.set_boolean("GUI", "LastShowAllExif", lastShowAllExif);
keyFile.set_integer("GUI", "PanAccelFactor", panAccelFactor);
@@ -2593,6 +2640,7 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_integer("GUI", "CurveBBoxPosition", curvebboxpos);
keyFile.set_boolean("GUI", "Showtooltip", showtooltip);
keyFile.set_integer("GUI", "Complexity", complexity);
keyFile.set_integer("GUI", "Spotmet", spotmet);
keyFile.set_boolean("GUI", "InspectorWindow", inspectorWindow);
keyFile.set_boolean("GUI", "ZoomOnScroll", zoomOnScroll);
keyFile.set_integer("GUI", "MaxZoom", static_cast<int>(maxZoomLimit));
@@ -2655,6 +2703,7 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_string("Color Management", "ClutsDirectory", clutsDir);
keyFile.set_integer("Color Management", "Previewselection", rtSettings.previewselection);
keyFile.set_double("Color Management", "Cbdlsensi", rtSettings.cbdlsensi);
keyFile.set_double("Color Management", "Basecorlog", rtSettings.basecorlog);
keyFile.set_double("Wavelet", "Edghi", rtSettings.edghi);
keyFile.set_double("Wavelet", "Edglo", rtSettings.edglo);