Changeset e540cd2 in sasview for src/sas/qtgui/GuiManager.py

Timestamp:

Jul 7, 2016 4:54:18 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

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

Children:

0cd8612

Parents:

f0f309d

Message:

Status bar, progress bar, initial treeview context menu + minor cleanup

File:

• src/sas/qtgui/GuiManager.py (modified) (8 diffs)

src/sas/qtgui/GuiManager.py

@@ -60 +60 @@
         # Add FileDialog widget as docked
         self.filesWidget = DataExplorerWindow(parent, self)
-        #flags = (QtCore.Qt.Window | QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowMinimizeButtonHint)
-        flags = (QtCore.Qt.CustomizeWindowHint | QtCore.Qt.WindowTitleHint |
-                 QtCore.Qt.WindowMinMaxButtonsHint)
-
-        self.dockedFilesWidget = QtGui.QDockWidget("Data explorer", self._workspace, flags=flags)
+
+        self.dockedFilesWidget = QtGui.QDockWidget("Data explorer", self._workspace)
         self.dockedFilesWidget.setWidget(self.filesWidget)
+        self.dockedFilesWidget.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures)
         self._workspace.addDockWidget(QtCore.Qt.DockWidgetArea(1), self.dockedFilesWidget)
 
@@ -71 +69 @@
         self.aboutWidget = AboutBox()
 
-        # Disable the close button (?)
+        # Set up the status bar
+        self.statusBarSetup()
 
         # Show the Welcome panel
@@ -95 +94 @@
         # Default perspective
         self._current_perspective = self.invariantWidget
+
+    def statusBarSetup(self):
+        """
+        Define the status bar.
+        | <message label> .... | Progress Bar |
+
+        Progress bar invisible until explicitly shown
+        """
+        self.progress = QtGui.QProgressBar()
+        self._workspace.statusbar.setSizeGripEnabled(False)
+
+        self.statusLabel = QtGui.QLabel()
+        self.statusLabel.setText("Welcome to SasView")
+        self._workspace.statusbar.addPermanentWidget(self.statusLabel,1)
+        self._workspace.statusbar.addPermanentWidget(self.progress, stretch=0)
+        self.progress.setRange(0,100)
+        self.progress.setValue(0)
+        self.progress.setTextVisible(True)
+        self.progress.setVisible(False)
 
     def fileRead(self, data):
@@ -133 +151 @@
         return self._current_perspective
 
+    def updateProgressBar(self, value):
+        """
+        Update progress bar with the required value (0-100)
+        """
+        assert(-1 <= value <= 100)
+        if value == -1:
+            self.progress.setVisible(False)
+            return
+        if not self.progress.isVisible():
+            self.progress.setTextVisible(True)
+            self.progress.setVisible(True)
+
+        self.progress.setValue(value)
+
     def updateStatusBar(self, text):
         """
         """
-        self._workspace.statusbar.showMessage(text)
+        #self._workspace.statusbar.showMessage(text)
+        self.statusLabel.setText(text)
 
     def createGuiData(self, item, p_file=None):
@@ -237 +270 @@
         self.communicate.statusBarUpdateSignal.connect(self.updateStatusBar)
         self.communicate.updatePerspectiveWithDataSignal.connect(self.updatePerspective)
+        self.communicate.progressBarUpdateSignal.connect(self.updateProgressBar)
 
     def addTriggers(self):
@@ -284 +318 @@
         # Window
         self._workspace.actionCascade.triggered.connect(self.actionCascade)
-        self._workspace.actionTile_Horizontally.triggered.connect(self.actionTile_Horizontally)
-        self._workspace.actionTile_Vertically.triggered.connect(self.actionTile_Vertically)
+        self._workspace.actionTile.triggered.connect(self.actionTile)
         self._workspace.actionArrange_Icons.triggered.connect(self.actionArrange_Icons)
         self._workspace.actionNext.triggered.connect(self.actionNext)
@@ -402 +435 @@
     def actionHide_Toolbar(self):
         """
-        """
-        print("actionHide_Toolbar TRIGGERED")
+        Toggle toolbar vsibility
+        """
+        if self._workspace.toolBar.isVisible():
+            self._workspace.actionHide_Toolbar.setText("Show Toolbar")
+            self._workspace.toolBar.setVisible(False)
+        else:
+            self._workspace.actionHide_Toolbar.setText("Hide Toolbar")
+            self._workspace.toolBar.setVisible(True)
         pass
 
@@ -532 +571 @@
     def actionCascade(self):
         """
-        """
-        print("actionCascade TRIGGERED")
-        pass
-
-    def actionTile_Horizontally(self):
-        """
-        """
-        print("actionTile_Horizontally TRIGGERED")
-        pass
-
-    def actionTile_Vertically(self):
-        """
-        """
-        print("actionTile_Vertically TRIGGERED")
-        pass
+        Arranges all the child windows in a cascade pattern.
+        """
+        self._workspace.workspace.cascade()
+
+    def actionTile(self):
+        """
+        Tile workspace windows
+        """
+        self._workspace.workspace.tile()
 
     def actionArrange_Icons(self):
         """
-        """
-        print("actionArrange_Icons TRIGGERED")
-        pass
+        Arranges all iconified windows at the bottom of the workspace
+        """
+        self._workspace.workspace.arrangeIcons()
 
     def actionNext(self):
         """
-        """
-        print("actionNext TRIGGERED")
-        pass
+        Gives the input focus to the next window in the list of child windows.
+        """
+        self._workspace.workspace.activateNextWindow()
 
     def actionPrevious(self):
         """
-        """
-        print("actionPrevious TRIGGERED")
-        pass
+        Gives the input focus to the previous window in the list of child windows.
+        """
+        self._workspace.workspace.activatePreviousWindow()
 
     #============ HELP =================