Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-09-27 23:41:41 +02:00
55 changed files with 945 additions and 844 deletions

View File

@@ -212,21 +212,21 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
methodmedconn = methodmed->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrDenoise::methodmedChanged) );
rgbmethod = Gtk::manage (new MyComboBoxText ());
rgbmethod->append (M("TP_DIRPYRDENOISE_SOFT"));
rgbmethod->append (M("TP_DIRPYRDENOISE_33"));
rgbmethod->append (M("TP_DIRPYRDENOISE_55SOFT"));
rgbmethod->append (M("TP_DIRPYRDENOISE_3X3_SOFT"));
rgbmethod->append (M("TP_DIRPYRDENOISE_3X3"));
rgbmethod->append (M("TP_DIRPYRDENOISE_5X5_SOFT"));
rgbmethod->set_active (0);
rgbmethod->set_tooltip_text (M("TP_DIRPYRDENOISE_MET_TOOLTIP"));
rgbmethodconn = rgbmethod->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrDenoise::rgbmethodChanged) );
medmethod = Gtk::manage (new MyComboBoxText ());
medmethod->append (M("TP_DIRPYRDENOISE_SOFT"));
medmethod->append (M("TP_DIRPYRDENOISE_33"));
medmethod->append (M("TP_DIRPYRDENOISE_55SOFT"));
medmethod->append (M("TP_DIRPYRDENOISE_55"));
medmethod->append (M("TP_DIRPYRDENOISE_77"));
medmethod->append (M("TP_DIRPYRDENOISE_99"));
medmethod->append (M("TP_DIRPYRDENOISE_3X3_SOFT"));
medmethod->append (M("TP_DIRPYRDENOISE_3X3"));
medmethod->append (M("TP_DIRPYRDENOISE_5X5_SOFT"));
medmethod->append (M("TP_DIRPYRDENOISE_5X5"));
medmethod->append (M("TP_DIRPYRDENOISE_7X7"));
medmethod->append (M("TP_DIRPYRDENOISE_9X9"));
medmethod->set_active (0);
medmethod->set_tooltip_text (M("TP_DIRPYRDENOISE_MET_TOOLTIP"));
medmethodconn = medmethod->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrDenoise::medmethodChanged) );