From 2bedec55edb9be8ee27596f00468bde3de6fd46f Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Thu, 20 Sep 2012 09:38:39 +0200 Subject: [PATCH] RadioToolButton, ToolButton, ToggleToolButton: add back the getter for the icon_name property Follow up of fe11a3aa23c0e7fbc3c0c498e147b0a20348cc12 --- src/sugar3/graphics/radiotoolbutton.py | 9 ++++++++- src/sugar3/graphics/toggletoolbutton.py | 9 ++++++++- src/sugar3/graphics/toolbutton.py | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/sugar3/graphics/radiotoolbutton.py b/src/sugar3/graphics/radiotoolbutton.py index aafe8fb9..4e27a8f7 100644 --- a/src/sugar3/graphics/radiotoolbutton.py +++ b/src/sugar3/graphics/radiotoolbutton.py @@ -85,7 +85,14 @@ class RadioToolButton(Gtk.RadioToolButton): self.set_icon_widget(icon) icon.show() - icon_name = GObject.property(type=str, setter=set_icon_name) + def get_icon_name(self): + if self.props.icon_widget is not None: + return self.props.icon_widget.props.icon_name + else: + return None + + icon_name = GObject.property(type=str, setter=set_icon_name, + getter=get_icon_name) def set_xo_color(self, xo_color): if self._xo_color != xo_color: diff --git a/src/sugar3/graphics/toggletoolbutton.py b/src/sugar3/graphics/toggletoolbutton.py index 5f08a520..e893c7a9 100644 --- a/src/sugar3/graphics/toggletoolbutton.py +++ b/src/sugar3/graphics/toggletoolbutton.py @@ -80,7 +80,14 @@ class ToggleToolButton(Gtk.ToggleToolButton): self.set_icon_widget(icon) icon.show() - icon_name = GObject.property(type=str, setter=set_icon_name) + def get_icon_name(self): + if self.props.icon_widget is not None: + return self.props.icon_widget.props.icon_name + else: + return None + + icon_name = GObject.property(type=str, setter=set_icon_name, + getter=get_icon_name) def create_palette(self): return None diff --git a/src/sugar3/graphics/toolbutton.py b/src/sugar3/graphics/toolbutton.py index 37ed85cd..265153da 100644 --- a/src/sugar3/graphics/toolbutton.py +++ b/src/sugar3/graphics/toolbutton.py @@ -119,7 +119,14 @@ class ToolButton(Gtk.ToolButton): self.set_icon_widget(icon) icon.show() - icon_name = GObject.property(type=str, setter=set_icon_name) + def get_icon_name(self): + if self.props.icon_widget is not None: + return self.props.icon_widget.props.icon_name + else: + return None + + icon_name = GObject.property(type=str, setter=set_icon_name, + getter=get_icon_name) def create_palette(self): return None