Changeset adfcab3 in sasview

Timestamp:

May 23, 2008 4:59:03 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

7cb0353

Parents:

1a5c946

Message:

Only add menu Perspectives and Panels menu items when they contain more than 1 item

File:

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

guiframe/gui_manager.py

@@ -22 +22 @@
     import config
 from sans.guicomm.events import EVT_STATUS
+
+import warnings
+warnings.simplefilter("ignore")
+
 
 class ViewerFrame(wx.Frame):
@@ -262 +266 @@
         filemenu.Append(101,'&Quit', 'Exit') 
         
+        # Add sub menus
+        menubar.Append(filemenu,  '&File')
+        
         # Plot menu
         # Attach a menu item for each panel in our
@@ -267 +274 @@
         # TODO: clean this up. We should just identify
         # plug-in panels and add them all.
-        viewmenu = wx.Menu()
-        
+        
+        # Only add the panel menu if there is more than one panel
+        n_panels = 0
         for plug in self.plugins:
-            plugmenu = wx.Menu()
             pers = plug.get_perspective()
             if len(pers)>0:
-                for item in self.panels:
-                    if item == 'default':
-                        continue
-                    panel = self.panels[item]
-                    if panel.window_name in pers:
-                        plugmenu.Append(int(item), panel.window_caption, "Show %s window" % panel.window_caption)
-                        wx.EVT_MENU(self, int(item), self._on_view)
-                
-                viewmenu.AppendMenu(wx.NewId(), plug.sub_menu, plugmenu, plug.sub_menu)
-            
+                n_panels += 1
+        
+        if n_panels>1:
+            viewmenu = wx.Menu()
+            for plug in self.plugins:
+                plugmenu = wx.Menu()
+                pers = plug.get_perspective()
+                if len(pers)>0:
+                    for item in self.panels:
+                        if item == 'default':
+                            continue
+                        panel = self.panels[item]
+                        if panel.window_name in pers:
+                            plugmenu.Append(int(item), panel.window_caption, "Show %s window" % panel.window_caption)
+                            wx.EVT_MENU(self, int(item), self._on_view)
+                    
+                    viewmenu.AppendMenu(wx.NewId(), plug.sub_menu, plugmenu, plug.sub_menu)
+                
+            menubar.Append(viewmenu, '&Panel')
+
         # Perspective
         # Attach a menu item for each defined perspective.
-        p_menu = wx.Menu()
-        
+        # Only add the perspective menu if there are more than one perspectves
+        n_perspectives = 0
         for plug in self.plugins:
             if len(plug.get_perspective()) > 0:
-                id = wx.NewId()
-                p_menu.Append(id, plug.sub_menu, "Switch to %s perspective" % plug.sub_menu)
-                wx.EVT_MENU(self, id, plug.on_perspective)
+                n_perspectives += 1
+        
+        if n_perspectives>1:
+            p_menu = wx.Menu()
+            for plug in self.plugins:
+                if len(plug.get_perspective()) > 0:
+                    id = wx.NewId()
+                    p_menu.Append(id, plug.sub_menu, "Switch to %s perspective" % plug.sub_menu)
+                    wx.EVT_MENU(self, id, plug.on_perspective)
+            menubar.Append(p_menu,   '&Perspective')
  
         # Help menu
@@ -312 +336 @@
         
         
-        # Add sub menus
-        menubar.Append(filemenu,  '&File')
+        
         
         # Look for plug-in menus
@@ -323 +346 @@
         
 
-        menubar.Append(viewmenu, '&Panel')
-        menubar.Append(p_menu,   '&Perspective')
         menubar.Append(helpmenu, '&Help')