Changeset 93fe7e2 in sasview

Timestamp:

Feb 7, 2011 1:56:36 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:

f9f4b65

Parents:

1b3a5a9

Message:

working on guiframe toolbar

File:

• guiframe/gui_toolbar.py (modified) (2 diffs)

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()
-      
        
-        self.AddLabelTool(GUIFRAME_ID.BOOKMARK_ID, 'Bookmark', bookmark_bmp,
-                          shortHelp='Bookmark')
-       
+        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)
@@ -109 +104 @@
         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)