Merge pull request #3093 from adamreichold/fix-batch-save-format-visi…

…bility Fix all save format options being visible immediately after start-up
Beep6581 · Jan 19, 2016 · 676a444 · 676a444
2 parents aa212e5 + 74a0524
commit 676a444
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 31 deletions.
diff --git a/rtgui/batchqueuepanel.cc b/rtgui/batchqueuepanel.cc
@@ -187,13 +187,18 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog)
 
     show_all ();
 
-    saveFormatPanel->init (options.saveFormatBatch);
-
     if (batchQueue->loadBatchQueue ()) {
         g_idle_add_full (G_PRIORITY_LOW, processLoadedBatchQueueUIThread, batchQueue, NULL);
     }
 }
 
+void BatchQueuePanel::init (RTWindow *parent)
+{
+    this->parent = parent;
+
+    saveFormatPanel->init (options.saveFormatBatch);
+}
+
 // it is expected to have a non null forceOrientation value on Preferences update only. In this case, qsize is ingored and computed automatically
 void BatchQueuePanel::updateTab (int qsize, int forceOrientation)
 {

diff --git a/rtgui/batchqueuepanel.h b/rtgui/batchqueuepanel.h
@@ -57,10 +57,7 @@ class BatchQueuePanel : public Gtk::VBox,
 
     BatchQueuePanel (FileCatalog* aFileCatalog);
 
-    void setParent (RTWindow* p)
-    {
-        parent = p;
-    }
+    void init (RTWindow* parent);
 
     void addBatchQueueJobs (std::vector<BatchQueueEntry*> &entries , bool head = false);
 

diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
@@ -190,7 +190,6 @@ RTWindow::RTWindow ()
 
         // Batch Queue panel
         bpanel = Gtk::manage ( new BatchQueuePanel (fpanel->fileCatalog) );
-        bpanel->setParent (this);
 
         // decorate tab, the label is unimportant since its updated in batchqueuepanel anyway
         Gtk::Label* lbq = Gtk::manage ( new Gtk::Label (M("MAIN_FRAME_BATCHQUEUE")) );
@@ -283,9 +282,10 @@ RTWindow::RTWindow ()
 
         pldBridge = new PLDBridge(static_cast<rtengine::ProgressListener*>(this));
 
-        //add (*mainBox);
         add (*mainNB);
         show_all ();
+
+        bpanel->init (this);
     }
 
     if (!isSingleTabMode() && !simpleEditor) {

diff --git a/rtgui/saveformatpanel.cc b/rtgui/saveformatpanel.cc
@@ -35,17 +35,23 @@ SaveFormatPanel::SaveFormatPanel () : listener (NULL)
     setExpandAlignProperties(flab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
     format = Gtk::manage (new MyComboBoxText ());
     setExpandAlignProperties(format, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+    format->signal_changed ().connect (sigc::mem_fun (*this, &SaveFormatPanel::formatChanged));
+
     format->append ("JPEG (8 bit)");
     format->append ("TIFF (8 bit)");
     format->append ("TIFF (16 bit)");
     format->append ("PNG (8 bit)");
     format->append ("PNG (16 bit)");
-    format->set_active (0);
-    format->signal_changed().connect( sigc::mem_fun(*this, &SaveFormatPanel::formatChanged) );
+
+    fstr[0] = "jpg";
+    fstr[1] = "tif";
+    fstr[2] = "tif";
+    fstr[3] = "png";
+    fstr[4] = "png";
 
     hb1->attach (*flab, 0, 0, 1, 1);
     hb1->attach (*format, 1, 0, 1, 1);
-
+    hb1->show_all();
 
     // ---------------------  JPEG OPTIONS
 
@@ -58,11 +64,9 @@ SaveFormatPanel::SaveFormatPanel () : listener (NULL)
     jpegQual = new Adjuster (M("SAVEDLG_JPEGQUAL"), 0, 100, 1, 100);
     setExpandAlignProperties(jpegQual, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
     jpegQual->setAdjusterListener (this);
-    jpegQual->show ();
 
     jpegSubSampLabel = Gtk::manage (new Gtk::Label (M("SAVEDLG_SUBSAMP") + Glib::ustring(":")) );
     setExpandAlignProperties(jpegSubSampLabel, true, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
-    jpegSubSampLabel->show ();
 
     jpegSubSamp = Gtk::manage (new MyComboBoxText ());
     setExpandAlignProperties(jpegSubSamp, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
@@ -72,22 +76,19 @@ SaveFormatPanel::SaveFormatPanel () : listener (NULL)
     jpegSubSamp->set_tooltip_text (M("SAVEDLG_SUBSAMP_TOOLTIP"));
     jpegSubSamp->set_active (2);
     jpegSubSamp->signal_changed().connect( sigc::mem_fun(*this, &SaveFormatPanel::formatChanged) );
-    jpegSubSamp->show ();
 
     jpegOpts->attach(*jpegQual, 0, 0, 1, 2);
     jpegOpts->attach(*jpegSubSampLabel, 1, 0, 1, 1);
     jpegOpts->attach(*jpegSubSamp, 1, 1, 1, 1);
-
-    jpegOpts->show ();
-
+    jpegOpts->show_all ();
 
     // ---------------------  PNG OPTIONS
 
 
     pngCompr = new Adjuster (M("SAVEDLG_PNGCOMPR"), 0, 6, 1, 6);
     setExpandAlignProperties(pngCompr, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
     pngCompr->setAdjusterListener (this);
-    pngCompr->show ();
+    pngCompr->show_all ();
 
 
     // ---------------------  TIFF OPTIONS
@@ -96,14 +97,15 @@ SaveFormatPanel::SaveFormatPanel () : listener (NULL)
     tiffUncompressed = new Gtk::CheckButton (M("SAVEDLG_TIFFUNCOMPRESSED"));
     setExpandAlignProperties(tiffUncompressed, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
     tiffUncompressed->signal_toggled().connect( sigc::mem_fun(*this, &SaveFormatPanel::formatChanged));
-    tiffUncompressed->show();
+    tiffUncompressed->show_all();
 
 
     // ---------------------  MAIN BOX
 
 
     savesPP = Gtk::manage (new Gtk::CheckButton (M("SAVEDLG_SAVESPP")));
     savesPP->signal_toggled().connect( sigc::mem_fun(*this, &SaveFormatPanel::formatChanged));
+    savesPP->show_all();
 
     set_column_spacing(5);
     set_row_spacing(5);
@@ -113,18 +115,6 @@ SaveFormatPanel::SaveFormatPanel () : listener (NULL)
     attach (*tiffUncompressed, 0, 2, 1, 1);
     attach (*pngCompr, 0, 3, 1, 1);
     attach (*savesPP, 0, 4, 1, 2);
-
-    hb1->show_all();
-    savesPP->show_all();
-    jpegOpts->show_all();
-    tiffUncompressed->hide();
-    pngCompr->hide();
-
-    fstr[0] = "jpg";
-    fstr[1] = "tif";
-    fstr[2] = "tif";
-    fstr[3] = "png";
-    fstr[4] = "png";
 }
 SaveFormatPanel::~SaveFormatPanel ()
 {