Changeset 3a37fe0 in sasview for sansview/perspectives

Timestamp:

Sep 17, 2009 3:54:43 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

a720d1f

Parents:

a85f622

Message:

remove unod and redo option and rename keep to bookmark

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (7 diffs)
• fitpage.py (modified) (7 diffs)
• modelpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -95 +95 @@
         ## Create context menu for page
         self.popUpMenu = wx.Menu()
-        id = wx.NewId()
-        self._undo = wx.MenuItem(self.popUpMenu,id, "Undo","cancel the previous action")
-        self.popUpMenu.AppendItem(self._undo)
-        self._undo.Enable(False)
-        wx.EVT_MENU(self, id, self.onUndo)
-        
-        id = wx.NewId()
-        self._redo = wx.MenuItem(self.popUpMenu,id,"Redo"," Restore the previous action")
-        self.popUpMenu.AppendItem(self._redo)
-        self._redo.Enable(False)
-        wx.EVT_MENU(self, id, self.onRedo)       
-        self.popUpMenu.AppendSeparator()
+        #id = wx.NewId()
+        #self._undo = wx.MenuItem(self.popUpMenu,id, "Undo","cancel the previous action")
+        #self.popUpMenu.AppendItem(self._undo)
+        #self._undo.Enable(False)
+        #wx.EVT_MENU(self, id, self.onUndo)
+        
+        #id = wx.NewId()
+        #self._redo = wx.MenuItem(self.popUpMenu,id,"Redo"," Restore the previous action")
+        #self.popUpMenu.AppendItem(self._redo)
+        #self._redo.Enable(False)
+        #wx.EVT_MENU(self, id, self.onRedo)       
+        #self.popUpMenu.AppendSeparator()
                 
         id = wx.NewId()
-        self._keep = wx.MenuItem(self.popUpMenu,id,"Keep"," Keep the panel status to recall it later")
+        self._keep = wx.MenuItem(self.popUpMenu,id,"Bookmark"," Keep the panel status to recall it later")
         self.popUpMenu.AppendItem(self._keep)
         self._keep.Enable(True)
@@ -641 +641 @@
         """
         if state ==None:
-            self._undo.Enable(False)
+            #self._undo.Enable(False)
             return 
        
@@ -806 +806 @@
         self.state.formfactorbox = self.formfactorbox.GetCurrentSelection()
         
-        self._undo.Enable(True)
+        #self._undo.Enable(True)
         ## post state to fit panel
         event = PageInfoEvent(page = self)
@@ -828 +828 @@
              use : _check_value_enter 
         """
-        self._undo.Enable(True)
+        #self._undo.Enable(True)
         if self.model !=None:
             
@@ -1315 +1315 @@
         self.save_current_state()
         if event !=None:
-            self._undo.Enable(True)
+            #self._undo.Enable(True)
             event = PageInfoEvent(page = self)
             wx.PostEvent(self.parent, event)
@@ -1431 +1431 @@
         self.save_current_state()
         if event !=None:
-            self._undo.Enable(True)
+            #self._undo.Enable(True)
             event = PageInfoEvent(page = self)
             wx.PostEvent(self.parent, event)
@@ -1533 +1533 @@
         self.state.disp_box= n
         
-        self._undo.Enable(True)
+        #self._undo.Enable(True)
         event = PageInfoEvent(page = self)
         wx.PostEvent(self.parent, event)

sansview/perspectives/fitting/fitpage.py

@@ -663 +663 @@
        
         if event !=None:
-            self._undo.Enable(True)
+            #self._undo.Enable(True)
             ## post state to fit panel
             event = PageInfoEvent(page = self)
@@ -698 +698 @@
         ## new state posted
         if self.state_change:
-            self._undo.Enable(True)
+            #self._undo.Enable(True)
             event = PageInfoEvent(page = self)
             wx.PostEvent(self.parent, event)
@@ -719 +719 @@
             ## new state posted
             if self.state_change:
-                self._undo.Enable(True)
+                #self._undo.Enable(True)
                 event = PageInfoEvent(page = self)
                 wx.PostEvent(self.parent, event)
@@ -751 +751 @@
         ## new state posted
         if self.state_change:
-            self._undo.Enable(True)
+            #self._undo.Enable(True)
             event = PageInfoEvent(page = self)
             wx.PostEvent(self.parent, event)
@@ -774 +774 @@
             reset the state
         """
-        if first:
-            self._undo.Enable(False)
+        #if first:
+        #    self._undo.Enable(False)
            
         self.reset_page_helper(state)
@@ -1079 +1079 @@
         #self.save_current_state()  
         if event !=None:
-            self._undo.Enable(True)
+            #self._undo.Enable(True)
             ## post state to fit panel
             event = PageInfoEvent(page = self)
@@ -1126 +1126 @@
         #self.save_current_state()
         if event !=None:
-            self._undo.Enable(True)
+            #self._undo.Enable(True)
             ## post state to fit panel
             event = PageInfoEvent(page = self)

sansview/perspectives/fitting/modelpage.py

@@ -331 +331 @@
         self.Layout()
         ## post state to fit panel
-        self._undo.Enable(True)
+        #self._undo.Enable(True)
         event = PageInfoEvent(page = self)
         wx.PostEvent(self.parent, event)
@@ -365 +365 @@
        
         ## post state to fit panel
-        self._undo.Enable(True)
+        #self._undo.Enable(True)
         event = PageInfoEvent(page = self)
         wx.PostEvent(self.parent, event)