Changeset 4093

Timestamp:

Aug 14, 2019 5:17:47 PM (4 years ago)

Author:

toby

Message:

more work on menu hot keys & ask to save on exit

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (2 diffs)
• GSASIIdataGUI.py (modified) (7 diffs)

trunk/GSASIIctrlGUI.py

@@ -4221 +4221 @@
         self.HelpById = {}
         self.frame = frame
-        self.Append(wx.ID_ABOUT,'&About GSAS-II','')
+        self.Append(wx.ID_ABOUT,'&About GSAS-II',
+                        'Shows version and citation info')
         frame.Bind(wx.EVT_MENU, self.OnHelpAbout, id=wx.ID_ABOUT)
         if GSASIIpath.whichsvn():
-            helpobj = self.Append(wx.ID_ANY,'&Check for updates','')
+            helpobj = self.Append(wx.ID_ANY,'&Check for updates\tCtrl+U',
+                    'Updates to latest GSAS-II version')
             frame.Bind(wx.EVT_MENU, self.OnCheckUpdates, helpobj)
-            helpobj = self.Append(wx.ID_ANY,'&Regress to an old GSAS-II version','')
+            helpobj = self.Append(wx.ID_ANY,'&Regress to old GSAS-II version',
+                    'Installs previous GSAS-II version')
             frame.Bind(wx.EVT_MENU, self.OnSelectVersion, helpobj)
             # if GSASIIpath.svnTestBranch():
@@ -4243 +4246 @@
         self.AppendSeparator()
         if includeTree:
-            helpobj = self.Append(wx.ID_ANY,'Help on Data tree','')
+            helpobj = self.Append(wx.ID_ANY,'Help on Data tree',
+                'Web page on GSAS-II data structure')
             frame.Bind(wx.EVT_MENU, self.OnHelpById, id=helpobj.GetId())
             self.HelpById[helpobj.GetId()] = 'Data tree'
-        helpobj = self.Append(wx.ID_ANY,'Help on current data tree item','')
+        helpobj = self.Append(wx.ID_ANY,'Help on current data tree item\tF1',
+                'Web page on selected item in tree')
         frame.Bind(wx.EVT_MENU, self.OnHelpById, id=helpobj.GetId())
        

trunk/GSASIIdataGUI.py

@@ -466 +466 @@
         item = parent.Append(wx.ID_ANY,'&Open project...\tCtrl+O','Open a GSAS-II project file (*.gpx)')            
         self.Bind(wx.EVT_MENU, self.OnFileOpen, id=item.GetId())
-        item = parent.Append(wx.ID_ANY,'Reopen recent...\tCtrl+R','Reopen a previously used GSAS-II project file (*.gpx)')
+        item = parent.Append(wx.ID_ANY,'Reopen recent...\tCtrl+E','Reopen a previously used GSAS-II project file (*.gpx)')
         self.Bind(wx.EVT_MENU, self.OnFileReopen, id=item.GetId())
         item = parent.Append(wx.ID_ANY,'&Save project\tCtrl+S','Save project under current name')
@@ -490 +490 @@
             self.Bind(wx.EVT_MENU, OnwxInspect, item)
             
-        item = parent.Append(wx.ID_ANY,'&Exit','Exit from GSAS-II')
+        item = parent.Append(wx.ID_EXIT,'Exit\tALT+F4','Exit from GSAS-II')
         self.Bind(wx.EVT_MENU, self.ExitMain, id=item.GetId())
         
@@ -539 +539 @@
         self.Bind(wx.EVT_MENU, self.OnShowLSParms, id=item.GetId())
         
-        item = parent.Append(wx.ID_ANY,'&Refine','') 
+        item = parent.Append(wx.ID_ANY,'&Refine\tCTRL+R','Perform a refinement') 
         if len(self.Refine): # extend state for new menus to match main (on mac)
             state = self.Refine[0].IsEnabled()
@@ -586 +586 @@
         if seqSetting:
             for item in self.Refine:
-                item.SetText('Se&quential refine')
+                item.SetText('Se&quential refine\tCtrl+R')
             seqMode = True
         else:
             for item in self.Refine:
-                item.SetText('&Refine')
+                item.SetText('&Refine\tCtrl+R')
             seqMode = False
         for menu,Id in self.ExportSeq:
@@ -3980 +3980 @@
             self.CheckNotebook()
             G2IO.ProjFileSave(self)
+            return True
         else:
-            self.OnFileSaveas(event)
+            return self.OnFileSaveas(event)
             
     def SetTitleByGPX(self):
@@ -4017 +4018 @@
                 self.SetTitleByGPX()
                 os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!
+                return True
+            else:
+                return False
         finally:
             dlg.Destroy()
@@ -4075 +4079 @@
         NB: not called if console window closed
         '''
+        if self.GPXtree.GetCount() > 1:
+            dlg = wx.MessageDialog(self,
+                    'Do you want to save and exit?\n(Use No to exit without save or Cancel to prevent exiting)',
+                    'Confirm exit/save?',
+                    wx.YES|wx.NO|wx.CANCEL)
+            try:
+                result = dlg.ShowModal()
+            finally:
+                dlg.Destroy()
+        else:
+            result = wx.ID_NO
+        if result == wx.ID_NO:
+            pass
+        elif result == wx.ID_CANCEL:
+            return
+        else:
+            if not self.OnFileSave(event):
+                return
         FrameInfo = {'Main_Pos':tuple(self.GetPosition()),
                      'Main_Size':tuple(self.GetSize()),