Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-07-10 21:42:28 +02:00
21 changed files with 7382 additions and 2388 deletions

View File

@@ -80,7 +80,7 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
edgesonly->set_active (false);
edgebox = new Gtk::VBox ();
eradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.5, 2.5, 0.1, 1.9));
etolerance = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDTOLERANCE"), 10, 10000, 100, 1000));
etolerance = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDTOLERANCE"), 10, 10000, 100, 1800));
usm->pack_start(*hsep6, Gtk::PACK_SHRINK, 2);
usm->pack_start(*edgesonly);
edgebox->pack_start(*eradius);