Changeset 570cb96 in sasview

Timestamp:

Apr 20, 2011 12:55:53 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

3554fd39

Parents:

39e5025f

Message:

update menu item according to discussion

Location:

guiframe

Files:

• gui_manager.py (modified) (1 diff)
• local_perspectives/data_loader/data_loader.py (modified) (1 diff)

guiframe/gui_manager.py

@@ -784 +784 @@
             self._data_panel_menu.SetText('Data Explorer ON')
         self._view_menu.AppendSeparator()
-        style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
-        if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
-            id = wx.NewId()
+        id = wx.NewId()
+        style1 = self.__gui_style & GUIFRAME.TOOL_ON
+        if style1 == GUIFRAME.TOOL_ON:
             self._toolbar_menu = self._view_menu.Append(id,'&Show Toolbar', '')
-            wx.EVT_MENU(self, id, self._on_hide_toolbar)
+        else:
+            self._toolbar_menu = self._view_menu.Append(id,'&Hide Toolbar', '')
+        wx.EVT_MENU(self, id, self._on_hide_toolbar)
         self._menubar.Append(self._view_menu, '&View')
         

guiframe/local_perspectives/data_loader/data_loader.py

@@ -46 +46 @@
         self._data_menu = None 
         
-    def populate_menu(self, parent):
-        """
-        """
-         # Add menu data 
+    def populate_file_menu(self):
+        """
+        get a menu item and append it under file menu of the application
+        add load file menu item and load folder item
+        """
+        #menu for data files
+        menu_list = []
+        data_file_hint = "load one or more data in the application"
+        menu_list = [('&Load Data File(s)', data_file_hint, self._load_data)]
+        gui_style = self.parent.get_style()
+        style = gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
+        style1 = gui_style & GUIFRAME.DATALOADER_ON
+        if style == GUIFRAME.MULTIPLE_APPLICATIONS:
+            #menu for data from folder
+            data_folder_hint = "load multiple data in the application"
+            menu_list.append(('&Load Data Folder', data_folder_hint, 
+                              self._load_folder))
+        return menu_list
+    
+    def unused_populate_menu(self, parent):
+        """
+        """
+        # Add menu data 
         self._data_menu = wx.Menu()
         #menu for data files