Rename color property in CanvasIcon to xo-color and added properties fill-color and stroke-color.

5 files changed, 13 insertions, 8 deletions

diff --git a/shell/view/home/FriendView.py b/shell/view/home/FriendView.py
index c84cee5..d0273a7 100644
--- a/shell/view/home/FriendView.py
+++ b/shell/view/home/FriendView.py
@@ -70,7 +70,7 @@ class FriendView(hippo.CanvasBox):
         name = self._get_new_icon_name(activity)
         if name:
             self._activity_icon.props.icon_name = name
-            self._activity_icon.props.color = buddy.get_color()
+            self._activity_icon.props.xo_color = buddy.get_color()
             if not self._activity_icon_visible:
                 self.append(self._activity_icon, hippo.PACK_EXPAND)
                 self._activity_icon_visible = True
@@ -85,4 +85,4 @@ class FriendView(hippo.CanvasBox):
         self._buddy_activity_changed_cb(buddy, None)
 
     def _buddy_color_changed_cb(self, buddy, color):
-        self._activity_icon.props.color = buddy.get_color()
+        self._activity_icon.props.xo_color = buddy.get_color()
diff --git a/shell/view/home/HomeBox.py b/shell/view/home/HomeBox.py
index 0d5f999..a7936cf 100644
--- a/shell/view/home/HomeBox.py
+++ b/shell/view/home/HomeBox.py
@@ -19,6 +19,7 @@ import math
 import hippo
 
 from sugar.graphics import units
+from sugar.graphics import color
 from sugar.graphics.xocolor import XoColor
 
 from view.home.activitiesdonut import ActivitiesDonut
@@ -59,7 +60,11 @@ class HomeBox(hippo.CanvasBox, hippo.CanvasItem):
             if self._donut:
                 self.remove(self._donut)
                 self._donut = None
-                self._my_icon.props.color = XoColor('insensitive')
+                self._my_icon.props.stroke_color = color.BUTTON_INACTIVE
+                self._my_icon.props.fill_color = \
+                        color.BUTTON_INACTIVE_BACKGROUND
+                self._my_icon.props.background_color = \
+                        color.BUTTON_INACTIVE_BACKGROUND
 
     def do_allocate(self, width, height, origin_changed):
         hippo.CanvasBox.do_allocate(self, width, height, origin_changed)
diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py
index 2c6947c..b8ff3ea 100644
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
@@ -33,7 +33,7 @@ class ActivityView(SnowflakeBox):
         self._icons = {}
 
         icon = CanvasIcon(icon_name=model.get_icon_name(),
-                          color=model.get_color(), box_width=80)
+                          xo_color=model.get_color(), box_width=80)
         icon.connect('activated', self._clicked_cb)
         self.append(icon, hippo.PACK_FIXED)
         self.set_root(icon)
diff --git a/shell/view/home/MyIcon.py b/shell/view/home/MyIcon.py
index 6fa36b6..91b1d4c 100644
--- a/shell/view/home/MyIcon.py
+++ b/shell/view/home/MyIcon.py
@@ -21,4 +21,4 @@ class MyIcon(CanvasIcon):
     def __init__(self, scale):
         CanvasIcon.__init__(self, scale=scale,
                             icon_name='theme:stock-buddy',
-                            color=profile.get_color())
+                            xo_color=profile.get_color())
diff --git a/shell/view/home/activitiesdonut.py b/shell/view/home/activitiesdonut.py
index 6c411ae..455fbaa 100644
--- a/shell/view/home/activitiesdonut.py
+++ b/shell/view/home/activitiesdonut.py
@@ -55,7 +55,7 @@ class ActivityIcon(CanvasIcon):
         self._level = self._level_max
         color = self._icon_colors[self._level]
 
-        CanvasIcon.__init__(self, icon_name=icon_name, color=color,
+        CanvasIcon.__init__(self, icon_name=icon_name, xo_color=color,
                             scale=units.MEDIUM_ICON_SCALE, cache=True)
 
         self._activity = activity
@@ -103,7 +103,7 @@ class ActivityIcon(CanvasIcon):
                 self._direction = 1
                 self._level = 0
 
-        self.props.color = self._icon_colors[self._level]
+        self.props.xo_color = self._icon_colors[self._level]
         self.emit_paint_needed(0, 0, -1, -1)
         return True
 
@@ -113,7 +113,7 @@ class ActivityIcon(CanvasIcon):
         self._launched = True
         self.cleanup()
         self._level = 100.0
-        self.props.color = self._orig_color
+        self.props.xo_color = self._orig_color
         self.emit_paint_needed(0, 0, -1, -1)
 
     def get_launched(self):