Changeset 707c6be in sasview for src/sas/guiframe

Timestamp:

Feb 17, 2015 11:48:47 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:

00323d6

Parents:

8729965 (diff), 3ef5b2f (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/guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• local_perspectives/data_loader/data_loader.py (modified) (1 diff)

src/sas/guiframe/gui_manager.py

@@ -2129 +2129 @@
                     logging.error("Error in _onTutorial: %s" % sys.exc_value)
                     try:
-                        #in case when the pdf default set other than acrobat
-                        import ho.pisa as pisa
+                        # Try an alternate method
+                        logging.error("Could not open the tutorial pdf, trying xhtml2pdf")
+                        from xhtml2pdf import pisa
                         pisa.startViewer(path)
                     except:
+                        logging.error("Could not open the tutorial pdf with xhtml2pdf")
                         msg = "This feature requires 'PDF Viewer'\n"
-                        msg += "Please install it first (Free)..."
                         wx.MessageBox(msg, 'Error')
             else:
@@ -2142 +2143 @@
                 except:
                     try:
-                        #in case when the pdf default set other than preview
-                        import ho.pisa as pisa
+                        # Try an alternate method
+                        logging.error("Could not open the tutorial pdf, trying xhtml2pdf")
+                        from xhtml2pdf import pisa
                         pisa.startViewer(path)
                     except:
-                        msg = "This feature requires 'Preview' Application\n"
-                        msg += "Please install it first..."
+                        logging.error("Could not open the tutorial pdf with xhtml2pdf")
+                        msg = "This feature requires the 'Preview' application\n"
                         wx.MessageBox(msg, 'Error')
 

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):