Changeset 3554fd39 in sasview

Timestamp:

Apr 20, 2011 11:09:09 AM (14 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:

56d940f

Parents:

570cb96

Message:

fix toolbar

File:

• guiframe/gui_manager.py (modified) (6 diffs)

guiframe/gui_manager.py

@@ -662 +662 @@
         self.SetToolBar(self._toolbar)
         self._update_toolbar_helper()
-        #self._on_hide_toolbar(event=None)
+        self._on_toggle_toolbar(event=None)
     
     def _update_toolbar_helper(self):
@@ -787 +787 @@
         style1 = self.__gui_style & GUIFRAME.TOOL_ON
         if style1 == GUIFRAME.TOOL_ON:
+            self._toolbar_menu = self._view_menu.Append(id,'&Hide Toolbar', '')
+        else:
             self._toolbar_menu = self._view_menu.Append(id,'&Show Toolbar', '')
-        else:
-            self._toolbar_menu = self._view_menu.Append(id,'&Hide Toolbar', '')
-        wx.EVT_MENU(self, id, self._on_hide_toolbar)
+        wx.EVT_MENU(self, id, self._on_toggle_toolbar)
         self._menubar.Append(self._view_menu, '&View')
         
@@ -987 +987 @@
         
                         
-    def _on_hide_toolbar(self, event=None):
+    def _on_toggle_toolbar(self, event=None):
         """
         hide or show toolbar
@@ -1036 +1036 @@
             style = self.__gui_style & GUIFRAME.TOOL_ON
             if (style == GUIFRAME.TOOL_ON) & (not self._toolbar.IsShown()):
-                self._on_hide_toolbar()
+                self._on_toggle_toolbar()
             
     def show_welcome_panel(self, event):
@@ -1057 +1057 @@
             if self._toolbar != None and not self._toolbar.IsShown():
                 self._toolbar.Show(True)
-            self._on_hide_toolbar()
+            self._on_toggle_toolbar()
 
         self._mgr.Update()
@@ -1468 +1468 @@
         style = self.__gui_style & GUIFRAME.TOOL_ON
         if (style == GUIFRAME.TOOL_ON) & (not self._toolbar.IsShown()):
-            self._on_hide_toolbar()
+            self._on_toggle_toolbar()
         for item in self.panels:
             # Check whether this is a sticky panel