Merge pull request #56 from tarman3/dropdown

Addon: Combine Refresh Cache, Python Dependencies and Open Folder

Author: chennes

AddonManager.py

@@ -301,12 +301,12 @@ def launch(self) -> None:
         self.dialog.accepted.connect(self.accept)
         self.button_bar.update_all_addons.clicked.connect(self.update_all)
         self.button_bar.close.clicked.connect(self.dialog.reject)
-        self.button_bar.refresh_local_cache.clicked.connect(self.on_button_update_cache_clicked)
         self.button_bar.check_for_updates.clicked.connect(
             lambda: self.force_check_updates(standalone=True)
         )
-        self.button_bar.python_dependencies.clicked.connect(self.show_python_updates_dialog)
-        self.button_bar.addons_folder.clicked.connect(self.open_addons_folder)
+        self.button_bar.python_dependencies.triggered.connect(self.show_python_updates_dialog)
+        self.button_bar.addons_folder.triggered.connect(self.open_addons_folder)
+        self.button_bar.refresh_local_cache.triggered.connect(self.on_button_update_cache_clicked)
         self.button_bar.developer_tools.clicked.connect(self.show_developer_tools)
         self.composite_view.package_list.stop_loading.connect(self.stop_update)
         self.composite_view.package_list.setEnabled(False)

Resources/icons/gear.svg

@@ -28,7 +28,7 @@
 import os
 
 from addonmanager_freecad_interface import translate
-from PySideWrapper import QtGui, QtWidgets
+from PySideWrapper import QtCore, QtGui, QtWidgets
 
 
 class WidgetGlobalButtonBar(QtWidgets.QWidget):
@@ -51,18 +51,38 @@ def __init__(self, parent: QtWidgets.QWidget = None):
 
     def _update_ui(self):
         self.horizontal_layout = QtWidgets.QHBoxLayout()
-        self.refresh_local_cache = QtWidgets.QPushButton(self)
         self.update_all_addons = QtWidgets.QPushButton(self)
         self.check_for_updates = QtWidgets.QPushButton(self)
-        self.python_dependencies = QtWidgets.QPushButton(self)
         self.developer_tools = QtWidgets.QPushButton(self)
-        self.addons_folder = QtWidgets.QPushButton(self)
         self.close = QtWidgets.QPushButton(self)
-        self.horizontal_layout.addWidget(self.refresh_local_cache)
+
+        self.gear_tools = QtWidgets.QToolButton()
+        icon_path = os.path.join(os.path.dirname(__file__), "..", "Resources", "icons")
+        self.gear_tools.setIcon(QtGui.QIcon(os.path.join(icon_path, "gear.svg")))
+        self.gear_tools.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+        self.gear_tools.setPopupMode(QtWidgets.QToolButton.InstantPopup)
+        self.gear_tools.setStyleSheet("QToolButton::menu-indicator { image: none; }")
+
+        if hasattr(QtGui, "QAction"):
+            # Qt6
+            self.addons_folder = QtGui.QAction()
+            self.python_dependencies = QtGui.QAction()
+            self.refresh_local_cache = QtGui.QAction()
+        else:
+            # Qt5
+            self.addons_folder = QtWidgets.QAction()
+            self.python_dependencies = QtWidgets.QAction()
+            self.refresh_local_cache = QtWidgets.QAction()
+        self.gear_menu = QtWidgets.QMenu(self.gear_tools)
+        self.gear_menu.addAction(self.addons_folder)
+        self.gear_menu.addAction(self.python_dependencies)
+        self.gear_menu.addAction(self.refresh_local_cache)
+
+        self.gear_tools.setMenu(self.gear_menu)
+
         self.horizontal_layout.addWidget(self.update_all_addons)
         self.horizontal_layout.addWidget(self.check_for_updates)
-        self.horizontal_layout.addWidget(self.python_dependencies)
-        self.horizontal_layout.addWidget(self.addons_folder)
+        self.horizontal_layout.addWidget(self.gear_tools)
         self.horizontal_layout.addWidget(self.developer_tools)
         self.horizontal_layout.addStretch()
         self.horizontal_layout.addWidget(self.close)
@@ -77,13 +97,14 @@ def _set_icons(self):
         )
 
     def retranslateUi(self, _):
-        self.refresh_local_cache.setText(translate("AddonsInstaller", "Close"))
+        self.refresh_local_cache.setText(translate("AddonsInstaller", "Refresh local cache"))
         self.update_all_addons.setText(translate("AddonsInstaller", "Update all addons"))
         self.check_for_updates.setText(translate("AddonsInstaller", "Check for updates"))
-        self.python_dependencies.setText(translate("AddonsInstaller", "Python dependencies..."))
+        self.python_dependencies.setText(translate("AddonsInstaller", "Open Python dependencies"))
         self.addons_folder.setText(translate("AddonsFolder", "Open Addons folder"))
         self.developer_tools.setText(translate("AddonsInstaller", "Developer tools..."))
         self.close.setText(translate("AddonsInstaller", "Close"))
+        self.gear_tools.setText(translate("AddonsInstaller", "Gear tools ..."))
 
     def set_number_of_available_updates(self, updates: int):
         if updates > 0: