Adapt to icon name changes

shell/intro/colorpicker.py

@@ -26,7 +26,7 @@ class ColorPicker(hippo.CanvasBox, hippo.CanvasItem):
         self.props.orientation = hippo.ORIENTATION_HORIZONTAL
 
         self._xo = CanvasIcon(size=style.XLARGE_ICON_SIZE,
-                              icon_name='theme:stock-buddy')
+                              icon_name='theme:xo')
         self._set_random_colors()
         self._xo.connect('activated', self._xo_activated_cb)
         self.append(self._xo)

shell/model/homeactivity.py

@@ -103,7 +103,7 @@ class HomeActivity(gobject.GObject):
         if self._activity_info:
             return self._activity_info.icon
         else:
-            return 'theme:stock-missing'
+            return 'theme:image-missing'
     
     def get_icon_color(self):
         """Retrieve the appropriate icon colour for this activity

shell/view/BuddyIcon.py

@@ -20,7 +20,7 @@ from view.BuddyMenu import BuddyMenu
 
 class BuddyIcon(CanvasIcon):
     def __init__(self, shell, buddy):
-        CanvasIcon.__init__(self, icon_name='theme:stock-buddy',
+        CanvasIcon.__init__(self, icon_name='theme:xo',
                             xo_color=buddy.get_color())
 
         self._shell = shell

shell/view/BuddyMenu.py

@@ -80,10 +80,10 @@ class BuddyMenu(Palette):
 
         friends = shell_model.get_friends()
         if friends.has_buddy(self._buddy):
-            menu_item = MenuItem(_('Remove friend'), 'stock-remove')
+            menu_item = MenuItem(_('Remove friend'), 'list-remove')
             menu_item.connect('activate', self._remove_friend_cb)
         else:
-            menu_item = MenuItem(_('Make friend'), 'stock-add')
+            menu_item = MenuItem(_('Make friend'), 'list-add')
             menu_item.connect('activate', self._make_friend_cb)
 
         self.menu.append(menu_item)

shell/view/clipboardmenu.py

@@ -63,12 +63,12 @@ class ClipboardMenu(Palette):
             self.append(self._preview_text)
         """
 
-        self._remove_item = MenuItem(_('Remove'), 'stock-remove')
+        self._remove_item = MenuItem(_('Remove'), 'list-remove')
         self._remove_item.connect('activate', self._remove_item_activate_cb)
         self.menu.append(self._remove_item)
         self._remove_item.show()
 
-        self._open_item = MenuItem(_('Open'), 'stock-keep')
+        self._open_item = MenuItem(_('Open'))
         self._open_item_activate_sid = self._open_item.connect('activate',
                 self._open_item_activate_cb)
         self.menu.append(self._open_item)

shell/view/devices/network/wired.py

@@ -19,4 +19,4 @@ from view.devices import deviceview
 class DeviceView(deviceview.DeviceView):
     def __init__(self, model):
         deviceview.DeviceView.__init__(self, model)
-        self.props.icon_name = 'theme:stock-net-wired'
+        self.props.icon_name = 'theme:network-wired'

shell/view/home/MyIcon.py

@@ -20,5 +20,5 @@ from sugar import profile
 class MyIcon(CanvasIcon):
     def __init__(self, size):
         CanvasIcon.__init__(self, size=size,
-                            icon_name='theme:stock-buddy',
+                            icon_name='theme:xo',
                             xo_color=profile.get_color())

sugar/graphics/objectchooser.py

@@ -150,7 +150,7 @@ class CollapsedEntry(CanvasRoundBox):
                 self._icon_name = type.icon
 
         if not self._icon_name:
-            self._icon_name = 'theme:stock-missing'
+            self._icon_name = 'theme:image-missing'
 
         return self._icon_name
 

tests/test-snowflake-layout.py

@@ -37,12 +37,12 @@ def add_snowflake(parent, size):
     box.set_layout(layout)
 
     icon = CanvasIcon(scale=0.8, xo_color=XoColor(),
-                      icon_name='theme:object-link')
+                      icon_name='theme:xo')
     layout.add_center(icon)
 
     for k in range(0, size):
         icon = CanvasIcon(scale=0.4, xo_color=XoColor(),
-                          icon_name='theme:stock-buddy')
+                          icon_name='theme:xo')
         layout.add(icon)
 
 window = gtk.Window()

tests/test-spread-layout.py

@@ -35,7 +35,7 @@ def _create_icon():
 
     scale = 1.0 + random.random() * 1.5
     icon = CanvasIcon(scale=scale, xo_color=color,
-                      icon_name='theme:stock-buddy')
+                      icon_name='theme:xo')
     icon.set_tooltip('Test')
     layout.add(icon)