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

Solving issue 1657: "Destination save path forgotten for photos in queue when RT crashes". Also allow to set the Saving parameters or not, when sent to the queue with the "Save as" dialog box

Browse Source
This commit is contained in:
natureh 510
2013-03-31 17:25:10 +02:00
parent c5af5476de
commit 0a20574ff0
14 changed files with 287 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/options.cc
View File

@@ -269,6 +269,7 @@ void Options::setDefaults () {
maxCacheEntries = 20000;
thumbInterp = 1;
autoSuffix = false;
forceFormatOpts = false;
saveMethodNum = 0; // 0->immediate, 1->putToQueuHead, 2->putToQueueTail
saveParamsFile = true; // was false, but saving the procparams files next to the file make more sense when reorganizing file tree than in a cache
saveParamsCache = false; // there's no need to save the procparams files in a cache if saveParamsFile is true
@@ -493,7 +494,7 @@ int Options::readFromFile (Glib::ustring fname) {
if (!keyFile.load_from_file (fname))
return 1;
}
catch (Glib::FileError) {
catch (Glib::FileError &err) {
return 1;
}
@@ -555,6 +556,7 @@ if (keyFile.has_group ("Output")) {
if (keyFile.has_key ("Output", "PathTemplate")) savePathTemplate = keyFile.get_string ("Output", "PathTemplate");
if (keyFile.has_key ("Output", "PathFolder")) savePathFolder = keyFile.get_string ("Output", "PathFolder");
if (keyFile.has_key ("Output", "AutoSuffix")) autoSuffix = keyFile.get_boolean("Output", "AutoSuffix");
if (keyFile.has_key ("Output", "ForceFormatOpts")) forceFormatOpts = keyFile.get_boolean("Output", "ForceFormatOpts");
if (keyFile.has_key ("Output", "SaveMethodNum")) saveMethodNum = keyFile.get_integer("Output", "SaveMethodNum");
if (keyFile.has_key ("Output", "UsePathTemplate")) saveUsePathTemplate = keyFile.get_boolean("Output", "UsePathTemplate");
if (keyFile.has_key ("Output", "LastSaveAsPath")) lastSaveAsPath = keyFile.get_string ("Output", "LastSaveAsPath");
@@ -853,6 +855,7 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_string ("Output", "PathTemplate", savePathTemplate);
keyFile.set_string ("Output", "PathFolder", savePathFolder);
keyFile.set_boolean ("Output", "AutoSuffix", autoSuffix);
keyFile.set_boolean ("Output", "ForceFormatOpts", forceFormatOpts);
keyFile.set_integer ("Output", "SaveMethodNum", saveMethodNum);
keyFile.set_boolean ("Output", "UsePathTemplate", saveUsePathTemplate);
keyFile.set_string ("Output", "LastSaveAsPath", lastSaveAsPath);