Changeset 768387e0 in sasview

Timestamp:

Sep 14, 2018 3:45:39 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

86d3207

Parents:

855e7ad

Message:

Added Data Explorer visibility toggle for more flexibility. SASVIEW-998

Location:

src/sas/qtgui/MainWindow

Files:

• GuiManager.py (modified) (4 diffs)
• UI/MainWindowUI.ui (modified) (2 diffs)
• UnitTesting/GuiManagerTest.py (modified) (1 diff)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -118 +118 @@
         self.dockedFilesWidget.setWidget(self.filesWidget)
 
-        # Disable maximize/minimize and close buttons
-        self.dockedFilesWidget.setFeatures(QDockWidget.NoDockWidgetFeatures)
-
-        #self._workspace.workspace.addDockWidget(Qt.LeftDockWidgetArea, self.dockedFilesWidget)
+        # Modify menu items on widget visibility change
+        self.dockedFilesWidget.visibilityChanged.connect(self.updateContextMenus)
+
         self._workspace.addDockWidget(Qt.LeftDockWidgetArea, self.dockedFilesWidget)
         self._workspace.resizeDocks([self.dockedFilesWidget], [305], Qt.Horizontal)
@@ -164 +163 @@
             logger.error("%s: could not load SasView models")
             logger.error(traceback.format_exc())
+
+    def updateContextMenus(self, visible=False):
+        """
+        Modify the View/Data Explorer menu item text on widget visibility
+        """
+        if visible:
+            self._workspace.actionHide_DataExplorer.setText("Hide Data Explorer")
+        else:
+            self._workspace.actionHide_DataExplorer.setText("Show Data Explorer")
 
     def statusBarSetup(self):
@@ -427 +435 @@
         self._workspace.actionStartup_Settings.triggered.connect(self.actionStartup_Settings)
         self._workspace.actionCategory_Manager.triggered.connect(self.actionCategory_Manager)
+        self._workspace.actionHide_DataExplorer.triggered.connect(self.actionHide_DataExplorer)
         # Tools
         self._workspace.actionData_Operation.triggered.connect(self.actionData_Operation)
@@ -617 +626 @@
         pass
 
+    def actionHide_DataExplorer(self):
+        """
+        Toggle Data Explorer vsibility
+        """
+        if self.dockedFilesWidget.isVisible():
+            #self._workspace.actionHide_DataExplorer.setText("Show Data Explorer")
+            self.dockedFilesWidget.setVisible(False)
+        else:
+            #self._workspace.actionHide_DataExplorer.setText("Hide Data Explorer")
+            self.dockedFilesWidget.setVisible(True)
+        pass
+
     def actionStartup_Settings(self):
         """

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -74 +74 @@
     <addaction name="separator"/>
     <addaction name="actionHide_Toolbar"/>
+    <addaction name="actionHide_DataExplorer"/>
     <addaction name="separator"/>
     <addaction name="actionStartup_Settings"/>
@@ -552 +553 @@
    </property>
   </action>
+  <action name="actionHide_DataExplorer">
+   <property name="text">
+    <string>Hide Data Explorer</string>
+   </property>
+  </action>
  </widget>
  <resources/>

src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py

@@ -53 +53 @@
         self.assertIsInstance(self.manager.dockedFilesWidget, QDockWidget)
         self.assertIsInstance(self.manager.dockedFilesWidget.widget(), DataExplorerWindow)
-        self.assertEqual(self.manager.dockedFilesWidget.features(), QDockWidget.NoDockWidgetFeatures)
         self.assertEqual(self.manager._workspace.dockWidgetArea(self.manager.dockedFilesWidget), Qt.LeftDockWidgetArea)