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

Merge n.4 from branch3.0

Browse Source
This commit is contained in:
ffsup2
2011-05-15 20:25:33 +02:00
parent 90421820a3
commit af90c97fdc
36 changed files with 1872 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
rtgui/batchqueuepanel.cc
View File

@@ -22,11 +22,12 @@
#include <multilangmgr.h>
#include <rtwindow.h>
#include <soundman.h>
#include <safegtk.h>
BatchQueuePanel::BatchQueuePanel () {
batchQueue = new BatchQueue();
batchQueue = Gtk::manage( new BatchQueue() );
// construct batch queue panel with the extra "start" and "stop" button
Gtk::VBox* batchQueueButtonBox = Gtk::manage (new Gtk::VBox);
@@ -107,25 +108,6 @@ BatchQueuePanel::BatchQueuePanel () {
bottomBox = Gtk::manage (new Gtk::HBox ());
pack_start (*bottomBox, Gtk::PACK_SHRINK);
// change thumbnail arrangement button
hAlignIcon = new Gtk::Image (argv0+"/images/horizontals.png");
vAlignIcon = new Gtk::Image (argv0+"/images/verticals.png");
hAlignIcon->show ();
vAlignIcon->show ();
chAlign = Gtk::manage (new Gtk::Button ());
chAlign->show ();
bottomBox->pack_end (*chAlign, Gtk::PACK_SHRINK);
chAlign->set_image (*hAlignIcon);
chAlign->set_relief (Gtk::RELIEF_NONE);
chAlign->signal_pressed().connect (sigc::mem_fun(*this, &BatchQueuePanel::arrangementButtonPressed));
chAlign->set_tooltip_text (M("FILEBROWSER_ARRANGEMENTHINT"));
bottomBox->pack_end (*Gtk::manage (new Gtk::VSeparator), Gtk::PACK_SHRINK, 4);
if (options.fbArrangement==1)
chAlign->set_image (*vAlignIcon);
else
chAlign->set_image (*hAlignIcon);
arrangementButtonPressed ();
// thumbnail zoom
Gtk::HBox* zoomBox = Gtk::manage (new Gtk::HBox ());
zoomBox->pack_start (*Gtk::manage (new Gtk::VSeparator), Gtk::PACK_SHRINK, 4);
@@ -154,17 +136,6 @@ BatchQueuePanel::BatchQueuePanel () {
batchQueue->notifyListener ();
}
void BatchQueuePanel::arrangementButtonPressed () {
if (chAlign->get_image()==hAlignIcon) {
chAlign->set_image (*vAlignIcon);
batchQueue->setArrangement (BatchQueue::TB_Vertical);
}
else {
chAlign->set_image (*hAlignIcon);
batchQueue->setArrangement (BatchQueue::TB_Horizontal);
}
}
void BatchQueuePanel::updateTab (int qsize)
{
@@ -176,13 +147,13 @@ void BatchQueuePanel::updateTab (int qsize)
if(!qsize ){
vbb->pack_start (*Gtk::manage (new Gtk::Image (argv0+"/images/processing.png")));
l=new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_BATCHQUEUE"));
l=Gtk::manage (new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_BATCHQUEUE")) );
} else if( start->get_active () ){
vbb->pack_start (*Gtk::manage (new Gtk::Image (argv0+"/images/processing-play.png")));
l=new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_BATCHQUEUE")+" [" +Glib::ustring::format( qsize )+"]");
l=Gtk::manage (new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_BATCHQUEUE")+" [" +Glib::ustring::format( qsize )+"]"));
} else {
vbb->pack_start (*Gtk::manage (new Gtk::Image (argv0+"/images/processing-pause.png")));
l=new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_BATCHQUEUE")+" [" +Glib::ustring::format( qsize )+"]" );
l=Gtk::manage (new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_BATCHQUEUE")+" [" +Glib::ustring::format( qsize )+"]" ));
}
l->set_angle (90);
vbb->pack_start (*l);
@@ -285,7 +256,7 @@ void BatchQueuePanel::saveOptions () {
options.procQueueEnabled = autoStart->get_active ();
}
// We only want to save the following when it changes, \
// We only want to save the following when it changes,
// since these settings are shared with editorpanel :
void BatchQueuePanel::pathFolderChanged () {