Merge branch 'dev' into favorites-gui
This commit is contained in:
@@ -272,7 +272,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, TOOL_NAME, M ("TP
|
||||
genVBox->pack_start (*catHBox, Gtk::PACK_SHRINK);
|
||||
|
||||
presetcat02 = Gtk::manage (new Gtk::CheckButton (M ("TP_COLORAPP_PRESETCAT02")));
|
||||
presetcat02->set_tooltip_markup (M("TP_COLORAPP_PRESETCAT02_TIP"));
|
||||
presetcat02->set_tooltip_markup (M("TP_COLORAPP_PRESETCAT02_TOOLTIP"));
|
||||
presetcat02conn = presetcat02->signal_toggled().connect( sigc::mem_fun(*this, &ColorAppearance::presetcat02pressed));
|
||||
// genVBox->pack_start (*presetcat02, Gtk::PACK_SHRINK);
|
||||
|
||||
@@ -720,7 +720,6 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, TOOL_NAME, M ("TP
|
||||
|
||||
|
||||
gamut = Gtk::manage (new Gtk::CheckButton (M ("TP_COLORAPP_GAMUT")));
|
||||
gamut->set_tooltip_markup (M ("TP_COLORAPP_GAMUT_TOOLTIP"));
|
||||
gamutconn = gamut->signal_toggled().connect ( sigc::mem_fun (*this, &ColorAppearance::gamut_toggled) );
|
||||
pack_start (*gamut, Gtk::PACK_SHRINK);
|
||||
|
||||
@@ -747,7 +746,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, TOOL_NAME, M ("TP
|
||||
RTImage *resetImg = Gtk::manage (new RTImage ("undo-small.png", "redo-small.png"));
|
||||
setExpandAlignProperties (resetImg, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
|
||||
neutral->set_image (*resetImg);
|
||||
neutral->set_tooltip_text (M ("TP_COLORAPP_NEUTRAL_TIP"));
|
||||
neutral->set_tooltip_text (M ("TP_COLORAPP_NEUTRAL_TOOLTIP"));
|
||||
neutralconn = neutral->signal_pressed().connect ( sigc::mem_fun (*this, &ColorAppearance::neutral_pressed) );
|
||||
neutral->show();
|
||||
|
||||
|
Reference in New Issue
Block a user