Add icon for activity to the donut.

Add signals in the shell for window open/close and use them in the task view.

1 files changed, 44 insertions, 5 deletions

diff --git a/sugar/canvas/DonutItem.py b/sugar/canvas/DonutItem.py
index e7f5605..54c6dcc 100644
--- a/sugar/canvas/DonutItem.py
+++ b/sugar/canvas/DonutItem.py
@@ -2,6 +2,29 @@ import math
 
 import goocanvas
 
+from sugar.canvas.IconItem import IconItem
+
+class PieceIcon(IconItem):
+	def __init__(self, piece_item, icon_name, color, **kwargs):
+		IconItem.__init__(self, icon_name, color, 48, **kwargs)
+		self._piece_item = piece_item
+
+	def construct(self):
+		angle_start = self._piece_item.get_angle_start()
+		angle_end = self._piece_item.get_angle_end()
+		radius = self.get_parent().get_radius()
+		inner_radius = self.get_parent().get_inner_radius()
+
+		icon_radius = (radius + inner_radius) / 2
+		icon_angle = (angle_start + angle_end) / 2
+		x = icon_radius * math.cos(icon_angle)
+		y = - icon_radius * math.sin(icon_angle)
+
+		icon_width = self.get_property('width')
+		icon_height = self.get_property('height')
+		self.set_property('x', x - icon_width / 2)
+		self.set_property('y', y - icon_height / 2)
+
 class PieceItem(goocanvas.Path):
 	def __init__(self, angle_start, angle_end, **kwargs):
 		goocanvas.Path.__init__(self, **kwargs)
@@ -12,6 +35,12 @@ class PieceItem(goocanvas.Path):
 		self.set_property('stroke-color', '#d8d8d8')
 		self.set_property('line-width', 4)
 
+	def get_angle_start(self):
+		return self._angle_start
+
+	def get_angle_end(self):
+		return self._angle_end
+
 	def construct(self):
 		r = self.get_parent().get_radius()
 
@@ -41,21 +70,28 @@ class DonutItem(goocanvas.Group):
 							   fill_color='#c2c3c5', line_width=0)
 		self.add_child(bg)
 
-		fg_radius = radius / 2
-		fg = goocanvas.Ellipse(radius_x=fg_radius, radius_y=fg_radius,
+		self._inner_radius = radius / 2
+		fg = goocanvas.Ellipse(radius_x=self._inner_radius,
+							   radius_y=self._inner_radius,
 							   fill_color='#d8d8d8', line_width=0)
 		self.add_child(fg)
 
-	def add_piece(self, perc):
+	def add_piece(self, perc, icon_name, color):
+		# FIXME can't override set_parent on the
+		# PieceItem and there is no signal. So we
+		# call a construct item on the childs for now.
+
 		angle_end = self._angle_start + perc * 2 * math.pi / 100
 		piece_item = PieceItem(self._angle_start, angle_end)
 		self._angle_start = angle_end
 
-		# FIXME can't override set_parent on the
-		# PieceItem and there is no signal.
 		self.add_child(piece_item, 1)
 		piece_item.construct()
 
+		icon = PieceIcon(piece_item, icon_name, color)
+		self.add_child(icon)
+		icon.construct()
+
 		return piece_item
 
 	def remove_piece(self, piece_item):
@@ -64,3 +100,6 @@ class DonutItem(goocanvas.Group):
 
 	def get_radius(self):
 		return self._radius
+
+	def get_inner_radius(self):
+		return self._inner_radius