More stylsheets work

shell/view/home/FriendView.py

@@ -0,0 +1,75 @@
+import hippo
+import gobject
+
+from view.BuddyIcon import BuddyIcon
+from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics import style
+from sugar.presence import PresenceService
+import conf
+
+
+class FriendView(hippo.CanvasBox):
+	def __init__(self, shell, menu_shell, buddy, **kwargs):
+		hippo.CanvasBox.__init__(self, **kwargs)
+
+		self._pservice = PresenceService.get_instance()
+		self._activity_registry = conf.get_activity_registry()
+
+		self._buddy = buddy
+		self._buddy_icon = BuddyIcon(shell, menu_shell, buddy)
+		style.apply_stylesheet(self._buddy_icon, 'friends.FriendIcon')
+		self.append(self._buddy_icon)
+
+		self._activity_icon = CanvasIcon()
+		style.apply_stylesheet(self._activity_icon, 'friends.ActivityIcon')
+		self._activity_icon_visible = False
+
+		if self._buddy.is_present():
+			self._buddy_appeared_cb(buddy)
+
+		self._buddy.connect('current-activity-changed', self._buddy_activity_changed_cb)
+		self._buddy.connect('appeared', self._buddy_appeared_cb)
+		self._buddy.connect('disappeared', self._buddy_disappeared_cb)
+		self._buddy.connect('color-changed', self._buddy_color_changed_cb)
+
+	def _get_new_icon_name(self, activity):
+		# FIXME: do something better here; we probably need to use "flagship"
+		# services like mDNS where activities default services are marked
+		# somehow.
+		for serv in activity.get_services():
+			act = self._activity_registry.get_activity_from_type(serv.get_type())
+			if act:
+				return act.get_icon()
+		return None
+
+	def _remove_activity_icon(self):
+		if self._activity_icon_visible:
+			self.remove(self._activity_icon)
+			self._activity_icon_visible = False
+
+	def _buddy_activity_changed_cb(self, buddy, activity=None):
+		if not activity:
+			self._remove_activity_icon()
+			return
+
+		# FIXME: use some sort of "unknown activity" icon rather
+		# than hiding the icon?
+		name = self._get_new_icon_name(activity)
+		if name:
+			self._activity_icon.props.icon_name = name
+			self._activity_icon.props.color = buddy.get_color()
+			if not self._activity_icon_visible:
+				self.append(self._activity_icon)
+				self._activity_icon_visible = True
+		else:
+			self._remove_activity_icon()
+
+	def _buddy_appeared_cb(self, buddy):
+		activity = self._buddy.get_current_activity()
+		self._buddy_activity_changed_cb(buddy, activity)
+
+	def _buddy_disappeared_cb(self, buddy):
+		self._buddy_activity_changed_cb(buddy, None)
+
+	def _buddy_color_changed_cb(self, buddy, color):
+		self._activity_icon.props.color = buddy.get_color()

shell/view/home/FriendsBox.py

@@ -5,7 +5,7 @@ import hippo
 from sugar.graphics.spreadlayout import SpreadLayout
 from sugar.graphics import style
 from view.home.MyIcon import MyIcon
-from view.BuddyActivityView import BuddyActivityView
+from view.home.FriendView import FriendView
 
 class FriendsBox(hippo.CanvasBox, hippo.CanvasItem):
 	__gtype_name__ = 'SugarFriendsBox'
@@ -30,7 +30,7 @@ class FriendsBox(hippo.CanvasBox, hippo.CanvasItem):
 		friends.connect('friend-removed', self._friend_removed_cb)
 
 	def add_friend(self, buddy_info):
-		icon = BuddyActivityView(self._shell, self._menu_shell, buddy_info)
+		icon = FriendView(self._shell, self._menu_shell, buddy_info)
 		self.append(icon, hippo.PACK_FIXED)
 
 		self._friends[buddy_info.get_name()] = icon