Changeset cbf22e5 in sasview

Timestamp:

Jan 31, 2011 5:13:21 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:

2399b2a

Parents:

bf4402c3

Message:

working on guiframe menu

File:

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

guiframe/gui_manager.py

@@ -53 +53 @@
 
 
-
 class ViewerFrame(wx.Frame):
     """
@@ -104 +103 @@
         self._help_menu = None
         self._tool_menu = None
-        self._plugin_menu_list = []
+        self._plugin_menu = None
         ## Find plug-ins
         # Modify this so that we can specify the directory to look into
@@ -372 +371 @@
                     self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
                                           Name(p.window_name).Caption(p.window_caption).
-                                           Center().
-                                           CloseButton(True).
+                                           CenterPane().
                                            MinSize(wx.Size(w, h)).
                                            Hide())
@@ -477 +475 @@
         self._add_menu_data()
         self._add_menu_application()
-        self._add_current_plugin_menu()
         self._add_menu_tool()
         self._add_menu_window()
         self._add_help_menu()
+        self._add_current_plugin_menu()
         self.SetMenuBar(self._menubar)
         
@@ -506 +504 @@
         """
         add current plugin menu
-        """
-          # Look for plug-in menus
-        # Add available plug-in sub-menus. 
-        for item in self.plugins:
-            if item != self._plotting_plugin:
-                for (menu, name) in \
-                    item.populate_menu(self):
-                    self._menubar.Append(menu, name)
-                   
+        Look for plug-in menus
+        Add available plug-in sub-menus. 
+        """
+        if self._menubar 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')
+                        
     def _add_help_menu(self):
         """
@@ -976 +983 @@
         :param panels: list of panels
         """
-       
         for item in self.panels:
             # Check whether this is a sticky panel
@@ -1130 +1136 @@
         self._current_perspective = perspective
         name = "No current Application selected"
-        if self._current_perspective is not None and \
-            self._data_panel is not None:
-            name = self._current_perspective.sub_menu
-            self._data_panel.set_active_perspective(name)
+        if self._current_perspective is not None:
+            self._add_current_plugin_menu()
+            if self._data_panel is not None:
+                name = self._current_perspective.sub_menu
+                self._data_panel.set_active_perspective(name)
            
     def set_plotpanel_floating(self, event=None):