Changeset 1722

Timestamp:

Mar 16, 2015 10:38:02 PM (9 years ago)

Author:

toby

Message:

Show download paths, as suggested by Bob

File:

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

trunk/GSASIIctrls.py

@@ -2088 +2088 @@
         sizer1.Add(self.dataLoc,0,WACV)
         sizer.Add(sizer1)
+        label = wx.StaticText(
+            pnl,  wx.ID_ANY,
+            'Tutorials and Exercise files will be downloaded to:'
+            )
+        sizer.Add(label, 0, wx.ALIGN_LEFT|wx.ALL, 5)
+        self.TutorialLabel = wx.StaticText(pnl,wx.ID_ANY,'')
+        sizer.Add(self.TutorialLabel, 0, wx.ALIGN_LEFT|wx.EXPAND, 5)
+        self.ExerciseLabel = wx.StaticText(pnl,wx.ID_ANY,'')
+        self.ShowTutorialPath()
+        sizer.Add(self.ExerciseLabel, 0, wx.ALIGN_LEFT|wx.EXPAND, 5)
         self.listbox = wx.ListBox(pnl, wx.ID_ANY, size=(450, 100), style=wx.LB_SINGLE)
         self.listbox.Bind(wx.EVT_LISTBOX, self.OnTutorialSelected)
@@ -2143 +2153 @@
             ''')
                 return
-        self.dataLoc.SetLabel(tutorialPath)
+        #self.dataLoc.SetLabel(tutorialPath)
         self.EndModal(wx.ID_OK)
         wx.BeginBusyCursor()
@@ -2172 +2182 @@
             raise Exception("How did this happen!")
         wx.EndBusyCursor()
+    def ShowTutorialPath(self):
+        'Show the help and exercise directory names'
+        self.TutorialLabel.SetLabel('\t'+
+                                    os.path.join(tutorialPath,"help") +
+                                    ' (tutorials)')
+        self.ExerciseLabel.SetLabel('\t'+
+                                    os.path.join(tutorialPath,"Exercises") +
+                                    ' (exercises)')
     def ValidateTutorialDir(self,fullpath=tutorialPath,baseURL=G2BaseURL):
         '''Load help to new directory or make sure existing directory looks correctly set up
@@ -2239 +2257 @@
                 G2MessageBox(self.frame,msg)
                 return
-        self.ValidateTutorialDir(pth,G2BaseURL)
-        try: 
+        try:
             self.ValidateTutorialDir(pth,G2BaseURL)
             tutorialPath = pth
@@ -2253 +2270 @@
             ''')
         self.dataLoc.SetLabel(tutorialPath)
+        self.ShowTutorialPath()
     
 if __name__ == '__main__':