Issue #1303 Re-ordering of Sketcher menus: Geometry linear, Geometry circular

diff --git a/src/PythonAddons/macros/rectangle/widget.xml b/src/PythonAddons/macros/rectangle/widget.xml
index 8bdf5010d6ff94be4838123104ed4b62d178423f..e21dbda1b6139c7f44923382bb1925f60ee2162d 100644 (file)
--- a/src/PythonAddons/macros/rectangle/widget.xml
+++ b/src/PythonAddons/macros/rectangle/widget.xml
@@ -1,6 +1,6 @@
 <source>
   <workbench id="Sketch">
-    <group id="Geometry">
+    <group id="Linear geometry">
 
       <!-- SketchRectangle (python feature) -->
       <feature

diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index 78cdcb08d1b3bb7044b7a6bb3bb924ad8c2b4936..cb1deb39284170aa3484d300ebcb5060e3590d92 100644 (file)
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -454,9 +454,11 @@ QAction* SHAPERGUI::addFeatureOfNested(const QString& theWBName,
 
   int aWBMenu = createMenu(theWBName, -1, -1, 50);
   int aItemId = createMenu(anAction, aWBMenu);
+  createMenu(separator(), aWBMenu); /// nested action is always separated of others
 
   int aWBTool = createTool(theWBName, theWBName);
   int aToolId = createTool(anAction, aWBTool);
+  createTool(separator(), aWBTool); /// nested action is always separated of others
 
   return anAction;
 }

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index f30753752e7a224eeaf9fb939e2df47170dce4e9..592f7503def0a01bf4435b921a30bf7787fce94b 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -2,7 +2,7 @@
 
 <plugin>
   <workbench id="Sketch">
-    <group id="Geometry">
+    <group id="Linear geometry">
       <feature
         id="Sketch"
         nested="SketchPoint SketchIntersectionPoint SketchLine SketchCircle SketchArc SketchRectangle SketchProjection SketchConstraintLength SketchConstraintRadius SketchConstraintDistance SketchConstraintParallel SketchConstraintPerpendicular SketchConstraintRigid SketchConstraintHorizontal SketchConstraintVertical SketchConstraintEqual SketchConstraintTangent SketchConstraintFillet SketchConstraintCoincidence SketchConstraintMirror SketchConstraintAngle SketchMultiRotation SketchMultiTranslation SketchConstraintCollinear SketchConstraintMiddle"
@@ -31,7 +31,8 @@
         <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
         <validator id="GeomValidators_Different" parameters="StartPoint,EndPoint"/>
       </feature>
-
+    </group>
+    <group id="Circular geometry">
       <!-- SketchCircle -->
       <feature 
         id="SketchCircle"