From cb0d75eb59da59ff505794d6a1bddb484b4b2e88 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Fri, 23 Feb 2007 12:09:33 +0000 Subject: Rename IconColor to XoColor. --- (limited to 'shell') diff --git a/shell/model/BuddyModel.py b/shell/model/BuddyModel.py index 8e175e7..9f1ad7f 100644 --- a/shell/model/BuddyModel.py +++ b/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 diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py index 6c9f883..bb3c223 100644 --- a/shell/model/MeshModel.py +++ b/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 diff --git a/shell/model/homeactivity.py b/shell/model/homeactivity.py index d4962f3..f823f59 100644 --- a/shell/model/homeactivity.py +++ b/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() diff --git a/shell/view/FirstTimeDialog.py b/shell/view/FirstTimeDialog.py index 0ae82ef..cb56bb7 100644 --- a/shell/view/FirstTimeDialog.py +++ b/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') diff --git a/shell/view/clipboardicon.py b/shell/view/clipboardicon.py index 65eafb7..faf2e18 100644 --- a/shell/view/clipboardicon.py +++ b/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()) diff --git a/shell/view/frame/ActivitiesBox.py b/shell/view/frame/ActivitiesBox.py index 5d4c59d..8041a62 100644 --- a/shell/view/frame/ActivitiesBox.py +++ b/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 diff --git a/shell/view/frame/FriendsBox.py b/shell/view/frame/FriendsBox.py index 5b88fb1..9b12f6c 100644 --- a/shell/view/frame/FriendsBox.py +++ b/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 diff --git a/shell/view/frame/ZoomBox.py b/shell/view/frame/ZoomBox.py index e77e350..0cb0c34 100644 --- a/shell/view/frame/ZoomBox.py +++ b/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 diff --git a/shell/view/home/HomeBox.py b/shell/view/home/HomeBox.py index c6c0f88..0d5f999 100644 --- a/shell/view/home/HomeBox.py +++ b/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) diff --git a/shell/view/home/activitiesdonut.py b/shell/view/home/activitiesdonut.py index b1ec62d..6c411ae 100644 --- a/shell/view/home/activitiesdonut.py +++ b/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: -- cgit v0.9.1