Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-12-18 17:49:03 +01:00
8 changed files with 6 additions and 15 deletions

View File

@@ -35,8 +35,6 @@ Defringe::Defringe () : FoldableToolPanel(this, "defringe", M("TP_DEFRINGE_LABEL
bottomMilestones.push_back( GradientMilestone(double(x), double(R), double(G), double(B)) );
}
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
curveEditorPF = new CurveEditorGroup (options.lastPFCurvesDir);
curveEditorPF->setCurveListener (this);
chshape = static_cast<FlatCurveEditor*>(curveEditorPF->addCurve(CT_Flat, M("TP_PFCURVE_CURVEEDITOR_CH")));

View File

@@ -69,8 +69,6 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
cbVBox->pack_start(*cdbox);
pack_start(*cbVBox);
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
Gtk::HBox * buttonBox1 = Gtk::manage (new Gtk::HBox(true, 10));
pack_start(*buttonBox1);

View File

@@ -25,8 +25,6 @@ using namespace rtengine::procparams;
Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENING_LABEL"), true, true)
{
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
hb->show ();
Gtk::Label* ml = Gtk::manage (new Gtk::Label (M("TP_SHARPENING_METHOD") + ":"));

View File

@@ -28,8 +28,6 @@ using namespace rtengine::procparams;
SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SHARPENMICRO_LABEL"), true, true)
{
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
amount = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"), 0, 100, 1, 20));
amount->setAdjusterListener (this);