From ba9240a3f2a690e35477f3b1278bdd200cff1ef7 Mon Sep 17 00:00:00 2001
From: Max Wilfinger <max@wilfinger.de>
Date: Sun, 5 May 2024 14:10:10 +0200
Subject: [PATCH] Update Part Design toolbars. Command group for datum. Removed
 ShapeBinder. Added CheckGeometry.

---
 src/Mod/PartDesign/Gui/Command.cpp   | 61 ++++++++++++++++++++++++++++
 src/Mod/PartDesign/Gui/Workbench.cpp | 43 ++++++++++----------
 2 files changed, 83 insertions(+), 21 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index 862f2a4825..345531c578 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -2394,6 +2394,65 @@ bool CmdPartDesignBoolean::isActive()
         return false;
 }
 
+// Command group for datums =============================================
+
+class CmdPartDesignCompDatums: public Gui::GroupCommand
+{
+public:
+    CmdPartDesignCompDatums()
+        : GroupCommand("PartDesign_CompDatums")
+    {
+        sAppModule = "PartDesign";
+        sGroup = "PartDesign";
+        sMenuText = QT_TR_NOOP("Create datum");
+        sToolTipText = QT_TR_NOOP("Create a datum object or local coordinate system");
+        sWhatsThis = "PartDesign_CompDatums";
+        sStatusTip = sToolTipText;
+        eType = ForEdit;
+
+        setCheckable(false);
+
+        addCommand("PartDesign_Plane");
+        addCommand("PartDesign_Line");
+        addCommand("PartDesign_Point");
+        addCommand("PartDesign_CoordinateSystem");
+    }
+
+    const char* className() const override
+    {
+        return "CmdPartDesignCompDatums";
+    }
+};
+
+// Command group for datums =============================================
+
+class CmdPartDesignCompSketches: public Gui::GroupCommand
+{
+public:
+    CmdPartDesignCompSketches()
+        : GroupCommand("PartDesign_CompSketches")
+    {
+        sAppModule = "PartDesign";
+        sGroup = "PartDesign";
+        sMenuText = QT_TR_NOOP("Create datum");
+        sToolTipText = QT_TR_NOOP("Create a datum object or local coordinate system");
+        sWhatsThis = "PartDesign_CompDatums";
+        sStatusTip = sToolTipText;
+        eType = ForEdit;
+
+        setCheckable(false);
+        setRememberLast(false);
+
+        addCommand("PartDesign_NewSketch");
+        addCommand("Sketcher_MapSketch");
+        addCommand("Sketcher_EditSketch");
+    }
+
+    const char* className() const override
+    {
+        return "CmdPartDesignCompSketches";
+    }
+};
 
 //===========================================================================
 // Initialization
@@ -2437,4 +2496,6 @@ void CreatePartDesignCommands()
     rcCmdMgr.addCommand(new CmdPartDesignMultiTransform());
 
     rcCmdMgr.addCommand(new CmdPartDesignBoolean());
+    rcCmdMgr.addCommand(new CmdPartDesignCompDatums());
+    rcCmdMgr.addCommand(new CmdPartDesignCompSketches());
 }
diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index 539f856705..74e1f24d54 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -551,7 +551,6 @@ Gui::MenuItem* Workbench::setupMenuBar() const
           << "Separator"
           << datums
           << "PartDesign_CoordinateSystem"
-          << "PartDesign_ShapeBinder"
           << "PartDesign_SubShapeBinder"
           << "PartDesign_Clone"
           << "Separator"
@@ -567,6 +566,8 @@ Gui::MenuItem* Workbench::setupMenuBar() const
           << "Separator"
           << "PartDesign_Boolean"
           << "Separator"
+          << "Part_CheckGeometry"
+          << "Separator"
           << "PartDesign_Migrate"
           << "PartDesign_Sprocket";
 
@@ -604,18 +605,12 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
     part->setCommand("Part Design Helper");
 
     *part << "PartDesign_Body"
-          << "PartDesign_NewSketch"
-          << "Sketcher_EditSketch"
-          << "Sketcher_MapSketch"
+          << "PartDesign_CompSketches"
           << "Sketcher_ValidateSketch"
-          << "Separator"
-          << "PartDesign_Point"
-          << "PartDesign_Line"
-          << "PartDesign_Plane"
-          << "PartDesign_CoordinateSystem"
-          << "PartDesign_ShapeBinder"
+          << "Part_CheckGeometry"
           << "PartDesign_SubShapeBinder"
-          << "PartDesign_Clone";
+          << "PartDesign_Clone"
+          << "PartDesign_CompDatums";
 
     part = new Gui::ToolBarItem(root);
     part->setCommand("Part Design Modeling");
@@ -635,18 +630,24 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
           << "PartDesign_SubtractiveHelix"
           << "PartDesign_CompPrimitiveSubtractive"
           << "Separator"
-          << "PartDesign_Mirrored"
-          << "PartDesign_LinearPattern"
-          << "PartDesign_PolarPattern"
-//          << "PartDesign_Scaled"
-          << "PartDesign_MultiTransform"
-          << "Separator"
-          << "PartDesign_Fillet"
+          << "PartDesign_Boolean";
+
+    part = new Gui::ToolBarItem(root);
+
+    part->setCommand("Part Design Dressup");
+    *part << "PartDesign_Fillet"
           << "PartDesign_Chamfer"
           << "PartDesign_Draft"
-          << "PartDesign_Thickness"
-          << "Separator"
-          << "PartDesign_Boolean";
+          << "PartDesign_Thickness";
+
+    part = new Gui::ToolBarItem(root);
+    part->setCommand("Part Design Patterns");
+
+    *part << "PartDesign_Mirrored"
+          << "PartDesign_LinearPattern"
+          << "PartDesign_PolarPattern"
+          // << "PartDesign_Scaled"
+          << "PartDesign_MultiTransform";
 
     return root;
 }