Changeset d11d1aa in sasview

Timestamp:

Apr 9, 2014 8:55:03 AM (11 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:

6a4511d1

Parents:

3d6b00c

Message:

Fix menu order

File:

• src/sans/guiframe/gui_manager.py (modified) (3 diffs)

src/sans/guiframe/gui_manager.py

@@ -768 +768 @@
         
         # Set up the menu
-        self._setup_menus()
+        self._add_menu_file()
+        self._add_menu_edit()
+        self._add_menu_view()
+        self._add_menu_application()
+        self._add_menu_tool()
+        self._add_current_plugin_menu()
+        self._add_help_menu()
         
         try:
@@ -1210 +1216 @@
         
         return captions
-          
-    def _setup_menus(self):
-        """
-        Set up the application menus
-        """
-        # Menu
-        self._add_menu_file()
-        self._add_menu_edit()
-        self._add_menu_view()
-        #self._add_menu_data()
-        self._add_menu_application()
-        self._add_menu_tool()
-        self._add_current_plugin_menu()
-        #self._add_menu_window()
-        self._add_help_menu()
         
     def _setup_tool_bar(self):
@@ -1293 +1284 @@
         Add available plug-in sub-menus. 
         """
-        if (self._menubar is None) or (self._current_perspective is None):
+        if self._menubar is None or self._current_perspective is None \
+            or self._menubar.GetMenuCount()==0:
             return
         #replace or add a new menu for the current plugin