From 23086d3bcb90d68235dfd4b2f1365d87b6f6c4f0 Mon Sep 17 00:00:00 2001
From: mpv <mpv@opencascade.com>
Date: Fri, 22 Feb 2019 15:42:26 +0300
Subject: [PATCH] Make "Macro" menu be the last, not just after the Sketch.

---
 src/Config/plugins.xml.in                |  1 +
 src/SketchPlugin/CMakeLists.txt          |  1 +
 src/SketchPlugin/plugin-Sketch.xml       | 17 -----------------
 src/SketchPlugin/plugin-SketchDrawer.xml | 17 +++++++++++++++++
 4 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 src/SketchPlugin/plugin-SketchDrawer.xml

diff --git a/src/Config/plugins.xml.in b/src/Config/plugins.xml.in
index a86d9c178..7734d59d8 100644
--- a/src/Config/plugins.xml.in
+++ b/src/Config/plugins.xml.in
@@ -11,6 +11,7 @@
   <plugin library="CollectionPlugin" configuration="plugin-Collection.xml"/>
   <plugin library="ExchangePlugin" configuration="plugin-Exchange.xml"/>
   <plugin script="addons_Features" configuration="addons_Features.xml"/>
+  <plugin library="SketchPlugin" configuration="plugin-SketchDrawer.xml"/>
   <plugin script="ConnectorPlugin" configuration="plugin-Connector.xml" dependency="GEOM"/>
   <plugin library="ParametersPlugin" configuration="plugin-Parameters.xml"/>
 @DEFAULT_SOLVER@
diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt
index 66b34b901..787ce8770 100644
--- a/src/SketchPlugin/CMakeLists.txt
+++ b/src/SketchPlugin/CMakeLists.txt
@@ -125,6 +125,7 @@ SET(PROJECT_LIBRARIES
 
 SET(XML_RESOURCES
   plugin-Sketch.xml
+  plugin-SketchDrawer.xml
 )
 
 SET(TEXT_RESOURCES
diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 1042d1802..e44cc0171 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -1032,23 +1032,6 @@
         </sketch_shape_selector>
         <validator id="PartSet_CollinearSelection"/>
       </feature>
-
-    </group>
-
-  </workbench>
-  <workbench id="Macros" document="Part">
-    <group id="Samples">
-
-      <feature id="SketchDrawer" title="Sketch drawer" tooltip="Creates sketch using elements of selected shape belonging to selected plane"
-            icon="icons/Sketch/drawer.png"
-            helpfile="sketchDrawer.html">
-        <shape_selector id="base_shape" label="Shape:" tooltip="Select a shape for extraction to sketch."
-            shape_types="objects" concealment="false"/>
-        <shape_selector id="plane" label="Plane:" tooltip="Select plane for sketch" shape_types="face">
-          <validator id="GeomValidators_Face" parameters="plane"/>
-        </shape_selector>
-        <boolvalue id="add_dimensions" label="Create dimensions" default="true" tooltip="To add dimensions into created sketch" obligatory="0"/>
-      </feature>
     </group>
   </workbench>
 </plugin>
diff --git a/src/SketchPlugin/plugin-SketchDrawer.xml b/src/SketchPlugin/plugin-SketchDrawer.xml
new file mode 100644
index 000000000..44a6bf7a0
--- /dev/null
+++ b/src/SketchPlugin/plugin-SketchDrawer.xml
@@ -0,0 +1,17 @@
+<plugin>
+  <workbench id="Macros" document="Part">
+    <group id="Samples">
+
+      <feature id="SketchDrawer" title="Sketch drawer" tooltip="Creates sketch using elements of selected shape belonging to selected plane"
+            icon="icons/Sketch/drawer.png"
+            helpfile="sketchDrawer.html">
+        <shape_selector id="base_shape" label="Shape:" tooltip="Select a shape for extraction to sketch."
+            shape_types="objects" concealment="false"/>
+        <shape_selector id="plane" label="Plane:" tooltip="Select plane for sketch" shape_types="face">
+          <validator id="GeomValidators_Face" parameters="plane"/>
+        </shape_selector>
+        <boolvalue id="add_dimensions" label="Create dimensions" default="true" tooltip="To add dimensions into created sketch" obligatory="0"/>
+      </feature>
+    </group>
+  </workbench>
+</plugin>
-- 
2.39.2