From 54dcba355d650c72c845711e0c857734f8d5d5b6 Mon Sep 17 00:00:00 2001
From: Geoff Lankow <geoff@darktrojan.net>
Date: Sat, 18 Nov 2017 17:22:01 +1300
Subject: Add arc radius to toolbar

---
 share/ui/select-toolbar.ui | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'share')

diff --git a/share/ui/select-toolbar.ui b/share/ui/select-toolbar.ui
index 122c52a2c..fbbcdb350 100644
--- a/share/ui/select-toolbar.ui
+++ b/share/ui/select-toolbar.ui
@@ -248,6 +248,10 @@
   <toolbar name='ArcToolbar'>
     <toolitem action='ArcStateAction' />
     <separator />
+    <toolitem action='ArcRadiusXAction' />
+    <toolitem action='ArcRadiusYAction' />
+    <toolitem action='ArcUnitsAction' />
+    <separator />
     <toolitem action='ArcStartAction' />
     <toolitem action='ArcEndAction' />
     <separator />
-- 
cgit v1.2.3


From 95e9863f25766387460b8d260de0c4bd30eade4b Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Tue, 5 Dec 2017 04:02:34 +0100
Subject: Toolbar: Some minor consistency fixes

Drop some unnecessary separators add a few new ones
---
 share/ui/select-toolbar.ui | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'share')

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' />
-- 
cgit v1.2.3


From 9cff10a53a3e0c404e5b5b7a56542360532b96c7 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Wed, 6 Dec 2017 19:36:55 +0100
Subject: Fix bug 1692377 -

---
 share/ui/select-toolbar.ui | 2 --
 1 file changed, 2 deletions(-)

(limited to 'share')

diff --git a/share/ui/select-toolbar.ui b/share/ui/select-toolbar.ui
index f3e8400b1..d265a9027 100644
--- a/share/ui/select-toolbar.ui
+++ b/share/ui/select-toolbar.ui
@@ -213,8 +213,6 @@
     <toolitem action='PencilLpeSimplify' />
     <toolitem action='PencilLpeSimplifyFlatten' />
     <separator />
-    <toolitem action='PencilResetAction' />
-    <separator />
     <toolitem action='SetPencilShapeAction'/>
   </toolbar>
 
-- 
cgit v1.2.3