Changeset 4e4d3bb in sasview for guiframe/gui_toolbar.py

Timestamp:

Feb 14, 2011 3:14:27 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:

18ec684

Parents:

982e953

Message:

working on the bookmark option

File:

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

guiframe/gui_toolbar.py

@@ -3 +3 @@
 import os
 from wx import ToolBar as Tbar
-
-
+from wx.lib.platebtn import PlateButton
 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
 
 
@@ -28 +28 @@
         Tbar.__init__(self, parent,  *args, **kwds)
         self.parent = parent
+        self._bookmark_menu = None
+        self._bookmark_bt = None
         self.do_layout()
         self.on_bind_button()
@@ -44 +46 @@
                           disable_save_bmp,button_type, shortHelp='Save')
         self.AddSeparator()
-        bookmark_im = GUIFRAME_ICON.BOOKMARK_ICON
-        bookmark_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
-        bookmark_bmp = bookmark_im.ConvertToBitmap()
-        #disable_bookmark_bmp = clear_image(bookmark_im).ConvertToBitmap()
-        disable_bookmark_bmp = wx.NullBitmap
-        self.AddLabelTool(GUIFRAME_ID.BOOKMARK_ID, 'Bookmark', bookmark_bmp,
-                   disable_bookmark_bmp, button_type,'Bookmark')
-        self.AddSeparator()
         zoom_in_im = GUIFRAME_ICON.ZOOM_IN_ICON
         zoom_in_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
@@ -139 +133 @@
         self.button_panel.SetToolTipString(hint)
         self.AddControl(self.button_panel)
+        self._bookmark_bt = PlateButton(self, -1, 'bookmark', 
+                         GUIFRAME_ICON.BOOKMARK_ICON.ConvertToBitmap(), 
+                         style=PB_STYLE_SQUARE|PB_STYLE_DROPARROW)
+        self._bookmark_bt.Disable()
+        self._bookmark_menu = wx.Menu()
+        id = wx.NewId()
+        self._bookmark_menu.Append(id, 'Add bookmark')
+        self._bookmark_menu.AppendSeparator()
+        wx.EVT_MENU(self, id, self.on_bookmark)
+        
+        self._bookmark_bt.SetMenu(self._bookmark_menu)
+        self.AddControl(self._bookmark_bt)
        
         self.SetToolBitmapSize(tbar_size)
@@ -147 +153 @@
         """
         if self.parent is not None:
+            
             self.parent.Bind(wx.EVT_TOOL, self.parent.on_redo_panel,
                              id=GUIFRAME_ID.REDO_ID)
             self.parent.Bind(wx.EVT_TOOL, self.parent.on_undo_panel,
                              id=GUIFRAME_ID.UNDO_ID)
-            self.parent.Bind(wx.EVT_TOOL, self.parent.on_bookmark_panel,
-                             id=GUIFRAME_ID.BOOKMARK_ID)
             self.parent.Bind(wx.EVT_TOOL, self.parent.on_save_panel,
                              id=GUIFRAME_ID.SAVE_ID)
@@ -186 +191 @@
             self.EnableTool(GUIFRAME_ID.ZOOM_IN_ID, False)
             self.EnableTool(GUIFRAME_ID.ZOOM_OUT_ID, False)
-            self.EnableTool(GUIFRAME_ID.BOOKMARK_ID, False)
             self.EnableTool(GUIFRAME_ID.PREVIEW_ID, False)
             self.EnableTool(GUIFRAME_ID.SAVE_ID, False)
             self.EnableTool(GUIFRAME_ID.DRAG_ID, False)
             self.EnableTool(GUIFRAME_ID.RESET_ID, False)
+            self._bookmark_bt.Disable()
+            
         else:
             self.EnableTool(GUIFRAME_ID.PRINT_ID, panel.get_print_flag())
@@ -198 +204 @@
             self.EnableTool(GUIFRAME_ID.ZOOM_IN_ID, panel.get_zoom_in_flag())
             self.EnableTool(GUIFRAME_ID.ZOOM_OUT_ID, panel.get_zoom_out_flag())
-            self.EnableTool(GUIFRAME_ID.BOOKMARK_ID, panel.get_bookmark_flag())
             self.EnableTool(GUIFRAME_ID.PREVIEW_ID, panel.get_preview_flag())
             self.EnableTool(GUIFRAME_ID.SAVE_ID, panel.get_save_flag())
             self.EnableTool(GUIFRAME_ID.DRAG_ID, panel.get_drag_flag())
             self.EnableTool(GUIFRAME_ID.RESET_ID, panel.get_reset_flag())
+            self._bookmark_bt.Enable(panel.get_bookmark_flag())
         self.Realize()
         
@@ -230 +236 @@
         
     def enable_bookmark(self, panel):
-        self.EnableTool(GUIFRAME_ID.BOOKMARK_ID, panel.get_bookmark_flag())
+        flag =  panel.get_bookmark_flag()
+        self._bookmark_bt.Enable(flag)
         self.Realize()
         
@@ -244 +251 @@
         self.EnableTool(GUIFRAME_ID.PREVIEW_ID, panel.get_preview_flag())
         self.Realize()
-
-              
+    
+    def on_bookmark(self, event):
+        """
+        add book mark
+        """
+        if self.parent is not None:
+           self.parent.on_bookmark_panel(event)
+           
+    def append_bookmark(self, event):
+        """
+        receive item to append on the toolbar button bookmark
+        """
+        title = event.title
+        hint = event.hint
+        handler = event.handler
+        id = wx.NewId()
+        self._bookmark_menu.Append(id, str(title), str(hint))
+        wx.EVT_MENU(self, id, handler)
+