Changeset bc7bc839 in sasview

Timestamp:

Jul 25, 2011 5:24:12 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

486aa43

Parents:

463eb76e

Message:

finished tutorial help menu

Files:

• guiframe/gui_manager.py (modified) (1 diff)
• guiframe/pdfview.py (modified) (4 diffs)
• sansview/local_config.py (modified) (1 diff)
• sansview/media/Tutorial.pdf (added)

guiframe/gui_manager.py

@@ -1773 +1773 @@
             if IS_WIN:
                 try:
-                    import pdfview 
+                    from sans.guiframe.pdfview import PDFFrame
                     
-                    dialog = pdfview.PDFFrame(None, -1, "Tutorial", path)
+                    dialog = PDFFrame(None, -1, "Tutorial", path)
                     #self.SetTopWindow(dialog)
                     dialog.Show(True) 

guiframe/pdfview.py

@@ -3 +3 @@
 
 import  wx
+import os
 if wx.Platform == '__WXMSW__':
     from wx.lib.pdfwin import PDFWindow
@@ -16 +17 @@
         
         self.parent = parent
+        self.path = path
         sizer = wx.BoxSizer(wx.VERTICAL)
         btnSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -27 +29 @@
         btnSizer.Add(btn, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
 
-        self.pdf.LoadFile(path)
+        self.pdf.LoadFile(self.path)
         btn = wx.Button(self, wx.NewId(), "Previous Page")
         self.Bind(wx.EVT_BUTTON, self.OnPrevPageButton, btn)
@@ -51 +53 @@
         # make sure you have PDF files available on your drive
         dlg = wx.FileDialog(self, wildcard="*.pdf")
+        dlg.SetDirectory(os.path.dirname(self.path))
         if dlg.ShowModal() == wx.ID_OK:
             wx.BeginBusyCursor()
-            self.pdf.LoadFile(dlg.GetPath())
-
+            file = dlg.GetPath()
+            self.pdf.LoadFile(file)
+            self.parent.SetTitle(os.path.basename(file.split('.')[0]))
             wx.EndBusyCursor()
         dlg.Destroy()

sansview/local_config.py

@@ -62 +62 @@
 DATAPANEL_HEIGHT = 700
 SPLASH_SCREEN_PATH = os.path.join("images","SVwelcome_mini.png")
-TUTORIAL_PATH = os.path.join("media","sansview_tutorial.pdf")
+TUTORIAL_PATH = os.path.join("media","Tutorial.pdf")
 DEFAULT_STYLE = GUIFRAME.MULTIPLE_APPLICATIONS|GUIFRAME.MANAGER_ON\
                     |GUIFRAME.CALCULATOR_ON|GUIFRAME.TOOLBAR_ON