Changes in src/sas/qtgui/Perspectives/Fitting/FittingWidget.py [d3c0b95:a3c94b54] in sasview

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (4 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -8 +8 @@
 from twisted.internet import threads
 import numpy as np
-import webbrowser
 
 from PyQt5 import QtCore
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
+from PyQt5 import QtWebKitWidgets
+# Officially QtWebEngineWidgets are the way to display HTML in Qt5,
+# but this module isn't ported to PyQt5 yet...
+# let's wait. In the meantime no Help.
+#from PyQt5 import QtWebEngineWidgets
 
 from sasmodels import product
@@ -126 +130 @@
 
         # Display HTML content
-        #self.setupHelp()
+        self.helpView = QtWebKitWidgets.QWebView()
 
         # New font to display angstrom symbol
@@ -941 +945 @@
         Show the "Fitting" section of help
         """
-        tree_location = "/user/sasgui/perspectives/fitting/"
+        tree_location = GuiUtils.HELP_DIRECTORY_LOCATION + "/user/sasgui/perspectives/fitting/"
 
         # Actual file will depend on the current tab
@@ -951 +955 @@
             helpfile = "residuals_help.html"
         elif tab_id == 2:
-            helpfile = "resolution.html"
+            helpfile = "sm_help.html"
         elif tab_id == 3:
-            helpfile = "pd/polydispersity.html"
+            helpfile = "pd_help.html"
         elif tab_id == 4:
-            helpfile = "magnetism/magnetism.html"
+            helpfile = "mag_help.html"
         help_location = tree_location + helpfile
 
-        self.showHelp(help_location)
-
-    def showHelp(self, url):
-        """
-        Calls parent's method for opening an HTML page
-        """
-        self.parent.showHelp(url)
+        content = QtCore.QUrl(help_location)
+        self.helpView.load(QtCore.QUrl(help_location))
+        self.helpView.show()
 
     def onDisplayMagneticAngles(self):