Changeset 73b3ae2 in sasview

Timestamp:

Feb 4, 2011 2:21:17 PM (13 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:

946d1b1

Parents:

3cd5806

Message:

working on guiframe toolbar

Location:

guiframe

Files:

• gui_manager.py (modified) (4 diffs)
• gui_toolbar.py (modified) (1 diff)

guiframe/gui_manager.py

@@ -111 +111 @@
         self._edit_menu = None
         self._toolbar_menu = None
+        self._save_appl_menu = None
         #tool bar
         self._toolbar = None
@@ -160 +161 @@
         #update edit menu
         self.enable_edit_menu()
-        print "set_panel_on_focus", event.panel.window_caption
-            
+       
     def build_gui(self):
         """
@@ -725 +725 @@
             self._populate_file_menu()
             id = wx.NewId()
-            self._file_menu.Append(id, '&Save Application',
+            self._save_appl_menu = self._file_menu.Append(id, 
+                                                          '&Save Application',
                                  'Save state of the current active application')
             wx.EVT_MENU(self, id, self._on_save_application)
@@ -940 +941 @@
         save the state of the current active application
         """
-        ## Default file location for save
-        self._default_save_location = os.getcwd()
-        if self._current_perspective is  None:
-            return
-        reader, ext = self._current_perspective.get_extensions()
-        path = None
-        dlg = wx.FileDialog(self, "Choose a file",
-                            self._default_save_location, "", ext, wx.SAVE)
-        if dlg.ShowModal() == wx.ID_OK:
-            path = dlg.GetPath()
-            self._default_save_location = os.path.dirname(path)
-        else:
-            return None
-        dlg.Destroy()
-        if path is None:
-            return
-        # default cansas xml doc
-        doc = None
-        for panel in self._current_perspective.get_perspective():
-            doc = on_save_helper(doc, reader, panel, path)
+        if self.panel_on_focus is not None:
+            self.panel_on_focus.on_save(event)
             
     def _on_save_project(self, event):

guiframe/gui_toolbar.py

@@ -19 +19 @@
                                              size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.SAVE_ID, 'Save', save_bmp, shortHelp='Save')
+        self.AddSeparator()
        
         bookmark_bmp =  wx.ArtProvider.GetBitmap(wx.ART_ADD_BOOKMARK, wx.ART_TOOLBAR,
                                                  size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.BOOKMARK_ID, 'Bookmark', bookmark_bmp,shortHelp='Bookmark')
-        
+        self.AddSeparator()
         zoom_in_bmp = wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_TOOLBAR,
                                                 size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.ZOOM_IN_ID, 'Zoom in', zoom_in_bmp,shortHelp='Zoom in')
-        
+        self.AddSeparator()
         zoom_out_bmp = wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_TOOLBAR,
                                                  size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.ZOOM_OUT_ID,'Zoom out',zoom_out_bmp,shortHelp='Zoom out')
-        
+        self.AddSeparator()
         zoom_bmp =  wx.ArtProvider.GetBitmap(wx.ART_GO_FORWARD, wx.ART_TOOLBAR,
                                              size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.ZOOM_ID, 'Zoom', zoom_bmp,shortHelp='Zoom')
-        
+        self.AddSeparator()
         drag_bmp =  wx.ArtProvider.GetBitmap(wx.ART_REMOVABLE, wx.ART_TOOLBAR,
                                              size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.DRAG_ID, 'Drag', drag_bmp,shortHelp='Drag')
-        
+        self.AddSeparator()
         preview_bmp =  wx.ArtProvider.GetBitmap(wx.ART_REPORT_VIEW, wx.ART_TOOLBAR,
                                                 size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.PREVIEW_ID, 'Preview', preview_bmp,shortHelp='Report')
-        
+        self.AddSeparator()
         print_bmp =  wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_TOOLBAR,
                                               size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.PRINT_ID, 'Print', print_bmp,shortHelp='Print')
-        
+        self.AddSeparator()
         undo_bmp =  wx.ArtProvider.GetBitmap(wx.ART_UNDO, wx.ART_TOOLBAR,
                                              size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.UNDO_ID, 'Undo', undo_bmp,shortHelp='Undo')
-        
-      
+        self.AddSeparator()
         redo_bmp =  wx.ArtProvider.GetBitmap(wx.ART_REDO, wx.ART_TOOLBAR,
                                              size=tbar_size)
         self.AddLabelTool(GUIFRAME_ID.REDO_ID, 'Redo', redo_bmp,shortHelp='Redo')
+        self.AddSeparator()
         #add button for the current application
-        self.button_application = wx.Button(self, -1, 'Welcome')
+        self.button_application = wx.StaticText(self, -1, 'Welcome')
         self.button_application.SetForegroundColour('black')
         self.button_application.SetBackgroundColour('#1874CD')
         self.AddControl(self.button_application)
+        self.AddSeparator()
          #add button for the panel on focus
-        self.button_panel = wx.Button(self, -1, 'No Panel')
+        self.button_panel = wx.StaticText(self, -1, 'No Panel')
         self.button_panel.SetForegroundColour('black')
         self.button_panel.SetBackgroundColour('#90EE90')