Changeset 0318c4f in sasview for sansguiframe/src/sans/guiframe

Timestamp:

Apr 26, 2012 12:40:33 PM (13 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:

b582d6bc

Parents:

2d0756a5

Message:

better bookmark toolbar icon style

File:

• sansguiframe/src/sans/guiframe/gui_toolbar.py (modified) (8 diffs)

sansguiframe/src/sans/guiframe/gui_toolbar.py

@@ -6 +6 @@
 from sans.guiframe.gui_style import GUIFRAME_ID
 from sans.guiframe.gui_style import GUIFRAME_ICON
-from wx.lib.platebtn import PB_STYLE_SQUARE, PB_STYLE_DROPARROW
+from wx.lib.platebtn import PB_STYLE_DEFAULT, PB_STYLE_DROPARROW,PB_STYLE_NOBG
 #Control panel width 
 import sys
@@ -76 +76 @@
                    disable_report_bmp, button_type,'Report')
         self.AddSeparator()
-        #print_im = GUIFRAME_ICON.PRINT_ICON
-        #print_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
-        #print_bmp = print_im.ConvertToBitmap()
-        
-        #disable_print_bmp = wx.NullBitmap
-        #self.AddLabelTool(GUIFRAME_ID.PRINT_ID, 'Print', print_bmp,
-        #                  disable_print_bmp, button_type, 'Print')
-        #self.AddSeparator()
         undo_im = GUIFRAME_ICON.UNDO_ICON
         undo_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
         undo_bmp = undo_im.ConvertToBitmap()
-        #disable_undo_bmp = clear_image(undo_im).ConvertToBitmap()
         disable_undo_bmp = wx.NullBitmap
         self.AddLabelTool(GUIFRAME_ID.UNDO_ID, 'Undo', undo_bmp,
@@ -95 +86 @@
         redo_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
         redo_bmp = redo_im.ConvertToBitmap()
-        #disable_redo_bmp = clear_image(redo_im).ConvertToBitmap()
         disable_redo_bmp = wx.NullBitmap
         self.AddLabelTool(GUIFRAME_ID.REDO_ID, 'Redo', redo_bmp,
@@ -103 +93 @@
         copy_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
         copy_bmp = copy_im.ConvertToBitmap()
-        #disable_undo_bmp = clear_image(undo_im).ConvertToBitmap()
         disable_copy_bmp = wx.NullBitmap
         self.AddLabelTool(GUIFRAME_ID.COPY_ID, 'Copy', copy_bmp,
@@ -111 +100 @@
         paste_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
         paste_bmp = paste_im.ConvertToBitmap()
-        #disable_redo_bmp = clear_image(redo_im).ConvertToBitmap()
         disable_paste_bmp = wx.NullBitmap
         self.AddLabelTool(GUIFRAME_ID.PASTE_ID, 'Paste', paste_bmp,
                           disable_paste_bmp, button_type,'Paste parameter values')
-
-        self.AddSeparator()
-        #add button for the current application
-        #self.button_application = wx.StaticText(self, -1, 'Welcome')
-        #self.button_application.SetForegroundColour('black')
-        #self.button_application.SetBackgroundColour('#1874CD')
-        #hint = 'Active Application'
-        #self.button_application.SetToolTipString(hint)
-        #self.AddControl(self.button_application)
-        #self.AddSeparator()
-        
-        self._bookmark_bt = PlateButton(self, -1, 'bookmark', 
-                         GUIFRAME_ICON.BOOKMARK_ICON.ConvertToBitmap(), 
-                         style=PB_STYLE_SQUARE|PB_STYLE_DROPARROW)
+        self.AddSeparator()
+        self._bookmark_bt = PlateButton(self, -1, 'Bookmarks',
+                        GUIFRAME_ICON.BOOKMARK_ICON.ConvertToBitmap(), 
+                        style=PB_STYLE_DEFAULT|PB_STYLE_DROPARROW|PB_STYLE_NOBG)
+        self._bookmark_bt.SetWindowVariant(FONT_VARIANT)
         self._bookmark_bt.Disable()
         self._bookmark_menu = wx.Menu()
         self.add_bookmark_default()
-        
-        
         self._bookmark_bt.SetMenu(self._bookmark_menu)
         self.AddControl(self._bookmark_bt)
-
         self.SetToolBitmapSize(tbar_size)
         self.AddSeparator()
@@ -144 +120 @@
                                           size=NAME_BOX,
                                           style=wx.SUNKEN_BORDER|wx.ALIGN_LEFT)
-        #self.button_panel.SetForegroundColour('black')
-        #self.button_panel.SetBackgroundColour('white')
         button_panel_font = self.button_panel.GetFont()
         button_panel_font.SetWeight(wx.BOLD)
         self.button_panel.SetFont(button_panel_font)
-        #self.button_panel.SetClientSize((80,20))
         hint = 'Control Panel on Focus'
         self.button_panel.SetToolTipString(hint)
@@ -161 +134 @@
         """
         id = wx.NewId()
-        self._bookmark_menu.Append(id, 'Add bookmark')
+        self._bookmark_menu.Append(id, 'Bookmark This Page State')
         self._bookmark_menu.AppendSeparator()
         wx.EVT_MENU(self, id, self.on_bookmark)
@@ -167 +140 @@
     def on_bind_button(self):
         """
+        Bind the buttons
         """
         if self.parent is not None: