Changeset 6f59a98 in sasview

Timestamp:

Feb 27, 2010 9:07:20 AM (15 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:

272d91e

Parents:

4ea3600

Message:

Fixed issue with "Panel" menu. Moved to Window menu if app has 1 and only 1 perspective and it has >1 panels.

File:

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

guiframe/gui_manager.py

@@ -374 +374 @@
             # Check whether we need to put this panel
             # in the center pane
-            if hasattr(p, "CENTER_PANE"):
+            if hasattr(p, "CENTER_PANE") and p.CENTER_PANE:
                 if p.CENTER_PANE:
                     self.panels[str(id)] = p
@@ -487 +487 @@
         menubar.Append(self.filemenu,  '&File')
         
-        # Plot menu
+        # Window menu
         # Attach a menu item for each panel in our
         # panel list that also appears in a plug-in.
-        # TODO: clean this up. We should just identify
-        # plug-in panels and add them all.
-        
-        # Only add the panel menu if there is more than two panels
-        n_panels = 0
-        for plug in self.plugins:
+        
+        # Only add the panel menu if there is only one perspective and
+        # it has more than two panels.
+        # Note: the first plug-in is always the plotting plug-in. The first application
+        # plug-in is always the second one in the list.
+        if len(self.plugins)==2:
+            plug = self.plugins[1]
             pers = plug.get_perspective()
-            if len(pers)>0:
-                n_panels += 1
        
-        if n_panels>2:
-            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')
+            if len(pers)>1:
+                viewmenu = wx.Menu()
+                for item in self.panels:
+                    if item == 'default':
+                        continue
+                    panel = self.panels[item]
+                    if panel.window_name in pers:
+                        viewmenu.Append(int(item), panel.window_caption, "Show %s window" % panel.window_caption)
+                        wx.EVT_MENU(self, int(item), self._on_view)
+                menubar.Append(viewmenu, '&Window')
 
         # Perspective