Merge branch 'dev' into multi-external-editor
This commit is contained in:
@@ -687,6 +687,8 @@ void Options::setDefaults()
|
||||
lastICCProfCreatorDir = "";
|
||||
gimpPluginShowInfoDialog = true;
|
||||
maxRecentFolders = 15;
|
||||
sortMethod = SORT_BY_NAME;
|
||||
sortDescending = false;
|
||||
rtSettings.lensfunDbDirectory = ""; // set also in main.cc and main-cli.cc
|
||||
cropGuides = CROP_GUIDE_FULL;
|
||||
cropAutoFit = false;
|
||||
@@ -1303,6 +1305,19 @@ void Options::readFromFile(Glib::ustring fname)
|
||||
if (keyFile.has_key("File Browser", "RecentFolders")) {
|
||||
recentFolders = keyFile.get_string_list("File Browser", "RecentFolders");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("File Browser", "SortMethod")) {
|
||||
int v = keyFile.get_integer("File Browser", "SortMethod");
|
||||
if (v < int(0) || v >= int(SORT_METHOD_COUNT)) {
|
||||
sortMethod = SORT_BY_NAME;
|
||||
} else {
|
||||
sortMethod = SortMethod(v);
|
||||
}
|
||||
}
|
||||
|
||||
if (keyFile.has_key("File Browser", "SortDescending")) {
|
||||
sortDescending = keyFile.get_boolean("File Browser", "SortDescending");
|
||||
}
|
||||
}
|
||||
|
||||
if (keyFile.has_group("Clipping Indication")) {
|
||||
@@ -2389,6 +2404,8 @@ void Options::saveToFile(Glib::ustring fname)
|
||||
|
||||
keyFile.set_string_list("File Browser", "RecentFolders", temp);
|
||||
}
|
||||
keyFile.set_integer("File Browser", "SortMethod", sortMethod);
|
||||
keyFile.set_boolean("File Browser", "SortDescending", sortDescending);
|
||||
keyFile.set_integer("Clipping Indication", "HighlightThreshold", highlightThreshold);
|
||||
keyFile.set_integer("Clipping Indication", "ShadowThreshold", shadowThreshold);
|
||||
keyFile.set_boolean("Clipping Indication", "BlinkClipped", blinkClipped);
|
||||
|
Reference in New Issue
Block a user