Changeset ecc85443 in sasview

Timestamp:

Mar 28, 2011 10:37:34 AM (13 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:

4b5bd73

Parents:

e52865f

Message:

update toolbar

Location:

guiframe

Files:

• gui_toolbar.py (modified) (1 diff)
• panel_base.py (modified) (11 diffs)

guiframe/gui_toolbar.py

@@ -158 +158 @@
         
     def enable_undo(self, panel):
-        self.EnableTool(GUIFRAME_ID.PRINT_ID, panel.get_print_flag())
+        self.EnableTool(GUIFRAME_ID.UNDO_ID, panel.get_undo_flag())
         self.Realize()
         

guiframe/panel_base.py

@@ -70 +70 @@
         self._print_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_print()
      
@@ -89 +90 @@
         self._undo_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_undo()
       
@@ -108 +110 @@
         self._redo_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_redo()
       
@@ -127 +130 @@
         self._zoom_in_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_zoom_in()
        
@@ -146 +150 @@
         self._zoom_out_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_zoom_out()
         
@@ -165 +170 @@
         self._zoom_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_zoom()
      
@@ -184 +190 @@
         self._bookmark_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_bookmark()
        
@@ -203 +210 @@
         self._preview_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_preview()
        
@@ -222 +230 @@
         self._save_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_save()
 
@@ -241 +250 @@
         self._drag_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_drag()
        
@@ -260 +270 @@
         self._reset_flag = flag
         if self._manager is not None and self._manager.parent is not None:
+            self._manager.parent.panel_on_focus = self
             self._manager.parent.enable_reset()