Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@laptop.org>2012-09-20 07:38:39 (GMT)
committer Simon Schampijer <simon@laptop.org>2012-09-20 07:38:39 (GMT)
commit2bedec55edb9be8ee27596f00468bde3de6fd46f (patch)
tree803d86e3679393b924f5d251ea5ebb6f979b6189
parentc411190178d28c5fef343a1aa2c9bd428f0604fc (diff)
RadioToolButton, ToolButton, ToggleToolButton: add back the getter for the icon_name property
Follow up of fe11a3aa23c0e7fbc3c0c498e147b0a20348cc12
-rw-r--r--src/sugar3/graphics/radiotoolbutton.py9
-rw-r--r--src/sugar3/graphics/toggletoolbutton.py9
-rw-r--r--src/sugar3/graphics/toolbutton.py9
3 files changed, 24 insertions, 3 deletions
diff --git a/src/sugar3/graphics/radiotoolbutton.py b/src/sugar3/graphics/radiotoolbutton.py
index aafe8fb..4e27a8f 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 5f08a52..e893c7a 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 37ed85c..265153d 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