diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-05-23 15:37:04 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-05-23 15:37:04 (GMT) |
commit | bbd3404310e40821dbdfe5e6dba9d63be7fd94a5 (patch) | |
tree | e18750982395a4c4cc5ec25bda4041abe4db5d76 /src/sugar/graphics/toolbutton.py | |
parent | 685a9e3462564a9d7000ffddeb5c6b936881615f (diff) |
Hookup the new palette creation in the toolbuttons.
Diffstat (limited to 'src/sugar/graphics/toolbutton.py')
-rw-r--r-- | src/sugar/graphics/toolbutton.py | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/src/sugar/graphics/toolbutton.py b/src/sugar/graphics/toolbutton.py index 236d7ec..4334dcd 100644 --- a/src/sugar/graphics/toolbutton.py +++ b/src/sugar/graphics/toolbutton.py @@ -55,10 +55,11 @@ class ToolButton(gtk.ToolButton): def __init__(self, icon_name=None, **kwargs): self._accelerator = None self._tooltip = None - self._palette = None gobject.GObject.__init__(self, **kwargs) + self._palette_invoker = ToolInvoker(self) + if icon_name: self.set_icon(icon_name) @@ -97,24 +98,34 @@ class ToolButton(gtk.ToolButton): self.set_icon_widget(icon) icon.show() + def create_palette(self): + return None + def get_palette(self): - return self._palette - + return self._palette_invoker.palette + def set_palette(self, palette): - if self._palette is not None: - self._palette.props.invoker = None - self._palette = palette - self._palette.props.invoker = ToolInvoker(self) + self._palette_invoker.palette = palette palette = gobject.property( type=object, setter=set_palette, getter=get_palette) - + + def get_palette_invoker(self): + return self._palette_invoker + + def set_palette_invoker(self, palette_invoker): + self._palette_invoker.detach() + self._palette_invoker = palette_invoker + + palette_invoker = gobject.property( + type=object, setter=set_palette_invoker, getter=get_palette_invoker) + def do_expose_event(self, event): child = self.get_child() allocation = self.get_allocation() - if self._palette and self._palette.is_up(): - invoker = self._palette.props.invoker - invoker.draw_rectangle(event, self._palette) + if self.palette and self.palette.is_up(): + invoker = self.palette.props.invoker + invoker.draw_rectangle(event, self.palette) elif child.state == gtk.STATE_PRELIGHT: child.style.paint_box(event.window, gtk.STATE_PRELIGHT, gtk.SHADOW_NONE, event.area, @@ -125,6 +136,6 @@ class ToolButton(gtk.ToolButton): gtk.ToolButton.do_expose_event(self, event) def __button_clicked_cb(self, widget): - if self._palette: - self._palette.popdown(True) + if self.palette: + self.palette.popdown(True) |