Changeset 7bc88bf in sasview

Timestamp:

Feb 1, 2011 7:47:54 PM (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:

cab076b

Parents:

4986ce7

Message:

make plugin menu change according to the current plugin

File:

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

guiframe/gui_manager.py

@@ -103 +103 @@
         self._help_menu = None
         self._tool_menu = None
-        self._plugin_menu = None
+        self._plugin_menu_pos = -1
         ## Find plug-ins
         # Modify this so that we can specify the directory to look into
@@ -476 +476 @@
         self._add_menu_application()
         self._add_menu_tool()
+        self._add_current_plugin_menu()
         self._add_menu_window()
         self._add_help_menu()
-        self._add_current_plugin_menu()
         self.SetMenuBar(self._menubar)
         
@@ -507 +507 @@
         Add available plug-in sub-menus. 
         """
-        if self._menubar is None:
+        if (self._menubar is None) or (self._current_perspective is None):
             return
-        
-        pos = self._menubar.GetMenuCount()
-        if self._current_perspective is not None:
-            if self._current_perspective != self._plotting_plugin:
-                menu_list = self._current_perspective.populate_menu(self)
-                if menu_list:
-                    for (menu, name) in menu_list:
-                        self._plugin_menu = self._menubar.Append(menu, 'Others')
-                #else:
-                #    self._plugin_menu = self._menubar.Append(wx.Menu(), 'all')              
-        #else:
-        #    self._plugin_menu = self._menubar.Insert(pos, wx.Menu(), 'all')
-                        
+        #replace or add a new menu for the current plugin
+        name = 'Others'
+        pos = self._menubar.FindMenu(name)
+        if pos != -1:
+            menu_list = self._current_perspective.populate_menu(self)
+            if menu_list:
+                for (menu, _) in menu_list:
+                    hidden_menu = self._menubar.Replace(self._plugin_menu_pos,
+                                                         menu, name)  
+            else:
+                hidden_menu = self._menubar.Remove(pos)
+            #get the position of the menu when it first added
+            self._plugin_menu_pos = pos 
+        else:
+            menu_list = self._current_perspective.populate_menu(self)
+            if menu_list:
+                for (menu, _) in menu_list:
+                    if self._plugin_menu_pos == -1:
+                        self._menubar.Append(menu, name)
+                    else:
+                        self._menubar.Insert(self._plugin_menu_pos, menu, name)
+                  
     def _add_help_menu(self):
         """