Changeset 1719 for trunk/GSASIIctrls.py

Timestamp:

Mar 16, 2015 4:20:06 PM (7 years ago)

Author:

toby

Message:

implement default starting and import directories

File:

• trunk/GSASIIctrls.py (modified) (3 diffs)

trunk/GSASIIctrls.py

@@ -1486 +1486 @@
             print 'id=',event.GetId()
         elif helpType == 'OldTutorials': # this will go away
-            self.frame.Tutorials = True
+            #self.frame.Tutorials = True
             ShowHelp(helpType,self.frame)
         elif helpType == 'Tutorials': 
             dlg = OpenTutorial(self.frame)
-            if dlg.ShowModal() == wx.ID_OK:
-                self.frame.Tutorials = True
+            dlg.ShowModal()
+            #if dlg.ShowModal() == wx.ID_OK:
+                #self.frame.Tutorials = True
             dlg.Destroy()
             return
@@ -2151 +2152 @@
             URL = os.path.join(tutorialPath,'help',tutdir,htmlname)
             ShowWebPage(URL,self.frame)
+            self.frame.ImportDir = os.path.join(tutorialPath,'Exercises',exedir)
         elif self.BrowseMode == 1:
             # xfer data locally, open web page remotely
@@ -2156 +2158 @@
             URL = os.path.join(G2BaseURL,'Tutorials',tutdir,htmlname)
             ShowWebPage(URL,self.frame)
+            self.frame.ImportDir = os.path.join(tutorialPath,'Exercises',exedir)
         elif self.BrowseMode == 2:
             # open web page remotely, don't worry about data
             URL = os.path.join(G2BaseURL,'Tutorials',tutdir,htmlname)
             ShowWebPage(URL,self.frame)
+            self.frame.ImportDir = os.path.join(tutorialPath,'Exercises',exedir)
         elif self.BrowseMode == 3:
             # open web page that has already been transferred