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

OverwriteOutputfile option is now available in Preferences dialog (see issue #344)

Browse Source
This commit is contained in:
Oliver Duis
2010-11-18 19:20:39 +01:00
parent a783b340bc
commit e16b4eee2e
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtdata/languages/Deutsch
View File

@@ -487,6 +487,7 @@ PREFERENCES_OUTDIRHINT;<i>Die folgenden Variablen können verwendet werden:</i>\
PREFERENCES_OUTDIRTEMPLATE;Verwenden einer Vorlage
PREFERENCES_OUTDIRTEMPLATEHINT;<i>Die folgenden Variablen können verwendet werden:</i>\n<b>%f, %d1, %d2, ..., %p1, %p2, ...</b>\n<i>\nDiese Variablen referenzieren die Verzeichnisse und Unterverzeichnisse des Pfades in dem das RAW liegt.\n\nWenn zum Beispiele</i> <b>/home/tom/image/02-09-2006/dsc0012.nef</b><i>geöffnet wurde, dann haben die Variablen den folgenden Inhalt:\n</i><b>%f=dsc0012, %d1=02-09-2006, %d2=image, ...\n%p1=/home/tom/image/02-09-2006, %p2=/home/tom/image, p3=/home/tom, ...\n</b><i>\nWenn Sie die Ausgabedatei in das selbe Verzeichnis wie das RAW speichern wollen, dann wählen Sie:\n</i><b>%p1/%f\n</b><i>\nWenn sie die Ausgabedatei in ein Unterverzeichnis mit dem Namen 'konvertiert' schreiben wollen, wählen sie:\n</i><b>%p1/konvertiert/%f\n</b><i>\nWenn Sie die Ausgabedatei im Verzeichnis '/home/tom/converted' unter beibehaltung des letzen Verzeichnisses wo das RAW lag, dann wählen sie:\n</i><b>%p2/converted/%d1/%f</b>
PREFERENCES_OVERLAY_FILENAMES;Dateinamen auf Vorschaubildern anzeigen
PREFERENCES_OVERWRITEOUTPUTFILE;Bestehende Ausgabe-Dateien überschreiben
PREFERENCES_PARSEDEXT;Im Datei-Browser angezeigte Datei-Typen
PREFERENCES_PARSEDEXTADD;Datei-Typ hinzufügen
PREFERENCES_PARSEDEXTADDHINT;Gebe einen Datei-Typ (Extension) ein und drücke diesen Knopf um diesen Typ hinzuzufügen

3
rtdata/languages/default
View File

@@ -406,7 +406,7 @@ PARTIALPASTE_WHITEBALANCE;White balance
POPUPBUTTON_SELECTOPTIONHINT;RMB to change option
PREFERENCES_ADD;ADD
PREFERENCES_APPLNEXTSTARTUP;restart required
PREFERENCES_BATCH_PROCESSING;batch processing
PREFERENCES_BATCH_PROCESSING;Batch Processing
PREFERENCES_BEHAVIOR;Behavior
PREFERENCES_BLINKCLIPPED;Blink clipped areas
PREFERENCES_CACHECLEARALL;Clear All
@@ -470,6 +470,7 @@ PREFERENCES_OUTDIRHINT;You can use the following formatting strings:\n<b>%f</b>,
PREFERENCES_OUTDIRTEMPLATE;Use Template
PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>\nthe meaning of the formatting strings are:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>\n<b>%p2</b> = <i>/home/tom/photos/</i>\n<b>%p3</b> = <i>/home/tom/</i>\n<b>%p4</b> = <i>/home/</i>\n\nIf you want to save the output image where the original is, write:\n<b>%p1/%f</b>\n\nIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:\n<b>%p1/converted/%f</b>\n\nIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:\n<b>%p2/converted/%d1/%f</b>
PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
PREFERENCES_PARSEDEXT;Parsed Extensions
PREFERENCES_PARSEDEXTADD;Add Extension
PREFERENCES_PARSEDEXTADDHINT;Type an extension and press this button to append list

11
rtgui/preferences.cc
View File

@@ -96,8 +96,8 @@ Gtk::Widget* Preferences::getBatchProcPanel () {
behscrollw->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
Gtk::Frame* behFrame = Gtk::manage (new Gtk::Frame (M("PREFERENCES_BEHAVIOR")));
behFrame->add (*behscrollw);
mvbpp->pack_start (*behFrame);
// mvbpp->pack_start (*behFrame, Gtk::PACK_SHRINK, 2);
//mvbpp->pack_start (*behFrame);
mvbpp->pack_start (*behFrame, Gtk::PACK_EXPAND_WIDGET, 4);
Gtk::TreeView* behTreeView = Gtk::manage (new Gtk::TreeView ());
behscrollw->add (*behTreeView);
@@ -192,6 +192,9 @@ Gtk::Widget* Preferences::getBatchProcPanel () {
behTreeView->expand_all ();
chOverwriteOutputFile = new Gtk::CheckButton (M("PREFERENCES_OVERWRITEOUTPUTFILE"));
mvbpp->pack_start(*chOverwriteOutputFile, Gtk::PACK_SHRINK, 4);
return mvbpp;
}
@@ -759,6 +762,8 @@ void Preferences::storePreferences () {
moptions.baBehav[adjs->get_value (behavColumns.addsetid)] = adjs->get_value (behavColumns.badd);
moptions.tabbedUI = (bool)editorLayout->get_active_row_number();
moptions.overwriteOutputFile = chOverwriteOutputFile->get_active ();
}
void Preferences::fillPreferences () {
@@ -852,6 +857,8 @@ void Preferences::fillPreferences () {
setc.block (false);
tconn.block (false);
dfconn.block (false);
chOverwriteOutputFile->set_active (moptions.overwriteOutputFile);
}
void Preferences::loadPressed () {

2
rtgui/preferences.h
View File

@@ -98,6 +98,8 @@ class Preferences : public Gtk::Dialog {
Gtk::Button* delExt;
Gtk::CheckButton* overlayedFileNames;
Gtk::CheckButton* chOverwriteOutputFile;
Gtk::CheckButton* saveParamsFile;
Gtk::CheckButton* saveParamsCache;
Gtk::ComboBoxText* loadParamsPreference;