Changeset 53750a1 in sasview

Timestamp:

Mar 16, 2016 3:01:49 PM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

82bc7a9, 66f21cd

Parents:

40fc798 (diff), 0d534de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview

Files:

• build_tools/jenkins_linux_build_ver02.sh (added)
• build_tools/jenkins_linux_pylint_ver02.sh (added)
• src/sas/sasgui/guiframe/gui_manager.py (modified) (3 diffs)
• sasview/setup_exe.py (modified) (1 diff)

src/sas/sasgui/guiframe/gui_manager.py

@@ -1290 +1290 @@
                         wx.EVT_MENU(self, id, tool[2])
             if self._tool_menu is not None:
-                self._menubar.Append(self._tool_menu, '&Tool')
+                self._menubar.Append(self._tool_menu, '&Tools')
 
     def _add_current_plugin_menu(self):
@@ -1321 +1321 @@
                 for (menu, name) in menu_list:
                     if self._applications_menu_pos == -1:
-                        # Find the Help position and insert just before it if possible
-                        help_pos = self._menubar.FindMenu("Help")
-                        if help_pos == -1:
+                        # Find the Analysis position and insert just after it if possible
+                        analysis_pos = self._menubar.FindMenu("Analysis")
+                        if analysis_pos == -1:
                             self._menubar.Append(menu, name)
                             self._applications_menu_pos = -1
                         else:
-                            self._menubar.Insert(help_pos-1, menu, name)
-                            self._applications_menu_pos = help_pos - 1
+                            self._menubar.Insert(analysis_pos+1, menu, name)
+                            self._applications_menu_pos = analysis_pos + 1
                     else:
                         self._menubar.Insert(self._applications_menu_pos, menu, name)
@@ -1492 +1492 @@
             if not plug_data_count or not plug_no_data_count:
                 self._applications_menu.RemoveItem(separator)
-            self._menubar.Append(self._applications_menu, '&Analysis')
+            #Windows introduces a "Window" menu item during the layout process
+            #somehow.  We want it to be next to the last item with Help as
+            #last. However Analysis gets stuck after Window in normal ordering
+            #so force it to be next after the Tools menu item.  Should we add
+            #another menu item will need to check if this is still where we 
+            #want Analysis.  This is NOT an issue on the Mac which does not
+            #have the extra Window menu item.
+            #      March 2016 Code Camp  -- PDB 
+            Tools_pos = self._menubar.FindMenu("Tools")
+            self._menubar.Insert(Tools_pos+1,self._applications_menu,
+                                 '&Analysis')
             self._check_applications_menu()
 

sasview/setup_exe.py

@@ -265 +265 @@
 # Copy the settings file for the sas.dataloader file extension associations
 import sas.sascalc.dataloader.readers
-f = os.path.join(sas.dataloader.readers.get_data_path(), 'defaults.json')
+f = os.path.join(sas.sascalc.dataloader.readers.get_data_path(), 'defaults.json')
 if os.path.isfile(f):
     data_files.append(('.', [f]))