Updated translations

Corrected bug for displaying correct WB
Reintroduced progress bar
bugfix for correction of badpixel

rtgui/editorpanel.cc

@@ -23,6 +23,7 @@
 #include <guiutils.h>
 #include <procparamchangers.h>
 #include <safegtk.h>
+#include <imagesource.h>
 
 using namespace rtengine::procparams;
 
@@ -333,7 +334,8 @@ void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc) {
         ldprof = new ProcParams ();
         *ldprof = openThm->getProcParams ();
     }
-
+    rtengine::ImageSource* is=isrc->getImageSource();
+    is->setProgressListener( this );
     // initialize profile
     if (openThm->getType()!=FT_Raw)
         profilep->initProfile (options.defProfImg, ldprof, NULL);
@@ -426,6 +428,48 @@ void EditorPanel::setProgressState (int state) {
     g_idle_add (setprocstate, p);
 }
 
+struct spparams {
+    double val;
+    Glib::ustring str;
+    rtengine::ProgressListener* progListener;
+};
+
+int _setprogress( void *p )
+{
+	spparams *s= (spparams*)p;
+	gdk_threads_enter ();
+	s->progListener->setProgress( s->val );
+	gdk_threads_leave ();
+	delete s;
+	return 0;
+}
+
+int _setprogressStr( void *p )
+{
+	spparams *s= (spparams*)p;
+	gdk_threads_enter ();
+	s->progListener->setProgressStr( s->str );
+	gdk_threads_leave ();
+	delete s;
+	return 0;
+}
+
+void EditorPanel::setProgress (double p)
+{
+	spparams *s=new spparams;
+	s->val = p;
+	s->progListener = parent;
+	g_idle_add (_setprogress, s);
+}
+
+void EditorPanel::setProgressStr (Glib::ustring str)
+{
+	spparams *s=new spparams;
+	s->str = str;
+	s->progListener = parent;
+	g_idle_add (_setprogressStr, s);
+}
+
 void EditorPanel::refreshProcessingState (bool state) {
 
     // Set proc params of thumbnail. It saves it into the cache and updates the file browser.

rtgui/editorpanel.h

@@ -112,6 +112,8 @@ class EditorPanel : public Gtk::VBox,
         void setParent (RTWindow* p) { parent = p; }
 
         // progresslistener interface
+        void setProgress (double p);
+        void setProgressStr (Glib::ustring str);
         void setProgressState (int state);
         void error (Glib::ustring descr);
         void refreshProcessingState (bool state); // this is called by setProcessingState in the gtk thread

rtgui/filebrowser.cc

@@ -59,9 +59,9 @@ FileBrowser::FileBrowser ()
     pmenu->attach (*(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
     pmenu->attach (*(selall = new Gtk::MenuItem (M("FILEBROWSER_POPUPSELECTALL"))), 0, 1, p, p+1); p++;
     pmenu->attach (*(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
-    pmenu->attach (*(selectDF = new Gtk::MenuItem ("Select Dark Frame...")), 0, 1, p, p+1); p++;
-    pmenu->attach (*(autoDF = new Gtk::MenuItem ("Auto Dark Frame")), 0, 1, p, p+1); p++;
-    pmenu->attach (*(thisIsDF = new Gtk::MenuItem ("Move to Dark Frames folder")), 0, 1, p, p+1); p++;
+    pmenu->attach (*(selectDF = new Gtk::MenuItem (M("FILEBROWSER_SELECTDARKFRAME"))), 0, 1, p, p+1); p++;
+    pmenu->attach (*(autoDF = new Gtk::MenuItem (M("FILEBROWSER_AUTODARKFRAME"))), 0, 1, p, p+1); p++;
+    pmenu->attach (*(thisIsDF = new Gtk::MenuItem (M("FILEBROWSER_MOVETODARKFDIR"))), 0, 1, p, p+1); p++;
     pmenu->attach (*(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
     pmenu->attach (*(copyprof = new Gtk::MenuItem (M("FILEBROWSER_COPYPROFILE"))), 0, 1, p, p+1); p++;
     pmenu->attach (*(pasteprof = new Gtk::MenuItem (M("FILEBROWSER_PASTEPROFILE"))), 0, 1, p, p+1); p++;

rtgui/preferences.cc

@@ -253,10 +253,10 @@ Gtk::Widget* Preferences::getProcParamsPanel () {
     fdp->add (*vbdp);
     mvbpp->pack_start (*fdp, Gtk::PACK_SHRINK, 4);
 
-    Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame ("Dark Frame") );
+    Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame (M("PREFERENCES_DARKFRAME")) );
     Gtk::HBox* hb42 = Gtk::manage (new Gtk::HBox ());
-    darkFrameDir = Gtk::manage(new Gtk::FileChooserButton( "Dark frames directory", Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
-    Gtk::Label *dfLab = Gtk::manage(new Gtk::Label("Dark Frames directory"));
+    darkFrameDir = Gtk::manage(new Gtk::FileChooserButton(M("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
+    Gtk::Label *dfLab = Gtk::manage(new Gtk::Label(M("PREFERENCES_DIRDARKFRAMES")));
     hb42->pack_start(*dfLab , Gtk::PACK_SHRINK, 4 );
     hb42->pack_start(*darkFrameDir);
     dfLabel = Gtk::manage(new Gtk::Label("Found:"));

rtgui/preprocess.cc

@@ -25,14 +25,14 @@ using namespace rtengine::procparams;
 PreProcess::PreProcess ()
 {
 	hbdf = Gtk::manage(new Gtk::HBox());
-	darkFrameFile = Gtk::manage(new Gtk::FileChooserButton(M("PREFERENCES_DARKFRAME"), Gtk::FILE_CHOOSER_ACTION_OPEN));
-	dfLabel = Gtk::manage(new Gtk::Label("Dark Frame"));
+	darkFrameFile = Gtk::manage(new Gtk::FileChooserButton(M("TP_PREPROCESS_DARKFRAME"), Gtk::FILE_CHOOSER_ACTION_OPEN));
+	dfLabel = Gtk::manage(new Gtk::Label(M("TP_PREPROCESS_DARKFRAME")));
 	btnReset = Gtk::manage(new Gtk::Button());
 	btnReset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON)));
 	hbdf->pack_start(*dfLabel, Gtk::PACK_SHRINK, 4);
 	hbdf->pack_start(*darkFrameFile);
 	hbdf->pack_start(*btnReset, Gtk::PACK_SHRINK, 4);
-	dfAuto = Gtk::manage(new Gtk::CheckButton(("Auto selection")));
+	dfAuto = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_DFAUTOSELECT"))));
 	caAutocorrect = Gtk::manage(new Gtk::CheckButton((M("PREFERENCES_CACORRECTION"))));
 	hotDeadPixel = Gtk::manage(new Gtk::CheckButton((M("PREFERENCES_HOTDEADPIXFILT"))));
 
@@ -163,7 +163,7 @@ void PreProcess::caCorrectionChanged()
         lastCA = caAutocorrect->get_active ();
     }
     if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring("CA autocorrection ")+ (caAutocorrect->get_active()?"ON":"OFF") );
+        listener->panelChanged (EvPreProcess, Glib::ustring(M("PREFERENCES_CACORRECTION"))+"="+(caAutocorrect->get_active()?"ON":"OFF") );
 }
 
 void PreProcess::dfAutoChanged()
@@ -182,7 +182,7 @@ void PreProcess::dfAutoChanged()
     }
 	hbdf->set_sensitive( !dfAuto->get_active() );
     if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring("Dark Frame autoselection")+ (dfAuto->get_active()?"ON":"OFF") );
+        listener->panelChanged (EvPreProcess, Glib::ustring(M("TP_PREPROCESS_DFAUTOSELECT"))+"="+(dfAuto->get_active()?"ON":"OFF") );
 }
 
 void PreProcess::hotDeadPixelChanged ()
@@ -200,13 +200,13 @@ void PreProcess::hotDeadPixelChanged ()
         lastHot = hotDeadPixel->get_active ();
     }
     if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring("Hot Dead Pixel ")+(hotDeadPixel->get_active()?"ON":"OFF") );
+        listener->panelChanged (EvPreProcess, Glib::ustring(M("PREFERENCES_HOTDEADPIXFILT"))+"="+(hotDeadPixel->get_active()?"ON":"OFF") );
 }
 void PreProcess::darkFrameChanged()
 {
 	dfChanged=true;
     if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring("Dark Framet set to ")+darkFrameFile->get_filename());
+        listener->panelChanged (EvPreProcess, Glib::ustring(M("TP_PREPROCESS_DARKFRAME"))+"="+darkFrameFile->get_filename());
 }
 
 void PreProcess::darkFrameReset()
@@ -215,6 +215,6 @@ void PreProcess::darkFrameReset()
 	darkFrameFile->set_current_name("");
 	darkFrameFile->set_filename ("");
     if (listener)
-        listener->panelChanged (EvPreProcess, Glib::ustring("Dark Framet reset"));
+        listener->panelChanged (EvPreProcess, Glib::ustring(M("TP_PREPROCESS_DARKFRAME"))+"=0" );
 
 }