Changeset 765e47c in sasview

Timestamp:

May 5, 2015 9:37:50 AM (10 years ago)

Author:

Doucet, Mathieu <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:

f22d219

Parents:

3b67c30

Message:

Re #390. Fix how the default perspective is set.

Location:

src/sas

Files:

• guiframe/gui_manager.py (modified) (3 diffs)
• perspectives/fitting/fitting.py (modified) (1 diff)

src/sas/guiframe/gui_manager.py

@@ -1295 +1295 @@
             return
         #replace or add a new menu for the current plugin
-
         pos = self._menubar.FindMenu(str(self._applications_menu_name))
         if pos != -1:
@@ -1308 +1307 @@
             #get the position of the menu when it first added
             self._applications_menu_pos = pos
-
         else:
             menu_list = self._current_perspective.populate_menu(self)
@@ -1314 +1312 @@
                 for (menu, name) in menu_list:
                     if self._applications_menu_pos == -1:
-                        self._menubar.Append(menu, name)
+                        # Find the Help position and insert just before it if possible
+                        help_pos = self._menubar.FindMenu("Help")
+                        if help_pos == -1:
+                            self._menubar.Append(menu, name)
+                        else:
+                            self._menubar.Insert(help_pos-1, menu, name)
                     else:
-                        self._menubar.Insert(self._applications_menu_pos,
-                                             menu, name)
+                        self._menubar.Insert(self._applications_menu_pos, menu, name)
                     self._applications_menu_name = name
 

src/sas/perspectives/fitting/fitting.py

@@ -80 +80 @@
         self.elapsed = 0.022
         self.fit_panel = None
-        #Flag to let the plug-in know that it is running stand alone
-        self.standalone = True
         ## dictionary of page closed and id
         self.closed_page_dict = {}