More work to get rid of stylesheets, some regressions.

shell/view/frame/ActivitiesBox.py

@@ -17,16 +17,20 @@
 import hippo
 import logging
 
+from sugar.graphics import units
+from sugar.graphics.iconcolor import IconColor
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.presence import PresenceService
-from sugar.graphics import style
 from sugar import profile
 
 class ActivityItem(CanvasIcon):
     def __init__(self, activity):
         icon_name = activity.get_icon()
-        CanvasIcon.__init__(self, icon_name=icon_name)
-        style.apply_stylesheet(self, 'frame.ActivityIcon')
+        CanvasIcon.__init__(self, icon_name=icon_name,
+                            box_width=units.grid_to_pixels(1),
+                            box_height=units.grid_to_pixels(1),
+                            color=IconColor('white'))
+
         self._activity = activity
         self._normal_color = self.get_property('color')
         self._prelight_color = profile.get_color() 
@@ -44,9 +48,10 @@ class ActivityItem(CanvasIcon):
 
 class InviteItem(CanvasIcon):
     def __init__(self, activity, invite):
-        CanvasIcon.__init__(self, icon_name=activity.get_icon())
+        CanvasIcon.__init__(self, icon_name=activity.get_icon(),
+                            box_width=units.grid_to_pixels(1),
+                            box_height=units.grid_to_pixels(1))
 
-        style.apply_stylesheet(self, 'frame.ActivityIcon')
         self.props.color = activity.get_color()
 
         self._invite = invite

shell/view/frame/FriendsBox.py

@@ -18,7 +18,6 @@ import hippo
 
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics.iconcolor import IconColor
-from sugar.graphics import style
 from sugar.presence import PresenceService
 from view.BuddyIcon import BuddyIcon
 from model.BuddyModel import BuddyModel
@@ -51,7 +50,6 @@ class FriendsBox(hippo.CanvasBox):
 
         model = BuddyModel(buddy=buddy)
         icon = BuddyIcon(self._shell, self._menu_shell, model)
-        style.apply_stylesheet(icon, 'frame.BuddyIcon')
         self.append(icon)
 
         self._buddies[buddy.get_name()] = icon

shell/view/frame/clipboardbox.py

@@ -3,7 +3,6 @@ import hippo
 import gtk
  
 from sugar import util
-from sugar.graphics import style
 from view.clipboardicon import ClipboardIcon
 from sugar.clipboard import clipboardservice
 
@@ -76,7 +75,6 @@ class ClipboardBox(hippo.CanvasBox):
     
     def _object_added_cb(self, cb_service, object_id, name):
         icon = ClipboardIcon(self._menu_shell, object_id, name)
-        style.apply_stylesheet(icon, 'frame.BuddyIcon')
         self.append(icon)
         self._icons[object_id] = icon