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

Applied patch for issue #58 (adding hard coded GUI labels to translations), submitted by Philippe

Browse Source
This commit is contained in:
Wyatt Olson
2010-04-24 10:57:41 -06:00
parent ea27ca03cd
commit 7b0290328b
38 changed files with 514 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/batchqueuepanel.cc
View File

@@ -30,10 +30,10 @@ BatchQueuePanel::BatchQueuePanel () {
Gtk::VBox* batchQueueButtonBox = Gtk::manage (new Gtk::VBox);
start = Gtk::manage (new Gtk::ToggleButton (M("FILEBROWSER_STARTPROCESSING")));
stop = Gtk::manage (new Gtk::ToggleButton (M("FILEBROWSER_STOPPROCESSING")));
autoStart = Gtk::manage (new Gtk::CheckButton ("Auto start"));
autoStart = Gtk::manage (new Gtk::CheckButton (M("BATCHQUEUE_AUTOSTART")));
start->set_tooltip_text (M("FILEBROWSER_STARTPROCESSINGHINT"));
stop->set_tooltip_text (M("FILEBROWSER_STOPPROCESSINGHINT"));
autoStart->set_tooltip_text ("Start processing automatically when a new job arrives");
autoStart->set_tooltip_text (M("FILEBROWSER_TOOLTIP_STOPPROCESSING"));
start->set_active (false);
stop->set_active (true);
autoStart->set_active (options.procQueueEnabled);

2
rtgui/colordenoise.cc
View File

@@ -29,7 +29,7 @@ ColorDenoise::ColorDenoise () : ToolPanel() {
enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED")));
enabled->set_active (false);
amount = Gtk::manage (new Adjuster ("Amount", 1, 100, 1, 30));
amount = Gtk::manage (new Adjuster (M("TP_DETAIL_AMOUNT"), 1, 100, 1, 30));
pack_start (*enabled);
pack_start (*Gtk::manage (new Gtk::HSeparator()));

10
rtgui/editorpanel.cc
View File

@@ -69,8 +69,8 @@ EditorPanel::EditorPanel (Thumbnail* tmb, rtengine::InitialImage* isrc) : parent
info->set_relief(Gtk::RELIEF_NONE);
info->set_tooltip_text (M("MAIN_TOOLTIP_QINFO"));
beforeAfter = Gtk::manage (new Gtk::ToggleButton ("B|A"));
beforeAfter->set_tooltip_text ("Toggle before/after view");
beforeAfter = Gtk::manage (new Gtk::ToggleButton (M("MAIN_TOGGLE_BEFORE_AFTER")));
beforeAfter->set_tooltip_text (M("MAIN_TOOLTIP_TOGGLE"));
Gtk::VSeparator* vsept = Gtk::manage (new Gtk::VSeparator ());
@@ -129,7 +129,7 @@ EditorPanel::EditorPanel (Thumbnail* tmb, rtengine::InitialImage* isrc) : parent
Gtk::HBox* iops = Gtk::manage (new Gtk::HBox ());
saveimgas = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_SAVE")));
saveimgas->set_image (*Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-save"), Gtk::ICON_SIZE_BUTTON)));
queueimg = Gtk::manage (new Gtk::Button ("Put to queue"));
queueimg = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PUTTOQUEUE")));
queueimg->set_image (*Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-execute"), Gtk::ICON_SIZE_BUTTON)));
sendtogimp = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_SENDTOEDITOR")));
sendtogimp->set_image (*Gtk::manage(new Gtk::Image (argv0+"/images/gimp.png")));
@@ -754,13 +754,13 @@ void EditorPanel::beforeAfterToggled () {
beforeIarea = new ImageAreaPanel ();
beforeLabel = Gtk::manage (new Gtk::Label ());
beforeLabel->set_markup ("<b>Before:</b>");
beforeLabel->set_markup (Glib::ustring("<b>") + M("GENERAL_BEFORE") + "</b>");
beforeBox = Gtk::manage (new Gtk::VBox ());
beforeBox->pack_start (*beforeLabel, Gtk::PACK_SHRINK, 2);
beforeBox->pack_start (*beforeIarea);
afterLabel = Gtk::manage (new Gtk::Label ());
afterLabel->set_markup ("<b>After:</b>");
afterLabel->set_markup (Glib::ustring("<b>") + M("GENERAL_AFTER") + "</b>");
afterBox->pack_start (*afterLabel, Gtk::PACK_SHRINK, 2);
afterBox->reorder_child (*afterLabel, 0);

2
rtgui/hlrec.cc
View File

@@ -127,5 +127,5 @@ void HLRecovery::setRaw (bool raw) {
void HLRecovery::setBatchMode (bool batchMode) {
ToolPanel::setBatchMode (batchMode);
method->append_text ("(Unchanged)");
method->append_text (M("GENERAL_UNCHANGED"));
}

14
rtgui/icmpanel.cc
View File

@@ -167,9 +167,9 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) {
iunchanged->set_active (!pedited->icm.input);
igamma->set_sensitive (false);
if (!pedited->icm.working)
wnames->set_active_text("(Unchanged)");
wnames->set_active_text(M("GENERAL_UNCHANGED"));
if (!pedited->icm.output)
onames->set_active_text("(Unchanged)");
onames->set_active_text(M("GENERAL_UNCHANGED"));
}
ipc.block (false);
@@ -196,8 +196,8 @@ void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited) {
if (pedited) {
pedited->icm.input = !iunchanged->get_active ();
pedited->icm.working = wnames->get_active_text()!="(Unchanged)";
pedited->icm.output = onames->get_active_text()!="(Unchanged)";
pedited->icm.working = wnames->get_active_text()!=M("GENERAL_UNCHANGED");
pedited->icm.output = onames->get_active_text()!=M("GENERAL_UNCHANGED");
pedited->icm.gammaOnInput = !ifromfile->get_active ();
}
}
@@ -279,12 +279,12 @@ void ICMPanel::saveReferencePressed () {
void ICMPanel::setBatchMode (bool batchMode) {
ToolPanel::setBatchMode (batchMode);
iunchanged = Gtk::manage (new Gtk::RadioButton ("(Unchanged)"));
iunchanged = Gtk::manage (new Gtk::RadioButton (M("GENERAL_UNCHANGED")));
iunchanged->set_group (opts);
pack_start (*iunchanged, Gtk::PACK_SHRINK, 4);
reorder_child (*iunchanged, 5);
removeIfThere (this, saveRef);
onames->append_text ("(Unchanged)");
wnames->append_text ("(Unchanged)");
onames->append_text (M("GENERAL_UNCHANGED"));
wnames->append_text (M("GENERAL_UNCHANGED"));
}

3
rtgui/navigator.cc
View File

@@ -17,10 +17,11 @@
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <navigator.h>
#include <toolpanel.h>
Navigator::Navigator () {
set_label ("Navigator");
set_label (M("MAIN_MSG_NAVIGATOR"));
Gtk::VBox* mbox = Gtk::manage (new Gtk::VBox ());
previewWindow = Gtk::manage (new PreviewWindow ());
mbox->pack_start (*previewWindow, Gtk::PACK_SHRINK, 2);

2
rtgui/placesbrowser.cc
View File

@@ -18,7 +18,7 @@
*/
#include <placesbrowser.h>
#include <options.h>
#include <algorithm>
#include <toolpanel.h>>
#include <safegtk.h>
PlacesBrowser::PlacesBrowser () : listener (NULL) {

12
rtgui/resize.cc
View File

@@ -45,12 +45,12 @@ Resize::Resize () : maxw(100000), maxh(100000) {
combos->attach (*method, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
spec = Gtk::manage (new Gtk::ComboBoxText ());
spec->append_text ("Scale");
spec->append_text ("Width");
spec->append_text ("Height");
spec->append_text (M("TP_RESIZE_SCALE"));
spec->append_text (M("TP_RESIZE_WIDTH"));
spec->append_text (M("TP_RESIZE_HEIGHT"));
method->set_active (0);
combos->attach (*Gtk::manage (new Gtk::Label ("Specify:")), 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
combos->attach (*Gtk::manage (new Gtk::Label (M("TP_RESIZE_SPECIFY"))), 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
combos->attach (*spec, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
pack_start (*combos, Gtk::PACK_SHRINK, 4);
@@ -325,8 +325,8 @@ void Resize::specChanged () {
void Resize::setBatchMode (bool batchMode) {
method->append_text ("(Unchanged)");
spec->append_text ("(Unchanged)");
method->append_text (M("GENERAL_UNCHANGED"));
spec->append_text (M("GENERAL_UNCHANGED"));
ToolPanel::setBatchMode (batchMode);
scale->showEditedCB ();
}

2
rtgui/shadowshighlights.cc
View File

@@ -30,7 +30,7 @@ ShadowsHighlights::ShadowsHighlights () : ToolPanel() {
pack_start (*Gtk::manage (new Gtk::HSeparator()));
hq = Gtk::manage (new Gtk::CheckButton ("High Quality"));
hq = Gtk::manage (new Gtk::CheckButton (M("GENERAL_HIGH_QUALITY")));
hq->set_active (false);
pack_start (*hq);
hqConn = hq->signal_toggled().connect( sigc::mem_fun(*this, &ShadowsHighlights::hqChanged) );

2
rtgui/sharpening.cc
View File

@@ -444,7 +444,7 @@ void Sharpening::setBatchMode (bool batchMode) {
damount->showEditedCB ();
ddamping->showEditedCB ();
diter->showEditedCB ();
method->append_text ("(Unchanged)");
method->append_text (M("GENERAL_UNCHANGED"));
}
void Sharpening::setAdjusterBehavior (bool bamountadd) {

4
rtgui/whitebalance.cc
View File

@@ -134,7 +134,7 @@ void WhiteBalance::optChanged () {
}
}
else if (opt==3) {
meth = "(Unchanged)";
meth = M("GENERAL_UNCHANGED");
temp->setEditedState (UnEdited);
green->setEditedState (UnEdited);
}
@@ -258,7 +258,7 @@ void WhiteBalance::setBatchMode (bool batchMode) {
ToolPanel::setBatchMode (batchMode);
temp->showEditedCB ();
green->showEditedCB ();
method->append_text ("(Unchanged)");
method->append_text (M("GENERAL_UNCHANGED"));
}
int WhiteBalance::getSize () {