remove second label from ToleranceSlider, fixes #1407428

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 3d241d6714b6e8cba849cf5364be9710dabd4ff4..3c59e77af7d34df7b00b96fefb76ab4549d6b167 100644 (file)
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -292,7 +292,7 @@ DocumentProperties::build_snap()
     _rcbsnon.init (_("Snap to object _nodes"), 
                 _("Snap to other object nodes"), 
                 "inkscape:object-nodes", _wr);
-    _rsu_sno.init (_("Snap s_ensitivity:"), _(""),
+    _rsu_sno.init (_("Snap s_ensitivity:"), 
                   _("Controls max. snapping distance from object"),
                   "objecttolerance", _wr);
     _rcbsnbb.init (_("Snap _bounding boxes to grid"), 
@@ -301,7 +301,7 @@ DocumentProperties::build_snap()
     _rcbsnnod.init (_("Snap nodes to _grid"), 
                 _("Snap path nodes, text baselines, ellipse centers, etc."), 
                 "inkscape:grid-points", _wr);
-    _rsu_sn.init (_("Snap sens_itivity:"),  _(""),
+    _rsu_sn.init (_("Snap sens_itivity:"), 
                   _("Controls max. snapping distance from grid"),
                   "gridtolerance", _wr);
     _rcb_snpgui.init (_("Snap bounding boxes to g_uides"),  
@@ -310,7 +310,7 @@ DocumentProperties::build_snap()
     _rcb_snbgui.init (_("Snap p_oints to guides"), 
                 _("Snap path nodes, text baselines, ellipse centers, etc."), 
                 "inkscape:guide-points", _wr);
-    _rsu_gusn.init (_("Snap sensiti_vity:"), _(""), 
+    _rsu_gusn.init (_("Snap sensiti_vity:"), 
                 _("Controls max. snapping distance from guides"), "guidetolerance", _wr);
     _rrb_pix.init (_("Sensitivity:"), _("S_creen pixels"), _("p_x units"),
                 _("Sensitivity is always the same, regardless of zoom."),

diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 88e6915ae817f8b172aaa98fd04f031981247423..12127d06c8be56644cd523204a3c71d239dea65a 100644 (file)
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -54,7 +54,7 @@ ToleranceSlider::~ToleranceSlider()
 }
 
 void
-ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& label2, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr)
+ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr)
 {
     _hbox = new Gtk::HBox;
     Gtk::Label *theLabel1 = manage (new Gtk::Label (label1));
@@ -66,8 +66,8 @@ ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& label2,
     _hscale->set_value_pos (Gtk::POS_RIGHT);
     _hscale->set_size_request (100, -1);
     _hbox->add (*_hscale);
-    Gtk::Label *theLabel2 = manage (new Gtk::Label (label2));
-    _hbox->add (*theLabel2);
+//    Gtk::Label *theLabel2 = manage (new Gtk::Label (label2));
+//    _hbox->add (*theLabel2);
     _key = key;
     _scale_changed_connection = _hscale->signal_value_changed().connect (sigc::mem_fun (*this, &ToleranceSlider::update));
     _wr = ≀

diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h
index 2eeacb403d578636aba47a86bde27a89ae5728d3..92239265d0dfa477582f7acb4d347cb1f474975f 100644 (file)
--- a/src/ui/widget/tolerance-slider.h
+++ b/src/ui/widget/tolerance-slider.h
@@ -25,7 +25,7 @@ public:
     ToleranceSlider();
     ~ToleranceSlider();
     void init (const Glib::ustring& label1, 
-            const Glib::ustring& label2, 
+//            const Glib::ustring& label2, 
             const Glib::ustring& tip, 
             const Glib::ustring& key, 
             Registry& wr);