Changeset 11857f7 in sasview

Timestamp:

Apr 19, 2012 5:43:19 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

5cc6d20

Parents:

9130227

Message:

fixed a bug in last feature added

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -612 +612 @@
                 self.enable_edit_menu()
     
-    def disable_app_menu(self,p_panel=None):  
+    def disable_app_menu(self, p_panel=None):  
         """
         Disables all menus in the menubar
@@ -629 +629 @@
 
         if not enable:
-            p_panel.on_set_focus(None)
             if self._toolbar is not None:
                 self._toolbar.update_toolbar(None)
+            p_panel.on_set_focus(None)
         else:
             self._toolbar.update_toolbar(c_panel)
@@ -1158 +1158 @@
     def _update_toolbar_helper(self):
         """
+        Helping to update the toolbar
         """
         application_name = 'No Selected Analysis'
         panel_name = 'No Panel on Focus'
+        c_panel = self.cpanel_on_focus
         if self._toolbar is  None:
             return
-        if self.cpanel_on_focus is not None:
+        if c_panel is not None:
             self.reset_bookmark_menu(self.cpanel_on_focus)
-        self._toolbar.update_toolbar(self.cpanel_on_focus)
         if self._current_perspective is not None:
             application_name = self._current_perspective.sub_menu
-        if self.cpanel_on_focus is not None:
-            panel_name = self.cpanel_on_focus.window_caption
-            
+        c_panel_state = c_panel
+        if c_panel is not None:
+            panel_name = c_panel.window_caption
+            if not c_panel.IsShownOnScreen():
+                c_panel_state = None
+        self._toolbar.update_toolbar(c_panel_state)
         self._toolbar.update_button(application_name=application_name, 
                                         panel_name=panel_name)
-        
         self._toolbar.Realize()