Changeset 34e3ab3 in sasview

Timestamp:

Apr 20, 2011 10:36:11 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:

39e5025f

Parents:

38aadd9

Message:

modify menu item position according to what was discuss today

Location:

guiframe

Files:

• gui_manager.py (modified) (7 diffs)
• plugin_base.py (modified) (1 diff)

guiframe/gui_manager.py

@@ -122 +122 @@
         self._file_menu = None
         self._data_menu = None
+        self._view_menu = None
         self._window_menu = None
         self._data_panel_menu = None
@@ -644 +645 @@
         self._add_menu_file()
         self._add_menu_edit()
-        self._add_menu_data()
+        self._add_menu_view()
+        #self._add_menu_data()
         self._add_menu_application()
-        
         self._add_menu_tool()
         self._add_current_plugin_menu()
@@ -768 +769 @@
         self._menubar.Append(self._help_menu, '&Help')
             
+    def _add_menu_view(self):
+        """
+        add menu items under view menu
+        """
+        self._view_menu = wx.Menu()
+        style = self.__gui_style & GUIFRAME.MANAGER_ON
+        id = wx.NewId()
+        self._data_panel_menu = self._view_menu.Append(id,
+                                                '&Data Explorer ON', '')
+        wx.EVT_MENU(self, id, self.show_data_panel)
+        if style == GUIFRAME.MANAGER_ON:
+            self._data_panel_menu.SetText('Data Explorer OFF')
+        else:
+            self._data_panel_menu.SetText('Data Explorer ON')
+        self._view_menu.AppendSeparator()
+        style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
+        if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
+            id = wx.NewId()
+            self._toolbar_menu = self._view_menu.Append(id,'&Show Toolbar', '')
+            wx.EVT_MENU(self, id, self._on_hide_toolbar)
+        self._menubar.Append(self._view_menu, '&View')
+        
     def _add_menu_window(self):
         """
@@ -858 +881 @@
             self._check_applications_menu()
             
+    def _populate_file_menu(self):
+        """
+        Insert menu item under file menu
+        """
+        for plugin in self.plugins:
+            if len(plugin.populate_file_menu()) > 0:
+                for item in plugin.populate_file_menu():
+                    m_name, m_hint, m_handler = item
+                    id = wx.NewId()
+                    self._file_menu.Append(id, m_name, m_hint)
+                    wx.EVT_MENU(self, id, m_handler)
+                self._file_menu.AppendSeparator()
+                
     def _add_menu_file(self):
         """
@@ -865 +901 @@
          # File menu
         self._file_menu = wx.Menu()
+        #append item from plugin under menu file if necessary
+        self._populate_file_menu()
         style = self.__gui_style & GUIFRAME.DATALOADER_ON
         style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
@@ -927 +965 @@
                                'Reset current panel')
         wx.EVT_MENU(self, GUIFRAME_ID.RESET_ID, self.on_reset_panel)
-       
-        self._edit_menu.AppendSeparator()
-        style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
-        if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
-            id = wx.NewId()
-            self._toolbar_menu = self._edit_menu.Append(id,'&Show Toolbar', '')
-            wx.EVT_MENU(self, id, self._on_hide_toolbar)
-        
+    
         self._menubar.Append(self._edit_menu,  '&Edit')
         self.enable_edit_menu()
@@ -952 +983 @@
                 for (menu, name) in menu_list:
                     self._menubar.Append(menu, name)
-            
-        style = self.__gui_style & GUIFRAME.MANAGER_ON
-        if self._data_plugin != None:
-            _data_menu = self._data_plugin._data_menu
-            _data_menu.AppendSeparator()
-            id = wx.NewId()
-            self._data_panel_menu = _data_menu.Append(id,
-                                                    '&Data Explorer ON', '')
-            wx.EVT_MENU(self, id, self.show_data_panel)
-            if style == GUIFRAME.MANAGER_ON:
-                self._data_panel_menu.SetText('Data Explorer OFF')
-            else:
-                self._data_panel_menu.SetText('Data Explorer ON')
+        
                         
     def _on_hide_toolbar(self, event=None):

guiframe/plugin_base.py

@@ -105 +105 @@
         """
         return self._always_active
-
+    
+    def populate_file_menu(self):
+        """
+        Append menu item under file menu item of the frame
+        """
+        return []
+    
     def populate_menu(self, parent):
         """