Integrate Walter color values.
(Still not fully hooked up to buddies)
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user