Changeset f7e9af2 in sasview

Timestamp:

Apr 19, 2011 2:55:35 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

a9e489c

Parents:

512bbd0

Message:

finished menu re-arrange

Files:

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

guiframe/gui_manager.py

@@ -205 +205 @@
             self.panel_on_focus = event.panel
         panel_name = 'No panel on focus'
-        application_name = 'No Selected Application'
+        application_name = 'No Selected Analysis'
         if self.panel_on_focus is not None:
             for ID in self.panels.keys():
@@ -665 +665 @@
         """
         """
-        application_name = 'No Selected Application'
+        application_name = 'No Selected Analysis'
         panel_name = 'No Panel on Focus'
         if self._toolbar is  None:
@@ -750 +750 @@
             if hasattr(item, "help"):
                 id = wx.NewId()
-                self._help_menu.Append(id,'&%s help' % item.sub_menu, '')
+                self._help_menu.Append(id,'&%s Help' % item.sub_menu, '')
                 wx.EVT_MENU(self, id, item.help)
         if config._do_aboutbox:
@@ -843 +843 @@
                         
                         self._applications_menu.InsertCheckItem(pos, id, plug.sub_menu,
-                                      "Switch to application: %s" % plug.sub_menu)
+                                      "Switch to analysis: %s" % plug.sub_menu)
                         plug_data_count = True
                         pos += 1
@@ -849 +849 @@
                         plug_no_data_count = True
                         self._applications_menu.AppendCheckItem(id, plug.sub_menu,
-                                      "Switch to application: %s" % plug.sub_menu)
+                                      "Switch to analysis: %s" % plug.sub_menu)
                     wx.EVT_MENU(self, id, plug.on_perspective)
             #self._applications_menu.
             if (not plug_data_count or not plug_no_data_count):
                 self._applications_menu.RemoveItem(separator)
-            self._menubar.Append(self._applications_menu, '&Application')
+            self._menubar.Append(self._applications_menu, '&Analysis')
             self._check_applications_menu()
             
@@ -867 +867 @@
         style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
         if style == GUIFRAME.DATALOADER_ON:
+            id = wx.NewId()
+            hint_load_file = "read all analysis states save previously"
+            self._save_appl_menu = self._file_menu.Append(id, 
+                                    '&Open Project', hint_load_file)
+            wx.EVT_MENU(self, id, self._on_open_state_project)
+            
             if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
                 # some menu of plugin to be seen under file menu
-                hint_load_file = "Read state's files and load"
-                hint_load_file += " them into the application"
+                hint_load_file = "Read a status files and load"
+                hint_load_file += " them into the analysis"
                 id = wx.NewId()
                 self._save_appl_menu = self._file_menu.Append(id, 
-                                        '&Load Application', hint_load_file)
+                                        '&Open Analysis', hint_load_file)
                 wx.EVT_MENU(self, id, self._on_open_state_application)
                 
+            self._file_menu.AppendSeparator()
             id = wx.NewId()
-            hint_load_file = "read all applications states save previously"
-            self._save_appl_menu = self._file_menu.Append(id, 
-                                    '&Load Project', hint_load_file)
-            wx.EVT_MENU(self, id, self._on_open_state_project)
-           
+            self._file_menu.Append(id, '&Save Project',
+                                 'Save the state of the whole analysis')
+            
+            wx.EVT_MENU(self, id, self._on_save_project)
             if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
-                self._file_menu.AppendSeparator()
+                #self._file_menu.AppendSeparator()
                 id = wx.NewId()
                 self._save_appl_menu = self._file_menu.Append(id, 
-                                                          '&Save Application',
-                                 'Save state of the current active application')
+                                                          '&Save Analysis',
+                            'Save state of the current active analysis panel')
                 wx.EVT_MENU(self, id, self._on_save_application)
-            id = wx.NewId()
-            self._file_menu.Append(id, '&Save Project',
-                                 'Save the state of the whole application')
-            wx.EVT_MENU(self, id, self._on_save_project)
+            
             self._file_menu.AppendSeparator()
         
@@ -1624 +1627 @@
         """
         self._current_perspective = perspective
-        name = "No current Application selected"
+        name = "No current analysis selected"
         if self._current_perspective is not None:
             self._add_current_plugin_menu()

sansview/perspectives/fitting/fitting.py

@@ -135 +135 @@
         self.menu1.Append(id1, '&Simultaneous Fit',simul_help)
         wx.EVT_MENU(owner, id1, self.on_add_sim_page)
+        
+        self.menu1.AppendSeparator()
         
         id1 = wx.NewId()