From 37c049d35bd98ea9791513bb306beb00e3bd2ae6 Mon Sep 17 00:00:00 2001 From: dvlierop2 Date: Mon, 17 Dec 2007 21:54:20 +0000 Subject: [PATCH] Renaming captions and labels in snapping preferences dialog, and inverting the behaviour of the 'snap at any distance' checkbox --- src/ui/dialog/document-properties.cpp | 16 ++++++++-------- src/ui/widget/tolerance-slider.cpp | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 4fc01cc8f..70e6a9ecc 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -255,7 +255,7 @@ DocumentProperties::build_snap() _page_snap.show(); //General options _rcbsg.init (_("Enable snapping"), - _("When disabled, nothing will snap"), + _("Toggle snapping on or off"), "inkscape:snap-global", _wr); _rcbsnbb.init (_("_Bounding box corners"), _("Snap bounding box corners to grid lines, to guides, and to other bounding boxes (Snapping of bounding boxes is only available in the selector tool)"), @@ -278,21 +278,21 @@ DocumentProperties::build_snap() _("Snap bounding box corners and guides to bounding box edges"), "inkscape:bbox-paths", _wr); - _rsu_sno.init (_("Snap _distance"), _("Snap at any d_istance"), + _rsu_sno.init (_("Snap _distance"), _("Snap at specified d_istance"), _("Snapping distance, in screen pixels, for snapping to objects"), - _("If set, objects snap to the nearest object, regardless of distance"), + _("If set, objects only snap to another object when it's within the range specified below"), "objecttolerance", _wr); //Options for snapping to grids - _rsu_sn.init (_("Snap di_stance"), _("Snap at any dis_tance"), + _rsu_sn.init (_("Snap di_stance"), _("Snap at specified dis_tance"), _("Snapping distance, in screen pixels, for snapping to grid"), - _("If set, objects snap to the nearest grid line, regardless of distance"), + _("If set, objects only snap to a grid line when it's within the range specified below"), "gridtolerance", _wr); //Options for snapping to guides - _rsu_gusn.init (_("Snap dist_ance"), _("Snap at any distan_ce"), + _rsu_gusn.init (_("Snap dist_ance"), _("Snap at specified distan_ce"), _("Snapping distance, in screen pixels, for snapping to guides"), - _("If set, objects snap to the nearest guide, regardless of distance"), + _("If set, objects only snap to a guide when it's within the range specified below"), "guidetolerance", _wr); //Other options to locate here: e.g. visual snapping indicators on/off @@ -314,7 +314,7 @@ DocumentProperties::build_snap() _rcbsg.setSlaveButton(slaves); Gtk::Label *label_g = manage (new Gtk::Label); - label_g->set_markup (_("Global snapping toggle")); + label_g->set_markup (_("Snapping")); Gtk::Label *label_w = manage (new Gtk::Label); label_w->set_markup (_("What snaps")); Gtk::Label *label_o = manage (new Gtk::Label); diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp index d89d4cf5c..4db82d880 100644 --- a/src/ui/widget/tolerance-slider.cpp +++ b/src/ui/widget/tolerance-slider.cpp @@ -113,13 +113,13 @@ ToleranceSlider::setValue (double val) if (val > 9999.9) // magic value 10000.0 { - _button->set_active (true); + _button->set_active (false); _hbox->set_sensitive (false); val = 50.0; } else { - _button->set_active (false); + _button->set_active (true); _hbox->set_sensitive (true); } _hscale->set_value (val); @@ -142,7 +142,7 @@ ToleranceSlider::on_scale_changed() void ToleranceSlider::on_toggled() { - if (_button->get_active()) + if (!_button->get_active()) { _old_val = _hscale->get_value(); _hbox->set_sensitive (false); -- 2.30.2