Changeset 1b3a5a9 in sasview

Timestamp:

Feb 7, 2011 3:46:22 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:

93fe7e2

Parents:

68d48fa

Message:

working on toolbar

Location:

guiframe

Files:

• gui_manager.py (modified) (1 diff)
• gui_toolbar.py (modified) (2 diffs)
• images/Bookmark.png (added)
• images/Thumbs.db (added)
• images/bookmarks_list_add.png (added)
• images/cursor_drag_arrow.png (added)
• images/cursor_drag_hand.png (added)
• images/gnome_zoom_in.png (added)
• images/gnome_zoom_out.png (added)
• images/house_2.png (added)
• images/preview_2.png (added)
• images/print_preview.png (added)
• images/search.png (added)
• images/search_pan.png (added)
• images/star_plus.png (added)
• images/zoom_in_icon.bmp (added)

guiframe/gui_manager.py

@@ -1497 +1497 @@
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = True
+    def __init__(self, parent, *args, **kwds):
+        wx.Panel.__init__(self, parent, *args, **kwds)
+        PanelBase.__init__(self, parent)
     
 

guiframe/gui_toolbar.py

@@ -20 +20 @@
         self.AddLabelTool(GUIFRAME_ID.SAVE_ID, 'Save', save_bmp, shortHelp='Save')
         self.AddSeparator()
+        self.image_book = wx.Image('images/bookmarks_list_add.png',
+                                 wx.BITMAP_TYPE_PNG)
+        bookmark_bmp =self.image_book.ConvertToBitmap()
+      
        
-        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.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)
@@ -104 +109 @@
         self.button_application.SetLabel(str(application_name))
         self.button_panel.SetLabel(str(panel_name))
-        print "update_button", application_name, panel_name
+       
     def update_toolbar(self, panel=None):
         """
         """
         if panel is None:
-            #self.Disable()
             self.EnableTool(GUIFRAME_ID.PRINT_ID, False)
             self.EnableTool(GUIFRAME_ID.UNDO_ID,False)