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

Timestamp:

May 1, 2018 8:45:08 AM (7 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:

b5cc06e

Parents:

417c03f

Message:

Updated references to help files

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (1 diff)
• GuiManager.py (modified) (2 diffs)
• UnitTesting/DataExplorerTest.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -137 +137 @@
         Show the "Loading data" section of help
         """
-        tree_location = "/user/sasgui/guiframe/data_explorer_help.html"
+        tree_location = "/user/qtgui/MainWindow/data_explorer_help.html"
         self.parent.showHelp(tree_location)
 

src/sas/qtgui/MainWindow/GuiManager.py

@@ -172 +172 @@
         Open a local url in the default browser
         """
+        #location = os.path.join(GuiUtils.HELP_DIRECTORY_LOCATION, url)
         location = GuiUtils.HELP_DIRECTORY_LOCATION + url
         try:
@@ -779 +780 @@
         TODO: use QNetworkAccessManager to assure _helpLocation is valid
         """
-        self.showHelp(self._helpLocation)
+        helpfile = "index.html"
+        self.showHelp(helpfile)
 
     def actionTutorial(self):

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

@@ -437 +437 @@
         Test that the Help window gets shown correctly
         """
-        partial_url = "sasgui/guiframe/data_explorer_help.html"
+        partial_url = "qtgui/MainWindow/data_explorer_help.html"
         button1 = self.form.cmdHelp
         button2 = self.form.cmdHelp_2