diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-19 12:27:56 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-19 12:27:56 (GMT) |
| commit | a3f62ee68f47686e52128e7f1a1e2278bb287ebc (patch) | |
| tree | 625d83d671cf7c39466ab87f0e3a4928dc903e29 /shell | |
| parent | 32a368bdbb5dc9ce0de9adb5a1b120b39044dd77 (diff) | |
Integrate Walter color values.
(Still not fully hooked up to buddies)
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/home/FriendsView.py | 3 | ||||
| -rw-r--r-- | shell/home/HomeView.py | 8 | ||||
| -rw-r--r-- | shell/home/MeshView.py | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/shell/home/FriendsView.py b/shell/home/FriendsView.py index b12616a..820b555 100644 --- a/shell/home/FriendsView.py +++ b/shell/home/FriendsView.py @@ -3,6 +3,7 @@ import random import goocanvas from sugar.canvas.IconItem import IconItem +from sugar.canvas.IconItem import IconColor class Model(goocanvas.CanvasModelSimple): def __init__(self, data_model): @@ -22,7 +23,7 @@ class Model(goocanvas.CanvasModelSimple): def add_friend(self, friend): root = self.get_root_item() - icon = IconItem('stock-buddy', 'green', 48) + icon = IconItem('stock-buddy', IconColor(), 48) icon.set_property('x', random.random() * 1100) icon.set_property('y', random.random() * 800) diff --git a/shell/home/HomeView.py b/shell/home/HomeView.py index 6424e6e..acc451c 100644 --- a/shell/home/HomeView.py +++ b/shell/home/HomeView.py @@ -3,6 +3,7 @@ import goocanvas import wnck from sugar.canvas.IconItem import IconItem +from sugar.canvas.IconItem import IconColor from sugar.canvas.DonutItem import DonutItem from sugar.canvas.DonutItem import PieceItem from sugar.canvas.DonutItem import PieceIcon @@ -29,7 +30,7 @@ class TasksItem(DonutItem): def _add(self, activity): icon_name = activity.get_icon_name() - item = self.add_piece(100 / 8, icon_name, 'blue') + item = self.add_piece(100 / 8, icon_name, IconColor()) # FIXME This really sucks. Fix goocanvas event handling. item.set_data('activity', activity) @@ -41,7 +42,8 @@ class ActivityItem(IconItem): ICON_SIZE = 30 def __init__(self, activity): - IconItem.__init__(self, activity.get_icon(), 'white', + IconItem.__init__(self, activity.get_icon(), + IconColor('white'), ActivityItem.ICON_SIZE) self._activity = activity @@ -100,7 +102,7 @@ class Model(goocanvas.CanvasModelSimple): tasks.translate(600, 450) root.add_child(tasks) - me = IconItem('stock-buddy', 'green', 150) + me = IconItem('stock-buddy', IconColor(), 150) me.translate(600 - (me.get_property('width') / 2), 450 - (me.get_property('height') / 2)) root.add_child(me) diff --git a/shell/home/MeshView.py b/shell/home/MeshView.py index bd8f230..8bbea05 100644 --- a/shell/home/MeshView.py +++ b/shell/home/MeshView.py @@ -3,13 +3,14 @@ import random import goocanvas from sugar.canvas.IconItem import IconItem +from sugar.canvas.IconItem import IconColor class ActivityItem(IconItem): def __init__(self, activity, registry): info = registry.get_activity(activity.get_type()) icon_name = info.get_icon() - IconItem.__init__(self, icon_name, 'green', 48) + IconItem.__init__(self, icon_name, IconColor(), 48) self._activity = activity |