Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2017-01-06 20:12:12 +01:00
38 changed files with 1117 additions and 968 deletions

View File

@@ -145,8 +145,8 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
// blend cms matrix no longer used
//iVBox->pack_start (*ckbBlendCMSMatrix, Gtk::PACK_SHRINK, 2);
saveRef = Gtk::manage (new Gtk::Button ()); // M("TP_ICM_SAVEREFERENCE")
saveRef->set_image (*Gtk::manage (new RTImage ("gtk-save-large.png")));
saveRef = Gtk::manage (new Gtk::Button (M("TP_ICM_SAVEREFERENCE")));
saveRef->set_alignment (0.5f, 0.5f);
saveRef->set_tooltip_markup (M("TP_ICM_SAVEREFERENCE_TOOLTIP"));
iVBox->pack_start (*saveRef, Gtk::PACK_SHRINK);