From 64bc7e355fe8375f5491c41da74bb1bc6fe3fe01 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Fri, 17 May 2024 12:14:46 +0200
Subject: [PATCH] BIM: Reworked menus and toolbars

---
 src/Mod/BIM/InitGui.py | 50 ++++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/Mod/BIM/InitGui.py b/src/Mod/BIM/InitGui.py
index fb4826b26f..2bc9e561f5 100644
--- a/src/Mod/BIM/InitGui.py
+++ b/src/Mod/BIM/InitGui.py
@@ -88,7 +88,6 @@ class BIMWorkbench(Workbench):
         ]
 
         self.annotationtools = [
-            #"BIM_ImagePlane",
             "BIM_Text",
             "Draft_ShapeString",
             "BIM_DimensionAligned",
@@ -128,6 +127,7 @@ class BIMWorkbench(Workbench):
             "Arch_Frame",
             "Arch_Fence",
             "Arch_Truss",
+            "Arch_Equipment",
             "Arch_Rebar",
         ]
         
@@ -141,12 +141,15 @@ class BIMWorkbench(Workbench):
             "Arch_Reference",
         ]
 
-        self.modify = [
+        self.modify_gen = [
             "Draft_Move",
             "BIM_Copy",
             "Draft_Rotate",
             "BIM_Clone",
-            "BIM_Unclone",
+            "BIM_SimpleCopy",
+            "BIM_Compound",
+        ]
+        self.modify_2d = [
             "Draft_Offset",
             "BIM_Offset2D",
             "Draft_Trimex",
@@ -154,27 +157,30 @@ class BIMWorkbench(Workbench):
             "Draft_Split",
             "Draft_Scale",
             "Draft_Stretch",
-            "BIM_Rewire",
-            "BIM_Glue",
+            "Draft_Draft2Sketch",
+        ]
+        self.modify_obj = [
             "Draft_Upgrade",
             "Draft_Downgrade",
-            "Draft_Draft2Sketch",
-            "Arch_CutPlane",
             "Arch_Add",
             "Arch_Remove",
-            "BIM_Reextrude",
+        ]
+        self.modify_3d = [
             "Draft_OrthoArray",
             "Draft_PathArray",
+            "Draft_CircularArray",
             "Draft_PointArray",
+            "Arch_CutPlane",
             "Draft_Mirror",
             "BIM_Extrude",
             "BIM_Cut",
             "BIM_Fuse",
             "BIM_Common",
-            "BIM_Compound",
-            "BIM_SimpleCopy",
         ]
 
+        sep = ["Separator"]
+        self.modify = self.modify_gen + sep + self.modify_2d + sep + self.modify_obj + sep + self.modify_3d
+
         self.manage = [
             "BIM_Setup",
             "BIM_Views",
@@ -211,6 +217,12 @@ class BIMWorkbench(Workbench):
             "Arch_Survey",
             "BIM_Diff",
             "BIM_IfcExplorer",
+            "BIM_ImagePlane",
+            "BIM_Unclone",
+            "BIM_Rewire",
+            "BIM_Glue",
+            "BIM_Reextrude",
+            "BIM_PanelTools"
         ]
 
         nudge = [
@@ -390,13 +402,19 @@ class BIMWorkbench(Workbench):
         t2 = QT_TRANSLATE_NOOP("Workbench", "Draft snap")
         t3 = QT_TRANSLATE_NOOP("Workbench", "3D/BIM tools")
         t4 = QT_TRANSLATE_NOOP("Workbench", "Annotation tools")
-        t5 = QT_TRANSLATE_NOOP("Workbench", "Modification tools")
+        t5 = QT_TRANSLATE_NOOP("Workbench", "2D modification tools")
         t6 = QT_TRANSLATE_NOOP("Workbench", "Manage tools")
+        t7 = QT_TRANSLATE_NOOP("Workbench", "General modification tools")
+        t8 = QT_TRANSLATE_NOOP("Workbench", "Object modification tools")
+        t9 = QT_TRANSLATE_NOOP("Workbench", "3D modification tools")
         self.appendToolbar(t1, self.draftingtools)
         self.appendToolbar(t2, self.snapbar)
         self.appendToolbar(t3, self.bimtools)
         self.appendToolbar(t4, self.annotationtools)
-        self.appendToolbar(t5, self.modify)
+        self.appendToolbar(t7, self.modify_gen)
+        self.appendToolbar(t5, self.modify_2d)
+        self.appendToolbar(t8, self.modify_obj)
+        self.appendToolbar(t9, self.modify_3d)
         self.appendToolbar(t6, self.manage)
 
         # create menus
@@ -408,7 +426,7 @@ class BIMWorkbench(Workbench):
         t5 =  QT_TRANSLATE_NOOP("Workbench", "&Snapping")
         t6 =  QT_TRANSLATE_NOOP("Workbench", "&Modify")
         t7 =  QT_TRANSLATE_NOOP("Workbench", "&Manage")
-        t8 =  QT_TRANSLATE_NOOP("Workbench", "&IFC")
+        #t8 =  QT_TRANSLATE_NOOP("Workbench", "&IFC")
         t9 =  QT_TRANSLATE_NOOP("Workbench", "&Flamingo")
         t10 = QT_TRANSLATE_NOOP("Workbench", "&Fasteners")
         t11 = QT_TRANSLATE_NOOP("Workbench", "&Utils")
@@ -425,13 +443,13 @@ class BIMWorkbench(Workbench):
         self.appendMenu(t5, self.snapmenu)
         self.appendMenu(t6, self.modify)
         self.appendMenu(t7, self.manage)
-        if ifctools:
-            self.appendMenu(t8, ifctools)
+        #if ifctools:
+        #    self.appendMenu(t8, ifctools)
         if flamingo:
             self.appendMenu(t9, flamingo)
         if fasteners:
             self.appendMenu(t10, fasteners)
-        self.appendMenu(t11, self.utils)
+        self.appendMenu(t11, self.utils + ifctools)
         self.appendMenu([t11, t12], nudge)
 
     def loadPreferences(self):