Rename IconColor to XoColor.

shell/model/BuddyModel.py

@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 from sugar.presence import PresenceService
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 import gobject
 
 _NOT_PRESENT_COLOR = "#888888,#BBBBBB"
@@ -67,7 +67,7 @@ class BuddyModel(gobject.GObject):
             self.__set_color_from_string(_NOT_PRESENT_COLOR)
 
     def __set_color_from_string(self, color_string):
-        self._color = IconColor(color_string)
+        self._color = XoColor(color_string)
 
     def get_name(self):
         return self._name

shell/model/MeshModel.py

@@ -16,7 +16,7 @@
 
 import gobject
 
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 from sugar.presence import PresenceService
 from sugar.activity import bundleregistry
 from model.BuddyModel import BuddyModel
@@ -34,7 +34,7 @@ class ActivityModel:
         return self._bundle.get_icon()
     
     def get_color(self):
-        return IconColor(self._activity.get_color())
+        return XoColor(self._activity.get_color())
 
     def get_service(self):
         return self._service

shell/model/homeactivity.py

@@ -20,7 +20,7 @@ import logging
 import gobject
 import dbus
 
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 from sugar.presence import PresenceService
 from sugar import profile
 
@@ -100,7 +100,7 @@ class HomeActivity(gobject.GObject):
     def get_icon_color(self):
         activity = PresenceService.get_instance().get_activity(self._id)
         if activity != None:
-            return IconColor(activity.get_color())
+            return XoColor(activity.get_color())
         else:
             return profile.get_color()
         

shell/view/FirstTimeDialog.py

@@ -20,7 +20,7 @@ from ConfigParser import ConfigParser
 import gtk
 from gettext import gettext as _
 
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 from sugar import env
 
 class FirstTimeDialog(gtk.Dialog):
@@ -60,7 +60,7 @@ class FirstTimeDialog(gtk.Dialog):
         section = 'Buddy'    
         cp.add_section(section)
         cp.set(section, 'NickName', self._entry.get_text())
-        cp.set(section, 'Color', IconColor().to_string())
+        cp.set(section, 'Color', XoColor().to_string())
 
         config_path = os.path.join(env.get_profile_path(), 'config')
         fileobject = open(config_path, 'w')

shell/view/clipboardicon.py

@@ -2,7 +2,7 @@ import logging
 
 from sugar.graphics.canvasicon import CanvasIcon
 from view.clipboardmenu import ClipboardMenu
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 from sugar.graphics import units
 from sugar.activity import activityfactory
 from sugar.clipboard import clipboardservice
@@ -43,9 +43,9 @@ class ClipboardIcon(CanvasIcon):
             self._menu.set_state(name, percent, preview, activity)
 
         if activity and percent < 100:
-            self.set_property('color', IconColor("#000000,#424242"))
+            self.set_property('color', XoColor("#000000,#424242"))
         else:
-            self.set_property('color', IconColor("#000000,#FFFFFF"))
+            self.set_property('color', XoColor("#000000,#FFFFFF"))
     
     def _activity_create_success_cb(self, handler, activity):
         activity.start(util.unique_id())

shell/view/frame/ActivitiesBox.py

@@ -18,7 +18,7 @@ import hippo
 import logging
 
 from sugar.graphics import units
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 from sugar.graphics.iconbutton import IconButton
 from sugar.presence import PresenceService
 from sugar.activity import bundleregistry

shell/view/frame/FriendsBox.py

@@ -17,7 +17,6 @@
 import hippo
 
 from sugar.graphics.canvasicon import CanvasIcon
-from sugar.graphics.iconcolor import IconColor
 from sugar.presence import PresenceService
 from view.BuddyIcon import BuddyIcon
 from model.BuddyModel import BuddyModel

shell/view/frame/ZoomBox.py

@@ -20,7 +20,6 @@ from gettext import gettext as _
 import hippo
 
 from sugar.graphics.menu import Menu, MenuItem
-from sugar.graphics.iconcolor import IconColor
 from sugar.graphics.iconbutton import IconButton
 import sugar
 

shell/view/home/HomeBox.py

@@ -19,7 +19,7 @@ import math
 import hippo
 
 from sugar.graphics import units
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 
 from view.home.activitiesdonut import ActivitiesDonut
 from view.devices import deviceview
@@ -59,7 +59,7 @@ class HomeBox(hippo.CanvasBox, hippo.CanvasItem):
             if self._donut:
                 self.remove(self._donut)
                 self._donut = None
-                self._my_icon.props.color = IconColor('insensitive')
+                self._my_icon.props.color = XoColor('insensitive')
 
     def do_allocate(self, width, height, origin_changed):
         hippo.CanvasBox.do_allocate(self, width, height, origin_changed)

shell/view/home/activitiesdonut.py

@@ -21,7 +21,7 @@ import colorsys
 
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics import units
-from sugar.graphics import iconcolor
+from sugar.graphics import xocolor
 from sugar import profile
 
 # TODO: rgb_to_html and html_to_rgb are useful elsewhere 
@@ -89,7 +89,7 @@ class ActivityIcon(CanvasIcon):
         new_fill = rgb_to_html(*colorsys.hsv_to_rgb(h, s * factor, v))
         h, s, v = colorsys.rgb_to_hsv(*html_to_rgb(self._orig_color.get_stroke_color()))
         new_stroke = rgb_to_html(*colorsys.hsv_to_rgb(h, s * factor, v))
-        return iconcolor.IconColor("%s,%s" % (new_stroke, new_fill))
+        return xocolor.XoColor("%s,%s" % (new_stroke, new_fill))
 
     def _pulse_cb(self):
         if self._direction == 1: