Port a few widgets to use new style properties.

2 files changed, 48 insertions, 52 deletions

diff --git a/src/sugar/graphics/combobox.py b/src/sugar/graphics/combobox.py
index 2924fb3..68a7106 100644
--- a/src/sugar/graphics/combobox.py
+++ b/src/sugar/graphics/combobox.py
@@ -21,10 +21,6 @@ import gtk
 class ComboBox(gtk.ComboBox):
     __gtype_name__ = 'SugarComboBox'    
 
-    __gproperties__ = {
-        'value'    : (object, None, None,
-                      gobject.PARAM_READABLE)
-    }
     def __init__(self):
         gtk.ComboBox.__init__(self)
 
@@ -39,14 +35,14 @@ class ComboBox(gtk.ComboBox):
 
         self.set_row_separator_func(self._is_separator)
 
-    def do_get_property(self, pspec):
-        if pspec.name == 'value':
-            row = self.get_active_item()
-            if not row:
-                return None
-            return row[0]
-        else:
-            return gtk.ComboBox.do_get_property(self, pspec)
+    def get_value(self):
+        row = self.get_active_item()
+        if not row:
+            return None
+        return row[0]
+
+    value = gobject.property(
+        type=object, getter=get_value, setter=None)
 
     def _get_real_name_from_theme(self, name, size):
         icon_theme = gtk.icon_theme_get_default()
diff --git a/src/sugar/graphics/icon.py b/src/sugar/graphics/icon.py
index f99eade..0dc82bb 100644
--- a/src/sugar/graphics/icon.py
+++ b/src/sugar/graphics/icon.py
@@ -293,17 +293,6 @@ class _IconBuffer(object):
 class Icon(gtk.Image):
     __gtype_name__ = 'SugarIcon'
 
-    __gproperties__ = {
-        'xo-color'      : (object, None, None,
-                           gobject.PARAM_WRITABLE),
-        'fill-color'    : (object, None, None,
-                           gobject.PARAM_READWRITE),
-        'stroke-color'  : (object, None, None,
-                           gobject.PARAM_READWRITE),
-        'badge-name'    : (str, None, None, None,
-                           gobject.PARAM_READWRITE)
-    }
-
     def __init__(self, **kwargs):
         self._buffer = _IconBuffer()
 
@@ -368,35 +357,46 @@ class Icon(gtk.Image):
         cr.set_source_surface(surface, x, y)
         cr.paint()
 
-    def do_set_property(self, pspec, value):
-        if pspec.name == 'xo-color':
-            if self._buffer.xo_color != value:
-                self._buffer.xo_color = value
-                self.queue_draw()
-        elif pspec.name == 'fill-color':
-            if self._buffer.fill_color != value:
-                self._buffer.fill_color = value
-                self.queue_draw()
-        elif pspec.name == 'stroke-color':
-            if self._buffer.stroke_color != value:
-                self._buffer.stroke_color = value
-                self.queue_draw()
-        elif pspec.name == 'badge-name':
-            if self._buffer.badge_name != value:
-                self._buffer.badge_name = value
-                self.queue_resize()
-        else:
-            gtk.Image.do_set_property(self, pspec, value)
-
-    def do_get_property(self, pspec):
-        if pspec.name == 'fill-color':
-            return self._buffer.fill_color
-        elif pspec.name == 'stroke-color':
-            return self._buffer.stroke_color
-        elif pspec.name == 'badge-name':
-            return self._buffer.badge_name
-        else:
-            return gtk.Image.do_get_property(self, pspec)
+    def set_xo_color(self, value):
+        if self._buffer.xo_color != value:
+            self._buffer.xo_color = value
+            self.queue_draw()
+
+    xo_color = gobject.property(
+        type=object, getter=None, setter=set_xo_color)
+
+    def set_fill_color(self, value):
+        if self._buffer.fill_color != value:
+            self._buffer.fill_color = value
+            self.queue_draw()
+
+    def get_fill_color(self):
+        return self._buffer.fill_color
+
+    fill_color = gobject.property(
+        type=object, getter=get_fill_color, setter=set_fill_color)
+
+    def set_stroke_color(self, value):
+        if self._buffer.stroke_color != value:
+            self._buffer.stroke_color = value
+            self.queue_draw()
+
+    def get_stroke_color(self):
+        return self._buffer.stroke_color
+
+    stroke_color = gobject.property(
+        type=object, getter=get_stroke_color, setter=set_stroke_color)
+
+    def set_badge_name(self, value):
+        if self._buffer.badge_name != value:
+            self._buffer.badge_name = value
+            self.queue_resize()
+
+    def get_badge_name(self):
+        return self._buffer.badge_name
+
+    badge_name = gobject.property(
+        type=str, getter=get_badge_name, setter=set_badge_name)
 
 class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
     __gtype_name__ = 'CanvasIcon'