gtk3 -> masterv7

18 files changed, 447 insertions, 816 deletions

diff --git a/CardSortActivity.py b/CardSortActivity.py
index 91abbd1..50d2a6b 100644
--- a/CardSortActivity.py
+++ b/CardSortActivity.py
@@ -1,5 +1,6 @@
-#Copyright (c) 2009-11 Walter Bender
-
+# -*- coding: utf-8 -*-
+# Copyright (c) 2009-12 Walter Bender
+# Copyright (c) 2012 Ignacio Rodríguez
 # 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
@@ -9,31 +10,28 @@
 # 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 pygtk
 pygtk.require('2.0')
-import gtk
-import gobject
 
-import sugar
-from sugar.activity import activity
-try: # 0.86+ toolbar widgets
-    from sugar.bundle.activitybundle import ActivityBundle
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
-    from sugar.graphics.toolbarbox import ToolbarBox
-    from sugar.graphics.toolbarbox import ToolbarButton
-except ImportError:
-    pass
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.icon import Icon
-from sugar.datastore import datastore
+import sugar3
+from sugar3.activity import activity
+from sugar3.bundle.activitybundle import ActivityBundle
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.activity.widgets import StopButton
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.graphics.toolbarbox import ToolbarButton
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.icon import Icon
+from sugar3.datastore import datastore
 
 from gettext import gettext as _
 import locale
 import os.path
 
 from sprites import *
+from toolbar_utils import radio_factory, label_factory, separator_factory
 from window import Game
 
 SERVICE = 'org.sugarlabs.CardSortActivity'
@@ -48,87 +46,56 @@ class CardSortActivity(activity.Activity):
     def __init__(self, handle):
         super(CardSortActivity,self).__init__(handle)
 
-        try:
-            # Use 0.86 toolbar design
-            toolbar_box = ToolbarBox()
-
-            # Buttons added to the Activity toolbar
-            activity_button = ActivityToolbarButton(self)
-            toolbar_box.toolbar.insert(activity_button, 0)
-            activity_button.show()
-
-            # 2x2 Button
-            self.grid2x2 = ToolButton( "2x2on" )
-            self.grid2x2.set_tooltip(_('2x2'))
-            self.grid2x2.props.sensitive = True
-            self.grid2x2.connect('clicked', self._grid2x2_cb)
-            toolbar_box.toolbar.insert(self.grid2x2, -1)
-            self.grid2x2.show()
-
-            # 3x2 Button
-            self.grid3x2 = ToolButton( "3x2off" )
-            self.grid3x2.set_tooltip(_('3x2'))
-            self.grid3x2.props.sensitive = True
-            self.grid3x2.connect('clicked', self._grid3x2_cb)
-            toolbar_box.toolbar.insert(self.grid3x2, -1)
-            self.grid3x2.show()
-
-            # 2x3 Button
-            self.grid2x3 = ToolButton( "2x3off" )
-            self.grid2x3.set_tooltip(_('2x3'))
-            self.grid2x3.props.sensitive = True
-            self.grid2x3.connect('clicked', self._grid2x3_cb)
-            toolbar_box.toolbar.insert(self.grid2x3, -1)
-            self.grid2x3.show()
-
-            # 3x3 Button
-            self.grid3x3 = ToolButton( "3x3off" )
-            self.grid3x3.set_tooltip(_('3x3'))
-            self.grid3x3.props.sensitive = True
-            self.grid3x3.connect('clicked', self._grid3x3_cb)
-            toolbar_box.toolbar.insert(self.grid3x3, -1)
-            self.grid3x3.show()
-
-            separator = gtk.SeparatorToolItem()
-            separator.show()
-            toolbar_box.toolbar.insert(separator, -1)
-
-            # Label for showing status
-            self.results_label = gtk.Label(_("click to rotate; drag to swap"))
-            self.results_label.show()
-            results_toolitem = gtk.ToolItem()
-            results_toolitem.add(self.results_label)
-            toolbar_box.toolbar.insert(results_toolitem,-1)
-
-            separator = gtk.SeparatorToolItem()
-            separator.props.draw = False
-            separator.set_expand(True)
-            separator.show()
-            toolbar_box.toolbar.insert(separator, -1)
-
-            # The ever-present Stop Button
-            stop_button = StopButton(self)
-            stop_button.props.accelerator = '<Ctrl>Q'
-            toolbar_box.toolbar.insert(stop_button, -1)
-            stop_button.show()
-
-            self.set_toolbar_box(toolbar_box)
-            toolbar_box.show()
-
-        except NameError:
-            # Use pre-0.86 toolbar design
-            self.toolbox = activity.ActivityToolbox(self)
-            self.set_toolbox(self.toolbox)
-
-            self.projectToolbar = ProjectToolbar(self)
-            self.toolbox.add_toolbar( _('Project'), self.projectToolbar )
-
-            self.toolbox.show()
-
-        # Create a canvas
-        canvas = gtk.DrawingArea()
-        canvas.set_size_request(gtk.gdk.screen_width(),
-                                gtk.gdk.screen_height())
+	toolbar_box = ToolbarBox()
+	activity_button = ActivityToolbarButton(self)
+	toolbar_box.toolbar.insert(activity_button, 0)
+	activity_button.show()
+
+        self.grid2x2 = radio_factory('2x2on',
+                                     toolbar_box.toolbar,
+                                     self._grid2x2_cb,
+                                     tooltip=_('2x2'),
+                                     group = None)
+        self.grid3x2 = radio_factory('3x2on',
+                                     toolbar_box.toolbar,
+                                     self._grid3x2_cb,
+                                     tooltip=_('3x2'),
+                                     group = self.grid2x2)
+        self.grid2x3 = radio_factory('2x3on',
+                                     toolbar_box.toolbar,
+                                     self._grid2x3_cb,
+                                     tooltip=_('2x3'),
+                                     group = self.grid2x2)
+        self.grid3x3 = radio_factory('3x3on',
+                                     toolbar_box.toolbar,
+                                     self._grid3x3_cb,
+                                     tooltip=_('3x3'),
+                                     group = self.grid2x2)
+
+        separator_factory(toolbar_box.toolbar,
+                          visible=False)
+
+	self.results_label = label_factory(toolbar_box.toolbar,
+                                           _("click to rotate; drag to swap"),
+                                           width=300)
+
+        separator_factory(toolbar_box.toolbar,
+                          expand=True,
+                          visible=False)
+
+	# The ever-present Stop Button
+	stop_button = StopButton(self)
+	stop_button.props.accelerator = '<Ctrl>Q'
+	toolbar_box.toolbar.insert(stop_button, -1)
+	stop_button.show()
+
+	self.set_toolbar_box(toolbar_box)
+	toolbar_box.show()
+
+         # Create a canvas
+        canvas = Gtk.DrawingArea()
+        canvas.set_size_request(Gdk.Screen.width(),
+                                Gdk.Screen.height())
         self.set_canvas(canvas)
         canvas.show()
         self.show_all()
@@ -160,10 +127,6 @@ class CardSortActivity(activity.Activity):
         return True
 
     def show_grid2x2(self):
-        self.grid2x2.set_icon("2x2on")
-        self.grid3x2.set_icon("3x2off")
-        self.grid2x3.set_icon("2x3off")
-        self.grid3x3.set_icon("3x3off")
         self.game.test = self.game.grid.test2x2
         self.game.grid.reset2x2(self.game)
         self.metadata['grid'] = "2x2"
@@ -173,10 +136,6 @@ class CardSortActivity(activity.Activity):
         return True
 
     def show_grid3x2(self):
-        self.grid2x2.set_icon("2x2off")
-        self.grid3x2.set_icon("3x2on")
-        self.grid2x3.set_icon("2x3off")
-        self.grid3x3.set_icon("3x3off")
         self.game.test = self.game.grid.test3x2
         self.game.grid.reset3x2(self.game)
         self.metadata['grid'] = "3x2"
@@ -186,10 +145,6 @@ class CardSortActivity(activity.Activity):
         return True
 
     def show_grid2x3(self):
-        self.grid2x2.set_icon("2x2off")
-        self.grid3x2.set_icon("3x2off")
-        self.grid2x3.set_icon("2x3on")
-        self.grid3x3.set_icon("3x3off")
         self.game.test = self.game.grid.test2x3
         self.game.grid.reset2x3(self.game)
         self.metadata['grid'] = "2x3"
@@ -199,10 +154,6 @@ class CardSortActivity(activity.Activity):
         return True
 
     def show_grid3x3(self):
-        self.grid2x2.set_icon("2x2off")
-        self.grid3x2.set_icon("3x2off")
-        self.grid2x3.set_icon("2x3off")
-        self.grid3x3.set_icon("3x3on")
         self.game.test = self.game.grid.test3x3
         self.game.grid.reset3x3(self.game)
         self.metadata['grid'] = "3x3"
@@ -213,57 +164,3 @@ class CardSortActivity(activity.Activity):
     def write_file(self, file_path):
         pass
 
-#
-# Project toolbar for pre-0.86 toolbars
-#
-class ProjectToolbar(gtk.Toolbar):
-
-    def __init__(self, pc):
-        gtk.Toolbar.__init__(self)
-        self.activity = pc
-
-        # 2x2 Button
-        self.activity.grid2x2 = ToolButton( "2x2on" )
-        self.activity.grid2x2.set_tooltip(_('2x2'))
-        self.activity.grid2x2.props.sensitive = True
-        self.activity.grid2x2.connect('clicked', self.activity._grid2x2_cb)
-        self.insert(self.activity.grid2x2, -1)
-        self.activity.grid2x2.show()
-
-        # 3x2 Button
-        self.activity.grid3x2 = ToolButton( "3x2off" )
-        self.activity.grid3x2.set_tooltip(_('3x2'))
-        self.activity.grid3x2.props.sensitive = True
-        self.activity.grid3x2.connect('clicked', self.activity._grid3x2_cb)
-        self.insert(self.activity.grid3x2, -1)
-        self.activity.grid3x2.show()
-
-        # 2x3 Button
-        self.activity.grid2x3 = ToolButton( "2x3off" )
-        self.activity.grid2x3.set_tooltip(_('2x3'))
-        self.activity.grid2x3.props.sensitive = True
-        self.activity.grid2x3.connect('clicked', self.activity._grid2x3_cb)
-        self.insert(self.activity.grid2x3, -1)
-        self.activity.grid2x3.show()
-
-        # 3x3 Button
-        self.activity.grid3x3 = ToolButton( "3x3off" )
-        self.activity.grid3x3.set_tooltip(_('3x3'))
-        self.activity.grid3x3.props.sensitive = True
-        self.activity.grid3x3.connect('clicked', self.activity._grid3x3_cb)
-        self.insert(self.activity.grid3x3, -1)
-        self.activity.grid3x3.show()
-
-        separator = gtk.SeparatorToolItem()
-        separator.set_draw(True)
-        self.insert(separator, -1)
-        separator.show()
-
-        # Label for showing status
-        self.activity.results_label = gtk.Label(\
-            _("click to rotate; drag to swap"))
-        self.activity.results_label.show()
-        self.activity.results_toolitem = gtk.ToolItem()
-        self.activity.results_toolitem.add(self.activity.results_label)
-        self.insert(self.activity.results_toolitem, -1)
-        self.activity.results_toolitem.show()
diff --git a/MANIFEST b/MANIFEST
new file mode 100644
index 0000000..5615588
--- /dev/null
+++ b/MANIFEST
@@ -0,0 +1,39 @@
+cardsort.desktop
+window.py
+COPYING
+cardsort.py
+setup.py
+CardSortActivity.py
+orientation.py
+card.py
+sprites.py
+grid.py
+NEWS
+icons/3x3off.svg
+icons/3x3on.svg
+icons/2x2off.svg
+icons/2x3on.svg
+icons/2x2on.svg
+icons/3x2on.svg
+icons/2x3off.svg
+icons/3x2off.svg
+po/CardSort.pot
+activity/activity.info
+activity/activity-cardsort.svg
+images/card0.svg
+images/mask1v.svg
+images/card2.svg
+images/card4.svg
+images/card8.svg
+images/mask0v.svg
+images/mask0h.svg
+images/card5.svg
+images/card7.svg
+images/mask3h.svg
+images/mask3v.svg
+images/card1.svg
+images/mask2h.svg
+images/card6.svg
+images/card3.svg
+images/mask2v.svg
+images/mask1h.svg
diff --git a/NEWS b/NEWS
index fcba60f..3fe1156 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+7
+
+ENHANCEMENTS:
+* Ignacio Rodriguez port to gtk 3
+
 6
 
 * convert to Cairo graphics
diff --git a/activity/activity.info b/activity/activity.info
index 853b214..05abd95 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,9 +1,10 @@
 [Activity]
 name = Card Sort
-activity_version = 6
+activity_version = 7
 license = GPLv3
 bundle_id = org.sugarlabs.CardSortActivity
 exec = sugar-activity CardSortActivity.CardSortActivity
 icon = activity-cardsort
 show_launcher = yes
-summary = a pattern matching game
\ No newline at end of file
+summary = a pattern matching game
+
diff --git a/card.py b/card.py
index 0f08a20..c224e16 100644
--- a/card.py
+++ b/card.py
@@ -1,5 +1,6 @@
-#Copyright (c) 2009-11 Walter Bender
-
+# -*- coding: utf-8 -*-
+# Copyright (c) 2009-11 Walter Bender
+# Copyright (c) 2012 Ignacio Rodríguez
 # 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
@@ -8,17 +9,15 @@
 # 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
-
+from gi.repository import Gtk, Gdk, GObject, GdkPixbuf
 import pygtk
 pygtk.require('2.0')
-import gtk
-import gobject
 import os.path
 
 from sprites import Sprite
 
 def load_image(file, w, h):
-    return gtk.gdk.pixbuf_new_from_file_at_size(file, int(w), int(h))
+    return GdkPixbuf.Pixbuf.new_from_file_at_size(file, int(w), int(h))
 
 #
 # class for defining individual cards
diff --git a/cardsort.py b/cardsort.py
index fa4f68f..3add8cd 100755..100644
--- a/cardsort.py
+++ b/cardsort.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-
-#Copyright (c) 2009-11 Walter Bender
-
+# -*- coding: utf-8 -*-
+# Copyright (c) 2009-11 Walter Bender
+# Copyright (c) 2012 Ignacio Rodríguez
 # 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,10 +10,9 @@
 # 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
-
+from gi.repository import Gdk, Gtk, GdkPixbuf, GObject
 import pygtk
 pygtk.require('2.0')
-import gtk
 
 from gettext import gettext as _
 import os.path
@@ -27,27 +26,27 @@ class CardSortMain:
         self.r = 0
         self.tw = None
         # create a new window
-        self.win = gtk.Window(gtk.WINDOW_TOPLEVEL)
+        self.win = Gtk.Window(Gdk.WindowType.TOPLEVEL)
         self.win.maximize()
         self.win.set_title(_("CardSort") + ": " + 
                            _("click to rotate; drag to swap"))
         self.win.connect("delete_event", lambda w,e: gtk.main_quit())
 
-        menu = gtk.Menu()
+        menu = Gtk.Menu()
 
-        menu_items = gtk.MenuItem(_("2x2"))
+        menu_items = Gtk.MenuItem(_("2x2"))
         menu.append(menu_items)
         menu_items.connect("activate", self._grid2x2_cb)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("2x3"))
+        menu_items = Gtk.MenuItem(_("2x3"))
         menu.append(menu_items)
         menu_items.connect("activate", self._grid2x3_cb)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("3x2"))
+        menu_items = Gtk.MenuItem(_("3x2"))
         menu.append(menu_items)
         menu_items.connect("activate", self._grid3x2_cb)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("3x3"))
+        menu_items = Gtk.MenuItem(_("3x3"))
         menu.append(menu_items)
         menu_items.connect("activate", self._grid3x3_cb)
         menu_items.show()
@@ -59,21 +58,21 @@ class CardSortMain:
         menu_items.show()
         """
 
-        root_menu = gtk.MenuItem("Tools")
+        root_menu = Gtk.MenuItem("Tools")
         root_menu.show()
         root_menu.set_submenu(menu)
 
         # A vbox to put a menu and the canvas in:
-        vbox = gtk.VBox(False, 0)
+        vbox = Gtk.VBox(False, 0)
         self.win.add(vbox)
         vbox.show()
 
-        menu_bar = gtk.MenuBar()
+        menu_bar = Gtk.MenuBar()
         vbox.pack_start(menu_bar, False, False, 2)
         menu_bar.show()
 
-        canvas = gtk.DrawingArea()
-        vbox.pack_end(canvas, True, True)
+        canvas = Gtk.DrawingArea()
+        vbox.pack_end(canvas, True, True, 3)
         canvas.show()
 
         menu_bar.append(root_menu)
@@ -164,7 +163,7 @@ class Permutation:
                  self._sofar.pop() 
 
 def main():
-    gtk.main()
+    Gtk.main()
     return 0
 
 if __name__ == "__main__":
diff --git a/dist/CardSort-1.tar.bz2 b/dist/CardSort-1.tar.bz2
deleted file mode 100644
index c17a69e..0000000
--- a/dist/CardSort-1.tar.bz2
+++ /dev/null
diff --git a/dist/CardSort-1.xo b/dist/CardSort-1.xo
deleted file mode 100644
index b482f18..0000000
--- a/dist/CardSort-1.xo
+++ /dev/null
diff --git a/grid.py b/grid.py
index dfbec1d..56f3801 100644
--- a/grid.py
+++ b/grid.py
@@ -1,5 +1,6 @@
-#Copyright (c) 2009-11 Walter Bender
-
+# -*- coding: utf-8 -*-
+# Copyright (c) 2009-11 Walter Bender
+# Copyright (c) 2012 Ignacio Rodríguez
 # 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
@@ -11,8 +12,7 @@
 
 import pygtk
 pygtk.require('2.0')
-import gtk
-import gobject
+from gi.repository import Gtk, Gdk, GObject
 import os.path
 
 from random import uniform
diff --git a/icons/2x2off.svg b/icons/2x2off.svg
deleted file mode 100644
index ea9a432..0000000
--- a/icons/2x2off.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="55"
-   height="55"
-   id="svg2"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="2x2off.svg">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="972"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="4.2909091"
-     inkscape:cx="-29.597458"
-     inkscape:cy="27.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 27.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="55 : 27.5 : 1"
-       inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-       id="perspective11" />
-    <inkscape:perspective
-       id="perspective3680"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3048"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <rect
-     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:4.05900620999999973;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect2817"
-     width="50.94099"
-     height="50.940994"
-     x="2.0295048"
-     y="2.0295029"
-     ry="7.0263433"
-     rx="8.1506357" />
-  <g
-     id="g3031"
-     transform="translate(6.2813491,-6.281349)">
-    <g
-       id="g3026">
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:0.90334147;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 33.548314,21.014354 -25.0966483,0"
-         id="path2827-4-3"
-         sodipodi:nodetypes="cs" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:0.90334147;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 33.548314,33.781349 -25.0966483,0"
-         id="path2827-6-0"
-         sodipodi:nodetypes="cs" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:0.90334147;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 33.548305,46.548344 -25.0966492,0"
-         id="path2827-69-7"
-         sodipodi:nodetypes="cs" />
-    </g>
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-3-8"
-       d="m 21.218651,21.451686 0,25.096658"
-       style="fill:none;stroke:#ffffff;stroke-width:0.90334165;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-4-7-6"
-       d="m 33.985646,21.451686 0,25.096658"
-       style="fill:none;stroke:#ffffff;stroke-width:0.90334165;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-6-4-8"
-       d="m 8.4516558,21.451686 0,25.096658"
-       style="fill:none;stroke:#ffffff;stroke-width:0.90334165;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-</svg>
diff --git a/icons/2x3off.svg b/icons/2x3off.svg
deleted file mode 100644
index 749a781..0000000
--- a/icons/2x3off.svg
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="55"
-   height="55"
-   id="svg2"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="2x3off.svg">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="972"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="4.2909091"
-     inkscape:cx="-29.597458"
-     inkscape:cy="27.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 27.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="55 : 27.5 : 1"
-       inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-       id="perspective11" />
-    <inkscape:perspective
-       id="perspective3680"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2991"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <rect
-     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:4.05900620999999973;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect2817"
-     width="50.94099"
-     height="50.940994"
-     x="2.0295048"
-     y="2.0295029"
-     ry="7.0263433"
-     rx="8.1506357" />
-  <g
-     id="g2908"
-     transform="matrix(0,1,-1,0,48.622538,-0.00166932)">
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-45"
-       d="m 46.333235,8.4480169 -37.78125,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-4-2"
-       d="m 46.33325,21.114683 -37.78125,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-6-5"
-       d="m 46.33325,33.781349 -37.78125,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-3-4"
-       d="m 21.218651,8.6358597 0,25.2618283"
-       style="fill:none;stroke:#ffffff;stroke-width:0.90274125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-4-7-7"
-       d="m 33.885317,8.6358597 0,25.2618283"
-       style="fill:none;stroke:#ffffff;stroke-width:0.90274125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-6-4-4"
-       d="m 8.551985,8.6344363 0,25.1027487"
-       style="fill:none;stroke:#ffffff;stroke-width:0.89989436;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-69-5-4"
-       d="m 46.551983,8.6358597 0,25.2618283"
-       style="fill:none;stroke:#ffffff;stroke-width:0.90274125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-</svg>
diff --git a/icons/3x2off.svg b/icons/3x2off.svg
deleted file mode 100644
index dc1cc09..0000000
--- a/icons/3x2off.svg
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="55"
-   height="55"
-   id="svg2"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="3x2off.svg">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="972"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="4.2909091"
-     inkscape:cx="-29.597458"
-     inkscape:cy="27.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 27.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="55 : 27.5 : 1"
-       inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-       id="perspective11" />
-    <inkscape:perspective
-       id="perspective3680"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2925"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <rect
-     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:4.05900620999999973;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect2817"
-     width="50.94099"
-     height="50.940994"
-     x="2.0295048"
-     y="2.0295029"
-     ry="7.0263433"
-     rx="8.1506357" />
-  <g
-     id="g2908"
-     transform="translate(-0.00166932,6.3774622)">
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-47"
-       d="m 46.333235,8.4480169 -37.78125,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-4-6"
-       d="m 46.33325,21.114683 -37.78125,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-6-5"
-       d="m 46.33325,33.781349 -37.78125,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-3-6"
-       d="m 21.218651,8.6358597 0,25.2618283"
-       style="fill:none;stroke:#ffffff;stroke-width:0.90274125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-4-7-9"
-       d="m 33.885317,8.6358597 0,25.2618283"
-       style="fill:none;stroke:#ffffff;stroke-width:0.90274125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-6-4-3"
-       d="m 8.551985,8.6344363 0,25.1027487"
-       style="fill:none;stroke:#ffffff;stroke-width:0.89989436;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-69-5-7"
-       d="m 46.551983,8.6358597 0,25.2618283"
-       style="fill:none;stroke:#ffffff;stroke-width:0.90274125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-</svg>
diff --git a/icons/3x3off.svg b/icons/3x3off.svg
deleted file mode 100644
index 87d58e4..0000000
--- a/icons/3x3off.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="55"
-   height="55"
-   id="svg2"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="3x3off.svg">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="972"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="4.2909091"
-     inkscape:cx="-1.0487288"
-     inkscape:cy="27.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 27.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="55 : 27.5 : 1"
-       inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-       id="perspective11" />
-    <inkscape:perspective
-       id="perspective3680"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <rect
-     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:4.05900620999999973;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect2817"
-     width="50.94099"
-     height="50.940994"
-     x="2.0295048"
-     y="2.0295029"
-     ry="7.0263433"
-     rx="8.1506357" />
-  <g
-     id="g3715"
-     transform="translate(-40.783898,-19.34322)">
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827"
-       d="m 87.065149,27.843221 -37.78125,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-4"
-       d="m 87.065164,40.509887 -37.78125,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-6"
-       d="m 87.065164,53.176553 -37.78125,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-69"
-       d="m 87.06515,65.843219 -37.781251,0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-3"
-       d="m 61.950565,28.061969 0,37.78125"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-4-7"
-       d="m 74.617231,28.061969 0,37.78125"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-6-4"
-       d="m 49.283899,28.06197 0,37.781249"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2827-69-5"
-       d="m 87.283897,28.061969 0,37.78125"
-       style="fill:none;stroke:#ffffff;stroke-width:1.10399997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-</svg>
diff --git a/orientation.py b/orientation.py
index f50e86f..dc6113e 100644
--- a/orientation.py
+++ b/orientation.py
@@ -1,5 +1,6 @@
-#Copyright (c) 2009-11 Walter Bender
-
+# -*- coding: utf-8 -*-
+# Copyright (c) 2009-11 Walter Bender
+# Copyright (c) 2012 Ignacio Rodríguez
 # 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
diff --git a/setup.py b/setup.py
index bd1e319..bdeaed6 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from sugar.activity import bundlebuilder
+from sugar3.activity import bundlebuilder
 if __name__ == "__main__":
     bundlebuilder.start()
 
diff --git a/sprites.py b/sprites.py
index baae94f..8cad6a6 100644
--- a/sprites.py
+++ b/sprites.py
@@ -24,7 +24,7 @@
 '''
 
 sprites.py is a simple sprites library for managing graphics objects,
-'sprites', on a gtk.DrawingArea. It manages multiple sprites with
+'sprites', on a Gtk.DrawingArea. It manages multiple sprites with
 methods such as move, hide, set_layer, etc.
 
 There are two classes:
@@ -68,7 +68,7 @@ Example usage:
 
 # method for converting SVG to a gtk pixbuf
 def svg_str_to_pixbuf(svg_string):
-    pl = gtk.gdk.PixbufLoader('svg')
+    pl = GdkPixbuf.PixbufLoader('svg')
     pl.write(svg_string)
     pl.close()
     pixbuf = pl.get_pixbuf()
@@ -76,21 +76,20 @@ def svg_str_to_pixbuf(svg_string):
 
 '''
 
-import pygtk
-pygtk.require('2.0')
-import gtk
-import pango
-import pangocairo
+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 = []
-        self.cr = None
 
     def set_cairo_context(self, cr):
         ''' Cairo context may be set or reset after __init__ '''
@@ -98,7 +97,7 @@ class Sprites:
 
     def get_sprite(self, i):
         ''' Return a sprint from the array '''
-        if i < 0 or i > len(self.list) - 1:
+        if i < 0 or i > len(self.list)-1:
             return(None)
         else:
             return(self.list[i])
@@ -160,11 +159,13 @@ class 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.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
@@ -172,7 +173,7 @@ class Sprite:
         self._margins = [0, 0, 0, 0]
         self.layer = 100
         self.labels = []
-        self.cached_surfaces = []
+        self.images = []
         self._dx = []  # image offsets
         self._dy = []
         self.type = None
@@ -181,54 +182,47 @@ class Sprite:
 
     def set_image(self, image, i=0, dx=0, dy=0):
         ''' Add an image to the sprite. '''
-        while len(self.cached_surfaces) < i + 1:
-            self.cached_surfaces.append(None)
+        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 isinstance(image, gtk.gdk.Pixbuf):
-            w = image.get_width()
-            h = image.get_height()
+        if hasattr(self.images[i], 'get_width'):
+            w = self.images[i].get_width()
+            h = self.images[i].get_height()
         else:
-            w, h = image.get_size()
+            w, h = self.images[i].get_size()
         if i == 0:  # Always reset width and height when base image changes.
-            self.rect.width = w + dx
-            self.rect.height = h + dy
+            self.rect[2] = w + dx
+            self.rect[3] = h + dy
         else:
-            if w + dx > self.rect.width:
-                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
+            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.x, self.rect.y = int(pos[0]), int(pos[1])
+        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.x += int(pos[0])
-        self.rect.y += int(pos[1])
+        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.x, self.rect.y)
+        return (self.rect[0], self.rect[1])
 
     def get_dimensions(self):
         ''' Return current size '''
-        return (self.rect.width, self.rect.height)
+        return (self.rect[2], self.rect[3])
 
     def get_layer(self):
         ''' Return current layer '''
@@ -246,7 +240,7 @@ class Sprite:
         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:
+            if self.layer < self._sprites.get_sprite(i).layer:
                 self._sprites.insert_in_list(self, i)
                 self.inval()
                 return
@@ -279,10 +273,12 @@ class Sprite:
             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)
+        self._fd = Pango.FontDescription(font)
 
     def set_label_color(self, rgb):
         ''' Set the font color for a label '''
@@ -300,13 +296,15 @@ class Sprite:
         return
 
     def set_label_attributes(self, scale, rescale=True, horiz_align="center",
-                             vert_align="middle", i=0):
+                             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 '''
@@ -319,136 +317,149 @@ class Sprite:
 
     def inval(self):
         ''' Invalidate a region for gtk '''
-        self._sprites.widget.queue_draw_area(self.rect.x,
-                                             self.rect.y,
-                                             self.rect.width,
-                                             self.rect.height)
+        # 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, 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()
+        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.x:
+        if x < self.rect[0]:
             return False
-        if x > self.rect.x + self.rect.width:
+        if x > self.rect[0] + self.rect[2]:
             return False
-        if y < self.rect.y:
+        if y < self.rect[1]:
             return False
-        if y > self.rect.y + self.rect.height:
+        if y > self.rect[1] + self.rect[3]:
             return False
         return True
 
     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]
+        my_width = self.rect[2] - self._margins[0] - self._margins[2]
         if my_width < 0:
             my_width = 0
-        my_height = self.rect.height - self._margins[1] - self._margins[3]
+        my_height = self.rect[3] - self._margins[1] - self._margins[3]
         for i in range(len(self.labels)):
-            pl = cr.create_layout()
-            pl.set_text(str(self.labels[i]))
-            self._fd.set_size(int(self._scale[i] * pango.SCALE))
+            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
+            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))
+                            int(self._scale[i] * Pango.SCALE * my_width / w))
                     pl.set_font_description(self._fd)
-                    w = pl.get_size()[0] / pango.SCALE
+                    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:])
-                        self._fd.set_size(int(self._scale[i] * pango.SCALE))
+                            "…" + 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
+                        w = pl.get_size()[0] / Pango.SCALE
                         j -= 1
-            if self._horiz_align[i] == "center":
-                x = int(self.rect.x + self._margins[0] + (my_width - w) / 2)
+            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.x + self._margins[0])
+                x = int(self.rect[0] + self._margins[0])
             else: # right
-                x = int(self.rect.x + self.rect.width - w - self._margins[2])
-            h = pl.get_size()[1] / pango.SCALE
-            if self._vert_align[i] == "middle":
-                y = int(self.rect.y + self._margins[1] + (my_height - h) / 2)
+                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.y + self._margins[1])
+                y = int(self.rect[1] + self._margins[1])
             else: # bottom
-                y = int(self.rect.y + self.rect.height - h - self._margins[3])
+                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])
-            cr.update_layout(pl)
-            cr.show_layout(pl)
+            PangoCairo.update_layout(cr, pl)
+            PangoCairo.show_layout(cr, pl)
             cr.restore()
 
-    def label_width(self):
+    def label_width(self, cr=None):
         ''' 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
+        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.width - self._margins[0] - self._margins[2]
+        return self.rect[2] - self._margins[0] - self._margins[2]
 
     def label_safe_height(self):
         ''' Return maximum height for a label '''
-        return self.rect.height - self._margins[1] - self._margins[3]
+        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 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 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)
-
-        # 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..72f7100
--- /dev/null
+++ b/toolbar_utils.py
@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2011, Walter Bender
+# Port To GTK3:
+# Ignacio Rodriguez <ignaciorodriguez@sugarlabs.org>
+# 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
+
+
+from gi.repository import Gtk
+
+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,
+                  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 tooplbar 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(name, toolbar, callback, cb_arg=None, tooltip=None,
+                  group=None):
+    ''' Add a radio button to a toolbar '''
+    button = RadioToolButton(group=group)
+    button.set_icon_name(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)
+    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 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)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(separator, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.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)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(img_tool, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.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)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return spin
diff --git a/window.py b/window.py
index 45b7ec9..eee76d5 100644
--- a/window.py
+++ b/window.py
@@ -1,5 +1,6 @@
-#Copyright (c) 2009-11 Walter Bender
-
+# -*- coding: utf-8 -*-
+# Copyright (c) 2009-11 Walter Bender
+# Copyright (c) 2012 Ignacio Rodríguez
 # 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
@@ -8,17 +9,13 @@
 # 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
-
+from gi.repository import Gtk, Gdk
 import pygtk
 pygtk.require('2.0')
-import gtk
 from gettext import gettext as _
 
-try:
-    from sugar.graphics import style
-    GRID_CELL_SIZE = style.GRID_CELL_SIZE
-except:
-    GRID_CELL_SIZE = 0
+from sugar3.graphics import style
+GRID_CELL_SIZE = style.GRID_CELL_SIZE
 
 from grid import Grid
 from sprites import Sprites
@@ -47,14 +44,13 @@ class Game():
             self.canvas = canvas
             parent.show_all()
     
-        self.canvas.set_flags(gtk.CAN_FOCUS)
-        self.canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK)
-        self.canvas.add_events(gtk.gdk.BUTTON_RELEASE_MASK)
-        self.canvas.connect("expose-event", self._expose_cb)
+        self.canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
+        self.canvas.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK)
+        self.canvas.connect("draw", self.__draw_cb)
         self.canvas.connect("button-press-event", self._button_press_cb)
         self.canvas.connect("button-release-event", self._button_release_cb)
-        self.width = gtk.gdk.screen_width()
-        self.height = gtk.gdk.screen_height()-GRID_CELL_SIZE
+        self.width = Gdk.Screen.width()
+        self.height = Gdk.Screen.height()-GRID_CELL_SIZE
         self.card_dim = CARD_DIM
         self.scale = 0.8 * self.height / (self.card_dim * 3)
     
@@ -139,10 +135,8 @@ class Game():
     #
     # Repaint
     #
-    def _expose_cb(self, win, event):
-        ''' Callback to handle window expose events '''
-        self.do_expose_event(event)
-        return True
+    def __draw_cb(self, canvas, cr):
+		self.sprites.redraw_sprites(cr=cr)
     
     def do_expose_event(self, event):
         ''' Handle the expose-event by drawing '''
@@ -158,4 +152,4 @@ class Game():
     # callbacks
     #
     def _destroy_cb(self, win, event):
-        gtk.main_quit()
+        Gtk.main_quit()