summaryrefslogtreecommitdiffstats
path: root/src/widgets/toolbox.cpp
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@shlomifish.org>2017-01-06 14:35:01 +0000
committerShlomi Fish <shlomif@shlomifish.org>2017-01-06 14:35:01 +0000
commit40d1e4e26d9c3e61886b4e59ad12aca66a60fcfb (patch)
tree675e31291778de98da28471fe2d501a6dab7d5cb /src/widgets/toolbox.cpp
parentRemove an old comment which I don't understand. (diff)
parent[Bug #1651815] share/examples: rescale svgs to 96 dpi. (diff)
downloadinkscape-40d1e4e26d9c3e61886b4e59ad12aca66a60fcfb.tar.gz
inkscape-40d1e4e26d9c3e61886b4e59ad12aca66a60fcfb.zip
Merged.
(bzr r15369.1.15)
Diffstat (limited to 'src/widgets/toolbox.cpp')
-rw-r--r--src/widgets/toolbox.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 758a3125b..126eac9cd 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -362,8 +362,6 @@ static gchar const * ui_descr =
" <separator />"
" <toolitem action='MeasureScaleAction' />"
" <separator />"
- " <toolitem action='MeasureOffsetAction' />"
- " <separator />"
" <toolitem action='measure_units_label' />"
" <toolitem action='MeasureUnitsAction' />"
" <toolitem action='MeasureIgnore1stAndLast' />"
@@ -373,8 +371,9 @@ static gchar const * ui_descr =
" <toolitem action='MeasureReverse' />"
" <toolitem action='MeasureToPhantom' />"
" <toolitem action='MeasureToGuides' />"
- " <toolitem action='MeasureMarkDimension' />"
" <toolitem action='MeasureToItem' />"
+ " <toolitem action='MeasureMarkDimension' />"
+ " <toolitem action='MeasureOffsetAction' />"
" </toolbar>"
" <toolbar name='StarToolbar'>"