From 659940d6bb228f5ea59eedfcbe2136be11ce923a Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Tue, 12 Mar 2024 15:43:35 +0100
Subject: [PATCH] Use actions in Bim Views

---
 BimViews.py    |  44 +++++++++------
 dialogViews.ui | 149 +------------------------------------------------
 2 files changed, 27 insertions(+), 166 deletions(-)

diff --git a/BimViews.py b/BimViews.py
index 527f475..713f558 100644
--- a/BimViews.py
+++ b/BimViews.py
@@ -83,17 +83,16 @@ def Activated(self):
             size = FreeCAD.ParamGet(
                 "User parameter:BaseApp/Preferences/General"
             ).GetInt("ToolbarIconSize", 24)
-            for button in [
-                dialog.buttonAddLevel,
-                dialog.buttonAddProxy,
-                dialog.buttonDelete,
-                dialog.buttonToggle,
-                dialog.buttonIsolate,
-                dialog.buttonSaveView,
-                dialog.buttonRename,
-            ]:
-                button.setMaximumSize(QtCore.QSize(size + 4, size + 4))
-                button.setIconSize(QtCore.QSize(size, size))
+            toolbar = QtGui.QToolBar()
+            toolbar.setIconSize(QtCore.QSize(size, size))
+            dialog.horizontalLayout.addWidget(toolbar)
+            for button in ["AddLevel","AddProxy",
+                           "Delete","Toggle",
+                           "Isolate","SaveView",
+                           "Rename",]:
+                action = QtGui.QAction()
+                toolbar.addAction(action)
+                setattr(dialog,"button"+button, action)
 
             # # set button icons
             dialog.buttonAddLevel.setIcon(QtGui.QIcon(":/icons/Arch_Floor.svg"))
@@ -105,15 +104,24 @@ def Activated(self):
             dialog.buttonRename.setIcon(
                 QtGui.QIcon(":/icons/accessories-text-editor.svg")
             )
+            
+            # set tooltips
+            dialog.buttonAddLevel.setToolTip(translate("BIM","Creates a new level"))
+            dialog.buttonAddProxy.setToolTip(translate("BIM","Creates a new Working Plane Proxy"))
+            dialog.buttonDelete.setToolTip(translate("BIM","Deletes the selected item"))
+            dialog.buttonToggle.setToolTip(translate("BIM","Toggles selected items on/off"))
+            dialog.buttonIsolate.setToolTip(translate("BIM","Turns all items off except the selected ones"))
+            dialog.buttonSaveView.setToolTip(translate("BIM","Saves the current camera position to the selected items"))
+            dialog.buttonRename.setToolTip(translate("BIM","Renames the selected item"))
 
             # connect signals
-            dialog.buttonAddLevel.clicked.connect(self.addLevel)
-            dialog.buttonAddProxy.clicked.connect(self.addProxy)
-            dialog.buttonDelete.clicked.connect(self.delete)
-            dialog.buttonToggle.clicked.connect(self.toggle)
-            dialog.buttonIsolate.clicked.connect(self.isolate)
-            dialog.buttonSaveView.clicked.connect(self.saveView)
-            dialog.buttonRename.clicked.connect(self.rename)
+            dialog.buttonAddLevel.triggered.connect(self.addLevel)
+            dialog.buttonAddProxy.triggered.connect(self.addProxy)
+            dialog.buttonDelete.triggered.connect(self.delete)
+            dialog.buttonToggle.triggered.connect(self.toggle)
+            dialog.buttonIsolate.triggered.connect(self.isolate)
+            dialog.buttonSaveView.triggered.connect(self.saveView)
+            dialog.buttonRename.triggered.connect(self.rename)
             dialog.tree.itemClicked.connect(self.select)
             dialog.tree.itemDoubleClicked.connect(show)
             dialog.tree.itemChanged.connect(self.editObject)
diff --git a/dialogViews.ui b/dialogViews.ui
index 1b4c363..795b124 100644
--- a/dialogViews.ui
+++ b/dialogViews.ui
@@ -80,154 +80,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="buttonAddLevel">
-       <property name="maximumSize">
-        <size>
-         <width>32</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Add a new level (BuildingPart)</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonAddProxy">
-       <property name="maximumSize">
-        <size>
-         <width>32</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Adds a new Working Plane proxy</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonDelete">
-       <property name="maximumSize">
-        <size>
-         <width>32</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Deletes the selected items</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonToggle">
-       <property name="maximumSize">
-        <size>
-         <width>32</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Toggles selected items on/off</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonIsolate">
-       <property name="maximumSize">
-        <size>
-         <width>32</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Turns all items off except the selected ones</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonSaveView">
-       <property name="maximumSize">
-        <size>
-         <width>32</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Saves the current camera position to the selected items</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonRename">
-       <property name="maximumSize">
-        <size>
-         <width>32</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Rename the selected item</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
+    <layout class="QHBoxLayout" name="horizontalLayout"/>
    </item>
   </layout>
  </widget>