Some fixes for memory leaks, issue #657
Added Gtk:manage() on widgets and some destructors.
This commit is contained in:
ffsup2
parent
47ba6a6dd5
commit
dacf453c54
@ -41,7 +41,7 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep
|
||||
label = Gtk::manage (new Gtk::Label (vlabel, Gtk::ALIGN_LEFT));
|
||||
|
||||
if (editedcb) {
|
||||
editedCheckBox = new Gtk::CheckButton ();
|
||||
editedCheckBox = Gtk::manage (new Gtk::CheckButton ());
|
||||
editedChange = editedCheckBox->signal_toggled().connect( sigc::mem_fun(*this, &Adjuster::editedToggled) );
|
||||
hbox->pack_start (*editedCheckBox);
|
||||
}
|
||||
@ -262,7 +262,7 @@ EditedState Adjuster::getEditedState () {
|
||||
void Adjuster::showEditedCB () {
|
||||
|
||||
if (!editedCheckBox) {
|
||||
editedCheckBox = new Gtk::CheckButton ();
|
||||
editedCheckBox = Gtk::manage(new Gtk::CheckButton ());
|
||||
hbox->pack_start (*editedCheckBox, Gtk::PACK_SHRINK, 2);
|
||||
hbox->reorder_child (*editedCheckBox, 0);
|
||||
editedChange = editedCheckBox->signal_toggled().connect( sigc::mem_fun(*this, &Adjuster::editedToggled) );
|
||||
|
||||
@ -31,12 +31,12 @@ BatchQueue::BatchQueue () : processing(NULL), listener(NULL) {
|
||||
|
||||
int p = 0;
|
||||
pmenu = new Gtk::Menu ();
|
||||
pmenu->attach (*(cancel = new Gtk::MenuItem (M("FILEBROWSER_POPUPCANCELJOB"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(head = new Gtk::MenuItem (M("FILEBROWSER_POPUPMOVEHEAD"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(tail = new Gtk::MenuItem (M("FILEBROWSER_POPUPMOVEEND"))), 0, 1, p, p+1); p++;
|
||||
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 (*Gtk::manage(cancel = new Gtk::MenuItem (M("FILEBROWSER_POPUPCANCELJOB"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(head = new Gtk::MenuItem (M("FILEBROWSER_POPUPMOVEHEAD"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(tail = new Gtk::MenuItem (M("FILEBROWSER_POPUPMOVEEND"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(selall = new Gtk::MenuItem (M("FILEBROWSER_POPUPSELECTALL"))), 0, 1, p, p+1); p++;
|
||||
pmenu->show_all ();
|
||||
|
||||
cancel->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &BatchQueue::cancelItems), &selected));
|
||||
@ -45,6 +45,11 @@ BatchQueue::BatchQueue () : processing(NULL), listener(NULL) {
|
||||
selall->signal_activate().connect (sigc::mem_fun(*this, &BatchQueue::selectAll));
|
||||
}
|
||||
|
||||
BatchQueue::~BatchQueue ()
|
||||
{
|
||||
delete pmenu;
|
||||
}
|
||||
|
||||
void BatchQueue::rightClicked (ThumbBrowserEntryBase* entry) {
|
||||
|
||||
pmenu->popup (3, 0);
|
||||
|
||||
@ -59,6 +59,7 @@ class BatchQueue : public ThumbBrowserBase,
|
||||
|
||||
public:
|
||||
BatchQueue ();
|
||||
~BatchQueue ();
|
||||
|
||||
void addEntries (std::vector<BatchQueueEntry*> &entries, bool head=false);
|
||||
void cancelItems (std::vector<ThumbBrowserEntryBase*>* items);
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
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);
|
||||
@ -145,13 +145,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);
|
||||
|
||||
@ -128,9 +128,9 @@ void BatchToolPanelCoordinator::initSession () {
|
||||
distortion->setAdjusterBehavior (options.baBehav[ADDSET_DIST_AMOUNT]);
|
||||
perspective->setAdjusterBehavior (options.baBehav[ADDSET_PERSPECTIVE]);
|
||||
cacorrection->setAdjusterBehavior (options.baBehav[ADDSET_CA]);
|
||||
colorshift->setAdjusterBehavior (options.baBehav[ADDSET_CS_BLUEYELLOW], options.baBehav[ADDSET_CS_GREENMAGENTA]);
|
||||
colorboost->setAdjusterBehavior (options.baBehav[ADDSET_CBOOST_AMOUNT]);
|
||||
lumadenoise->setAdjusterBehavior (options.baBehav[ADDSET_LD_EDGETOLERANCE]);
|
||||
//colorshift->setAdjusterBehavior (options.baBehav[ADDSET_CS_BLUEYELLOW], options.baBehav[ADDSET_CS_GREENMAGENTA]);
|
||||
//colorboost->setAdjusterBehavior (options.baBehav[ADDSET_CBOOST_AMOUNT]);
|
||||
//lumadenoise->setAdjusterBehavior (options.baBehav[ADDSET_LD_EDGETOLERANCE]);
|
||||
sharpening->setAdjusterBehavior (options.baBehav[ADDSET_SHARP_AMOUNT]);
|
||||
shadowshighlights->setAdjusterBehavior (options.baBehav[ADDSET_SH_HIGHLIGHTS], options.baBehav[ADDSET_SH_SHADOWS], options.baBehav[ADDSET_SH_LOCALCONTRAST]);
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ using namespace rtengine::procparams;
|
||||
|
||||
ColorBoost::ColorBoost () : Gtk::VBox(), FoldableToolPanel(this), cbAdd(false) {
|
||||
|
||||
colorboost = new Adjuster (M("TP_COLORBOOST_AMOUNT"), -100, 300, 1, 0);
|
||||
colorboost = Gtk::manage (new Adjuster (M("TP_COLORBOOST_AMOUNT"), -100, 300, 1, 0));
|
||||
|
||||
pack_start (*colorboost);
|
||||
pack_start (*Gtk::manage (new Gtk::HSeparator()));
|
||||
|
||||
@ -65,7 +65,7 @@ class CurveEditor {
|
||||
public:
|
||||
|
||||
CurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEditorSubGroup* ceSubGroup);
|
||||
~CurveEditor ();
|
||||
virtual ~CurveEditor ();
|
||||
void typeSelectionChanged (int n);
|
||||
void curveTypeToggled();
|
||||
bool isUnChanged ();
|
||||
|
||||
@ -29,8 +29,8 @@ extern Glib::ustring argv0;
|
||||
|
||||
DirBrowser::DirBrowser () {
|
||||
|
||||
dirtree = new Gtk::TreeView();
|
||||
scrolledwindow4 = new Gtk::ScrolledWindow();
|
||||
dirtree = Gtk::manage ( new Gtk::TreeView() );
|
||||
scrolledwindow4 = Gtk::manage ( new Gtk::ScrolledWindow() );
|
||||
|
||||
// dirtree->set_flags(Gtk::CAN_FOCUS);
|
||||
dirtree->set_headers_visible(false);
|
||||
@ -65,7 +65,7 @@ void DirBrowser::fillDirTree () {
|
||||
|
||||
fillRoot ();
|
||||
|
||||
Gtk::CellRendererPixbuf* render_pb = new Gtk::CellRendererPixbuf ();
|
||||
Gtk::CellRendererPixbuf* render_pb = Gtk::manage ( new Gtk::CellRendererPixbuf () );
|
||||
tvc.pack_start (*render_pb, false);
|
||||
tvc.add_attribute(*render_pb, "pixbuf-expander-closed", 1);
|
||||
tvc.add_attribute(*render_pb, "pixbuf", 1);
|
||||
|
||||
@ -60,7 +60,7 @@ DirPyrEqualizer::DirPyrEqualizer () : Gtk::VBox(), FoldableToolPanel(this) {
|
||||
ss << " (" << M("TP_DIRPYREQUALIZER_LUMAFINEST") << ")";
|
||||
if(i == 3)
|
||||
ss << " (" << M("TP_DIRPYREQUALIZER_LUMACOARSEST") << ")";
|
||||
multiplier[i] = new Adjuster (ss.str(), 0, 4, 0.01, 1.0);
|
||||
multiplier[i] = Gtk::manage ( new Adjuster (ss.str(), 0, 4, 0.01, 1.0) );
|
||||
multiplier[i]->setAdjusterListener(this);
|
||||
pack_start(*multiplier[i]);
|
||||
}
|
||||
@ -68,7 +68,7 @@ DirPyrEqualizer::DirPyrEqualizer () : Gtk::VBox(), FoldableToolPanel(this) {
|
||||
Gtk::HSeparator *separator3 = Gtk::manage (new Gtk::HSeparator());
|
||||
pack_start(*separator3, Gtk::PACK_SHRINK, 2);
|
||||
|
||||
multiplier[4] = new Adjuster (M("TP_DIRPYREQUALIZER_THRESHOLD"), 0, 1, 0.01, 0.0);
|
||||
multiplier[4] = Gtk::manage ( new Adjuster (M("TP_DIRPYREQUALIZER_THRESHOLD"), 0, 1, 0.01, 0.0) );
|
||||
multiplier[4]->setAdjusterListener(this);
|
||||
pack_start(*multiplier[4]);
|
||||
|
||||
|
||||
@ -61,7 +61,7 @@ Equalizer::Equalizer () : Gtk::VBox(), FoldableToolPanel(this) {
|
||||
if(i == 7)
|
||||
ss << " (" << M("TP_EQUALIZER_LARGEST") << ")";
|
||||
|
||||
correction[i] = new Adjuster (ss.str(), -100, 100, 1, 0);
|
||||
correction[i] = Gtk::manage ( new Adjuster (ss.str(), -100, 100, 1, 0) );
|
||||
correction[i]->setAdjusterListener(this);
|
||||
pack_start(*correction[i]);
|
||||
}
|
||||
|
||||
@ -41,33 +41,33 @@ FileBrowser::FileBrowser ()
|
||||
|
||||
int p = 0;
|
||||
pmenu = new Gtk::Menu ();
|
||||
pmenu->attach (*(open = new Gtk::MenuItem (M("FILEBROWSER_POPUPOPEN"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(develop = new Gtk::MenuItem (M("FILEBROWSER_POPUPPROCESS"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(rank[0] = new Gtk::MenuItem (M("FILEBROWSER_POPUPUNRANK"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(rank[1] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK1"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(rank[2] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK2"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(rank[3] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK3"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(rank[4] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK4"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(rank[5] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK5"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(trash = new Gtk::MenuItem (M("FILEBROWSER_POPUPTRASH"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(untrash = new Gtk::MenuItem (M("FILEBROWSER_POPUPUNTRASH"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(rename = new Gtk::MenuItem (M("FILEBROWSER_POPUPRENAME"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(remove = new Gtk::MenuItem (M("FILEBROWSER_POPUPREMOVE"))), 0, 1, p, p+1); p++;
|
||||
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 (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++;
|
||||
pmenu->attach (*(partpasteprof = new Gtk::MenuItem (M("FILEBROWSER_PARTIALPASTEPROFILE"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(applyprof = new Gtk::MenuItem (M("FILEBROWSER_APPLYPROFILE"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*(clearprof = new Gtk::MenuItem (M("FILEBROWSER_CLEARPROFILE"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage((open = new Gtk::MenuItem (M("FILEBROWSER_POPUPOPEN")))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(develop = new Gtk::MenuItem (M("FILEBROWSER_POPUPPROCESS"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(rank[0] = new Gtk::MenuItem (M("FILEBROWSER_POPUPUNRANK"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(rank[1] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK1"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(rank[2] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK2"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(rank[3] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK3"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(rank[4] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK4"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(rank[5] = new Gtk::MenuItem (M("FILEBROWSER_POPUPRANK5"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(trash = new Gtk::MenuItem (M("FILEBROWSER_POPUPTRASH"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(untrash = new Gtk::MenuItem (M("FILEBROWSER_POPUPUNTRASH"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(rename = new Gtk::MenuItem (M("FILEBROWSER_POPUPRENAME"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(remove = new Gtk::MenuItem (M("FILEBROWSER_POPUPREMOVE"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(selall = new Gtk::MenuItem (M("FILEBROWSER_POPUPSELECTALL"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(selectDF = new Gtk::MenuItem (M("FILEBROWSER_SELECTDARKFRAME"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(autoDF = new Gtk::MenuItem (M("FILEBROWSER_AUTODARKFRAME"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(thisIsDF = new Gtk::MenuItem (M("FILEBROWSER_MOVETODARKFDIR"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(copyprof = new Gtk::MenuItem (M("FILEBROWSER_COPYPROFILE"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(pasteprof = new Gtk::MenuItem (M("FILEBROWSER_PASTEPROFILE"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(partpasteprof = new Gtk::MenuItem (M("FILEBROWSER_PARTIALPASTEPROFILE"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(applyprof = new Gtk::MenuItem (M("FILEBROWSER_APPLYPROFILE"))), 0, 1, p, p+1); p++;
|
||||
pmenu->attach (*Gtk::manage(clearprof = new Gtk::MenuItem (M("FILEBROWSER_CLEARPROFILE"))), 0, 1, p, p+1); p++;
|
||||
pmenu->show_all ();
|
||||
|
||||
pmaccelgroup = Gtk::AccelGroup::create ();
|
||||
@ -80,7 +80,6 @@ FileBrowser::FileBrowser ()
|
||||
pasteprof->add_accelerator ("activate", pmenu->get_accel_group(), GDK_V, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
|
||||
partpasteprof->add_accelerator ("activate", pmenu->get_accel_group(), GDK_V, Gdk::CONTROL_MASK | Gdk::SHIFT_MASK, Gtk::ACCEL_VISIBLE);
|
||||
|
||||
profmenu = new Gtk::Menu ();
|
||||
|
||||
open->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), open));
|
||||
for (int i=0; i<6; i++)
|
||||
@ -101,6 +100,11 @@ FileBrowser::FileBrowser ()
|
||||
clearprof->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), clearprof));
|
||||
}
|
||||
|
||||
FileBrowser::~FileBrowser ()
|
||||
{
|
||||
delete pmenu;
|
||||
}
|
||||
|
||||
void FileBrowser::rightClicked (ThumbBrowserEntryBase* entry) {
|
||||
|
||||
trash->set_sensitive (false);
|
||||
|
||||
@ -67,7 +67,7 @@ class FileBrowser : public ThumbBrowserBase, public LWButtonListener {
|
||||
Gtk::MenuItem* applyprof;
|
||||
Gtk::MenuItem* clearprof;
|
||||
Gtk::Menu* pmenu;
|
||||
Gtk::Menu* profmenu;
|
||||
|
||||
Glib::RefPtr<Gtk::AccelGroup> pmaccelgroup;
|
||||
|
||||
FileBrowserListener* tbl;
|
||||
@ -86,6 +86,7 @@ class FileBrowser : public ThumbBrowserBase, public LWButtonListener {
|
||||
public:
|
||||
|
||||
FileBrowser ();
|
||||
~FileBrowser ();
|
||||
|
||||
void addEntry (FileBrowserEntry* entry); // can be called from any thread
|
||||
void addEntry_ (FileBrowserEntry* entry); // this must be executed inside the gtk thread
|
||||
|
||||
@ -55,33 +55,33 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb) : selectedDirectoryId(1)
|
||||
|
||||
set_size_request(0,250);
|
||||
// construct trash panel with the extra "empty trash" button
|
||||
trashButtonBox = new Gtk::VBox;
|
||||
Gtk::Button* emptyT = new Gtk::Button (M("FILEBROWSER_EMPTYTRASH"));
|
||||
trashButtonBox = Gtk::manage( new Gtk::VBox );
|
||||
Gtk::Button* emptyT = Gtk::manage( new Gtk::Button (M("FILEBROWSER_EMPTYTRASH")));
|
||||
emptyT->set_tooltip_markup (M("FILEBROWSER_EMPTYTRASHHINT"));
|
||||
emptyT->set_image (*(new Gtk::Image (Gtk::StockID("gtk-delete"), Gtk::ICON_SIZE_BUTTON)));
|
||||
emptyT->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-delete"), Gtk::ICON_SIZE_BUTTON)));
|
||||
emptyT->signal_pressed().connect (sigc::mem_fun(*this, &FileCatalog::emptyTrash));
|
||||
trashButtonBox->pack_start (*emptyT, Gtk::PACK_SHRINK, 4);
|
||||
emptyT->show ();
|
||||
trashButtonBox->show ();
|
||||
|
||||
// setup button bar
|
||||
buttonBar = new Gtk::HBox ();
|
||||
buttonBar = Gtk::manage( new Gtk::HBox () );
|
||||
pack_start (*buttonBar, Gtk::PACK_SHRINK);
|
||||
|
||||
buttonBar->pack_start (*(new Gtk::VSeparator), Gtk::PACK_SHRINK);
|
||||
bDir = new Gtk::ToggleButton ();
|
||||
buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
|
||||
bDir = Gtk::manage( new Gtk::ToggleButton () );
|
||||
bDir->set_active (true);
|
||||
bDir->set_image (*(new Gtk::Image (argv0+"/images/folder.png")));
|
||||
bDir->set_image (*Gtk::manage(new Gtk::Image (argv0+"/images/folder.png")));
|
||||
bDir->set_relief (Gtk::RELIEF_NONE);
|
||||
bDir->set_tooltip_markup (M("FILEBROWSER_SHOWDIRHINT"));
|
||||
bDir->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event),false);
|
||||
bCateg[0] = bDir->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bDir));
|
||||
buttonBar->pack_start (*bDir, Gtk::PACK_SHRINK);
|
||||
buttonBar->pack_start (*(new Gtk::VSeparator), Gtk::PACK_SHRINK);
|
||||
buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
|
||||
|
||||
bUnRanked = new Gtk::ToggleButton ();
|
||||
bUnRanked = Gtk::manage( new Gtk::ToggleButton () );
|
||||
bUnRanked->set_active (false);
|
||||
bUnRanked->set_image (*(new Gtk::Image (argv0+"/images/unrated.png")));
|
||||
bUnRanked->set_image (*Gtk::manage(new Gtk::Image (argv0+"/images/unrated.png")));
|
||||
bUnRanked->set_relief (Gtk::RELIEF_NONE);
|
||||
bUnRanked->set_tooltip_markup (M("FILEBROWSER_SHOWUNRANKHINT"));
|
||||
bCateg[1] = bUnRanked->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bUnRanked));
|
||||
@ -89,11 +89,11 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb) : selectedDirectoryId(1)
|
||||
bUnRanked->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event),false);
|
||||
|
||||
for (int i=0; i<5; i++) {
|
||||
iranked[i] = new Gtk::Image (argv0+"/images/rated.png");
|
||||
igranked[i] = new Gtk::Image (argv0+"/images/grayrated.png");
|
||||
iranked[i] = Gtk::manage( new Gtk::Image (argv0+"/images/rated.png") );
|
||||
igranked[i] = Gtk::manage( new Gtk::Image (argv0+"/images/grayrated.png") );
|
||||
iranked[i]->show ();
|
||||
igranked[i]->show ();
|
||||
bRank[i] = new Gtk::ToggleButton ();
|
||||
bRank[i] = Gtk::manage( new Gtk::ToggleButton () );
|
||||
bRank[i]->set_image (*igranked[i]);
|
||||
bRank[i]->set_relief (Gtk::RELIEF_NONE);
|
||||
buttonBar->pack_start (*bRank[i], Gtk::PACK_SHRINK);
|
||||
@ -105,19 +105,19 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb) : selectedDirectoryId(1)
|
||||
bRank[2]->set_tooltip_markup (M("FILEBROWSER_SHOWRANK3HINT"));
|
||||
bRank[3]->set_tooltip_markup (M("FILEBROWSER_SHOWRANK4HINT"));
|
||||
bRank[4]->set_tooltip_markup (M("FILEBROWSER_SHOWRANK5HINT"));
|
||||
buttonBar->pack_start (*(new Gtk::VSeparator), Gtk::PACK_SHRINK);
|
||||
buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
|
||||
|
||||
iTrashEmpty = new Gtk::Image(argv0+"/images/trash-show-empty.png");
|
||||
iTrashFull = new Gtk::Image(argv0+"/images/trash-show-full.png");
|
||||
iTrashEmpty = Gtk::manage( new Gtk::Image(argv0+"/images/trash-show-empty.png") );
|
||||
iTrashFull = Gtk::manage( new Gtk::Image(argv0+"/images/trash-show-full.png") );
|
||||
|
||||
bTrash = new Gtk::ToggleButton ();
|
||||
bTrash = Gtk::manage( new Gtk::ToggleButton () );
|
||||
bTrash->set_image (*iTrashEmpty);
|
||||
bTrash->set_relief (Gtk::RELIEF_NONE);
|
||||
bTrash->set_tooltip_markup (M("FILEBROWSER_SHOWTRASHHINT"));
|
||||
bCateg[7] = bTrash->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bTrash));
|
||||
bTrash->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event),false);
|
||||
buttonBar->pack_start (*bTrash, Gtk::PACK_SHRINK);
|
||||
buttonBar->pack_start (*(new Gtk::VSeparator), Gtk::PACK_SHRINK);
|
||||
buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
|
||||
fileBrowser->trash_changed().connect( sigc::mem_fun(*this, &FileCatalog::trashChanged) );
|
||||
|
||||
categoryButtons[0] = bDir;
|
||||
@ -127,7 +127,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb) : selectedDirectoryId(1)
|
||||
categoryButtons[7] = bTrash;
|
||||
|
||||
exifInfo = Gtk::manage(new Gtk::ToggleButton ());
|
||||
exifInfo->set_image (*(new Gtk::Image (argv0+"/images/info.png")));
|
||||
exifInfo->set_image (*Gtk::manage(new Gtk::Image (argv0+"/images/info.png")));
|
||||
exifInfo->set_relief (Gtk::RELIEF_NONE);
|
||||
exifInfo->set_tooltip_markup (M("FILEBROWSER_SHOWEXIFINFO"));
|
||||
exifInfo->set_active( options.showFileNames );
|
||||
@ -135,30 +135,30 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb) : selectedDirectoryId(1)
|
||||
buttonBar->pack_start (*exifInfo, Gtk::PACK_SHRINK);
|
||||
|
||||
// thumbnail zoom
|
||||
Gtk::HBox* zoomBox = new Gtk::HBox ();
|
||||
zoomInButton = new Gtk::Button ();
|
||||
zoomInButton->set_image (*(new Gtk::Image (Gtk::StockID("gtk-zoom-in"), Gtk::ICON_SIZE_SMALL_TOOLBAR)));
|
||||
Gtk::HBox* zoomBox = Gtk::manage( new Gtk::HBox () );
|
||||
zoomInButton = Gtk::manage( new Gtk::Button () );
|
||||
zoomInButton->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-zoom-in"), Gtk::ICON_SIZE_SMALL_TOOLBAR)));
|
||||
zoomInButton->signal_pressed().connect (sigc::mem_fun(*this, &FileCatalog::zoomIn));
|
||||
zoomInButton->set_relief (Gtk::RELIEF_NONE);
|
||||
zoomInButton->set_tooltip_markup (M("FILEBROWSER_ZOOMINHINT"));
|
||||
zoomBox->pack_end (*zoomInButton, Gtk::PACK_SHRINK);
|
||||
zoomOutButton = new Gtk::Button ();
|
||||
zoomOutButton->set_image (*(new Gtk::Image (Gtk::StockID("gtk-zoom-out"), Gtk::ICON_SIZE_SMALL_TOOLBAR)));
|
||||
zoomOutButton = Gtk::manage( new Gtk::Button () );
|
||||
zoomOutButton->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-zoom-out"), Gtk::ICON_SIZE_SMALL_TOOLBAR)));
|
||||
zoomOutButton->signal_pressed().connect (sigc::mem_fun(*this, &FileCatalog::zoomOut));
|
||||
zoomOutButton->set_relief (Gtk::RELIEF_NONE);
|
||||
zoomOutButton->set_tooltip_markup (M("FILEBROWSER_ZOOMOUTHINT"));
|
||||
zoomBox->pack_end (*zoomOutButton, Gtk::PACK_SHRINK);
|
||||
|
||||
// add default panel
|
||||
hBox = new Gtk::HBox ();
|
||||
hBox = Gtk::manage( new Gtk::HBox () );
|
||||
hBox->show ();
|
||||
hBox->pack_end (*fileBrowser);
|
||||
fileBrowser->applyFilter (getFilter());
|
||||
pack_start (*hBox);
|
||||
|
||||
buttonBar2 = new Gtk::HBox ();
|
||||
buttonBar2 = Gtk::manage( new Gtk::HBox () );
|
||||
pack_end (*buttonBar2, Gtk::PACK_SHRINK);
|
||||
progressBar = new Gtk::ProgressBar ();
|
||||
progressBar = Gtk::manage( new Gtk::ProgressBar () );
|
||||
buttonBar2->pack_start (*progressBar, Gtk::PACK_SHRINK, 4);
|
||||
progressBar->set_size_request (-1, 16);
|
||||
|
||||
|
||||
@ -33,14 +33,14 @@ int fbinit (void* data) {
|
||||
FilePanel::FilePanel () : parent(NULL) {
|
||||
|
||||
isloading = false;
|
||||
dirpaned = new Gtk::HPaned ();
|
||||
dirpaned = Gtk::manage ( new Gtk::HPaned () );
|
||||
dirpaned->set_position (options.dirBrowserWidth);
|
||||
|
||||
dirBrowser = new DirBrowser ();
|
||||
placesBrowser = new PlacesBrowser ();
|
||||
recentBrowser = new RecentBrowser ();
|
||||
|
||||
placespaned = new Gtk::VPaned ();
|
||||
placespaned = Gtk::manage ( new Gtk::VPaned () );
|
||||
placespaned->set_size_request(50,100);
|
||||
placespaned->set_position (options.dirBrowserHeight);
|
||||
|
||||
@ -55,7 +55,7 @@ FilePanel::FilePanel () : parent(NULL) {
|
||||
|
||||
tpc = new BatchToolPanelCoordinator (this);
|
||||
fileCatalog = new FileCatalog (tpc->coarse, tpc->getToolBar());
|
||||
ribbonPane = new Gtk::Paned();
|
||||
ribbonPane = Gtk::manage ( new Gtk::Paned() );
|
||||
ribbonPane->add(*fileCatalog);
|
||||
ribbonPane->set_size_request(50,150);
|
||||
dirpaned->pack2 (*ribbonPane, true, true);
|
||||
@ -67,18 +67,18 @@ FilePanel::FilePanel () : parent(NULL) {
|
||||
dirBrowser->addDirSelectionListener (placesBrowser);
|
||||
fileCatalog->setFileSelectionListener (this);
|
||||
|
||||
rightBox = new Gtk::HBox ();
|
||||
rightBox = Gtk::manage ( new Gtk::HBox () );
|
||||
rightBox->set_size_request(50,100);
|
||||
rightNotebook = new Gtk::Notebook ();
|
||||
Gtk::VBox* taggingBox = new Gtk::VBox ();
|
||||
rightNotebook = Gtk::manage ( new Gtk::Notebook () );
|
||||
Gtk::VBox* taggingBox = Gtk::manage ( new Gtk::VBox () );
|
||||
|
||||
history = new History (false);
|
||||
|
||||
tpc->addPParamsChangeListener (history);
|
||||
history->setProfileChangeListener (tpc);
|
||||
|
||||
Gtk::ScrolledWindow* sFilterPanel = new Gtk::ScrolledWindow();
|
||||
filterPanel = new FilterPanel ();
|
||||
Gtk::ScrolledWindow* sFilterPanel = Gtk::manage ( new Gtk::ScrolledWindow() );
|
||||
filterPanel = Gtk::manage ( new FilterPanel () );
|
||||
sFilterPanel->add (*filterPanel);
|
||||
sFilterPanel->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
|
||||
|
||||
@ -89,14 +89,14 @@ FilePanel::FilePanel () : parent(NULL) {
|
||||
|
||||
rightNotebook->set_tab_pos (Gtk::POS_LEFT);
|
||||
|
||||
Gtk::Label* devLab = new Gtk::Label (M("MAIN_TAB_DEVELOP"));
|
||||
Gtk::Label* devLab = Gtk::manage ( new Gtk::Label (M("MAIN_TAB_DEVELOP")) );
|
||||
devLab->set_angle (90);
|
||||
Gtk::Label* filtLab = new Gtk::Label (M("MAIN_TAB_FILTER"));
|
||||
Gtk::Label* filtLab = Gtk::manage ( new Gtk::Label (M("MAIN_TAB_FILTER")) );
|
||||
filtLab->set_angle (90);
|
||||
Gtk::Label* tagLab = new Gtk::Label (M("MAIN_TAB_TAGGING"));
|
||||
Gtk::Label* tagLab = Gtk::manage ( new Gtk::Label (M("MAIN_TAB_TAGGING")) );
|
||||
tagLab->set_angle (90);
|
||||
|
||||
tpcPaned = new Gtk::VPaned ();
|
||||
tpcPaned = Gtk::manage ( new Gtk::VPaned () );
|
||||
tpcPaned->pack1 (*tpc->toolPanelNotebook, false, true);
|
||||
tpcPaned->pack2 (*history, true, true);
|
||||
|
||||
|
||||
@ -28,14 +28,14 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
set_border_width (2);
|
||||
|
||||
Gtk::Table* iptc = new Gtk::Table (27, 2);
|
||||
Gtk::Table* iptc = Gtk::manage( new Gtk::Table (27, 2) );
|
||||
|
||||
int row = 0;
|
||||
|
||||
Gtk::Label* capl = new Gtk::Label (M("IPTCPANEL_CAPTION")+":");
|
||||
Gtk::Label* capl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CAPTION")+":") );
|
||||
captionText = Gtk::TextBuffer::create ();
|
||||
captionView = new Gtk::TextView (captionText);
|
||||
Gtk::ScrolledWindow* scrolledWindowc = new Gtk::ScrolledWindow();
|
||||
captionView = Gtk::manage( new Gtk::TextView (captionText) );
|
||||
Gtk::ScrolledWindow* scrolledWindowc = Gtk::manage( new Gtk::ScrolledWindow() );
|
||||
scrolledWindowc->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
|
||||
scrolledWindowc->add(*captionView);
|
||||
capl->set_tooltip_text (M("IPTCPANEL_CAPTIONHINT"));
|
||||
@ -45,8 +45,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* capwl = new Gtk::Label (M("IPTCPANEL_CAPTIONWRITER")+":");
|
||||
captionWriter = new Gtk::Entry ();
|
||||
Gtk::Label* capwl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CAPTIONWRITER")+":") );
|
||||
captionWriter = Gtk::manage( new Gtk::Entry () );
|
||||
capwl->set_tooltip_text (M("IPTCPANEL_CAPTIONWRITERHINT"));
|
||||
captionWriter->set_tooltip_text (M("IPTCPANEL_CAPTIONWRITERHINT"));
|
||||
iptc->attach (*capwl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -54,8 +54,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* headl = new Gtk::Label (M("IPTCPANEL_HEADLINE")+":");
|
||||
headline = new Gtk::Entry ();
|
||||
Gtk::Label* headl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_HEADLINE")+":") );
|
||||
headline = Gtk::manage( new Gtk::Entry () );
|
||||
headl->set_tooltip_text (M("IPTCPANEL_HEADLINEHINT"));
|
||||
headline->set_tooltip_text (M("IPTCPANEL_HEADLINEHINT"));
|
||||
iptc->attach (*headl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -63,8 +63,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* instl = new Gtk::Label (M("IPTCPANEL_INSTRUCTIONS")+":");
|
||||
instructions = new Gtk::Entry ();
|
||||
Gtk::Label* instl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_INSTRUCTIONS")+":") );
|
||||
instructions = Gtk::manage( new Gtk::Entry () );
|
||||
instl->set_tooltip_text (M("IPTCPANEL_INSTRUCTIONSHINT"));
|
||||
instructions->set_tooltip_text (M("IPTCPANEL_INSTRUCTIONSHINT"));
|
||||
iptc->attach (*instl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -72,29 +72,29 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::HSeparator* hsep1 = new Gtk::HSeparator ();
|
||||
Gtk::HSeparator* hsep1 = Gtk::manage( new Gtk::HSeparator () );
|
||||
iptc->attach (*hsep1, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* keyl = new Gtk::Label (M("IPTCPANEL_KEYWORDS")+":");
|
||||
keywords = new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE);
|
||||
Gtk::Label* keyl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_KEYWORDS")+":"));
|
||||
keywords = Gtk::manage( new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE) );
|
||||
keywords->set_headers_visible (false);
|
||||
Gtk::ScrolledWindow* scrolledWindowkw = new Gtk::ScrolledWindow();
|
||||
Gtk::ScrolledWindow* scrolledWindowkw = Gtk::manage( new Gtk::ScrolledWindow() );
|
||||
scrolledWindowkw->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
|
||||
scrolledWindowkw->add(*keywords);
|
||||
keyword = new Gtk::ComboBoxEntryText ();
|
||||
keyword = Gtk::manage( new Gtk::ComboBoxEntryText () );
|
||||
keyword->set_size_request (32, -1);
|
||||
keyl->set_tooltip_text (M("IPTCPANEL_KEYWORDSHINT"));
|
||||
keywords->set_tooltip_text (M("IPTCPANEL_KEYWORDSHINT"));
|
||||
keyword->set_tooltip_text (M("IPTCPANEL_KEYWORDSHINT"));
|
||||
addKW = new Gtk::Button ();
|
||||
delKW = new Gtk::Button ();
|
||||
Gtk::Image* addKWImg = new Gtk::Image (argv0+"/images/list-add12.png");
|
||||
Gtk::Image* delKWImg = new Gtk::Image (argv0+"/images/list-remove12r.png");
|
||||
addKW = Gtk::manage( new Gtk::Button () );
|
||||
delKW = Gtk::manage( new Gtk::Button () );
|
||||
Gtk::Image* addKWImg = Gtk::manage( new Gtk::Image (argv0+"/images/list-add12.png") );
|
||||
Gtk::Image* delKWImg = Gtk::manage( new Gtk::Image (argv0+"/images/list-remove12r.png") );
|
||||
addKW->add (*addKWImg);
|
||||
delKW->add (*delKWImg);
|
||||
Gtk::HBox* kwhb = new Gtk::HBox ();
|
||||
Gtk::HBox* kwhb = Gtk::manage( new Gtk::HBox () );
|
||||
kwhb->pack_start (*keyword);
|
||||
kwhb->pack_start (*addKW, Gtk::PACK_SHRINK, 2);
|
||||
kwhb->pack_start (*delKW, Gtk::PACK_SHRINK, 2);
|
||||
@ -104,33 +104,33 @@ IPTCPanel::IPTCPanel () {
|
||||
iptc->attach (*scrolledWindowkw, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
|
||||
row++;
|
||||
|
||||
Gtk::HSeparator* hsep2 = new Gtk::HSeparator ();
|
||||
Gtk::HSeparator* hsep2 = Gtk::manage( new Gtk::HSeparator () );
|
||||
iptc->attach (*hsep2, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
|
||||
row++;
|
||||
|
||||
Gtk::Label* catl = new Gtk::Label (M("IPTCPANEL_CATEGORY")+":");
|
||||
category = new Gtk::ComboBoxEntryText ();
|
||||
Gtk::Label* catl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CATEGORY")+":") );
|
||||
category = Gtk::manage( new Gtk::ComboBoxEntryText () );
|
||||
category->set_size_request (32, -1);
|
||||
catl->set_tooltip_text (M("IPTCPANEL_CATEGORYHINT"));
|
||||
category->set_tooltip_text (M("IPTCPANEL_CATEGORYHINT"));
|
||||
Gtk::Label* scl = new Gtk::Label (M("IPTCPANEL_SUPPCATEGORIES")+":");
|
||||
suppCategories = new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE);
|
||||
Gtk::Label* scl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_SUPPCATEGORIES")+":") );
|
||||
suppCategories = Gtk::manage( new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE) );
|
||||
suppCategories->set_headers_visible (false);
|
||||
Gtk::ScrolledWindow* scrolledWindowsc = new Gtk::ScrolledWindow();
|
||||
Gtk::ScrolledWindow* scrolledWindowsc = Gtk::manage( new Gtk::ScrolledWindow() );
|
||||
scrolledWindowsc->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
|
||||
scrolledWindowsc->add(*suppCategories);
|
||||
suppCategory = new Gtk::ComboBoxEntryText ();
|
||||
suppCategory = Gtk::manage( new Gtk::ComboBoxEntryText () );
|
||||
suppCategory->set_size_request (32, -1);
|
||||
scl->set_tooltip_text (M("IPTCPANEL_SUPPCATEGORIESHINT"));
|
||||
suppCategories->set_tooltip_text (M("IPTCPANEL_SUPPCATEGORIESHINT"));
|
||||
suppCategory->set_tooltip_text (M("IPTCPANEL_SUPPCATEGORIESHINT"));
|
||||
addSC = new Gtk::Button ();
|
||||
delSC = new Gtk::Button ();
|
||||
Gtk::Image* addSCImg = new Gtk::Image (argv0+"/images/list-add12.png");
|
||||
Gtk::Image* delSCImg = new Gtk::Image (argv0+"/images/list-remove12r.png");
|
||||
addSC = Gtk::manage( new Gtk::Button () );
|
||||
delSC = Gtk::manage( new Gtk::Button () );
|
||||
Gtk::Image* addSCImg = Gtk::manage( new Gtk::Image (argv0+"/images/list-add12.png") );
|
||||
Gtk::Image* delSCImg = Gtk::manage( new Gtk::Image (argv0+"/images/list-remove12r.png") );
|
||||
addSC->add (*addSCImg);
|
||||
delSC->add (*delSCImg);
|
||||
Gtk::HBox* schb = new Gtk::HBox ();
|
||||
Gtk::HBox* schb = Gtk::manage( new Gtk::HBox () );
|
||||
schb->pack_start (*suppCategory);
|
||||
schb->pack_start (*addSC, Gtk::PACK_SHRINK, 2);
|
||||
schb->pack_start (*delSC, Gtk::PACK_SHRINK, 2);
|
||||
@ -143,12 +143,12 @@ IPTCPanel::IPTCPanel () {
|
||||
iptc->attach (*scrolledWindowsc, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
|
||||
row++;
|
||||
|
||||
Gtk::HSeparator* hsep3 = new Gtk::HSeparator ();
|
||||
Gtk::HSeparator* hsep3 = Gtk::manage( new Gtk::HSeparator () );
|
||||
iptc->attach (*hsep3, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
|
||||
row++;
|
||||
|
||||
Gtk::Label* authl = new Gtk::Label (M("IPTCPANEL_AUTHOR")+":");
|
||||
author = new Gtk::Entry ();
|
||||
Gtk::Label* authl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_AUTHOR")+":") );
|
||||
author = Gtk::manage( new Gtk::Entry () );
|
||||
authl->set_tooltip_text (M("IPTCPANEL_CREDITHINT"));
|
||||
author->set_tooltip_text (M("IPTCPANEL_CREDITHINT"));
|
||||
iptc->attach (*authl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -156,8 +156,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* aupl = new Gtk::Label (M("IPTCPANEL_AUTHORSPOSITION")+":");
|
||||
authorPos = new Gtk::Entry ();
|
||||
Gtk::Label* aupl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_AUTHORSPOSITION")+":") );
|
||||
authorPos = Gtk::manage( new Gtk::Entry () );
|
||||
aupl->set_tooltip_text (M("IPTCPANEL_AUTHORSPOSITIONHINT"));
|
||||
authorPos->set_tooltip_text (M("IPTCPANEL_AUTHORSPOSITIONHINT"));
|
||||
iptc->attach (*aupl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -165,8 +165,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* credl = new Gtk::Label (M("IPTCPANEL_CREDIT")+":");
|
||||
credit = new Gtk::Entry ();
|
||||
Gtk::Label* credl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CREDIT")+":") );
|
||||
credit = Gtk::manage( new Gtk::Entry () );
|
||||
credl->set_tooltip_text (M("IPTCPANEL_CREDITHINT"));
|
||||
credit->set_tooltip_text (M("IPTCPANEL_CREDITHINT"));
|
||||
iptc->attach (*credl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -174,8 +174,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* sourl = new Gtk::Label (M("IPTCPANEL_SOURCE")+":");
|
||||
source = new Gtk::Entry ();
|
||||
Gtk::Label* sourl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_SOURCE")+":") );
|
||||
source = Gtk::manage( new Gtk::Entry () );
|
||||
sourl->set_tooltip_text (M("IPTCPANEL_SOURCEHINT"));
|
||||
source->set_tooltip_text (M("IPTCPANEL_SOURCEHINT"));
|
||||
iptc->attach (*sourl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -183,8 +183,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* cprl = new Gtk::Label (M("IPTCPANEL_COPYRIGHT")+":");
|
||||
copyright = new Gtk::Entry ();
|
||||
Gtk::Label* cprl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_COPYRIGHT")+":") );
|
||||
copyright = Gtk::manage( new Gtk::Entry () );
|
||||
cprl->set_tooltip_text (M("IPTCPANEL_COPYRIGHTHINT"));
|
||||
copyright->set_tooltip_text (M("IPTCPANEL_COPYRIGHTHINT"));
|
||||
iptc->attach (*cprl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -192,13 +192,13 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::HSeparator* hsep4 = new Gtk::HSeparator ();
|
||||
Gtk::HSeparator* hsep4 = Gtk::manage( new Gtk::HSeparator () );
|
||||
iptc->attach (*hsep4, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* cityl = new Gtk::Label (M("IPTCPANEL_CITY")+":");
|
||||
city = new Gtk::Entry ();
|
||||
Gtk::Label* cityl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_CITY")+":") );
|
||||
city = Gtk::manage( new Gtk::Entry () );
|
||||
cityl->set_tooltip_text (M("IPTCPANEL_CITYHINT"));
|
||||
city->set_tooltip_text (M("IPTCPANEL_CITYHINT"));
|
||||
iptc->attach (*cityl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -206,8 +206,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* provl = new Gtk::Label (M("IPTCPANEL_PROVINCE")+":");
|
||||
province = new Gtk::Entry ();
|
||||
Gtk::Label* provl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_PROVINCE")+":") );
|
||||
province = Gtk::manage( new Gtk::Entry () );
|
||||
provl->set_tooltip_text (M("IPTCPANEL_PROVINCEHINT"));
|
||||
province->set_tooltip_text (M("IPTCPANEL_PROVINCEHINT"));
|
||||
iptc->attach (*provl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -215,8 +215,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* ctrl = new Gtk::Label (M("IPTCPANEL_COUNTRY")+":");
|
||||
country = new Gtk::Entry ();
|
||||
Gtk::Label* ctrl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_COUNTRY")+":") );
|
||||
country = Gtk::manage( new Gtk::Entry () );
|
||||
ctrl->set_tooltip_text (M("IPTCPANEL_COUNTRYHINT"));
|
||||
country->set_tooltip_text (M("IPTCPANEL_COUNTRYHINT"));
|
||||
iptc->attach (*ctrl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -224,8 +224,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* titll = new Gtk::Label (M("IPTCPANEL_TITLE")+":");
|
||||
title = new Gtk::Entry ();
|
||||
Gtk::Label* titll = Gtk::manage( new Gtk::Label (M("IPTCPANEL_TITLE")+":") );
|
||||
title = Gtk::manage( new Gtk::Entry () );
|
||||
titll->set_tooltip_text (M("IPTCPANEL_TITLEHINT"));
|
||||
title->set_tooltip_text (M("IPTCPANEL_TITLEHINT"));
|
||||
iptc->attach (*titll, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -233,8 +233,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* dcl = new Gtk::Label (M("IPTCPANEL_DATECREATED")+":");
|
||||
dateCreated = new Gtk::Entry ();
|
||||
Gtk::Label* dcl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_DATECREATED")+":") );
|
||||
dateCreated = Gtk::manage( new Gtk::Entry () );
|
||||
dcl->set_tooltip_text (M("IPTCPANEL_DATECREATEDHINT"));
|
||||
dateCreated->set_tooltip_text (M("IPTCPANEL_DATECREATEDHINT"));
|
||||
iptc->attach (*dcl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -242,8 +242,8 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::Label* trl = new Gtk::Label (M("IPTCPANEL_TRANSREFERENCE")+":");
|
||||
transReference = new Gtk::Entry ();
|
||||
Gtk::Label* trl = Gtk::manage( new Gtk::Label (M("IPTCPANEL_TRANSREFERENCE")+":") );
|
||||
transReference = Gtk::manage( new Gtk::Entry () );
|
||||
trl->set_tooltip_text (M("IPTCPANEL_TRANSREFERENCEHINT"));
|
||||
transReference->set_tooltip_text (M("IPTCPANEL_TRANSREFERENCEHINT"));
|
||||
iptc->attach (*trl, 0, 1, row, row+1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
|
||||
@ -251,7 +251,7 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
row++;
|
||||
|
||||
Gtk::ScrolledWindow* scrolledWindow = new Gtk::ScrolledWindow();
|
||||
Gtk::ScrolledWindow* scrolledWindow = Gtk::manage( new Gtk::ScrolledWindow() );
|
||||
scrolledWindow->set_border_width(2);
|
||||
scrolledWindow->set_shadow_type(Gtk::SHADOW_NONE);
|
||||
scrolledWindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
|
||||
@ -260,27 +260,27 @@ IPTCPanel::IPTCPanel () {
|
||||
|
||||
pack_start (*scrolledWindow);
|
||||
|
||||
Gtk::HBox* bbox = new Gtk::HBox ();
|
||||
Gtk::HBox* bbox = Gtk::manage( new Gtk::HBox () );
|
||||
|
||||
reset = new Gtk::Button (M("IPTCPANEL_RESET"));
|
||||
reset->set_image (*(new Gtk::Image (Gtk::StockID ("gtk-undo"), Gtk::IconSize (2))));
|
||||
reset = Gtk::manage( new Gtk::Button (M("IPTCPANEL_RESET")) );
|
||||
reset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID ("gtk-undo"), Gtk::IconSize (2))));
|
||||
bbox->pack_start (*reset);
|
||||
|
||||
file = new Gtk::Button (M("IPTCPANEL_EMBEDDED"));
|
||||
file->set_image (*(new Gtk::Image (Gtk::StockID ("gtk-open"), Gtk::IconSize (2))));
|
||||
file = Gtk::manage( new Gtk::Button (M("IPTCPANEL_EMBEDDED")) );
|
||||
file->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID ("gtk-open"), Gtk::IconSize (2))));
|
||||
bbox->pack_start (*file);
|
||||
|
||||
copy = new Gtk::Button ();
|
||||
copy->set_image (*(new Gtk::Image (Gtk::StockID ("gtk-copy"), Gtk::IconSize (2))));
|
||||
copy = Gtk::manage( new Gtk::Button () );
|
||||
copy->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID ("gtk-copy"), Gtk::IconSize (2))));
|
||||
bbox->pack_start (*copy, Gtk::PACK_SHRINK, 0);
|
||||
|
||||
paste = new Gtk::Button ();
|
||||
paste->set_image (*(new Gtk::Image (Gtk::StockID ("gtk-paste"), Gtk::IconSize (2))));
|
||||
paste = Gtk::manage( new Gtk::Button () );
|
||||
paste->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID ("gtk-paste"), Gtk::IconSize (2))));
|
||||
bbox->pack_start (*paste, Gtk::PACK_SHRINK, 0);
|
||||
|
||||
pack_end (*bbox, Gtk::PACK_SHRINK, 2);
|
||||
|
||||
Gtk::Tooltips* toolTip = new Gtk::Tooltips ();
|
||||
Gtk::Tooltips* toolTip = Gtk::manage( new Gtk::Tooltips () );
|
||||
toolTip->set_tip (*reset, M("IPTCPANEL_RESETHINT"));
|
||||
toolTip->set_tip (*file, M("IPTCPANEL_EMBEDDEDHINT"));
|
||||
toolTip->set_tip (*copy, M("IPTCPANEL_COPYHINT"));
|
||||
|
||||
@ -52,7 +52,7 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this), brAdd(false), contrAdd
|
||||
enablelimiter = Gtk::manage (new Gtk::CheckButton (M("TP_LABCURVE_ENABLESATLIMITER")));
|
||||
pack_start (*enablelimiter);
|
||||
|
||||
saturationlimiter = new Adjuster (M("TP_LABCURVE_SATLIMIT"), 0, 100, 1.0, 40);
|
||||
saturationlimiter = Gtk::manage ( new Adjuster (M("TP_LABCURVE_SATLIMIT"), 0, 100, 1.0, 40) );
|
||||
pack_start (*saturationlimiter);
|
||||
saturationlimiter->show ();
|
||||
saturationlimiter->reference ();
|
||||
|
||||
@ -38,7 +38,7 @@ Navigator::Navigator () {
|
||||
LAB_B = Gtk::manage (new Gtk::Label ());
|
||||
LAB_L = Gtk::manage (new Gtk::Label ());
|
||||
|
||||
Gtk::Table* table = new Gtk::Table (3, 3);
|
||||
Gtk::Table* table = Gtk::manage (new Gtk::Table (3, 3));
|
||||
table->attach (*R, 0, 1, 0, 1, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
|
||||
table->attach (*G, 0, 1, 1, 2, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
|
||||
table->attach (*B, 0, 1, 2, 3, Gtk::EXPAND, Gtk::SHRINK, 0, 0);
|
||||
|
||||
@ -44,16 +44,16 @@ PartialPasteDlg::PartialPasteDlg () {
|
||||
// options in detail:
|
||||
sharpen = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_SHARPENING")));
|
||||
impden = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_IMPULSEDENOISE")));
|
||||
lumaden = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_LUMADENOISE")));
|
||||
//lumaden = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_LUMADENOISE")));
|
||||
dirpyreq = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DIRPYREQUALIZER")));
|
||||
waveq = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WAVELETEQUALIZER")));
|
||||
//waveq = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WAVELETEQUALIZER")));
|
||||
defringe = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DEFRINGE")));
|
||||
|
||||
// options in color:
|
||||
chmixer = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_CHANNELMIXER")));
|
||||
colorshift = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORSHIFT")));
|
||||
colorboost = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORBOOST")));
|
||||
colorden = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORDENOISE")));
|
||||
//colorshift = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORSHIFT")));
|
||||
//colorboost = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORBOOST")));
|
||||
//colorden = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORDENOISE")));
|
||||
dirpyrden = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DIRPYRDENOISE")));
|
||||
hsveq = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_HSVEQUALIZER")));
|
||||
|
||||
|
||||
@ -199,7 +199,7 @@ Gtk::Widget* Preferences::getBatchProcPanel () {
|
||||
|
||||
behTreeView->expand_all ();
|
||||
|
||||
chOverwriteOutputFile = new Gtk::CheckButton (M("PREFERENCES_OVERWRITEOUTPUTFILE"));
|
||||
chOverwriteOutputFile = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_OVERWRITEOUTPUTFILE")) );
|
||||
mvbpp->pack_start(*chOverwriteOutputFile, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
return mvbpp;
|
||||
@ -335,13 +335,13 @@ Gtk::Widget* Preferences::getColorManagementPanel () {
|
||||
|
||||
Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
|
||||
Gtk::VBox* mvbsd = new Gtk::VBox ();
|
||||
Gtk::VBox* mvbsd = Gtk::manage( new Gtk::VBox () );
|
||||
|
||||
Gtk::Frame* fworklflow = new Gtk::Frame (M("PREFERENCES_WORKFLOW"));
|
||||
Gtk::HBox* hbworkflow = new Gtk::HBox ();
|
||||
Gtk::Frame* fworklflow = Gtk::manage( new Gtk::Frame (M("PREFERENCES_WORKFLOW")) );
|
||||
Gtk::HBox* hbworkflow = Gtk::manage( new Gtk::HBox () );
|
||||
hbworkflow->set_border_width (4);
|
||||
Gtk::Label* flayoutlab = new Gtk::Label (M("PREFERENCES_EDITORLAYOUT")+":");
|
||||
editorLayout = new Gtk::ComboBoxText ();
|
||||
Gtk::Label* flayoutlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_EDITORLAYOUT")+":") );
|
||||
editorLayout = Gtk::manage( new Gtk::ComboBoxText () );
|
||||
editorLayout->set_size_request(45, -1);
|
||||
|
||||
editorLayout->append_text (M("PREFERENCES_SINGLETAB"));
|
||||
@ -354,17 +354,17 @@ Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
|
||||
hbworkflow->pack_start (*flayoutlab, Gtk::PACK_SHRINK, 4);
|
||||
hbworkflow->pack_start (*editorLayout);
|
||||
Gtk::Label* lNextStart = new Gtk::Label (Glib::ustring(" (") + M("PREFERENCES_APPLNEXTSTARTUP") + ")");
|
||||
Gtk::Label* lNextStart = Gtk::manage( new Gtk::Label (Glib::ustring(" (") + M("PREFERENCES_APPLNEXTSTARTUP") + ")") );
|
||||
hbworkflow->pack_end (*lNextStart, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
fworklflow->add (*hbworkflow);
|
||||
mvbsd->pack_start (*fworklflow, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
Gtk::Frame* flang = new Gtk::Frame (M("PREFERENCES_DEFAULTLANG"));
|
||||
Gtk::HBox* hblang = new Gtk::HBox ();
|
||||
Gtk::Frame* flang = Gtk::manage( new Gtk::Frame (M("PREFERENCES_DEFAULTLANG")) );
|
||||
Gtk::HBox* hblang = Gtk::manage( new Gtk::HBox () );
|
||||
hblang->set_border_width (4);
|
||||
Gtk::Label* langlab = new Gtk::Label (M("PREFERENCES_SELECTLANG")+":");
|
||||
languages = new Gtk::ComboBoxText ();
|
||||
Gtk::Label* langlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_SELECTLANG")+":") );
|
||||
languages = Gtk::manage( new Gtk::ComboBoxText () );
|
||||
|
||||
std::vector<Glib::ustring> langs;
|
||||
parseDir (argv0 + "/languages", langs, "");
|
||||
@ -374,24 +374,24 @@ Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
}
|
||||
}
|
||||
|
||||
Gtk::Label* langw = new Gtk::Label (Glib::ustring(" (") + M("PREFERENCES_APPLNEXTSTARTUP") + ")");
|
||||
Gtk::Label* langw = Gtk::manage( new Gtk::Label (Glib::ustring(" (") + M("PREFERENCES_APPLNEXTSTARTUP") + ")") );
|
||||
hblang->pack_start (*langlab, Gtk::PACK_SHRINK, 4);
|
||||
hblang->pack_start (*languages);
|
||||
hblang->pack_end (*langw, Gtk::PACK_SHRINK, 4);
|
||||
flang->add (*hblang);
|
||||
mvbsd->pack_start (*flang, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
Gtk::Frame* ftheme = new Gtk::Frame (M("PREFERENCES_DEFAULTTHEME"));
|
||||
Gtk::VBox* vbftheme = new Gtk::VBox ();
|
||||
Gtk::Frame* ftheme = Gtk::manage( new Gtk::Frame (M("PREFERENCES_DEFAULTTHEME")) );
|
||||
Gtk::VBox* vbftheme = Gtk::manage( new Gtk::VBox () );
|
||||
vbftheme->set_border_width(4);
|
||||
vbftheme->set_spacing(4);
|
||||
Gtk::HBox* hbUseSystemTheme = new Gtk::HBox ();
|
||||
Gtk::HBox* hbUseSystemTheme = Gtk::manage( new Gtk::HBox () );
|
||||
hbUseSystemTheme->set_spacing(4);
|
||||
chUseSystemTheme = new Gtk::CheckButton (M("PREFERENCES_USESYSTEMTHEME"));
|
||||
Gtk::Label* useNextStart = new Gtk::Label (Glib::ustring("(") + M("PREFERENCES_APPLNEXTSTARTUP") + ")");
|
||||
chUseSystemTheme = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_USESYSTEMTHEME")) );
|
||||
Gtk::Label* useNextStart = Gtk::manage( new Gtk::Label (Glib::ustring("(") + M("PREFERENCES_APPLNEXTSTARTUP") + ")") );
|
||||
|
||||
Gtk::Label* cutOverlayLabel = new Gtk::Label (M("PREFERENCES_CUTOVERLAYBRUSH") + ":");
|
||||
butCropCol=new Gtk::ColorButton();
|
||||
Gtk::Label* cutOverlayLabel = Gtk::manage( new Gtk::Label (M("PREFERENCES_CUTOVERLAYBRUSH") + ":") );
|
||||
butCropCol= Gtk::manage( new Gtk::ColorButton() );
|
||||
butCropCol->set_use_alpha(true);
|
||||
|
||||
hbUseSystemTheme->pack_start(*chUseSystemTheme, Gtk::PACK_SHRINK);
|
||||
@ -400,10 +400,10 @@ Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
hbUseSystemTheme->pack_end (*cutOverlayLabel, Gtk::PACK_SHRINK, 0);
|
||||
vbftheme->pack_start(*hbUseSystemTheme, Gtk::PACK_SHRINK, 0);
|
||||
|
||||
hbtheme = new Gtk::HBox ();
|
||||
hbtheme = Gtk::manage( new Gtk::HBox () );
|
||||
hbtheme->set_spacing (4);
|
||||
Gtk::Label* themelab = new Gtk::Label (M("PREFERENCES_SELECTTHEME")+":");
|
||||
theme = new Gtk::ComboBoxText ();
|
||||
Gtk::Label* themelab = Gtk::manage( new Gtk::Label (M("PREFERENCES_SELECTTHEME")+":") );
|
||||
theme = Gtk::manage( new Gtk::ComboBoxText () );
|
||||
|
||||
theme->append_text (Glib::ustring("(")+M("PREFERENCES_GTKTHEME")+")");
|
||||
theme->set_active (0);
|
||||
@ -412,8 +412,8 @@ Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
for (int i=0; i<themes.size(); i++)
|
||||
theme->append_text (themes[i]);
|
||||
|
||||
Gtk::Label* fontlab = new Gtk::Label (M("PREFERENCES_SELECTFONT")+":");
|
||||
fontbutton = new Gtk::FontButton ();
|
||||
Gtk::Label* fontlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_SELECTFONT")+":") );
|
||||
fontbutton = Gtk::manage( new Gtk::FontButton ());
|
||||
fontbutton->set_use_size(true);
|
||||
fontbutton->set_font_name(options.font);
|
||||
|
||||
@ -427,20 +427,20 @@ Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
|
||||
//-----
|
||||
|
||||
Gtk::HBox* hbcd = new Gtk::HBox ();
|
||||
Gtk::HBox* hbcd = Gtk::manage( new Gtk::HBox () );
|
||||
hbcd->set_spacing(4);
|
||||
|
||||
Gtk::Frame* frl = new Gtk::Frame (M("PREFERENCES_CLIPPINGIND"));
|
||||
blinkClipped = new Gtk::CheckButton (M("PREFERENCES_BLINKCLIPPED"));
|
||||
Gtk::VBox* vbrl = new Gtk::VBox ();
|
||||
Gtk::Frame* frl = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CLIPPINGIND")));
|
||||
blinkClipped = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_BLINKCLIPPED")) );
|
||||
Gtk::VBox* vbrl = Gtk::manage( new Gtk::VBox () );
|
||||
vbrl->set_border_width(4);
|
||||
vbrl->set_spacing (4);
|
||||
vbrl->pack_start (*blinkClipped, Gtk::PACK_SHRINK, 0);
|
||||
|
||||
Gtk::HBox* vbhl = new Gtk::HBox ();
|
||||
Gtk::HBox* vbhl = Gtk::manage( new Gtk::HBox () );
|
||||
vbhl->set_spacing(4);
|
||||
Gtk::Label* hll = new Gtk::Label (M("PREFERENCES_HLTHRESHOLD")+": ");
|
||||
hlThresh = new Gtk::SpinButton ();
|
||||
Gtk::Label* hll = Gtk::manage( new Gtk::Label (M("PREFERENCES_HLTHRESHOLD")+": "));
|
||||
hlThresh = Gtk::manage( new Gtk::SpinButton () );
|
||||
hlThresh->set_digits (0);
|
||||
hlThresh->set_increments (1, 10);
|
||||
hlThresh->set_range (0, 255);
|
||||
@ -449,10 +449,10 @@ Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
|
||||
vbrl->pack_start (*vbhl, Gtk::PACK_SHRINK, 0);
|
||||
|
||||
Gtk::HBox* vbsh = new Gtk::HBox ();
|
||||
Gtk::HBox* vbsh = Gtk::manage( new Gtk::HBox () );
|
||||
vbsh->set_spacing (4);
|
||||
Gtk::Label* shl = new Gtk::Label (M("PREFERENCES_SHTHRESHOLD")+": ");
|
||||
shThresh = new Gtk::SpinButton ();
|
||||
Gtk::Label* shl = Gtk::manage( new Gtk::Label (M("PREFERENCES_SHTHRESHOLD")+": ") );
|
||||
shThresh = Gtk::manage( new Gtk::SpinButton () );
|
||||
shThresh->show ();
|
||||
shThresh->set_digits (0);
|
||||
shThresh->set_increments (1, 10);
|
||||
@ -465,15 +465,15 @@ Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
hbcd->pack_start (*frl, true, true, 0);
|
||||
|
||||
//-----
|
||||
Gtk::Frame* fdf = new Gtk::Frame (M("PREFERENCES_DATEFORMATFRAME"));
|
||||
Gtk::Frame* fdf = Gtk::manage( new Gtk::Frame (M("PREFERENCES_DATEFORMATFRAME")) );
|
||||
|
||||
Gtk::HBox* hb6 = new Gtk::HBox ();
|
||||
Gtk::HBox* hb6 = Gtk::manage( new Gtk::HBox () );
|
||||
hb6->set_border_width (4);
|
||||
hb6->set_spacing (4);
|
||||
Gtk::VBox* dfvb = new Gtk::VBox ();
|
||||
Gtk::Label* dflab = new Gtk::Label (M("PREFERENCES_DATEFORMAT")+":");
|
||||
Gtk::VBox* dfvb = Gtk::manage( new Gtk::VBox () );
|
||||
Gtk::Label* dflab = Gtk::manage( new Gtk::Label (M("PREFERENCES_DATEFORMAT")+":") );
|
||||
hb6->pack_start (*dflab, Gtk::PACK_SHRINK,4);
|
||||
dateformat = new Gtk::Entry ();
|
||||
dateformat = Gtk::manage( new Gtk::Entry () );
|
||||
dateformat->set_tooltip_markup (M("PREFERENCES_DATEFORMATHINT"));
|
||||
dflab->set_tooltip_markup (M("PREFERENCES_DATEFORMATHINT"));
|
||||
hb6->pack_start (*dateformat);
|
||||
@ -484,49 +484,49 @@ Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
mvbsd->pack_start (*hbcd, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
//-----
|
||||
Gtk::Frame* fdg = new Gtk::Frame (M("PREFERENCES_EXTERNALEDITOR"));
|
||||
Gtk::VBox* dgvb = new Gtk::VBox ();
|
||||
Gtk::Frame* fdg = Gtk::manage( new Gtk::Frame (M("PREFERENCES_EXTERNALEDITOR")) );
|
||||
Gtk::VBox* dgvb = Gtk::manage( new Gtk::VBox () );
|
||||
|
||||
Gtk::HBox* hb7c = new Gtk::HBox ();
|
||||
edOther = new Gtk::RadioButton (M("PREFERENCES_EDITORCMDLINE")+":");
|
||||
Gtk::HBox* hb7c = Gtk::manage( new Gtk::HBox () );
|
||||
edOther = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_EDITORCMDLINE")+":"));
|
||||
hb7c->pack_start (*edOther, Gtk::PACK_SHRINK,4);
|
||||
editorToSendTo = new Gtk::Entry ();
|
||||
editorToSendTo = Gtk::manage( new Gtk::Entry () );
|
||||
hb7c->pack_start (*editorToSendTo);
|
||||
Gtk::RadioButton::Group ge = edOther->get_group();
|
||||
|
||||
#ifdef __APPLE__
|
||||
Gtk::HBox* hb7 = new Gtk::HBox ();
|
||||
edGimp = new Gtk::RadioButton ("GIMP");
|
||||
Gtk::HBox* hb7 = Gtk::manage( new Gtk::HBox () );
|
||||
edGimp = Gtk::manage( new Gtk::RadioButton ("GIMP") );
|
||||
hb7->pack_start (*edGimp, Gtk::PACK_SHRINK,4);
|
||||
dgvb->pack_start (*hb7, Gtk::PACK_SHRINK, 4);
|
||||
edGimp->set_group (ge);
|
||||
|
||||
Gtk::HBox* hb7b = new Gtk::HBox ();
|
||||
edPS = new Gtk::RadioButton (M("PREFERENCES_PSPATH")+":");
|
||||
Gtk::HBox* hb7b = Gtk::manage( new Gtk::HBox () );
|
||||
edPS = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_PSPATH")+":"));
|
||||
hb7b->pack_start (*edPS, Gtk::PACK_SHRINK,4);
|
||||
psDir = new Gtk::FileChooserButton (M("PREFERENCES_PSPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
|
||||
psDir = Gtk::manage( new Gtk::FileChooserButton (M("PREFERENCES_PSPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) );
|
||||
hb7b->pack_start (*psDir);
|
||||
dgvb->pack_start (*hb7b, Gtk::PACK_SHRINK, 4);
|
||||
edPS->set_group (ge);
|
||||
#elif defined _WIN32
|
||||
Gtk::HBox* hb7 = new Gtk::HBox ();
|
||||
edGimp = new Gtk::RadioButton (M("PREFERENCES_GIMPPATH")+":");
|
||||
Gtk::HBox* hb7 = Gtk::manage( new Gtk::HBox () );
|
||||
edGimp = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_GIMPPATH")+":") );
|
||||
hb7->pack_start (*edGimp, Gtk::PACK_SHRINK,4);
|
||||
gimpDir = new Gtk::FileChooserButton (M("PREFERENCES_GIMPPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
|
||||
gimpDir = Gtk::manage( new Gtk::FileChooserButton (M("PREFERENCES_GIMPPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) );
|
||||
hb7->pack_start (*gimpDir);
|
||||
dgvb->pack_start (*hb7, Gtk::PACK_SHRINK, 4);
|
||||
edGimp->set_group (ge);
|
||||
|
||||
Gtk::HBox* hb7b = new Gtk::HBox ();
|
||||
edPS = new Gtk::RadioButton (M("PREFERENCES_PSPATH")+":");
|
||||
Gtk::HBox* hb7b = Gtk::manage( new Gtk::HBox ());
|
||||
edPS = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_PSPATH")+":") );
|
||||
hb7b->pack_start (*edPS, Gtk::PACK_SHRINK,4);
|
||||
psDir = new Gtk::FileChooserButton (M("PREFERENCES_PSPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
|
||||
psDir = Gtk::manage( new Gtk::FileChooserButton (M("PREFERENCES_PSPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) );
|
||||
hb7b->pack_start (*psDir);
|
||||
dgvb->pack_start (*hb7b, Gtk::PACK_SHRINK, 4);
|
||||
edPS->set_group (ge);
|
||||
#else
|
||||
Gtk::HBox* hb7 = new Gtk::HBox ();
|
||||
edGimp = new Gtk::RadioButton ("GIMP");
|
||||
Gtk::HBox* hb7 = Gtk::manage( new Gtk::HBox () );
|
||||
edGimp = Gtk::manage( new Gtk::RadioButton ("GIMP") );
|
||||
hb7->pack_start (*edGimp, Gtk::PACK_SHRINK,4);
|
||||
dgvb->pack_start (*hb7, Gtk::PACK_SHRINK, 4);
|
||||
edGimp->set_group (ge);
|
||||
@ -548,30 +548,30 @@ Gtk::Widget* Preferences::getGeneralPanel () {
|
||||
|
||||
Gtk::Widget* Preferences::getFileBrowserPanel () {
|
||||
|
||||
Gtk::VBox* mvbfb = new Gtk::VBox ();
|
||||
Gtk::VBox* mvbfb = Gtk::manage( new Gtk::VBox () );
|
||||
mvbfb->set_border_width (4);
|
||||
|
||||
Gtk::Frame* fsd = new Gtk::Frame (M("PREFERENCES_STARTUPIMDIR"));
|
||||
Gtk::Frame* fsd = Gtk::manage( new Gtk::Frame (M("PREFERENCES_STARTUPIMDIR")) );
|
||||
|
||||
sdcurrent = new Gtk::RadioButton (M("PREFERENCES_DIRSOFTWARE"));
|
||||
sdlast = new Gtk::RadioButton (M("PREFERENCES_DIRLAST"));
|
||||
sdhome = new Gtk::RadioButton (M("PREFERENCES_DIRHOME"));
|
||||
sdother = new Gtk::RadioButton (M("PREFERENCES_DIROTHER")+": ");
|
||||
startupdir = new Gtk::Entry ();
|
||||
sdcurrent = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_DIRSOFTWARE")) );
|
||||
sdlast = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_DIRLAST")) );
|
||||
sdhome = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_DIRHOME")) );
|
||||
sdother = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_DIROTHER")+": ") );
|
||||
startupdir = Gtk::manage( new Gtk::Entry () );
|
||||
|
||||
Gtk::Button* sdselect = new Gtk::Button ("");
|
||||
sdselect->set_image (*(new Gtk::Image (Gtk::StockID("gtk-open"), Gtk::ICON_SIZE_BUTTON)));
|
||||
Gtk::Button* sdselect = Gtk::manage( new Gtk::Button ("") );
|
||||
sdselect->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-open"), Gtk::ICON_SIZE_BUTTON)));
|
||||
|
||||
Gtk::RadioButton::Group opts = sdcurrent->get_group();
|
||||
sdlast->set_group (opts);
|
||||
sdhome->set_group (opts);
|
||||
sdother->set_group (opts);
|
||||
|
||||
Gtk::VBox* vbsd = new Gtk::VBox ();
|
||||
Gtk::VBox* vbsd = Gtk::manage( new Gtk::VBox () );
|
||||
vbsd->pack_start (*sdcurrent, Gtk::PACK_SHRINK,0);
|
||||
vbsd->pack_start (*sdlast, Gtk::PACK_SHRINK,0);
|
||||
vbsd->pack_start (*sdhome, Gtk::PACK_SHRINK,0);
|
||||
Gtk::HBox* otherbox = new Gtk::HBox ();
|
||||
Gtk::HBox* otherbox = Gtk::manage( new Gtk::HBox () );
|
||||
otherbox->pack_start (*sdother, Gtk::PACK_SHRINK);
|
||||
otherbox->pack_start (*startupdir);
|
||||
otherbox->pack_end (*sdselect, Gtk::PACK_SHRINK, 4);
|
||||
@ -586,11 +586,11 @@ Gtk::Widget* Preferences::getFileBrowserPanel () {
|
||||
//---
|
||||
|
||||
|
||||
Gtk::Frame* fro = new Gtk::Frame (M("PREFERENCES_FBROWSEROPTS"));
|
||||
showDateTime = new Gtk::CheckButton (M("PREFERENCES_SHOWDATETIME"));
|
||||
showBasicExif = new Gtk::CheckButton (M("PREFERENCES_SHOWBASICEXIF"));
|
||||
Gtk::VBox* vbro = new Gtk::VBox ();
|
||||
overlayedFileNames = new Gtk::CheckButton (M("PREFERENCES_OVERLAY_FILENAMES"));
|
||||
Gtk::Frame* fro = Gtk::manage( new Gtk::Frame (M("PREFERENCES_FBROWSEROPTS")) );
|
||||
showDateTime = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SHOWDATETIME")) );
|
||||
showBasicExif = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SHOWBASICEXIF")) );
|
||||
Gtk::VBox* vbro = Gtk::manage( new Gtk::VBox () );
|
||||
overlayedFileNames = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_OVERLAY_FILENAMES")) );
|
||||
vbro->set_border_width (4);
|
||||
vbro->pack_start (*showDateTime, Gtk::PACK_SHRINK, 0);
|
||||
vbro->pack_start (*showBasicExif, Gtk::PACK_SHRINK, 0);
|
||||
@ -598,27 +598,27 @@ Gtk::Widget* Preferences::getFileBrowserPanel () {
|
||||
|
||||
fro->add (*vbro);
|
||||
|
||||
Gtk::Frame* fre = new Gtk::Frame (M("PREFERENCES_PARSEDEXT"));
|
||||
Gtk::VBox* vbre = new Gtk::VBox ();
|
||||
Gtk::Frame* fre = Gtk::manage( new Gtk::Frame (M("PREFERENCES_PARSEDEXT")) );
|
||||
Gtk::VBox* vbre = Gtk::manage( new Gtk::VBox () );
|
||||
vbre->set_border_width (4);
|
||||
Gtk::HBox* hb0 = new Gtk::HBox ();
|
||||
Gtk::Label* elab = new Gtk::Label (M("PREFERENCES_PARSEDEXTADD")+":");
|
||||
Gtk::HBox* hb0 = Gtk::manage( new Gtk::HBox () );
|
||||
Gtk::Label* elab = Gtk::manage( new Gtk::Label (M("PREFERENCES_PARSEDEXTADD")+":") );
|
||||
hb0->pack_start (*elab, Gtk::PACK_SHRINK, 4);
|
||||
extension = new Gtk::Entry ();
|
||||
extension = Gtk::manage( new Gtk::Entry () );
|
||||
extension->set_width_chars(5);
|
||||
hb0->pack_start (*extension);
|
||||
addExt = new Gtk::Button ();
|
||||
delExt = new Gtk::Button ();
|
||||
addExt = Gtk::manage( new Gtk::Button () );
|
||||
delExt = Gtk::manage( new Gtk::Button () );
|
||||
addExt->set_tooltip_text (M("PREFERENCES_PARSEDEXTADDHINT"));
|
||||
delExt->set_tooltip_text (M("PREFERENCES_PARSEDEXTDELHINT"));
|
||||
Gtk::Image* addExtImg = new Gtk::Image (argv0+"/images/list-add12.png");
|
||||
Gtk::Image* delExtImg = new Gtk::Image (argv0+"/images/list-remove12r.png");
|
||||
Gtk::Image* addExtImg = Gtk::manage( new Gtk::Image (argv0+"/images/list-add12.png") );
|
||||
Gtk::Image* delExtImg = Gtk::manage( new Gtk::Image (argv0+"/images/list-remove12r.png") );
|
||||
addExt->add (*addExtImg);
|
||||
delExt->add (*delExtImg);
|
||||
hb0->pack_end (*delExt, Gtk::PACK_SHRINK, 4);
|
||||
hb0->pack_end (*addExt, Gtk::PACK_SHRINK, 4);
|
||||
extensions = new Gtk::TreeView ();
|
||||
Gtk::ScrolledWindow* hscrollw = new Gtk::ScrolledWindow ();
|
||||
extensions = Gtk::manage( new Gtk::TreeView () );
|
||||
Gtk::ScrolledWindow* hscrollw = Gtk::manage( new Gtk::ScrolledWindow () );
|
||||
hscrollw->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
|
||||
hscrollw->add (*extensions);
|
||||
extensionModel = Gtk::ListStore::create (extensionColumns);
|
||||
@ -631,27 +631,27 @@ Gtk::Widget* Preferences::getFileBrowserPanel () {
|
||||
|
||||
fre->add (*vbre);
|
||||
|
||||
Gtk::Frame* frc = new Gtk::Frame (M("PREFERENCES_CACHEOPTS"));
|
||||
Gtk::VBox* vbc = new Gtk::VBox ();
|
||||
Gtk::Frame* frc = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CACHEOPTS")) );
|
||||
Gtk::VBox* vbc = Gtk::manage( new Gtk::VBox () );
|
||||
frc->add (*vbc);
|
||||
vbc->set_border_width (4);
|
||||
|
||||
Gtk::Label* cflab = new Gtk::Label (M("PREFERENCES_CACHETHUMBFORM")+":");
|
||||
cformat = new Gtk::ComboBoxText ();
|
||||
Gtk::Label* cflab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CACHETHUMBFORM")+":") );
|
||||
cformat = Gtk::manage( new Gtk::ComboBoxText () );
|
||||
cformat->set_size_request(50, -1);
|
||||
cformat->append_text (M("PREFERENCES_CACHEFORMAT1"));
|
||||
cformat->append_text (M("PREFERENCES_CACHEFORMAT2"));
|
||||
cformat->append_text (M("PREFERENCES_CACHEFORMAT1")+", 16 bit");
|
||||
cformat->signal_changed().connect( sigc::mem_fun(*this, &Preferences::cacheFormatComboChanged) );
|
||||
cacheFormatComboChanged(); // update the tooltip
|
||||
Gtk::HBox* hb2 = new Gtk::HBox ();
|
||||
Gtk::HBox* hb2 = Gtk::manage( new Gtk::HBox () );
|
||||
hb2->pack_start (*cflab, Gtk::PACK_SHRINK, 4);
|
||||
hb2->pack_start (*cformat);
|
||||
vbc->pack_start (*hb2, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
Gtk::HBox* hb3 = new Gtk::HBox ();
|
||||
Gtk::Label* chlab = new Gtk::Label (M("PREFERENCES_CACHETHUMBHEIGHT")+":");
|
||||
maxThumbSize = new Gtk::SpinButton ();
|
||||
Gtk::HBox* hb3 = Gtk::manage( new Gtk::HBox () );
|
||||
Gtk::Label* chlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CACHETHUMBHEIGHT")+":") );
|
||||
maxThumbSize = Gtk::manage( new Gtk::SpinButton () );
|
||||
hb3->pack_start (*chlab, Gtk::PACK_SHRINK, 4);
|
||||
hb3->pack_start (*maxThumbSize, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
@ -660,9 +660,9 @@ Gtk::Widget* Preferences::getFileBrowserPanel () {
|
||||
maxThumbSize->set_range (40, 400);
|
||||
vbc->pack_start (*hb3, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
Gtk::HBox* hb4 = new Gtk::HBox ();
|
||||
Gtk::Label* celab = new Gtk::Label (M("PREFERENCES_CACHEMAXENTRIES")+":");
|
||||
maxCacheEntries = new Gtk::SpinButton ();
|
||||
Gtk::HBox* hb4 = Gtk::manage( new Gtk::HBox () );
|
||||
Gtk::Label* celab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CACHEMAXENTRIES")+":") );
|
||||
maxCacheEntries = Gtk::manage( new Gtk::SpinButton () );
|
||||
hb4->pack_start (*celab, Gtk::PACK_SHRINK, 4);
|
||||
hb4->pack_start (*maxCacheEntries, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
@ -671,17 +671,17 @@ Gtk::Widget* Preferences::getFileBrowserPanel () {
|
||||
maxCacheEntries->set_range (10, 100000);
|
||||
vbc->pack_start (*hb4, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
Gtk::HBox* hb5 = new Gtk::HBox ();
|
||||
clearThumbnails = new Gtk::Button (M("PREFERENCES_CACHECLEARTHUMBS"));
|
||||
clearProfiles = new Gtk::Button (M("PREFERENCES_CACHECLEARPROFILES"));
|
||||
clearAll = new Gtk::Button (M("PREFERENCES_CACHECLEARALL"));
|
||||
Gtk::HBox* hb5 = Gtk::manage( new Gtk::HBox () );
|
||||
clearThumbnails = Gtk::manage( new Gtk::Button (M("PREFERENCES_CACHECLEARTHUMBS")) );
|
||||
clearProfiles = Gtk::manage( new Gtk::Button (M("PREFERENCES_CACHECLEARPROFILES")) );
|
||||
clearAll = Gtk::manage( new Gtk::Button (M("PREFERENCES_CACHECLEARALL")) );
|
||||
hb5->pack_start (*clearThumbnails, Gtk::PACK_SHRINK, 4);
|
||||
hb5->pack_start (*clearProfiles, Gtk::PACK_SHRINK, 4);
|
||||
hb5->pack_start (*clearAll, Gtk::PACK_SHRINK, 4);
|
||||
vbc->pack_start (*hb5, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
Gtk::HBox* hb6 = new Gtk::HBox ();
|
||||
Gtk::VBox* vb6 = new Gtk::VBox ();
|
||||
Gtk::HBox* hb6 = Gtk::manage( new Gtk::HBox () );
|
||||
Gtk::VBox* vb6 = Gtk::manage( new Gtk::VBox () );
|
||||
|
||||
vb6->pack_start (*fro);
|
||||
vb6->pack_end (*frc);
|
||||
|
||||
@ -53,7 +53,7 @@ RTWindow::RTWindow () {
|
||||
mainNB->set_scrollable (true);
|
||||
mainNB->signal_switch_page().connect_notify( sigc::mem_fun(*this, &RTWindow::on_mainNB_switch_page) );
|
||||
|
||||
fpanel = new FilePanel ();
|
||||
fpanel = Gtk::manage ( new FilePanel () );
|
||||
fpanel->setParent (this);
|
||||
|
||||
// decorate tab
|
||||
@ -62,7 +62,7 @@ RTWindow::RTWindow () {
|
||||
|
||||
Gtk::VBox* vbf = Gtk::manage (new Gtk::VBox ());
|
||||
vbf->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::DIRECTORY, Gtk::ICON_SIZE_MENU)));
|
||||
Gtk::Label* l=new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_FILEBROWSER"));
|
||||
Gtk::Label* l= Gtk::manage(new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_FILEBROWSER")));
|
||||
l->set_angle (90);
|
||||
vbf->pack_start (*l);
|
||||
vbf->set_spacing (2);
|
||||
@ -77,22 +77,22 @@ RTWindow::RTWindow () {
|
||||
mainNB->append_page (*fpanel, *hbf);
|
||||
}
|
||||
|
||||
bpanel = new BatchQueuePanel ();
|
||||
bpanel = Gtk::manage ( new BatchQueuePanel () );
|
||||
bpanel->setParent (this);
|
||||
|
||||
// decorate tab, the label is unimportant since its updated in batchqueuepanel anyway
|
||||
Gtk::Label* lbq = new Gtk::Label (M("MAIN_FRAME_BATCHQUEUE"));
|
||||
Gtk::Label* lbq = Gtk::manage ( new Gtk::Label (M("MAIN_FRAME_BATCHQUEUE")) );
|
||||
mainNB->append_page (*bpanel, *lbq);
|
||||
|
||||
// epanel is only for single tab mode
|
||||
epanel = new EditorPanel (fpanel);
|
||||
epanel = Gtk::manage ( new EditorPanel (fpanel) );
|
||||
epanel->setParent (this);
|
||||
|
||||
// decorate tab
|
||||
if (options.mainNBVertical) {
|
||||
Gtk::VBox* vbe = Gtk::manage (new Gtk::VBox ());
|
||||
vbe->pack_start (*Gtk::manage (new Gtk::Image (argv0+"/images/logoicon16.png")));
|
||||
Gtk::Label* l=new Gtk::Label( Glib::ustring(" ") + M("MAIN_FRAME_EDITOR") );
|
||||
Gtk::Label* l=Gtk::manage (new Gtk::Label( Glib::ustring(" ") + M("MAIN_FRAME_EDITOR") ));
|
||||
//l->set_markup(Glib::ustring("<b>Editor</b>")); Bold difficult to read
|
||||
l->set_angle (90);
|
||||
vbe->pack_start (*l);
|
||||
|
||||
@ -26,7 +26,7 @@ SaveAsDialog::SaveAsDialog (Glib::ustring initialDir) {
|
||||
|
||||
Gtk::VBox* vbox = get_vbox ();
|
||||
|
||||
fchooser = new Gtk::FileChooserWidget (Gtk::FILE_CHOOSER_ACTION_SAVE);
|
||||
fchooser = Gtk::manage( new Gtk::FileChooserWidget (Gtk::FILE_CHOOSER_ACTION_SAVE) );
|
||||
fchooser->set_current_folder (initialDir);
|
||||
|
||||
filter_jpg.set_name(M("SAVEDLG_JPGFILTER"));
|
||||
@ -40,35 +40,35 @@ SaveAsDialog::SaveAsDialog (Glib::ustring initialDir) {
|
||||
|
||||
vbox->pack_start (*fchooser);
|
||||
|
||||
Gtk::HSeparator* hsep1 = new Gtk::HSeparator ();
|
||||
Gtk::HSeparator* hsep1 = Gtk::manage( new Gtk::HSeparator () );
|
||||
vbox->pack_start (*hsep1, Gtk::PACK_SHRINK, 2);
|
||||
|
||||
// Unique filename option
|
||||
// ~~~~~~~~~~~~~~~~~~~~~~
|
||||
autoSuffix = new Gtk::CheckButton (M("SAVEDLG_AUTOSUFFIX"));
|
||||
autoSuffix = Gtk::manage( new Gtk::CheckButton (M("SAVEDLG_AUTOSUFFIX")) );
|
||||
autoSuffix->set_active(options.autoSuffix);
|
||||
|
||||
vbox->pack_start (*autoSuffix, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
Gtk::HSeparator* hsep2 = new Gtk::HSeparator ();
|
||||
Gtk::HSeparator* hsep2 = Gtk::manage( new Gtk::HSeparator () );
|
||||
vbox->pack_start (*hsep2, Gtk::PACK_SHRINK, 2);
|
||||
|
||||
// Output Options
|
||||
// ~~~~~~~~~~~~~~
|
||||
formatOpts = new SaveFormatPanel ();
|
||||
formatOpts = Gtk::manage( new SaveFormatPanel () );
|
||||
formatOpts->init (options.saveFormat);
|
||||
formatOpts->setListener (this);
|
||||
|
||||
vbox->pack_start (*formatOpts, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
Gtk::HSeparator* hsep3 = new Gtk::HSeparator ();
|
||||
Gtk::HSeparator* hsep3 = Gtk::manage( new Gtk::HSeparator () );
|
||||
vbox->pack_start (*hsep3, Gtk::PACK_SHRINK, 2);
|
||||
|
||||
// queue/immediate
|
||||
// ~~~~~~~~~~~~~
|
||||
immediately = new Gtk::RadioButton (M("SAVEDLG_SAVEIMMEDIATELY"));
|
||||
putToQueueHead = new Gtk::RadioButton (M("SAVEDLG_PUTTOQUEUEHEAD"));
|
||||
putToQueueTail = new Gtk::RadioButton (M("SAVEDLG_PUTTOQUEUETAIL"));
|
||||
immediately = Gtk::manage( new Gtk::RadioButton (M("SAVEDLG_SAVEIMMEDIATELY")) );
|
||||
putToQueueHead = Gtk::manage( new Gtk::RadioButton (M("SAVEDLG_PUTTOQUEUEHEAD")) );
|
||||
putToQueueTail = Gtk::manage( new Gtk::RadioButton (M("SAVEDLG_PUTTOQUEUETAIL")) );
|
||||
vbox->pack_start (*immediately, Gtk::PACK_SHRINK, 4);
|
||||
vbox->pack_start (*putToQueueHead, Gtk::PACK_SHRINK, 4);
|
||||
vbox->pack_start (*putToQueueTail, Gtk::PACK_SHRINK, 4);
|
||||
@ -79,11 +79,11 @@ SaveAsDialog::SaveAsDialog (Glib::ustring initialDir) {
|
||||
|
||||
// buttons
|
||||
// ~~~~~~
|
||||
Gtk::Button* ok = new Gtk::Button (M("GENERAL_OK"));
|
||||
Gtk::Button* cancel = new Gtk::Button (M("GENERAL_CANCEL"));
|
||||
Gtk::Button* ok = Gtk::manage( new Gtk::Button (M("GENERAL_OK")) );
|
||||
Gtk::Button* cancel = Gtk::manage( new Gtk::Button (M("GENERAL_CANCEL")) );
|
||||
|
||||
ok->set_image (*(new Gtk::Image (Gtk::StockID("gtk-ok"), Gtk::ICON_SIZE_BUTTON)));
|
||||
cancel->set_image (*(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON)));
|
||||
ok->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-ok"), Gtk::ICON_SIZE_BUTTON)));
|
||||
cancel->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON)));
|
||||
|
||||
ok->signal_clicked().connect( sigc::mem_fun(*this, &SaveAsDialog::okPressed) );
|
||||
cancel->signal_clicked().connect( sigc::mem_fun(*this, &SaveAsDialog::cancelPressed) );
|
||||
|
||||
@ -25,9 +25,9 @@ ThumbBrowserBase::ThumbBrowserBase ()
|
||||
inTabMode=false; // corresponding to take thumbSize
|
||||
inW = -1; inH = -1;
|
||||
|
||||
Gtk::HBox* hb1 = new Gtk::HBox ();
|
||||
Gtk::HBox* hb2 = new Gtk::HBox ();
|
||||
Gtk::Frame* frame = new Gtk::Frame ();
|
||||
Gtk::HBox* hb1 = Gtk::manage( new Gtk::HBox () );
|
||||
Gtk::HBox* hb2 = Gtk::manage( new Gtk::HBox () );
|
||||
Gtk::Frame* frame = Gtk::manage( new Gtk::Frame () );
|
||||
frame->add (internal);
|
||||
frame->set_shadow_type (Gtk::SHADOW_IN );
|
||||
hb1->pack_start (*frame);
|
||||
|
||||
@ -21,6 +21,15 @@
|
||||
|
||||
using namespace rtengine::procparams;
|
||||
|
||||
|
||||
class Frame2: public Gtk::Frame
|
||||
{
|
||||
Gtk::Container *pC;
|
||||
public:
|
||||
Frame2( Gtk::Container *p):pC(p){}
|
||||
~Frame2( ){ delete pC;}
|
||||
};
|
||||
|
||||
FoldableToolPanel::FoldableToolPanel(Gtk::Box* content) : ToolPanel(), parentContainer(NULL), exp(NULL) {
|
||||
|
||||
exp = Gtk::manage (new Gtk::Expander ());
|
||||
@ -28,7 +37,7 @@ FoldableToolPanel::FoldableToolPanel(Gtk::Box* content) : ToolPanel(), parentCon
|
||||
exp->set_use_markup (true);
|
||||
exp->signal_button_release_event().connect_notify( sigc::mem_fun(this, &FoldableToolPanel::foldThemAll) );
|
||||
|
||||
Gtk::Frame* pframe = Gtk::manage (new Gtk::Frame ());
|
||||
Frame2* pframe = Gtk::manage (new Frame2 (content));
|
||||
|
||||
pframe->set_name ("ToolPanel");
|
||||
|
||||
|
||||
@ -36,15 +36,15 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
|
||||
coarse = Gtk::manage (new CoarsePanel ());
|
||||
curve = Gtk::manage (new ToneCurve ());
|
||||
shadowshighlights = Gtk::manage (new ShadowsHighlights ());
|
||||
lumadenoise = Gtk::manage (new LumaDenoise ());
|
||||
colordenoise = Gtk::manage (new ColorDenoise ());
|
||||
//lumadenoise = Gtk::manage (new LumaDenoise ());
|
||||
//colordenoise = Gtk::manage (new ColorDenoise ());
|
||||
impulsedenoise = Gtk::manage (new ImpulseDenoise ());
|
||||
defringe = Gtk::manage (new Defringe ());
|
||||
dirpyrdenoise = Gtk::manage (new DirPyrDenoise ());
|
||||
sharpening = Gtk::manage (new Sharpening ());
|
||||
lcurve = Gtk::manage (new LCurve ());
|
||||
colorboost = Gtk::manage (new ColorBoost ());
|
||||
colorshift = Gtk::manage (new ColorShift ());
|
||||
//colorboost = Gtk::manage (new ColorBoost ());
|
||||
//colorshift = Gtk::manage (new ColorShift ());
|
||||
lensgeom = Gtk::manage (new LensGeometry ());
|
||||
distortion = Gtk::manage (new Distortion ());
|
||||
rotate = Gtk::manage (new Rotate ());
|
||||
@ -59,7 +59,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
|
||||
icm = Gtk::manage (new ICMPanel ());
|
||||
exifpanel = Gtk::manage (new ExifPanel ());
|
||||
iptcpanel = Gtk::manage (new IPTCPanel ());
|
||||
equalizer = Gtk::manage (new Equalizer ());
|
||||
//equalizer = Gtk::manage (new Equalizer ());
|
||||
dirpyrequalizer = Gtk::manage (new DirPyrEqualizer ());
|
||||
hsvequalizer = Gtk::manage (new HSVEqualizer ());
|
||||
rawprocess = Gtk::manage (new RawProcess ());
|
||||
|
||||
@ -83,23 +83,23 @@ class ToolPanelCoordinator : public ToolPanelListener,
|
||||
Distortion* distortion;
|
||||
PerspCorrection* perspective;
|
||||
CACorrection* cacorrection;
|
||||
ColorShift* colorshift;
|
||||
//ColorShift* colorshift;
|
||||
HLRecovery* hlrecovery;
|
||||
ChMixer* chmixer;
|
||||
ColorBoost* colorboost;
|
||||
//ColorBoost* colorboost;
|
||||
Resize* resize;
|
||||
ICMPanel* icm;
|
||||
Crop* crop;
|
||||
ToneCurve* curve;
|
||||
ShadowsHighlights* shadowshighlights;
|
||||
LumaDenoise* lumadenoise;
|
||||
ColorDenoise* colordenoise;
|
||||
//LumaDenoise* lumadenoise;
|
||||
//ColorDenoise* colordenoise;
|
||||
Defringe* defringe;
|
||||
ImpulseDenoise* impulsedenoise;
|
||||
DirPyrDenoise* dirpyrdenoise;
|
||||
Sharpening* sharpening;
|
||||
LCurve* lcurve;
|
||||
Equalizer * equalizer;
|
||||
//Equalizer * equalizer;
|
||||
DirPyrEqualizer * dirpyrequalizer;
|
||||
HSVEqualizer * hsvequalizer;
|
||||
RawProcess* rawprocess;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user