Changeset 95f9cc4 in sasview

Timestamp:

Feb 3, 2011 4:03:10 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:

7f795490

Parents:

eb8474f

Message:

change menu application to check menu

File:

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

guiframe/gui_manager.py

@@ -104 +104 @@
         self._help_menu = None
         self._tool_menu = None
-        self._plugin_menu_pos = -1
+        self._applications_menu_pos = -1
+        self._applications_menu = None
         ## Find plug-ins
         # Modify this so that we can specify the directory to look into
@@ -526 +527 @@
             if menu_list:
                 for (menu, _) in menu_list:
-                    if self._plugin_menu_pos == -1:
+                    if self._applications_menu_pos == -1:
                         self._menubar.Append(menu, name)
                     else:
-                        self._menubar.Insert(self._plugin_menu_pos, menu, name)
+                        self._menubar.Insert(self._applications_menu_pos, menu, name)
                   
     def _add_help_menu(self):
@@ -632 +633 @@
         style = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
         if style == GUIFRAME.MULTIPLE_APPLICATIONS:
-            p_menu = wx.Menu()
+            plug_data_count = False
+            plug_no_data_count = False
+            self._applications_menu = wx.Menu()
+            separator = self._applications_menu.AppendSeparator()
             for plug in self.plugins:
                 if len(plug.get_perspective()) > 0:
                     id = wx.NewId()
-                    p_menu.Append(id, plug.sub_menu,
-                                  "Switch to application: %s" % plug.sub_menu)
+                    if plug.use_data():
+                        self._applications_menu.InsertCheckItem(0, id, plug.sub_menu,
+                                      "Switch to application: %s" % plug.sub_menu)
+                        plug_data_count = True
+                    else:
+                        plug_no_data_count = True
+                        self._applications_menu.AppendCheckItem(id, plug.sub_menu,
+                                      "Switch to application: %s" % plug.sub_menu)
                     wx.EVT_MENU(self, id, plug.on_perspective)
-            self._menubar.Append(p_menu, '&Applications')
+            if not (plug_data_count and  plug_no_data_count):
+                self._applications_menu.RemoveItem(separator)
+            self._menubar.Append(self._applications_menu, '&Applications')
+            self._check_applications_menu()
             
     def _add_menu_file(self):
@@ -1146 +1159 @@
                 name = self._current_perspective.sub_menu
                 self._data_panel.set_active_perspective(name)
+                self._check_applications_menu()
+                
+    def _check_applications_menu(self):
+        """
+        check the menu of the current application
+        """
+        if self._applications_menu is not None:
+            for menu in self._applications_menu.GetMenuItems():
+                if self._current_perspective is not None:
+                    name = self._current_perspective.sub_menu
+                    if menu.IsCheckable():
+                        if menu.GetLabel() == name:
+                            menu.Check(True)
+                        else:
+                             menu.Check(False) 
            
     def set_plotpanel_floating(self, event=None):