Merge pull request #151 from hsorby/main

Add infrasturcture to handle dock widgets in plugins

Author: hsorby

src/mapclient/view/mainwindow.py

@@ -53,6 +53,7 @@ def __init__(self, model):
         self._setup_menus()
         self.setMenuBar(self._menu_bar)
         self._make_connections()
+        self._dynamic_actions = []
 
         self._action_Annotation.setEnabled(False)
 
@@ -85,6 +86,9 @@ def _setup_menus(self):
         self._menu_Help.setObjectName("menu_Help")
         self._menu_View = QtWidgets.QMenu(self._menu_bar)
         self._menu_View.setObjectName("menu_View")
+        self._menu_DockWidgets = QtWidgets.QMenu(self._menu_View)
+        self._menu_DockWidgets.setObjectName("menu_DockWidgets")
+        self._menu_DockWidgets.setEnabled(False)
         self._menu_File = QtWidgets.QMenu(self._menu_bar)
         self._menu_File.setObjectName("menu_File")
         self._menu_Edit = QtWidgets.QMenu(self._menu_bar)
@@ -128,6 +132,8 @@ def _setup_menus(self):
         self._menu_View.addSeparator()
         self._menu_View.addAction(self._action_LogInformation)
         self._menu_View.addAction(self._action_Options)
+        self._menu_View.addSeparator()
+        self._menu_View.addMenu(self._menu_DockWidgets)
         self._menu_File.addSeparator()
         self._menu_File.addAction(self._action_Quit)
         self._menu_Tools.addAction(self._action_PluginFinder)
@@ -152,6 +158,7 @@ def _setup_menus(self):
     def _re_translate_ui(self):
         self._menu_Help.setTitle(QtWidgets.QApplication.translate("MainWindow", "&Help", None, -1))
         self._menu_View.setTitle(QtWidgets.QApplication.translate("MainWindow", "&View", None, -1))
+        self._menu_DockWidgets.setTitle(QtWidgets.QApplication.translate("MainWindow", "&Dock Widgets", None, -1))
         self._menu_File.setTitle(QtWidgets.QApplication.translate("MainWindow", "&File", None, -1))
         self._menu_Edit.setTitle(QtWidgets.QApplication.translate("MainWindow", "&Edit", None, -1))
         self._menu_Workflow.setTitle(QtWidgets.QApplication.translate("MainWindow", "&Workflow", None, -1))
@@ -314,7 +321,23 @@ def set_workflow_direction(self, direction):
     def set_current_widget(self, widget):
         if self._ui.stackedWidget.indexOf(widget) <= 0:
             self._ui.stackedWidget.addWidget(widget)
+
+        self._menu_DockWidgets.setEnabled(False)
+        for act in self._dynamic_actions:
+            self._menu_DockWidgets.removeAction(act)
+        self._dynamic_actions.clear()
+
         self._ui.stackedWidget.setCurrentWidget(widget)
+        docks = widget.findChildren(QtWidgets.QDockWidget)
+
+        for dock in docks:
+            if not dock:
+                continue
+
+            toggle_act = dock.toggleViewAction()
+            self._menu_DockWidgets.addAction(toggle_act)
+            self._dynamic_actions.append(toggle_act)
+            self._menu_DockWidgets.setEnabled(True)
 
     def current_widget(self):
         return self._ui.stackedWidget.currentWidget()

src/mapclient/view/qt/mainwindow.ui

@@ -23,7 +23,14 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
     <item>
-     <widget class="QStackedWidget" name="stackedWidget"/>
+     <widget class="QStackedWidget" name="stackedWidget">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>

src/mapclient/view/ui/ui_mainwindow.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'mainwindow.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.7.0
+## Created by: Qt User Interface Compiler version 6.8.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -26,7 +26,7 @@ def setupUi(self, MainWindow):
             MainWindow.setObjectName(u"MainWindow")
         MainWindow.resize(800, 600)
         icon = QIcon()
-        icon.addFile(u":/mapclient/images/icon-app.png", QSize(), QIcon.Normal, QIcon.Off)
+        icon.addFile(u":/mapclient/images/icon-app.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         MainWindow.setWindowIcon(icon)
         MainWindow.setLocale(QLocale(QLocale.English, QLocale.UnitedKingdom))
         self.action_About = QAction(MainWindow)
@@ -47,6 +47,11 @@ def setupUi(self, MainWindow):
         self.horizontalLayout.setObjectName(u"horizontalLayout")
         self.stackedWidget = QStackedWidget(self.centralwidget)
         self.stackedWidget.setObjectName(u"stackedWidget")
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.stackedWidget.sizePolicy().hasHeightForWidth())
+        self.stackedWidget.setSizePolicy(sizePolicy)
 
         self.horizontalLayout.addWidget(self.stackedWidget)