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

Timestamp:

Jun 29, 2016 10:04:43 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:

481ff26

Parents:

9e426c1

Message:

More dialogs, drag and drop onto File Load

File:

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

src/sas/qtgui/GuiManager.py

@@ -18 +18 @@
 from GuiUtils import *
 from UI.AcknowledgementsUI import Acknowledgements
+from AboutBox import AboutBox
 
 # Perspectives
@@ -60 +61 @@
         # Add FileDialog widget as docked
         self.filesWidget = DataExplorerWindow(parent, self)
-        #flags = (QtCore.Qt.Window | QtCore.Qt.WindowTitleHint | QtCore.Qt.CustomizeWindowHint)
-
-        self.dockedFilesWidget = QtGui.QDockWidget("File explorer", self._workspace)
+        #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.setWidget(self.filesWidget)
         self._workspace.addDockWidget(QtCore.Qt.DockWidgetArea(1), self.dockedFilesWidget)
 
         self.ackWidget = Acknowledgements()
+        self.aboutWidget = AboutBox()
 
         # Disable the close button (?)
@@ -95 +98 @@
     def fileRead(self, data):
         """
+        Callback for fileDataReceivedSignal
         """
         pass
@@ -197 +201 @@
         # Exit if yes
         reactor.callFromThread(reactor.stop)
-        reactor.stop
         sys.exit()
 
@@ -220 +223 @@
         self.processVersion(version_info)  
   
-    def processVersion(self, version_info, standalone=False):
+    def processVersion(self, version_info):
         """
         Call-back method for the process of checking for updates.
@@ -228 +231 @@
 
         :param version: version string
-        :param standalone: True of the update is being checked in
-           the background, False otherwise.
-
         """
         try:
@@ -242 +242 @@
             elif cmp(version, LocalConfig.__version__) > 0:
                 msg = "Version %s is available! " % str(version)
-                if not standalone:
-                    if "download_url" in version_info:
-                        webbrowser.open(version_info["download_url"])
-                    else:
-                        webbrowser.open(LocalConfig.__download_page__)
+                if "download_url" in version_info:
+                    webbrowser.open(version_info["download_url"])
                 else:
-                    msg += "See the help menu to download it."
+                    webbrowser.open(LocalConfig.__download_page__)
                 self.communicate.statusBarUpdateSignal.emit(msg)
             else:
@@ -258 +255 @@
             msg += " version number\n  %s" % sys.exc_value
             logging.error(msg)
-            if not standalone:
-                msg = "Could not connect to the application server."
-                msg += " Please try again later."
-                self.communicate.statusBarUpdateSignal.emit(msg)
+            msg = "Could not connect to the application server."
+            msg += " Please try again later."
+            self.communicate.statusBarUpdateSignal.emit(msg)
 
     def addCallbacks(self):
@@ -629 +625 @@
         Open the About box
         """
-        
-        print("actionAbout TRIGGERED")
-        pass
+        # Update the about box with current version and stuff
+
+        # TODO: proper sizing
+        self.aboutWidget.show()
 
     def actionCheck_for_update(self):