Changeset e4d4de2 in sasview

Timestamp:

Feb 18, 2015 5:22:20 AM (10 years ago)

Author:

butler

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

74f6c7e

Parents:

00323d6 (diff), c4c3ec3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

Location:

src/sas

Files:

• models/media/list-of-links.txt (added)
• guiframe/gui_manager.py (modified) (1 diff)
• guiframe/local_perspectives/data_loader/data_loader.py (modified) (1 diff)

src/sas/guiframe/gui_manager.py

@@ -2164 +2164 @@
         from documentation_window import DocumentationWindow
         
-        sphinx_doc_viewer = DocumentationWindow(self, -1, "index.html")
-#        sphinx_doc_viewer.Show()
-
+        sphinx_doc_viewer = DocumentationWindow(self, -1, "index.html", \
+                                                "General Help")
 
     def set_manager(self, manager):

src/sas/guiframe/local_perspectives/data_loader/data_loader.py

@@ -57 +57 @@
         Show a general help dialog. 
         """
-        from help_panel import  HelpWindow
-        frame = HelpWindow(None, -1) 
-        if hasattr(frame, "IsIconized"):
-            if not frame.IsIconized():
-                try:
-                    icon = self.parent.GetIcon()
-                    frame.SetIcon(icon)
-                except:
-                    pass  
-        frame.Show(True)
+#        from documentation_window import DocumentationWindow     
+#        _sphinx_doc_viewer = DocumentationWindow(self, -1, "/user/guiframe/ \
+#            data_explorer_help.html", "DataLoader Help")
+#        from help_panel import  HelpWindow
+#        frame = HelpWindow(None, -1) 
+#        if hasattr(frame, "IsIconized"):
+#            if not frame.IsIconized():
+#                try:
+#                    icon = self.parent.GetIcon()
+#                    frame.SetIcon(icon)
+#                except:
+#                    pass  
+#        frame.Show(True)
         
     def populate_file_menu(self):