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

Fix all save format options being visible at once immediately after start-up by delaying initialization of the save format panel after the main windows call to Gtk::Widget::show_all.

Browse Source
This commit is contained in:
Adam Reichold 2016-01-12 20:15:35 +01:00
parent 1a9121714a
commit 74a0524bde
4 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/batchqueuepanel.cc
View File

@ -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)
{

5
rtgui/batchqueuepanel.h
View File

@ -57,10 +57,7 @@ public:
BatchQueuePanel (FileCatalog* aFileCatalog);
void setParent (RTWindow* p)
{
parent = p;
}
void init (RTWindow* parent);
void addBatchQueueJobs (std::vector<BatchQueueEntry*> &entries , bool head = false);

4
rtgui/rtwindow.cc
View File

@ -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) {

36
rtgui/saveformatpanel.cc
View File

@ -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,14 +76,11 @@ 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
@ -87,7 +88,7 @@ SaveFormatPanel::SaveFormatPanel () : listener (NULL)
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,7 +97,7 @@ 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
@ -104,6 +105,7 @@ SaveFormatPanel::SaveFormatPanel () : listener (NULL)
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 ()
{