v30.2; new translations

6 files changed, 438 insertions, 275 deletions

diff --git a/AbacusActivity.py b/AbacusActivity.py
index 41fe836..cd237c9 100644
--- a/AbacusActivity.py
+++ b/AbacusActivity.py
@@ -23,14 +23,9 @@ try:  # 0.86+ toolbar widgets
 except ImportError:
     HAS_TOOLBARBOX = False
 if HAS_TOOLBARBOX:
-    from sugar.bundle.activitybundle import ActivityBundle
+    from sugar.graphics.toolbarbox import ToolbarButton
     from sugar.activity.widgets import ActivityToolbarButton
     from sugar.activity.widgets import StopButton
-    from sugar.graphics.toolbarbox import ToolbarButton
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.radiotoolbutton import RadioToolButton
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.icon import Icon
 from sugar.datastore import datastore
 
 from gettext import gettext as _
@@ -42,80 +37,8 @@ _logger = logging.getLogger('abacus-activity')
 from abacus_window import Abacus, Custom, Suanpan, Soroban, Schety,\
                           Nepohualtzintzin, Binary, Hex, Decimal, Fractions,\
                           Caacupe, Cuisenaire
-
-
-def _button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None,
-                    accelerator=None):
-    '''Factory for making toolbar buttons'''
-    button = ToolButton(icon_name)
-    if tooltip is not None:
-        button.set_tooltip(tooltip)
-    button.props.sensitive = True
-    if accelerator is not None:
-        button.props.accelerator = accelerator
-    if cb_arg is None:
-        button.connect('clicked', callback)
-    else:
-        button.connect('clicked', cb_arg)
-    if hasattr(toolbar, 'insert'):  # the main toolbar
-        toolbar.insert(button, -1)
-    else:  # or a secondary toolbar
-        toolbar.props.page.insert(button, -1)
-    button.show()
-    return button
-
-
-def _radio_factory(icon_name, toolbar, callback, cb_arg=None,
-                          tooltip=None, group=None):
-    ''' Add a radio button to a toolbar '''
-    button = RadioToolButton(group=group)
-    button.set_named_icon(icon_name)
-    if tooltip is not None:
-        button.set_tooltip(tooltip)
-    if cb_arg is None:
-        button.connect('clicked', callback)
-    else:
-        button.connect('clicked', callback, cb_arg)
-    if hasattr(toolbar, 'insert'):  # the main toolbar
-        toolbar.insert(button, -1)
-    else:  # or a secondary toolbar
-        toolbar.props.page.insert(button, -1)
-    button.show()
-    return button
-
-
-def _label_factory(label_text, toolbar):
-    ''' Factory for adding a label to a toolbar '''
-    label = gtk.Label(label_text)
-    label.set_line_wrap(True)
-    label.show()
-    toolitem = gtk.ToolItem()
-    toolitem.add(label)
-    toolbar.insert(toolitem, -1)
-    toolitem.show()
-    return label
-
-
-def _spin_factory(default, min, max, callback, toolbar):
-    spin_adj = gtk.Adjustment(default, min, max, 1, 32, 0)
-    spin = gtk.SpinButton(spin_adj, 0, 0)
-    spin_id = spin.connect('value-changed', callback)
-    spin.set_numeric(True)
-    spin.show()
-    toolitem = gtk.ToolItem()
-    toolitem.add(spin)
-    toolbar.insert(toolitem, -1)
-    toolitem.show()
-    return spin
-
-
-def _separator_factory(toolbar, expand=False, visible=True):
-    ''' add a separator to a toolbar '''
-    separator = gtk.SeparatorToolItem()
-    separator.props.draw = visible
-    separator.set_expand(expand)
-    toolbar.insert(separator, -1)
-    separator.show()
+from toolbar_utils import separator_factory, radio_factory, label_factory, \
+    button_factory, spin_factory
 
 
 class AbacusActivity(activity.Activity):
@@ -162,12 +85,12 @@ class AbacusActivity(activity.Activity):
             toolbox.toolbar.insert(custom_toolbar_button, -1)
             custom_toolbar_button.show()
 
-            _separator_factory(toolbox.toolbar, False, True)
+            separator_factory(toolbox.toolbar, False, True)
 
-            _button_factory('edit-delete', toolbox.toolbar,
+            button_factory('edit-delete', toolbox.toolbar,
                             self._reset_cb, tooltip=_('Reset'))
 
-            _separator_factory(toolbox.toolbar, True, False)
+            separator_factory(toolbox.toolbar, True, False)
 
             stop_button = StopButton(self)
             stop_button.props.accelerator = _('<Ctrl>Q')
@@ -186,10 +109,10 @@ class AbacusActivity(activity.Activity):
             toolbox.add_toolbar(_('Custom'), custom_toolbar)
             toolbox.add_toolbar(_('Edit'), edit_toolbar)
 
-            _button_factory('edit-delete', edit_toolbar,
+            button_factory('edit-delete', edit_toolbar,
                             self._reset_cb, tooltip=_('Reset'))
 
-            _separator_factory(edit_toolbar, False, True)
+            separator_factory(edit_toolbar, False, True)
 
             toolbox.set_current_toolbar(1)
 
@@ -200,110 +123,109 @@ class AbacusActivity(activity.Activity):
                 toolbox.props.visible = False
 
         # TRANS: simple decimal abacus
-        self.decimal = _radio_factory('decimal', abacus_toolbar,
-                                      self._radio_cb, cb_arg='decimal',
-                                      tooltip=_('Decimal'),
-                                      group=None)
+        self.decimal = radio_factory('decimal', abacus_toolbar,
+                                     self._radio_cb, cb_arg='decimal',
+                                     tooltip=_('Decimal'),
+                                     group=None)
 
         # TRANS: http://en.wikipedia.org/wiki/Soroban (Japanese abacus)
-        self.japanese = _radio_factory('soroban', abacus_toolbar,
-                                       self._radio_cb, cb_arg='japanese',
-                                       tooltip=_('Soroban'),
-                                       group=self.decimal)
+        self.japanese = radio_factory('soroban', abacus_toolbar,
+                                      self._radio_cb, cb_arg='japanese',
+                                      tooltip=_('Soroban'),
+                                      group=self.decimal)
 
         # TRANS: http://en.wikipedia.org/wiki/Suanpan (Chinese abacus)
-        self.chinese = _radio_factory('suanpan', abacus_toolbar,
-                                      self._radio_cb, cb_arg='chinese',
-                                      tooltip=_('Suanpan'),
-                                      group=self.decimal)
+        self.chinese = radio_factory('suanpan', abacus_toolbar,
+                                     self._radio_cb, cb_arg='chinese',
+                                     tooltip=_('Suanpan'),
+                                     group=self.decimal)
 
-        _separator_factory(abacus_toolbar)
+        separator_factory(abacus_toolbar)
 
         # TRANS: http://en.wikipedia.org/wiki/Abacus#Native_American_abaci
-        self.mayan = _radio_factory('nepohualtzintzin', abacus_toolbar,
-                                    self._radio_cb, cb_arg='mayan',
-                                    tooltip=_('Nepohualtzintzin'),
-                                    group=self.decimal)
+        self.mayan = radio_factory('nepohualtzintzin', abacus_toolbar,
+                                   self._radio_cb, cb_arg='mayan',
+                                   tooltip=_('Nepohualtzintzin'),
+                                   group=self.decimal)
 
         # TRANS: hexidecimal abacus
-        self.hex = _radio_factory('hexadecimal', abacus_toolbar,
-                                  self._radio_cb, cb_arg='hex',
-                                  tooltip=_('Hexadecimal'),
-                                  group=self.decimal)
+        self.hex = radio_factory('hexadecimal', abacus_toolbar,
+                                 self._radio_cb, cb_arg='hex',
+                                 tooltip=_('Hexadecimal'),
+                                 group=self.decimal)
 
         # TRANS: binary abacus
-        self.binary = _radio_factory('binary', abacus_toolbar,
-                                     self._radio_cb, cb_arg='binary',
-                                     tooltip=_('Binary'),
-                                     group=self.decimal)
+        self.binary = radio_factory('binary', abacus_toolbar,
+                                    self._radio_cb, cb_arg='binary',
+                                    tooltip=_('Binary'),
+                                    group=self.decimal)
 
-        _separator_factory(abacus_toolbar)
+        separator_factory(abacus_toolbar)
 
         # TRANS: http://en.wikipedia.org/wiki/Abacus#Russian_abacus
-        self.russian = _radio_factory('schety', abacus_toolbar,
-                                      self._radio_cb, cb_arg='russian',
-                                      tooltip=_('Schety'),
-                                      group=self.decimal)
+        self.russian = radio_factory('schety', abacus_toolbar,
+                                     self._radio_cb, cb_arg='russian',
+                                     tooltip=_('Schety'),
+                                     group=self.decimal)
 
         # TRANS: abacus for adding fractions
-        self.fraction = _radio_factory('fraction', abacus_toolbar,
-                                       self._radio_cb, cb_arg='fraction',
-                                       tooltip=_('Fraction'),
-                                       group=self.decimal)
+        self.fraction = radio_factory('fraction', abacus_toolbar,
+                                      self._radio_cb, cb_arg='fraction',
+                                      tooltip=_('Fraction'),
+                                      group=self.decimal)
 
         # TRANS: Abacus invented by teachers in Caacupé, Paraguay
-        self.caacupe = _radio_factory('caacupe', abacus_toolbar,
-                                      self._radio_cb, cb_arg='caacupe',
-                                      tooltip=_('Caacupé'),
-                                      group=self.decimal)
+        self.caacupe = radio_factory('caacupe', abacus_toolbar,
+                                     self._radio_cb, cb_arg='caacupe',
+                                     tooltip=_('Caacupé'),
+                                     group=self.decimal)
 
-        _separator_factory(abacus_toolbar)
+        separator_factory(abacus_toolbar)
 
         # TRANS: Cuisenaire Rods
-        self.cuisenaire = _radio_factory('cuisenaire', abacus_toolbar,
-                                         self._radio_cb,
-                                         cb_arg='cuisenaire',
-                                         tooltip=_('Rods'), group=self.decimal)
+        self.cuisenaire = radio_factory('cuisenaire', abacus_toolbar,
+                                        self._radio_cb,
+                                        cb_arg='cuisenaire',
+                                        tooltip=_('Rods'), group=self.decimal)
 
-        _separator_factory(abacus_toolbar)
+        separator_factory(abacus_toolbar)
 
-        self.custom = _radio_factory('custom', abacus_toolbar,
-                                     self._radio_cb,
-                                     cb_arg='custom',
-                                     tooltip=_('Custom'), group=self.decimal)
+        self.custom = radio_factory('custom', abacus_toolbar,
+                                    self._radio_cb,
+                                    cb_arg='custom',
+                                    tooltip=_('Custom'), group=self.decimal)
 
         # TRANS: Number of rods on the abacus
-        self._rods_label = _label_factory(_('Rods:') + ' ', custom_toolbar)
-        self._rods_spin = _spin_factory(15, 1, 20, self._rods_spin_cb,
-                                        custom_toolbar)
-        # TRANS: Number of beads in the top section of the abacus
-        self._top_label = _label_factory(_('Top:') + ' ', custom_toolbar)
-        self._top_spin = _spin_factory(2, 0, 4, self._top_spin_cb,
+        self._rods_label = label_factory(custom_toolbar, _('Rods:') + ' ')
+        self._rods_spin = spin_factory(15, 1, 20, self._rods_spin_cb,
                                        custom_toolbar)
+        # TRANS: Number of beads in the top section of the abacus
+        self._top_label = label_factory(custom_toolbar, _('Top:') + ' ')
+        self._top_spin = spin_factory(2, 0, 4, self._top_spin_cb,
+                                      custom_toolbar)
         # TRANS: Number of beads in the bottom section of the abacus
-        self._bottom_label = _label_factory(_('Bottom:') + ' ',
-                                            custom_toolbar)
-        self._bottom_spin = _spin_factory(5, 1, 20, self._bottom_spin_cb,
-                                          custom_toolbar)
-        # TRANS: Scale factor between bottom and top beads
-        self._value_label = _label_factory(_('Factor:') + ' ', custom_toolbar)
-        self._value_spin = _spin_factory(5, 1, 20, self._value_spin_cb,
+        self._bottom_label = label_factory(custom_toolbar, _('Bottom:') + ' ')
+        self._bottom_spin = spin_factory(5, 1, 20, self._bottom_spin_cb,
                                          custom_toolbar)
-        # TRANS: Scale factor between rods
-        self._base_label = _label_factory(_('Base:') + ' ', custom_toolbar)
-        self._base_spin = _spin_factory(10, 1, 24, self._base_spin_cb,
+        # TRANS: Scale factor between bottom and top beads
+        self._value_label = label_factory(custom_toolbar, _('Factor:') + ' ')
+        self._value_spin = spin_factory(5, 1, 20, self._value_spin_cb,
                                         custom_toolbar)
+        # TRANS: Scale factor between rods
+        self._base_label = label_factory(custom_toolbar, _('Base:') + ' ')
+        self._base_spin = spin_factory(10, 1, 24, self._base_spin_cb,
+                                       custom_toolbar)
 
-        _separator_factory(custom_toolbar, False, False)
+        # separator_factory(custom_toolbar, False, False)
 
-        self.custom_maker = _button_factory('new-abacus', custom_toolbar,
-                                            self._custom_cb,
-                                            tooltip=_('Custom'))
+        self.custom_maker = button_factory('new-abacus', custom_toolbar,
+                                           self._custom_cb,
+                                           tooltip=_('Custom'))
 
-        copy = _button_factory('edit-copy', edit_toolbar, self._copy_cb,
-                               tooltip=_('Copy'), accelerator='<Ctrl>c')
-        paste = _button_factory('edit-paste', edit_toolbar, self._paste_cb,
-                                tooltip=_('Paste'), accelerator='<Ctrl>v')
+        copy = button_factory('edit-copy', edit_toolbar, self._copy_cb,
+                              tooltip=_('Copy'), accelerator='<Ctrl>c')
+        paste = button_factory('edit-paste', edit_toolbar, self._paste_cb,
+                               tooltip=_('Paste'), accelerator='<Ctrl>v')
 
         self.toolbox.show()
 
diff --git a/NEWS b/NEWS
index 3364da6..39ae6bc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+30.2
+
+ENHANCEMENT
+* new translations
+
+30.1
+
+ENHANCEMENT
+* new translations
+
+30
+
+UNDER THE HOOD
+* Using improved Cairo graphics sprite library
+* Using standard toolbar library
+
+29
+
+ENHANCEMENT
+* conversion to Cairo graphics
+
 28
 
 ENHANCEMENTS
diff --git a/abacus_window.py b/abacus_window.py
index 9be9b89..b340a8f 100644
--- a/abacus_window.py
+++ b/abacus_window.py
@@ -857,9 +857,23 @@ class Abacus():
 
     def _expose_cb(self, win, event):
         ''' Callback to handle window expose events '''
-        self.sprites.redraw_sprites(event.area)
+        self.do_expose_event(event)
         return True
 
+    # Handle the expose-event by drawing
+    def do_expose_event(self, event):
+
+        # Create the cairo context
+        cr = self.canvas.window.cairo_create()
+
+        # Restrict Cairo to the exposed area; avoid extra work
+        cr.rectangle(event.area.x, event.area.y,
+                event.area.width, event.area.height)
+        cr.clip()
+
+        # Refresh sprite list
+        self.sprites.redraw_sprites(cr=cr)
+
     def _destroy_cb(self, win, event):
         ''' Callback to handle quit '''
         gtk.main_quit()
diff --git a/activity/activity.info b/activity/activity.info
index e9ae1f6..1ca2544 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Abacus
-activity_version = 28
+activity_version = 30.2
 license = GPLv3
 bundle_id = org.sugarlabs.AbacusActivity
 exec = sugar-activity AbacusActivity.AbacusActivity
diff --git a/sprites.py b/sprites.py
index cdb10db..baae94f 100644
--- a/sprites.py
+++ b/sprites.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #Copyright (c) 2007-8, Playful Invention Company.
-#Copyright (c) 2008-10 Walter Bender
+#Copyright (c) 2008-11 Walter Bender
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
 #of this software and associated documentation files (the "Software"), to deal
@@ -21,24 +21,23 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #THE SOFTWARE.
 
-"""
+'''
 
 sprites.py is a simple sprites library for managing graphics objects,
-'sprites', on a canvas. It manages multiple sprites with methods such
-as move, hide, set_layer, etc.
+'sprites', on a gtk.DrawingArea. It manages multiple sprites with
+methods such as move, hide, set_layer, etc.
 
 There are two classes:
 
-class Sprites maintains a collection of sprites.
+class Sprites maintains a collection of sprites
 class Sprite manages individual sprites within the collection.
 
 Example usage:
         # Import the classes into your program.
         from sprites import Sprites Sprite
 
-        # Create a new sprite collection for a gtk Drawing Area.
-        my_drawing_area = gtk.DrawingArea()
-        self.sprite_list = Sprites(my_drawing_area)
+        # Create a new sprite collection associated with your widget
+        self.sprite_list = Sprites(widget)
 
         # Create a "pixbuf" (in this example, from SVG).
         my_pixbuf = svg_str_to_pixbuf("<svg>...some svg code...</svg>")
@@ -63,6 +62,10 @@ Example usage:
         # Now put my_sprite on top of your_sprite.
         my_sprite.set_layer(300)
 
+        cr = self.window.cairo_create()
+        # In your activity's do_expose_event, put in a call to redraw_sprites
+        self.sprites.redraw_sprites(event.area, cairo_context)
+
 # method for converting SVG to a gtk pixbuf
 def svg_str_to_pixbuf(svg_string):
     pl = gtk.gdk.PixbufLoader('svg')
@@ -70,46 +73,46 @@ def svg_str_to_pixbuf(svg_string):
     pl.close()
     pixbuf = pl.get_pixbuf()
     return pixbuf
-"""
+
+'''
 
 import pygtk
 pygtk.require('2.0')
 import gtk
 import pango
-
+import pangocairo
+import cairo
 
 class Sprites:
-    """ A class for the list of sprites and everything they share in common """
-
-    def __init__(self, canvas, area=None, gc=None):
-        """ Initialize an empty array of sprites """
-        self.canvas = canvas
-        if area == None:
-            self.area = self.canvas.window
-            self.gc = self.area.new_gc()
-        else:
-            self.area = area
-            self.gc = gc
-        self.cm = self.gc.get_colormap()
+    ''' A class for the list of sprites and everything they share in common '''
+
+    def __init__(self, widget):
+        ''' Initialize an empty array of sprites '''
+        self.widget = widget
         self.list = []
+        self.cr = None
+
+    def set_cairo_context(self, cr):
+        ''' Cairo context may be set or reset after __init__ '''
+        self.cr = cr
 
     def get_sprite(self, i):
-        """ Return a sprint from the array """
-        if i < 0 or i > len(self.list)-1:
+        ''' Return a sprint from the array '''
+        if i < 0 or i > len(self.list) - 1:
             return(None)
         else:
             return(self.list[i])
 
     def length_of_list(self):
-        """ How many sprites are there? """
+        ''' How many sprites are there? '''
         return(len(self.list))
 
     def append_to_list(self, spr):
-        """ Append a new sprite to the end of the list. """
+        ''' Append a new sprite to the end of the list. '''
         self.list.append(spr)
 
     def insert_in_list(self, spr, i):
-        """ Insert a sprite at position i. """
+        ''' Insert a sprite at position i. '''
         if i < 0:
             self.list.insert(0, spr)
         elif i > len(self.list) - 1:
@@ -118,12 +121,12 @@ class Sprites:
             self.list.insert(i, spr)
 
     def remove_from_list(self, spr):
-        """ Remove a sprite from the list. """
+        ''' Remove a sprite from the list. '''
         if spr in self.list:
             self.list.remove(spr)
 
     def find_sprite(self, pos):
-        """ Search based on (x, y) position. Return the 'top/first' one. """
+        ''' Search based on (x, y) position. Return the 'top/first' one. '''
         list = self.list[:]
         list.reverse()
         for spr in list:
@@ -131,23 +134,32 @@ class Sprites:
                 return spr
         return None
 
-    def redraw_sprites(self, area=None):
-        """ Redraw the sprites that intersect area. """
+    def redraw_sprites(self, area=None, cr=None):
+        ''' Redraw the sprites that intersect area. '''
+        # I think I need to do this to save Cairo some work
+        if cr is None:
+            cr = self.cr
+        else:
+            self.cr = cr
+        if cr is None:
+            print 'sprites.redraw_sprites: no Cairo context'
+            return
         for spr in self.list:
             if area == None:
-                spr.draw()
+                spr.draw(cr=cr)
             else:
                 intersection = spr.rect.intersect(area)
                 if intersection.width > 0 or intersection.height > 0:
-                    spr.draw()
+                    spr.draw(cr=cr)
 
 
 class Sprite:
-    """ A class for the individual sprites """
+    ''' A class for the individual sprites '''
 
     def __init__(self, sprites, x, y, image):
-        """ Initialize an individual sprite """
+        ''' Initialize an individual sprite '''
         self._sprites = sprites
+        self.save_xy = (x, y)  # remember initial (x, y) position
         self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0)
         self._scale = [12]
         self._rescale = [True]
@@ -160,7 +172,7 @@ class Sprite:
         self._margins = [0, 0, 0, 0]
         self.layer = 100
         self.labels = []
-        self.images = []
+        self.cached_surfaces = []
         self._dx = []  # image offsets
         self._dy = []
         self.type = None
@@ -168,19 +180,18 @@ class Sprite:
         self._sprites.append_to_list(self)
 
     def set_image(self, image, i=0, dx=0, dy=0):
-        """ Add an image to the sprite. """
-        while len(self.images) < i + 1:
-            self.images.append(None)
+        ''' Add an image to the sprite. '''
+        while len(self.cached_surfaces) < i + 1:
+            self.cached_surfaces.append(None)
             self._dx.append(0)
             self._dy.append(0)
-        self.images[i] = image
         self._dx[i] = dx
         self._dy[i] = dy
-        if isinstance(self.images[i], gtk.gdk.Pixbuf):
-            w = self.images[i].get_width()
-            h = self.images[i].get_height()
+        if isinstance(image, gtk.gdk.Pixbuf):
+            w = image.get_width()
+            h = image.get_height()
         else:
-            w, h = self.images[i].get_size()
+            w, h = image.get_size()
         if i == 0:  # Always reset width and height when base image changes.
             self.rect.width = w + dx
             self.rect.height = h + dy
@@ -189,42 +200,51 @@ class Sprite:
                 self.rect.width = w + dx
             if h + dy > self.rect.height:
                 self.rect.height = h + dy
+        surface = cairo.ImageSurface(
+            cairo.FORMAT_ARGB32, self.rect.width, self.rect.height)
+        context = cairo.Context(surface)
+        context = gtk.gdk.CairoContext(context)
+        context.set_source_pixbuf(image, 0, 0)
+        context.rectangle(0, 0, self.rect.width, self.rect.height)
+        context.fill()
+        self.cached_surfaces[i] = surface
 
     def move(self, pos):
-        """ Move to new (x, y) position """
+        ''' Move to new (x, y) position '''
         self.inval()
         self.rect.x, self.rect.y = int(pos[0]), int(pos[1])
         self.inval()
 
     def move_relative(self, pos):
-        """ Move to new (x+dx, y+dy) position """
+        ''' Move to new (x+dx, y+dy) position '''
         self.inval()
         self.rect.x += int(pos[0])
         self.rect.y += int(pos[1])
         self.inval()
 
     def get_xy(self):
-        """ Return current (x, y) position """
+        ''' Return current (x, y) position '''
         return (self.rect.x, self.rect.y)
 
     def get_dimensions(self):
-        """ Return current size """
+        ''' Return current size '''
         return (self.rect.width, self.rect.height)
 
     def get_layer(self):
-        """ Return current layer """
+        ''' Return current layer '''
         return self.layer
 
     def set_shape(self, image, i=0):
-        """ Set the current image associated with the sprite """
+        ''' Set the current image associated with the sprite '''
         self.inval()
         self.set_image(image, i)
         self.inval()
 
-    def set_layer(self, layer):
-        """ Set the layer for a sprite """
+    def set_layer(self, layer=None):
+        ''' Set the layer for a sprite '''
         self._sprites.remove_from_list(self)
-        self.layer = layer
+        if layer is not None:
+            self.layer = layer
         for i in range(self._sprites.length_of_list()):
             if layer < self._sprites.get_sprite(i).layer:
                 self._sprites.insert_in_list(self, i)
@@ -234,7 +254,7 @@ class Sprite:
         self.inval()
 
     def set_label(self, new_label, i=0):
-        """ Set the label drawn on the sprite """
+        ''' Set the label drawn on the sprite '''
         self._extend_labels_array(i)
         if type(new_label) is str or type(new_label) is unicode:
             # pango doesn't like nulls
@@ -244,15 +264,15 @@ class Sprite:
         self.inval()
 
     def set_margins(self, l=0, t=0, r=0, b=0):
-        """ Set the margins for drawing the label """
+        ''' Set the margins for drawing the label '''
         self._margins = [l, t, r, b]
 
     def _extend_labels_array(self, i):
-        """ Append to the labels attribute list """
+        ''' Append to the labels attribute list '''
         if self._fd is None:
             self.set_font('Sans')
         if self._color is None:
-            self._color = self._sprites.cm.alloc_color('black')
+            self._color = (0., 0., 0.)
         while len(self.labels) < i + 1:
             self.labels.append(" ")
             self._scale.append(self._scale[0])
@@ -261,16 +281,27 @@ class Sprite:
             self._vert_align.append(self._vert_align[0])
 
     def set_font(self, font):
-        """ Set the font for a label """
+        ''' Set the font for a label '''
         self._fd = pango.FontDescription(font)
 
     def set_label_color(self, rgb):
-        """ Set the font color for a label """
-        self._color = self._sprites.cm.alloc_color(rgb)
+        ''' Set the font color for a label '''
+        COLORTABLE = {'black': '#000000', 'white': '#FFFFFF',
+                      'red': '#FF0000', 'yellow': '#FFFF00',
+                      'green': '#00FF00', 'cyan': '#00FFFF',
+                      'blue': '#0000FF', 'purple': '#FF00FF',
+                      'gray': '#808080'}
+        if rgb.lower() in COLORTABLE:
+            rgb = COLORTABLE[rgb.lower()]
+        # Convert from '#RRGGBB' to floats
+        self._color = (int('0x' + rgb[1:3], 16) / 256.,
+                       int('0x' + rgb[3:5], 16) / 256.,
+                       int('0x' + rgb[5:7], 16) / 256.)
+        return
 
     def set_label_attributes(self, scale, rescale=True, horiz_align="center",
                              vert_align="middle", i=0):
-        """ Set the various label attributes """
+        ''' Set the various label attributes '''
         self._extend_labels_array(i)
         self._scale[i] = scale
         self._rescale[i] = rescale
@@ -278,31 +309,40 @@ class Sprite:
         self._vert_align[i] = vert_align
 
     def hide(self):
-        """ Hide a sprite """
+        ''' Hide a sprite '''
         self.inval()
         self._sprites.remove_from_list(self)
 
+    def restore(self):
+        ''' Restore a hidden sprite '''
+        self.set_layer()
+
     def inval(self):
-        """ Force a region redraw by gtk """
-        self._sprites.area.invalidate_rect(self.rect, False)
-
-    def draw(self):
-        """ Draw the sprite (and label) """
-        for i, img in enumerate(self.images):
-            if isinstance(img, gtk.gdk.Pixbuf):
-                self._sprites.area.draw_pixbuf(self._sprites.gc, img, 0, 0,
-                                               self.rect.x + self._dx[i],
-                                               self.rect.y + self._dy[i])
-            elif img is not None:
-                self._sprites.area.draw_drawable(self._sprites.gc, img, 0, 0,
-                                                 self.rect.x + self._dx[i],
-                                                 self.rect.y + self._dy[i],
-                                                 -1, -1)
+        ''' Invalidate a region for gtk '''
+        self._sprites.widget.queue_draw_area(self.rect.x,
+                                             self.rect.y,
+                                             self.rect.width,
+                                             self.rect.height)
+
+    def draw(self, cr=None):
+        ''' Draw the sprite (and label) '''
+        if cr is None:
+            print 'sprite.draw: no Cairo context.'
+            return
+        for i, surface in enumerate(self.cached_surfaces):
+            cr.set_source_surface(surface,
+                                  self.rect.x + self._dx[i],
+                                  self.rect.y + self._dy[i])
+            cr.rectangle(self.rect.x + self._dx[i],
+                         self.rect.y + self._dy[i],
+                         self.rect.width,
+                         self.rect.height)
+            cr.fill()
         if len(self.labels) > 0:
-            self.draw_label()
+            self.draw_label(cr)
 
     def hit(self, pos):
-        """ Is (x, y) on top of the sprite? """
+        ''' Is (x, y) on top of the sprite? '''
         x, y = pos
         if x < self.rect.x:
             return False
@@ -314,14 +354,17 @@ class Sprite:
             return False
         return True
 
-    def draw_label(self):
-        """ Draw the label based on its attributes """
+    def draw_label(self, cr):
+        ''' Draw the label based on its attributes '''
+        # Create a pangocairo context
+        cr = pangocairo.CairoContext(cr)
         my_width = self.rect.width - self._margins[0] - self._margins[2]
         if my_width < 0:
             my_width = 0
         my_height = self.rect.height - self._margins[1] - self._margins[3]
         for i in range(len(self.labels)):
-            pl = self._sprites.canvas.create_pango_layout(str(self.labels[i]))
+            pl = cr.create_layout()
+            pl.set_text(str(self.labels[i]))
             self._fd.set_size(int(self._scale[i] * pango.SCALE))
             pl.set_font_description(self._fd)
             w = pl.get_size()[0] / pango.SCALE
@@ -334,8 +377,8 @@ class Sprite:
                 else:
                     j = len(self.labels[i]) - 1
                     while(w > my_width and j > 0):
-                        pl = self._sprites.canvas.create_pango_layout(
-                              "…" + self.labels[i][len(self.labels[i]) - j:])
+                        pl.set_text(
+                            "…" + self.labels[i][len(self.labels[i]) - j:])
                         self._fd.set_size(int(self._scale[i] * pango.SCALE))
                         pl.set_font_description(self._fd)
                         w = pl.get_size()[0] / pango.SCALE
@@ -353,49 +396,59 @@ class Sprite:
                 y = int(self.rect.y + self._margins[1])
             else: # bottom
                 y = int(self.rect.y + self.rect.height - h - self._margins[3])
-            self._sprites.gc.set_foreground(self._color)
-            self._sprites.area.draw_layout(self._sprites.gc, x, y, pl)
+            cr.save()
+            cr.translate(x, y)
+            cr.set_source_rgb(self._color[0], self._color[1], self._color[2])
+            cr.update_layout(pl)
+            cr.show_layout(pl)
+            cr.restore()
 
     def label_width(self):
-        """ Calculate the width of a label """
-        max = 0
-        for i in range(len(self.labels)):
-            pl = self._sprites.canvas.create_pango_layout(self.labels[i])
-            self._fd.set_size(int(self._scale[i] * pango.SCALE))
-            pl.set_font_description(self._fd)
-            w = pl.get_size()[0] / pango.SCALE
-            if w > max:
-                max = w
-        return max
+        ''' Calculate the width of a label '''
+        cr = pangocairo.CairoContext(self._sprites.cr)
+        if cr is not None:
+            max = 0
+            for i in range(len(self.labels)):
+                pl = cr.create_layout()
+                pl.set_text(self.labels[i])
+                self._fd.set_size(int(self._scale[i] * pango.SCALE))
+                pl.set_font_description(self._fd)
+                w = pl.get_size()[0] / pango.SCALE
+                if w > max:
+                    max = w
+            return max
+        else:
+            return self.rect.width
 
     def label_safe_width(self):
-        """ Return maximum width for a label """
+        ''' Return maximum width for a label '''
         return self.rect.width - self._margins[0] - self._margins[2]
 
     def label_safe_height(self):
-        """ Return maximum height for a label """
+        ''' Return maximum height for a label '''
         return self.rect.height - self._margins[1] - self._margins[3]
 
     def label_left_top(self):
-        """ Return the upper-left corner of the label safe zone """
+        ''' Return the upper-left corner of the label safe zone '''
         return(self._margins[0], self._margins[1])
 
     def get_pixel(self, pos, i=0):
-        """ Return the pixl at (x, y) """
-        x, y = pos
-        x = x - self.rect.x
-        y = y - self.rect.y
-        if y > self.images[i].get_height() - 1:
-            return(-1, -1, -1, -1)
-        try:
-            array = self.images[i].get_pixels()
-            if array is not None:
-                offset = (y * self.images[i].get_width() + x) * 4
-                r, g, b, a = ord(array[offset]), ord(array[offset + 1]),\
-                             ord(array[offset + 2]), ord(array[offset + 3])
-                return(r, g, b, a)
-            else:
-                return(-1, -1, -1, -1)
-        except IndexError:
-            print "Index Error: %d %d" % (len(array), offset)
+        ''' Return the pixel at (x, y) '''
+        x = int(pos[0] - self.rect.x)
+        y = int(pos[1] - self.rect.y)
+        if x < 0 or x > (self.rect.width - 1) or \
+                y < 0 or y > (self.rect.height - 1):
             return(-1, -1, -1, -1)
+
+        # create a new 1x1 cairo surface
+        cs = cairo.ImageSurface(cairo.FORMAT_RGB24, 1, 1);
+        cr = cairo.Context(cs)
+        cr.set_source_surface(self.cached_surfaces[i], -x, -y)
+        cr.rectangle(0,0,1,1)
+        cr.set_operator(cairo.OPERATOR_SOURCE)
+        cr.fill()
+        cs.flush() # ensure all writing is done
+        # Read the pixel
+        pixels = cs.get_data()
+        return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0)
+
diff --git a/toolbar_utils.py b/toolbar_utils.py
new file mode 100644
index 0000000..70a6311
--- /dev/null
+++ b/toolbar_utils.py
@@ -0,0 +1,153 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2011, Walter Bender
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
+
+import gtk
+
+from sugar.graphics.radiotoolbutton import RadioToolButton
+from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.combobox import ComboBox
+from sugar.graphics.toolcombobox import ToolComboBox
+
+
+def combo_factory(combo_array, toolbar, callback, cb_arg=None,
+                  tooltip=None, default=None):
+    '''Factory for making a toolbar combo box'''
+    combo = ComboBox()
+    if tooltip is not None and hasattr(combo, 'set_tooltip_text'):
+        combo.set_tooltip_text(tooltip)
+    if cb_arg is not None:
+        combo.connect('changed', callback, cb_arg)
+    else:
+        combo.connect('changed', callback)
+    for i, selection in enumerate(combo_array):
+        combo.append_item(i, selection, None)
+    combo.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(combo)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    if default is not None:
+        combo.set_active(combo_array.index(default))
+    return combo
+
+
+def entry_factory(default_string, toolbar, tooltip=None, max=3):
+    ''' Factory for adding a text box to a toolbar '''
+    entry = gtk.Entry()
+    entry.set_text(default_string)
+    if tooltip is not None and hasattr(entry, 'set_tooltip_text'):
+        entry.set_tooltip_text(tooltip)
+    entry.set_width_chars(max)
+    entry.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(entry)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return entry
+
+
+def button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None,
+                   accelerator=None):
+    '''Factory for making toolbar buttons'''
+    button = ToolButton(icon_name)
+    if tooltip is not None:
+        button.set_tooltip(tooltip)
+    button.props.sensitive = True
+    if accelerator is not None:
+        button.props.accelerator = accelerator
+    if cb_arg is not None:
+        button.connect('clicked', callback, cb_arg)
+    else:
+        button.connect('clicked', callback)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(button, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(button, -1)
+    button.show()
+    return button
+
+
+def radio_factory(button_name, toolbar, callback, cb_arg=None, tooltip=None,
+                  group=None):
+    ''' Add a radio button to a toolbar '''
+    button = RadioToolButton(group=group)
+    button.set_named_icon(button_name)
+    if callback is not None:
+        if cb_arg is None:
+            button.connect('clicked', callback)
+        else:
+            button.connect('clicked', callback, cb_arg)
+    if hasattr(toolbar, 'insert'):  # Add button to the main toolbar...
+        toolbar.insert(button, -1)
+    else:  # ...or a secondary toolbar.
+        toolbar.props.page.insert(button, -1)
+    button.show()
+    if tooltip is not None:
+        button.set_tooltip(tooltip)
+    return button
+
+
+def label_factory(toolbar, label_text, width=None):
+    ''' Factory for adding a label to a toolbar '''
+    label = gtk.Label(label_text)
+    label.set_line_wrap(True)
+    if width is not None:
+        label.set_size_request(width, -1)  # doesn't work on XOs
+    label.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(label)
+    toolbar.insert(toolitem, -1)
+    toolitem.show()
+    return label
+
+
+def separator_factory(toolbar, expand=False, visible=True):
+    ''' add a separator to a toolbar '''
+    separator = gtk.SeparatorToolItem()
+    separator.props.draw = visible
+    separator.set_expand(expand)
+    toolbar.insert(separator, -1)
+    separator.show()
+
+
+def image_factory(image, toolbar, tooltip=None):
+    ''' Add an image to the toolbar '''
+    img = gtk.Image()
+    img.set_from_pixbuf(image)
+    img_tool = gtk.ToolItem()
+    img_tool.add(img)
+    if tooltip is not None:
+        img.set_tooltip_text(tooltip)
+    toolbar.insert(img_tool, -1)
+    img_tool.show()
+    return img
+
+
+def spin_factory(default, min, max, callback, toolbar):
+    spin_adj = gtk.Adjustment(default, min, max, 1, 32, 0)
+    spin = gtk.SpinButton(spin_adj, 0, 0)
+    spin_id = spin.connect('value-changed', callback)
+    spin.set_numeric(True)
+    spin.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(spin)
+    toolbar.insert(toolitem, -1)
+    toolitem.show()
+    return spin
+