summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-12-05 12:48:06 +0000
committerJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-12-05 12:48:06 +0000
commitc0a73d338290a417a79005a296d8975e12429fb2 (patch)
treef9dd2c315a4e42fd615aa60e1562dc434c78af5b /share
parentAdd fix to problem switching pen tool modes (diff)
parentAttemp to fix compile bug (diff)
downloadinkscape-c0a73d338290a417a79005a296d8975e12429fb2.tar.gz
inkscape-c0a73d338290a417a79005a296d8975e12429fb2.zip
Merge branch 'master' into pen-tool-mode-fixes
Diffstat (limited to 'share')
-rw-r--r--share/ui/select-toolbar.ui13
1 files changed, 3 insertions, 10 deletions
diff --git a/share/ui/select-toolbar.ui b/share/ui/select-toolbar.ui
index 1a4750f66..f3e8400b1 100644
--- a/share/ui/select-toolbar.ui
+++ b/share/ui/select-toolbar.ui
@@ -71,7 +71,6 @@
<toolbar name='TweakToolbar'>
<toolitem action='TweakWidthAction' />
- <separator />
<toolitem action='TweakForceAction' />
<toolitem action='TweakPressureAction' />
<separator />
@@ -133,18 +132,17 @@
<toolbar name='MeasureToolbar'>
<toolitem action='MeasureFontSizeAction' />
- <separator />
<toolitem action='MeasurePrecisionAction' />
- <separator />
<toolitem action='MeasureScaleAction' />
- <separator />
<toolitem action='measure_units_label' />
<toolitem action='MeasureUnitsAction' />
+ <separator />
<toolitem action='MeasureOnlySelected' />
<toolitem action='MeasureIgnore1stAndLast' />
<toolitem action='MeasureInBettween' />
<toolitem action='MeasureShowHidden' />
<toolitem action='MeasureAllLayers' />
+ <separator />
<toolitem action='MeasureReverse' />
<toolitem action='MeasureToPhantom' />
<toolitem action='MeasureToGuides' />
@@ -154,9 +152,7 @@
</toolbar>
<toolbar name='StarToolbar'>
- <separator />
<toolitem action='StarStateAction' />
- <separator />
<toolitem action='FlatAction' />
<separator />
<toolitem action='MagnitudeAction' />
@@ -181,10 +177,8 @@
<toolbar name='3DBoxToolbar'>
<toolitem action='3DBoxAngleXAction' />
<toolitem action='3DBoxVPXStateAction' />
- <separator />
<toolitem action='3DBoxAngleYAction' />
<toolitem action='3DBoxVPYStateAction' />
- <separator />
<toolitem action='3DBoxAngleZAction' />
<toolitem action='3DBoxVPZStateAction' />
</toolbar>
@@ -248,7 +242,6 @@
<toolbar name='ArcToolbar'>
<toolitem action='ArcStateAction' />
- <separator />
<toolitem action='ArcRadiusXAction' />
<toolitem action='ArcRadiusYAction' />
<toolitem action='ArcUnitsAction' />
@@ -264,7 +257,6 @@
<toolbar name='PaintbucketToolbar'>
<toolitem action='ChannelsAction' />
- <separator />
<toolitem action='ThresholdAction' />
<separator />
<toolitem action='OffsetAction' />
@@ -383,6 +375,7 @@
<toolitem action='ConnectorAvoidAction' />
<toolitem action='ConnectorIgnoreAction' />
<toolitem action='ConnectorOrthogonalAction' />
+ <separator />
<toolitem action='ConnectorCurvatureAction' />
<toolitem action='ConnectorSpacingAction' />
<toolitem action='ConnectorGraphAction' />