Changeset 4c0572f in sasview

Timestamp:

Feb 25, 2011 2:03:57 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:

8a7d922

Parents:

97ec26b

Message:

modify menu plugin name

File:

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

guiframe/gui_manager.py

@@ -108 +108 @@
         self._tool_menu = None
         self._applications_menu_pos = -1
+        self._applications_menu_name = None
         self._applications_menu = None
         self._edit_menu = None
@@ -147 +148 @@
         self.Bind(EVT_APPEND_BOOKMARK, self.append_bookmark)
     
+    def get_data_manager(self):
+        """
+        """
+        return self._data_manager
+    
     def get_toolbar(self):
         """
@@ -190 +196 @@
         self.SetStatusBar(self.sb)
         # Add panel
-        default_flag = wx.aui.AUI_MGR_DEFAULT#| wx.aui.AUI_MGR_ALLOW_ACTIVE_PANE
+        default_flag = wx.aui.AUI_MGR_DEFAULT| wx.aui.AUI_MGR_ALLOW_ACTIVE_PANE
         self._mgr = wx.aui.AuiManager(self, flags=default_flag)
    
@@ -560 +566 @@
             return
         #replace or add a new menu for the current plugin
-        name = 'Others'
-        pos = self._menubar.FindMenu(name)
+       
+        pos = self._menubar.FindMenu(str(self._applications_menu_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(pos, menu, name)  
+                for (menu, name) in menu_list:
+                    hidden_menu = self._menubar.Replace(pos, menu, name) 
+                    self._applications_menu_name = name 
+                #self._applications_menu_pos = pos
             else:
                 hidden_menu = self._menubar.Remove(pos)
+                self._applications_menu_name = None
             #get the position of the menu when it first added
-            self._plugin_menu_pos = pos 
+            self._applications_menu_pos = pos 
+            
         else:
             menu_list = self._current_perspective.populate_menu(self)
             if menu_list:
-                for (menu, _) in menu_list:
+                for (menu,name) in menu_list:
                     if self._applications_menu_pos == -1:
                         self._menubar.Append(menu, name)
                     else:
                         self._menubar.Insert(self._applications_menu_pos, menu, name)
+                    self._applications_menu_name = name
                   
     def _add_help_menu(self):
@@ -1270 +1281 @@
                     if self.enable_add_data(new_plot) and \
                     hasattr(self.panel_on_focus, 'group_id'):
-                        new_plot.group_id = self.panel_on_focus.group_id
+                        new_plot.group_id.append(self.panel_on_focus.group_id)
+            else:
+                #if not append then new plot
+                new_plot.group_id.append(wx.NewId())
             wx.PostEvent(self, NewPlotEvent(plot=new_plot,
                                                   title=str(new_plot.title)))