summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2011-11-04 19:26:44 +0000
committerJohan Engelen <goejendaagh@zonnet.nl>2011-11-04 19:26:44 +0000
commit3ea31b795fbba57e497f513bc4c66f6d6ad99e04 (patch)
tree2945f7c4ec6ddefb28cedd26b7a96f8d168c5c4c /src
parentmeasurement tool: display length info in white with transparent black backgro... (diff)
downloadinkscape-3ea31b795fbba57e497f513bc4c66f6d6ad99e04.tar.gz
inkscape-3ea31b795fbba57e497f513bc4c66f6d6ad99e04.zip
make significant digits consistent for grids
(bzr r10716)
Diffstat (limited to 'src')
-rw-r--r--src/display/canvas-axonomgrid.cpp6
-rw-r--r--src/display/canvas-grid.cpp8
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp7
3 files changed, 14 insertions, 7 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 3598c4e4e..4cb050b6e 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -379,13 +379,13 @@ _wr.setUpdating (true);
Inkscape::UI::Widget::RegisteredSuffixedInteger *_rsi = Gtk::manage( new Inkscape::UI::Widget::RegisteredSuffixedInteger(
_("_Major grid line every:"), "", _("lines"), "empspacing", _wr, repr, doc ) );
- _rsu_ox->setDigits(4);
+ _rsu_ox->setDigits(5);
_rsu_ox->setIncrements(0.1, 1.0);
- _rsu_oy->setDigits(4);
+ _rsu_oy->setDigits(5);
_rsu_oy->setIncrements(0.1, 1.0);
- _rsu_sy->setDigits(4);
+ _rsu_sy->setDigits(5);
_rsu_sy->setIncrements(0.1, 1.0);
_wr.setUpdating (false);
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index d9f6ddcf2..ee3b6fe5a 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -697,16 +697,16 @@ CanvasXYGrid::newSpecificWidget()
_wr.setUpdating (true);
- _rsu_ox->setDigits(4);
+ _rsu_ox->setDigits(5);
_rsu_ox->setIncrements(0.1, 1.0);
- _rsu_oy->setDigits(4);
+ _rsu_oy->setDigits(5);
_rsu_oy->setIncrements(0.1, 1.0);
- _rsu_sx->setDigits(4);
+ _rsu_sx->setDigits(5);
_rsu_sx->setIncrements(0.1, 1.0);
- _rsu_sy->setDigits(4);
+ _rsu_sy->setDigits(5);
_rsu_sy->setIncrements(0.1, 1.0);
Inkscape::UI::Widget::RegisteredCheckButton * _rcb_dotted = Gtk::manage(
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 448126091..6d28e8c88 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1049,10 +1049,14 @@ void InkscapePreferences::initPageGrids()
_grids_xy.add_line( false, _("Grid units:"), _grids_xy_units, "", "", false);
_grids_xy_origin_x.init("/options/grids/xy/origin_x", -10000.0, 10000.0, 0.1, 1.0, 0.0, false, false);
_grids_xy_origin_y.init("/options/grids/xy/origin_y", -10000.0, 10000.0, 0.1, 1.0, 0.0, false, false);
+ _grids_xy_origin_x.set_digits(5);
+ _grids_xy_origin_y.set_digits(5);
_grids_xy.add_line( false, _("Origin X:"), _grids_xy_origin_x, "", _("X coordinate of grid origin"), false);
_grids_xy.add_line( false, _("Origin Y:"), _grids_xy_origin_y, "", _("Y coordinate of grid origin"), false);
_grids_xy_spacing_x.init("/options/grids/xy/spacing_x", -10000.0, 10000.0, 0.1, 1.0, 1.0, false, false);
_grids_xy_spacing_y.init("/options/grids/xy/spacing_y", -10000.0, 10000.0, 0.1, 1.0, 1.0, false, false);
+ _grids_xy_spacing_x.set_digits(5);
+ _grids_xy_spacing_y.set_digits(5);
_grids_xy.add_line( false, _("Spacing X:"), _grids_xy_spacing_x, "", _("Distance between vertical grid lines"), false);
_grids_xy.add_line( false, _("Spacing Y:"), _grids_xy_spacing_y, "", _("Distance between horizontal grid lines"), false);
@@ -1070,9 +1074,12 @@ void InkscapePreferences::initPageGrids()
_grids_axonom.add_line( false, _("Grid units:"), _grids_axonom_units, "", "", false);
_grids_axonom_origin_x.init("/options/grids/axonom/origin_x", -10000.0, 10000.0, 0.1, 1.0, 0.0, false, false);
_grids_axonom_origin_y.init("/options/grids/axonom/origin_y", -10000.0, 10000.0, 0.1, 1.0, 0.0, false, false);
+ _grids_axonom_origin_x.set_digits(5);
+ _grids_axonom_origin_y.set_digits(5);
_grids_axonom.add_line( false, _("Origin X:"), _grids_axonom_origin_x, "", _("X coordinate of grid origin"), false);
_grids_axonom.add_line( false, _("Origin Y:"), _grids_axonom_origin_y, "", _("Y coordinate of grid origin"), false);
_grids_axonom_spacing_y.init("/options/grids/axonom/spacing_y", -10000.0, 10000.0, 0.1, 1.0, 1.0, false, false);
+ _grids_axonom_spacing_y.set_digits(5);
_grids_axonom.add_line( false, _("Spacing Y:"), _grids_axonom_spacing_y, "", _("Base length of z-axis"), false);
_grids_axonom_angle_x.init("/options/grids/axonom/angle_x", -360.0, 360.0, 1.0, 10.0, 30.0, false, false);
_grids_axonom_angle_z.init("/options/grids/axonom/angle_z", -360.0, 360.0, 1.0, 10.0, 30.0, false, false);