Changes in src/sas/qtgui/MainWindow/GuiManager.py [d1955d67:e90988c] in sasview

File:

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

src/sas/qtgui/MainWindow/GuiManager.py

@@ -86 +86 @@
         # Set up the status bar
         self.statusBarSetup()
-        # Show the Welcome panel
-        self.welcomePanel = WelcomePanel()
-        self._workspace.workspace.addSubWindow(self.welcomePanel)
-
-        # Current help file
-        self._helpView = QWebView()
+
         # Needs URL like path, so no path.join() here
         self._helpLocation = GuiUtils.HELP_DIRECTORY_LOCATION + "/index.html"
@@ -99 +94 @@
                                               "_downloads",
                                               "Tutorial.pdf"))
+
     def addWidgets(self):
         """
@@ -131 +127 @@
         self.ackWidget = Acknowledgements()
         self.aboutWidget = AboutBox()
+        self.welcomePanel = WelcomePanel()
 
         # Add calculators - floating for usability
@@ -165 +162 @@
         """
         pass
+
+    def showHelp(self, url):
+        """
+        Open a local url in the default browser
+        """
+        location = GuiUtils.HELP_DIRECTORY_LOCATION + url
+        try:
+            webbrowser.open('file://' + os.path.realpath(location))
+        except webbrowser.Error as ex:
+            logging.warning("Cannot display help. %s" % ex)
 
     def workspace(self):
@@ -334 +341 @@
             msg += " Please try again later."
             self.communicate.statusBarUpdateSignal.emit(msg)
+
+    def showWelcomeMessage(self):
+        """ Show the Welcome panel """
+        self._workspace.workspace.addSubWindow(self.welcomePanel)
+        self.welcomePanel.show()
 
     def addCallbacks(self):
@@ -714 +726 @@
         TODO: use QNetworkAccessManager to assure _helpLocation is valid
         """
-        self._helpView.load(QUrl(self._helpLocation))
-        self._helpView.show()
+        self.showHelp(self._helpLocation)
 
     def actionTutorial(self):