Changeset e90988c in sasview for src/sas/qtgui/MainWindow

Timestamp:

Dec 14, 2017 9:51:02 AM (6 years ago)

Author:

Piotr Rozyczko <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:

7fd20fc, 626c7c5

Parents:

8353d90

Message:

Show help pages in default browser. Fixed some help links and modified unit tests. SASVIEW-800

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (3 diffs)
• GuiManager.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -8 +8 @@
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
-from PyQt5 import QtWebKitWidgets
 
 from twisted.internet import threads
@@ -70 +69 @@
         self.cmdHelp_2.clicked.connect(self.displayHelp)
 
-        # Display HTML content
-        self._helpView = QtWebKitWidgets.QWebView()
-
         # Fill in the perspectives combo
         self.initPerspectives()
@@ -141 +137 @@
         Show the "Loading data" section of help
         """
-        tree_location = GuiUtils.HELP_DIRECTORY_LOCATION +\
-            "/user/sasgui/guiframe/data_explorer_help.html"
-        self._helpView.load(QtCore.QUrl(tree_location))
-        self._helpView.show()
+        tree_location = "/user/sasgui/guiframe/data_explorer_help.html"
+        self.parent.showHelp(tree_location)
 
     def enableGraphCombo(self, combo_text):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -87 +87 @@
         self.statusBarSetup()
 
-        # Current help file
-        self._helpView = QWebView()
         # Needs URL like path, so no path.join() here
         self._helpLocation = GuiUtils.HELP_DIRECTORY_LOCATION + "/index.html"
@@ -164 +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):
@@ -718 +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):