Port Finish!, But, I need a Summary!

10 files changed, 542 insertions, 122 deletions

diff --git a/NEWS b/NEWS
index 337af54..2bc91f8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+6
+
+ENHANCEMENTS:
+* Ignacio Rodriguez port to gtk3
 5
 
 BUG FIX:
diff --git a/YupanaActivity.py b/YupanaActivity.py
index d065ec3..5df63d9 100644
--- a/YupanaActivity.py
+++ b/YupanaActivity.py
@@ -1,4 +1,5 @@
 #Copyright (c) 2011 Walter Bender
+#Copyright (c) 2012 Ignacio Rodriguez
 
 # 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
@@ -9,21 +10,20 @@
 # along with this library; if not, write to the Free Software
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
+from gi.repository import Gtk, Gdk, GObject
 
-import gtk
-
-from sugar.activity import activity
-from sugar import profile
+from sugar3.activity import activity
+from sugar3 import profile
 try:
-    from sugar.graphics.toolbarbox import ToolbarBox
+    from sugar3.graphics.toolbarbox import ToolbarBox
     _have_toolbox = True
 except ImportError:
     _have_toolbox = False
 
 if _have_toolbox:
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
-    from sugar.graphics.toolbarbox import ToolbarButton
+    from sugar3.activity.widgets import ActivityToolbarButton
+    from sugar3.activity.widgets import StopButton
+    from sugar3.graphics.toolbarbox import ToolbarButton
 
 from toolbar_utils import button_factory, label_factory, separator_factory, \
     radio_factory, entry_factory
@@ -33,8 +33,8 @@ import telepathy
 import dbus
 from dbus.service import signal
 from dbus.gobject_service import ExportedGObject
-from sugar.presence import presenceservice
-from sugar.presence.tubeconn import TubeConnection
+from sugar3.presence import presenceservice
+from sugar3.presence.tubeconn import TubeConnection
 
 from gettext import gettext as _
 
@@ -70,9 +70,9 @@ class YupanaActivity(activity.Activity):
         self._setup_dispatch_table()
 
         # Create a canvas
-        canvas = gtk.DrawingArea()
-        canvas.set_size_request(gtk.gdk.screen_width(), \
-                                gtk.gdk.screen_height())
+        canvas = Gtk.DrawingArea()
+        canvas.set_size_request(Gdk.Screen.width(), \
+                                Gdk.Screen.height())
         self.set_canvas(canvas)
         canvas.show()
         self.show_all()
@@ -94,8 +94,8 @@ class YupanaActivity(activity.Activity):
 
         self.max_participants = 4
 
-        yupana_toolbar = gtk.Toolbar()
-        self.custom_toolbar = gtk.Toolbar()
+        yupana_toolbar = Gtk.Toolbar()
+        self.custom_toolbar = Gtk.Toolbar()
         if have_toolbox:
             toolbox = ToolbarBox()
 
diff --git a/activity/activity.info b/activity/activity.info
index a467072..4e625c7 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Yupana
-activity_version = 5
+activity_version = 6
 license = GPLv3
 bundle_id = org.sugarlabs.YupanaActivity
 exec = sugar-activity YupanaActivity.YupanaActivity
diff --git a/locale/es/LC_MESSAGES/org.sugarlabs.YupanaActivity.mo b/locale/es/LC_MESSAGES/org.sugarlabs.YupanaActivity.mo
new file mode 100644
index 0000000..94a257c
--- /dev/null
+++ b/locale/es/LC_MESSAGES/org.sugarlabs.YupanaActivity.mo
diff --git a/locale/es/activity.linfo b/locale/es/activity.linfo
new file mode 100644
index 0000000..eb33e95
--- /dev/null
+++ b/locale/es/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = Yupana
diff --git a/po/Yupana.pot b/po/Yupana.pot
index 2e078e2..910a59d 100644
--- a/po/Yupana.pot
+++ b/po/Yupana.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-05 15:57-0500\n"
+"POT-Creation-Date: 2012-02-06 15:11-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,62 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: activity/activity.info:2 YupanaActivity.py:108
+#: activity/activity.info:2 YupanaActivity.py:129
 msgid "Yupana"
 msgstr ""
 
-#: YupanaActivity.py:115
+#: YupanaActivity.py:108
+msgid "Mode"
+msgstr ""
+
+#: YupanaActivity.py:115 YupanaActivity.py:130
+msgid "Custom"
+msgstr ""
+
+#: YupanaActivity.py:137
 msgid "Clear the yupana."
 msgstr ""
+
+#: YupanaActivity.py:143 YupanaActivity.py:164 YupanaActivity.py:205
+msgid "decimal mode"
+msgstr ""
+
+#: YupanaActivity.py:147 YupanaActivity.py:209
+msgid "base-twenty mode"
+msgstr ""
+
+#: YupanaActivity.py:151 YupanaActivity.py:213
+msgid "prime-factor mode"
+msgstr ""
+
+#: YupanaActivity.py:155 YupanaActivity.py:217
+msgid "fibanocci mode"
+msgstr ""
+
+#: YupanaActivity.py:159 YupanaActivity.py:230
+msgid "custom mode"
+msgstr ""
+
+#: YupanaActivity.py:178
+msgid "one row"
+msgstr ""
+
+#: YupanaActivity.py:181
+msgid "two row"
+msgstr ""
+
+#: YupanaActivity.py:184
+msgid "three row"
+msgstr ""
+
+#: YupanaActivity.py:187
+msgid "five row"
+msgstr ""
+
+#: YupanaActivity.py:192
+msgid "base"
+msgstr ""
+
+#: YupanaActivity.py:196
+msgid "Reload custom values."
+msgstr ""
diff --git a/setup.py b/setup.py
index e5026ee..468572c 100755..100644
--- a/setup.py
+++ b/setup.py
@@ -1,32 +1,4 @@
 #!/usr/bin/env python
-import os
-import sys
-
-if len(sys.argv) > 1 and '--no-sugar' == sys.argv[1]:
-    # Remove the argument from the stack so we don't cause problems
-    # for distutils
-    sys.argv.pop(1)
-    
-    import glob, os.path, string
-    from distutils.core import setup
-    
-    DATA_FILES = [
-        ('icons', glob.glob('icons/*')),
-        ('images', glob.glob('images/*')),
-        ('/usr/share/applications', ['turtleart.desktop'])
-        ]
-
-    setup (name = 'Turtle Art',
-           description = "A LOGO-like tool for teaching programming",
-           author = "Walter Bender",
-           author_email = "walter.bender@gmail.com",
-           version = '0.9.4',
-           packages = ['TurtleArt'],
-           scripts = ['turtleart'],
-           data_files = DATA_FILES,
-           )
-else: 
-    from sugar.activity import bundlebuilder
-
-    if __name__ == "__main__":
-        bundlebuilder.start()
+from sugar3.activity import bundlebuilder
+if __name__ == "__main__":
+	bundlebuilder.start()
diff --git a/sprites.py b/sprites.py
index 2b8bb55..0ef8dca 100644
--- a/sprites.py
+++ b/sprites.py
@@ -73,9 +73,12 @@ def svg_str_to_pixbuf(svg_string):
     pl.close()
     pixbuf = pl.get_pixbuf()
     return pixbuf
+'''
+## <-----------GTK2---------------->##
 
 '''
 
+
 import pygtk
 pygtk.require('2.0')
 import gtk
@@ -84,35 +87,35 @@ import pangocairo
 import cairo
 
 class Sprites:
-    ''' A class for the list of sprites and everything they share in common '''
+    # A class for the list of sprites and everything they share in common #
 
     def __init__(self, widget):
-        ''' Initialize an empty array of sprites '''
+        # 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__ '''
+        # Cairo context may be set or reset after __init__ #
         self.cr = cr
 
     def get_sprite(self, i):
-        ''' Return a sprint from the array '''
+        # 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:
@@ -121,12 +124,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, inverse=False):
-        ''' 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[:]
         if not inverse:
             list.reverse()
@@ -136,7 +139,7 @@ class Sprites:
         return None
 
     def redraw_sprites(self, area=None, cr=None):
-        ''' Redraw the sprites that intersect area. '''
+        # 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
@@ -155,10 +158,10 @@ class Sprites:
 
 
 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)
@@ -181,7 +184,7 @@ 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. '''
+        # Add an image to the sprite. #
         while len(self.cached_surfaces) < i + 1:
             self.cached_surfaces.append(None)
             self._dx.append(0)
@@ -215,38 +218,38 @@ class Sprite:
             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=None):
-        ''' Set the layer for a sprite '''
+        # Set the layer for a sprite #
         self._sprites.remove_from_list(self)
         if layer is not None:
             self.layer = layer
@@ -259,7 +262,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
@@ -269,11 +272,11 @@ 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:
@@ -286,11 +289,11 @@ 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 '''
+        # Set the font color for a label #
         COLORTABLE = {'black': '#000000', 'white': '#FFFFFF',
                       'red': '#FF0000', 'yellow': '#FFFF00',
                       'green': '#00FF00', 'cyan': '#00FFFF',
@@ -306,7 +309,7 @@ class Sprite:
 
     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
@@ -314,23 +317,23 @@ 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 '''
+        # Restore a hidden sprite #
         self.set_layer()
 
     def inval(self):
-        ''' Invalidate a region for gtk '''
+        # 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) '''
+        # Draw the sprite (and label) #
         if cr is None:
             print 'sprite.draw: no Cairo context.'
             return
@@ -347,7 +350,7 @@ class Sprite:
             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
@@ -360,7 +363,7 @@ class Sprite:
         return True
 
     def draw_label(self, cr):
-        ''' Draw the label based on its attributes '''
+        # 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]
@@ -409,7 +412,7 @@ class Sprite:
             cr.restore()
 
     def label_width(self):
-        ''' Calculate the width of a label '''
+        # Calculate the width of a label #
         cr = pangocairo.CairoContext(self._sprites.cr)
         if cr is not None:
             max = 0
@@ -426,19 +429,19 @@ class Sprite:
             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 pixel at (x, y) '''
+        # 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 \
@@ -457,3 +460,393 @@ class Sprite:
         pixels = cs.get_data()
         return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0)
 
+'''
+
+#<-----------------------GTK3----------->#
+import gi
+from gi.repository import Gtk, GdkPixbuf, Gdk
+from gi.repository import Pango, PangoCairo
+import cairo
+
+
+class Sprites:
+    ''' A class for the list of sprites and everything they share in common '''
+
+    def __init__(self, widget):
+        ''' Initialize an empty array of sprites '''
+        self.cr = None
+        self.widget = widget
+        self.list = []
+
+    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(None)
+        else:
+            return(self.list[i])
+
+    def length_of_list(self):
+        ''' 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. '''
+        self.list.append(spr)
+
+    def insert_in_list(self, spr, i):
+        ''' Insert a sprite at position i. '''
+        if i < 0:
+            self.list.insert(0, spr)
+        elif i > len(self.list) - 1:
+            self.list.append(spr)
+        else:
+            self.list.insert(i, spr)
+
+    def remove_from_list(self, spr):
+        ''' 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. '''
+        list = self.list[:]
+        list.reverse()
+        for spr in list:
+            if spr.hit(pos):
+                return spr
+        return None
+
+    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(cr=cr)
+            else:
+                intersection = spr.rect.intersect(area)
+                if intersection.width > 0 or intersection.height > 0:
+                    spr.draw(cr=cr)
+
+
+class Sprite:
+    ''' A class for the individual sprites '''
+
+    def __init__(self, sprites, x, y, image):
+        ''' Initialize an individual sprite '''
+        self._sprites = sprites
+        self.save_xy = (x, y)  # remember initial (x, y) position
+        self.rect = [int(x), int(y), 0, 0]
+        self._scale = [12]
+        self._rescale = [True]
+        self._horiz_align = ["center"]
+        self._vert_align = ["middle"]
+        self._x_pos = [None]
+        self._y_pos = [None]
+        self._fd = None
+        self._bold = False
+        self._italic = False
+        self._color = None
+        self._margins = [0, 0, 0, 0]
+        self.layer = 100
+        self.labels = []
+        self.images = []
+        self._dx = []  # image offsets
+        self._dy = []
+        self.type = None
+        self.set_image(image)
+        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)
+            self._dx.append(0)
+            self._dy.append(0)
+        self.images[i] = image
+        self._dx[i] = dx
+        self._dy[i] = dy
+        if hasattr(self.images[i], 'get_width'):
+            w = self.images[i].get_width()
+            h = self.images[i].get_height()
+        else:
+            w, h = self.images[i].get_size()
+        if i == 0:  # Always reset width and height when base image changes.
+            self.rect[2] = w + dx
+            self.rect[3] = h + dy
+        else:
+            if w + dx > self.rect[2]:
+                self.rect[2] = w + dx
+            if h + dy > self.rect[3]:
+                self.rect[3] = h + dy
+
+    def move(self, pos):
+        ''' Move to new (x, y) position '''
+        self.inval()
+        self.rect[0], self.rect[1] = int(pos[0]), int(pos[1])
+        self.inval()
+
+    def move_relative(self, pos):
+        ''' Move to new (x+dx, y+dy) position '''
+        self.inval()
+        self.rect[0] += int(pos[0])
+        self.rect[1] += int(pos[1])
+        self.inval()
+
+    def get_xy(self):
+        ''' Return current (x, y) position '''
+        return (self.rect[0], self.rect[1])
+
+    def get_dimensions(self):
+        ''' Return current size '''
+        return (self.rect[2], self.rect[3])
+
+    def get_layer(self):
+        ''' Return current layer '''
+        return self.layer
+
+    def set_shape(self, image, i=0):
+        ''' Set the current image associated with the sprite '''
+        self.inval()
+        self.set_image(image, i)
+        self.inval()
+
+    def set_layer(self, layer=None):
+        ''' Set the layer for a sprite '''
+        self._sprites.remove_from_list(self)
+        if layer is not None:
+            self.layer = layer
+        for i in range(self._sprites.length_of_list()):
+            if self.layer < self._sprites.get_sprite(i).layer:
+                self._sprites.insert_in_list(self, i)
+                self.inval()
+                return
+        self._sprites.append_to_list(self)
+        self.inval()
+
+    def set_label(self, new_label, i=0):
+        ''' 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
+            self.labels[i] = new_label.replace("\0", " ")
+        else:
+            self.labels[i] = str(new_label)
+        self.inval()
+
+    def set_margins(self, l=0, t=0, r=0, b=0):
+        ''' 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 '''
+        if self._fd is None:
+            self.set_font('Sans')
+        if self._color is None:
+            self._color = (0., 0., 0.)
+        while len(self.labels) < i + 1:
+            self.labels.append(" ")
+            self._scale.append(self._scale[0])
+            self._rescale.append(self._rescale[0])
+            self._horiz_align.append(self._horiz_align[0])
+            self._vert_align.append(self._vert_align[0])
+            self._x_pos.append(self._x_pos[0])
+            self._y_pos.append(self._y_pos[0])
+
+    def set_font(self, font):
+        ''' Set the font for a label '''
+        self._fd = Pango.FontDescription(font)
+
+    def set_label_color(self, 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", x_pos=None, y_pos=None, i=0):
+        ''' Set the various label attributes '''
+        self._extend_labels_array(i)
+        self._scale[i] = scale
+        self._rescale[i] = rescale
+        self._horiz_align[i] = horiz_align
+        self._vert_align[i] = vert_align
+        self._x_pos[i] = x_pos
+        self._y_pos[i] = y_pos
+
+    def hide(self):
+        ''' Hide a sprite '''
+        self.inval()
+        self._sprites.remove_from_list(self)
+
+    def restore(self):
+        ''' Restore a hidden sprite '''
+        self.set_layer()
+
+    def inval(self):
+        ''' Invalidate a region for gtk '''
+        # self._sprites.window.invalidate_rect(self.rect, False)
+        self._sprites.widget.queue_draw_area(self.rect[0],
+                                             self.rect[1],
+                                             self.rect[2],
+                                             self.rect[3])
+
+    def draw(self, cr=None):
+        ''' Draw the sprite (and label) '''
+        if cr is None:
+            cr = self._sprites.cr
+        if cr is None:
+            print 'sprite.draw: no Cairo context.'
+            return
+        for i, img in enumerate(self.images):
+            if isinstance(img, GdkPixbuf.Pixbuf):
+                Gdk.cairo_set_source_pixbuf(cr, img,
+                                            self.rect[0] + self._dx[i],
+                                            self.rect[1] + self._dy[i])
+                cr.rectangle(self.rect[0] + self._dx[i],
+                             self.rect[1] + self._dy[i],
+                             self.rect[2],
+                             self.rect[3])
+                cr.fill()
+            elif type(img) == cairo.ImageSurface:
+                cr.set_source_surface(img, self.rect[0] + self._dx[i],
+                                      self.rect[1] + self._dy[i])
+                cr.rectangle(self.rect[0] + self._dx[i],
+                             self.rect[1] + self._dy[i],
+                             self.rect[2],
+                             self.rect[3])
+                cr.fill()
+            else:
+                print 'sprite.draw: source not a pixbuf (%s)' % (type(img))
+        if len(self.labels) > 0:
+            self.draw_label(cr)
+
+    def hit(self, pos):
+        ''' Is (x, y) on top of the sprite? '''
+        x, y = pos
+        if x < self.rect[0]:
+            return False
+        if x > self.rect[0] + self.rect[2]:
+            return False
+        if y < self.rect[1]:
+            return False
+        if y > self.rect[1] + self.rect[3]:
+            return False
+        return True
+
+    def draw_label(self, cr):
+        ''' Draw the label based on its attributes '''
+        my_width = self.rect[2] - self._margins[0] - self._margins[2]
+        if my_width < 0:
+            my_width = 0
+        my_height = self.rect[3] - self._margins[1] - self._margins[3]
+        for i in range(len(self.labels)):
+            pl = PangoCairo.create_layout(cr)
+            pl.set_text(str(self.labels[i]), -1)
+            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 > my_width:
+                if self._rescale[i]:
+                    self._fd.set_size(
+                            int(self._scale[i] * Pango.SCALE * my_width / w))
+                    pl.set_font_description(self._fd)
+                    w = pl.get_size()[0] / Pango.SCALE
+                else:
+                    j = len(self.labels[i]) - 1
+                    while(w > my_width and j > 0):
+                        pl.set_text(
+                            "…" + self.labels[i][len(self.labels[i]) - j:], -1)
+                        self._fd.set_size(int(self._scale[i] * Pango.SCALE))
+                        pl.set_font_description(self._fd)
+                        w = pl.get_size()[0] / Pango.SCALE
+                        j -= 1
+            if self._x_pos[i] is not None:
+                x = int(self.rect[0] + self._x_pos[i])
+            elif self._horiz_align[i] == "center":
+                x = int(self.rect[0] + self._margins[0] + (my_width - w) / 2)
+            elif self._horiz_align[i] == 'left':
+                x = int(self.rect[0] + self._margins[0])
+            else: # right
+                x = int(self.rect[0] + self.rect[2] - w - self._margins[2])
+            h = pl.get_size()[1] / Pango.SCALE
+            if self._y_pos[i] is not None:
+                y = int(self.rect[1] + self._y_pos[i])
+            elif self._vert_align[i] == "middle":
+                y = int(self.rect[1] + self._margins[1] + (my_height - h) / 2)
+            elif self._vert_align[i] == "top":
+                y = int(self.rect[1] + self._margins[1])
+            else: # bottom
+                y = int(self.rect[1] + self.rect[3] - h - self._margins[3])
+            cr.save()
+            cr.translate(x, y)
+            cr.set_source_rgb(self._color[0], self._color[1], self._color[2])
+            PangoCairo.update_layout(cr, pl)
+            PangoCairo.show_layout(cr, pl)
+            cr.restore()
+
+    def label_width(self, cr=None):
+        ''' Calculate the width of a label '''
+        if cr is None:
+            cr = self._sprites.cr
+        max = 0
+        for i in range(len(self.labels)):
+            pl = PangoCairo.create_layout(cr)
+            pl.set_text(str(self.labels[i]), -1)
+            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
+
+    def label_safe_width(self):
+        ''' Return maximum width for a label '''
+        return self.rect[2] - self._margins[0] - self._margins[2]
+
+    def label_safe_height(self):
+        ''' Return maximum height for a label '''
+        return self.rect[3] - self._margins[1] - self._margins[3]
+
+    def label_left_top(self):
+        ''' 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[0]
+        y = y - self.rect[1]
+        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(-1, -1, -1, -1)
diff --git a/toolbar_utils.py b/toolbar_utils.py
index 94e6883..03f5461 100644
--- a/toolbar_utils.py
+++ b/toolbar_utils.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2011, Walter Bender
-
+# Copyright (c) 2012, Ignacio Rodriguez
 # 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
@@ -10,13 +10,12 @@
 # along with this library; if not, write to the Free Software
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
+from gi.repository import Gtk
 
-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
+from sugar3.graphics.radiotoolbutton import RadioToolButton
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.combobox import ComboBox
+from sugar3.graphics.toolcombobox import ToolComboBox
 
 
 def combo_factory(combo_array, toolbar, callback, cb_arg=None,
@@ -32,7 +31,7 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None,
     for i, selection in enumerate(combo_array):
         combo.append_item(i, selection, None)
     combo.show()
-    toolitem = gtk.ToolItem()
+    toolitem = Gtk.ToolItem()
     toolitem.add(combo)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
@@ -46,13 +45,13 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None,
 
 def entry_factory(default_string, toolbar, tooltip=None, max=3):
     ''' Factory for adding a text box to a toolbar '''
-    entry = gtk.Entry()
+    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 = Gtk.ToolItem()
     toolitem.add(entry)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
@@ -87,7 +86,7 @@ def radio_factory(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(name)
+    button.set_icon_name(name)
     if callback is not None:
         if cb_arg is None:
             button.connect('clicked', callback)
@@ -105,12 +104,12 @@ def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None,
 
 def label_factory(toolbar, label_text, width=None):
     ''' Factory for adding a label to a toolbar '''
-    label = gtk.Label(label_text)
+    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 = Gtk.ToolItem()
     toolitem.add(label)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
@@ -122,7 +121,7 @@ def label_factory(toolbar, label_text, width=None):
 
 def separator_factory(toolbar, expand=False, visible=True):
     ''' add a separator to a toolbar '''
-    separator = gtk.SeparatorToolItem()
+    separator = Gtk.SeparatorToolItem()
     separator.props.draw = visible
     separator.set_expand(expand)
     if hasattr(toolbar, 'insert'):  # the main toolbar
@@ -134,9 +133,9 @@ def separator_factory(toolbar, expand=False, visible=True):
 
 def image_factory(image, toolbar, tooltip=None):
     ''' Add an image to the toolbar '''
-    img = gtk.Image()
+    img = Gtk.Image()
     img.set_from_pixbuf(image)
-    img_tool = gtk.ToolItem()
+    img_tool = Gtk.ToolItem()
     img_tool.add(img)
     if tooltip is not None:
         img.set_tooltip_text(tooltip)
@@ -149,12 +148,12 @@ def image_factory(image, toolbar, tooltip=None):
 
 
 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_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 = Gtk.ToolItem()
     toolitem.add(spin)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
diff --git a/yupana.py b/yupana.py
index bce920a..e4163f9 100644
--- a/yupana.py
+++ b/yupana.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #Copyright (c) 2011 Walter Bender
+#Copyright (c) 2012 Ignacio Rodriguez
 
 # 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
@@ -10,8 +11,7 @@
 # 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 gi.repository import Gtk, Gdk, GdkPixbuf
 import cairo
 
 from random import uniform
@@ -22,7 +22,7 @@ import logging
 _logger = logging.getLogger('yupana-activity')
 
 try:
-    from sugar.graphics import style
+    from sugar3.graphics import style
     GRID_CELL_SIZE = style.GRID_CELL_SIZE
 except ImportError:
     GRID_CELL_SIZE = 0
@@ -49,13 +49,12 @@ class Yupana():
             parent.show_all()
             self._parent = parent
 
-        self._canvas.set_flags(gtk.CAN_FOCUS)
-        self._canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK)
-        self._canvas.connect("expose-event", self._expose_cb)
+        self._canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
+        self._canvas.connect("draw", self.__draw_cb)
         self._canvas.connect("button-press-event", self._button_press_cb)
 
-        self._width = gtk.gdk.screen_width()
-        self._height = gtk.gdk.screen_height() - (GRID_CELL_SIZE * 1.5)
+        self._width = Gdk.Screen.width()
+        self._height = Gdk.Screen.height() - (GRID_CELL_SIZE * 1.5)
         self._scale = self._width / (20 * DOT_SIZE * 1.1)
         self._dot_size = int(DOT_SIZE * self._scale)
         self._space = int(self._dot_size / 5.)
@@ -330,8 +329,8 @@ class Yupana():
         ''' calculate the grid column and row for a dot '''
         return [dot % TEN, int(dot / TEN)]
 
-    def _expose_cb(self, win, event):
-        self.do_expose_event(event)
+    def __draw_cb(self, canvas, cr):
+	self._sprites.redraw_sprites(cr=cr)
 
     def do_expose_event(self, event):
         ''' Handle the expose-event by drawing '''
@@ -344,14 +343,14 @@ class Yupana():
         self._sprites.redraw_sprites(cr=cr)
 
     def _destroy_cb(self, win, event):
-        gtk.main_quit()
+        Gtk.main_quit()
 
     def _new_dot(self, color):
         ''' generate a dot of a color color '''
         def darken(color):
             ''' return a darker color than color '''
-            gdk_fill_color = gtk.gdk.color_parse(self._fill)
-            gdk_fill_dark_color = gtk.gdk.Color(
+            gdk_fill_color = Gdk.color_parse(self._fill)
+            gdk_fill_dark_color = Gdk.Color(
                 int(gdk_fill_color.red * 0.5),
                 int(gdk_fill_color.green * 0.5),
                 int(gdk_fill_color.blue * 0.5))
@@ -381,8 +380,7 @@ class Yupana():
             surface = cairo.ImageSurface(cairo.FORMAT_ARGB32,
                                          self._svg_width, self._svg_height)
             context = cairo.Context(surface)
-            context = gtk.gdk.CairoContext(context)
-            context.set_source_pixbuf(pixbuf, 0, 0)
+	    Gdk.cairo_set_source_pixbuf(context, pixbuf, 0, 0)
             context.rectangle(0, 0, self._svg_width, self._svg_height)
             context.fill()
             self._dot_cache[color] = surface
@@ -480,7 +478,7 @@ class Yupana():
 
 def svg_str_to_pixbuf(svg_string):
     """ Load pixbuf from SVG string """
-    pl = gtk.gdk.PixbufLoader('svg')
+    pl = GdkPixbuf.PixbufLoader.new_with_type('svg')
     pl.write(svg_string)
     pl.close()
     pixbuf = pl.get_pixbuf()