Port finish, need a summary!HEADmaster

27 files changed, 210 insertions, 1090 deletions

diff --git a/NEWS b/NEWS
index a389bc1..bbfb734 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
 NEWS
 
+7
+
+ENHANCEMENTS:
+* Ignacio Rodríguez port to gtk3
+
+6
+
+ENHANCEMENTS:
+* Added play levels (beginner, intermediate, expert, custom)
+* Added better end-of-game feedback
+
 5
 
 ENHANCEMENTS:
diff --git a/TurtlePondActivity.py b/TurtlePondActivity.py
index 8028b2a..dc97b8b 100644
--- a/TurtlePondActivity.py
+++ b/TurtlePondActivity.py
@@ -1,5 +1,6 @@
 #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
@@ -9,30 +10,29 @@
 # 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, GObject, Gdk
 
-import gtk
-import gobject
 
-import sugar
-from sugar.activity import activity
-from sugar import profile
+import sugar3
+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.bundle.activitybundle import ActivityBundle
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
-    from sugar.graphics.toolbarbox import ToolbarButton
+    from sugar3.bundle.activitybundle import ActivityBundle
+    from sugar3.activity.widgets import ActivityToolbarButton
+    from sugar3.activity.widgets import StopButton
+    from sugar3.graphics.toolbarbox import ToolbarButton
 
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.icon import Icon
-from sugar.datastore import datastore
-from sugar.graphics.objectchooser import ObjectChooser
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.icon import Icon
+from sugar3.datastore import datastore
+from sugar3.graphics.objectchooser import ObjectChooser
 
 from toolbar_utils import button_factory, image_factory, label_factory, \
     separator_factory, radio_factory
@@ -71,9 +71,9 @@ class TurtlePondActivity(activity.Activity):
         self._setup_toolbars(_have_toolbox)
 
         # 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()
@@ -103,7 +103,7 @@ class TurtlePondActivity(activity.Activity):
 
         else:
             # Use pre-0.86 toolbar design
-            games_toolbar = gtk.Toolbar()
+            games_toolbar = Gtk.Toolbar()
             toolbox = activity.ActivityToolbox(self)
             self.set_toolbox(toolbox)
             toolbox.add_toolbar(_('Game'), games_toolbar)
@@ -210,11 +210,11 @@ class TurtlePondActivity(activity.Activity):
         except TypeError:
             chooser = ObjectChooser(
                 None, self,
-                gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT)
+                Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT)
         if chooser is not None:
             try:
                 result = chooser.run()
-                if result == gtk.RESPONSE_ACCEPT:
+                if result == Gtk.ResponseType.ACCEPT:
                     dsobject = chooser.get_selected_object()
                     action(dsobject)
                     dsobject.destroy()
diff --git a/activity/activity.info b/activity/activity.info
index 0a3c10a..7b0f9e9 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Turtle in a Pond
-activity_version = 5
+activity_version = 7
 license = GPLv3
 bundle_id = org.sugarlabs.TurtlePondActivity
 exec = sugar-activity TurtlePondActivity.TurtlePondActivity
diff --git a/game.py b/game.py
index 5e8ecb8..e9ddb29 100644
--- a/game.py
+++ b/game.py
@@ -1,5 +1,7 @@
 # -*- 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
@@ -10,9 +12,8 @@
 # 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, GdkPixbuf, GObject
 
-import gtk
-import gobject
 import cairo
 
 from math import sqrt, pi
@@ -25,7 +26,7 @@ import logging
 _logger = logging.getLogger('turtle-in-a-pond-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
@@ -92,13 +93,12 @@ 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.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._height / (14.0 * DOT_SIZE * 1.2)
         self._dot_size = int(DOT_SIZE * self._scale)
         self._turtle_offset = 0
@@ -164,7 +164,7 @@ class Game():
         self._turtle.set_shape(self._turtle_images[0])
         self._set_label('')
         if self._timeout_id is not None:
-            gobject.source_remove(self._timeout_id)
+            GObject.source_remove(self._timeout_id)
 
     def new_game(self, saved_state=None):
         ''' Start a new game. '''
@@ -189,7 +189,7 @@ class Game():
         win.grab_focus()
         x, y = map(int, event.get_coords())
 
-        spr = self._sprites.find_sprite((x, y), inverse=True)
+        spr = self._sprites.find_sprite((x, y))
         if spr == None:
             return
 
@@ -291,7 +291,7 @@ class Game():
         self._orientation += 1
         self._orientation %= 6
         self._turtle.set_shape(self._turtle_images[self._orientation])
-        self._timeout_id = gobject.timeout_add(250, self._happy_turtle_dance)
+        self._timeout_id = GObject.timeout_add(250, self._happy_turtle_dance)
 
     def _ordered_weights(self, pos):
         ''' Returns the list of surrounding points sorted by their
@@ -366,10 +366,8 @@ class Game():
         traceback.print_exc()
         return None
 
-    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 '''
@@ -382,7 +380,7 @@ class Game():
         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 '''
@@ -413,12 +411,10 @@ class Game():
         for i in range(6):
             surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, nw, nh)
             context = cairo.Context(surface)
-            context = gtk.gdk.CairoContext(context)
+            Gdk.cairo_set_source_pixbuf(context, pixbuf, 0, 0)
             context.translate(nw / 2., nh / 2.)
             context.rotate((30 + i * 60) * pi / 180.)
             context.translate(-nw / 2., -nh / 2.)
-            context.set_source_pixbuf(image, (nw - w) / 2.,
-                                              (nh - h) / 2.)
             context.rectangle(0, 0, nw, nh)
             context.fill()
             self._turtle_images.append(surface)
@@ -521,7 +517,7 @@ class Game():
 
 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()
diff --git a/genxo.py b/genxo.py
index 596d29e..f759a3b 100644
--- a/genxo.py
+++ b/genxo.py
@@ -3,6 +3,9 @@
 
 #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
diff --git a/locale/es/LC_MESSAGES/org.sugarlabs.TurtlePondActivity.mo b/locale/es/LC_MESSAGES/org.sugarlabs.TurtlePondActivity.mo
new file mode 100644
index 0000000..3420166
--- /dev/null
+++ b/locale/es/LC_MESSAGES/org.sugarlabs.TurtlePondActivity.mo
diff --git a/locale/es/activity.linfo b/locale/es/activity.linfo
new file mode 100644
index 0000000..dd83eaf
--- /dev/null
+++ b/locale/es/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = Tortuga en un Estanque
diff --git a/po/TurtleinaPond.pot b/po/TurtleinaPond.pot
index 262df70..9f43821 100644
--- a/po/TurtleinaPond.pot
+++ b/po/TurtleinaPond.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
+"POT-Creation-Date: 2011-12-16 09:47-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,3 +48,7 @@ msgstr ""
 #: TurtlePondActivity.py:157
 msgid "Load strategy from Journal"
 msgstr ""
+
+#: TurtlePondActivity.py:162
+msgid "Load default strategy"
+msgstr ""
diff --git a/po/cs.po b/po/cs.po
deleted file mode 100644
index af1f8a8..0000000
--- a/po/cs.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-06-29 08:13+0200\n"
-"Last-Translator: jui <appukonrad@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: cs\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Želva v rybníku"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Začátečník"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Pokročilí"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Expert"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "Moje strategie"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Hra"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Začít novou hru."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Načíst strategii z deníčku"
diff --git a/po/da.po b/po/da.po
deleted file mode 100644
index cba6c6b..0000000
--- a/po/da.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-02-01 19:58+0200\n"
-"Last-Translator: Aputsiaq Niels <aj@isit.gl>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Skildpadde i en dam"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Begynder"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Øvet"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Ekspert"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "Min strategi"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Spil"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Start et nyt spil."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Indlæs strategi fra journal"
-
-#~ msgid "turtle is looking for any open dot"
-#~ msgstr "skildpadde kigger efter en åben prik"
-
-#~ msgid "Click on the dots to keep the turtle from escaping."
-#~ msgstr "Klik på prikkerne for at undgå at skildpadden stikker af."
-
-#~ msgid "turtle wins"
-#~ msgstr "skildpadde vinder"
-
-#~ msgid "you win"
-#~ msgstr "du vinder"
-
-#~ msgid "Game over"
-#~ msgstr "Spillet er slut"
-
-#~ msgid "Load default strategy"
-#~ msgstr "Indlæs standard-strategi"
-
-#~ msgid "customized strategy"
-#~ msgstr "tilpasset strategi"
diff --git a/po/de.po b/po/de.po
deleted file mode 100644
index 11213e4..0000000
--- a/po/de.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-04-11 12:44+0200\n"
-"Last-Translator: Markus <m.slg@gmx.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Schildkrötenteich"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Anfänger"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Fortgeschrittener"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Experte"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "Meine Strategie"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Spiel"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Beginne ein neues Spiel."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Lade eine Strategie aus dem Tagebuch."
diff --git a/po/el.po b/po/el.po
deleted file mode 100644
index edcfea0..0000000
--- a/po/el.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-09-23 19:34+0200\n"
-"Last-Translator: Yannis <kiolalis@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: el\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Μια χελώνα στη λιμνούλα"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Αρχάριος"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Μέσου επιπέδου"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Προχωρημένος"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "Η στρατηγική μου"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Παιχνίδι"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Έναρξη νέου παιχνιδιού"
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Φόρτωση στρατηγικής από το Ημερολόγιο"
diff --git a/po/en.po b/po/en.po
deleted file mode 100644
index 9853129..0000000
--- a/po/en.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-01-31 06:29+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Turtle in a Pond"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Beginner"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Intermediate"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Expert"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "My strategy"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Game"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Start a new game."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Load strategy from Journal"
-
-#~ msgid "turtle is looking for any open dot"
-#~ msgstr "turtle is looking for any open dot"
-
-#~ msgid "Click on the dots to keep the turtle from escaping."
-#~ msgstr "Click on the dots to keep the turtle from escaping."
-
-#~ msgid "turtle wins"
-#~ msgstr "turtle wins"
-
-#~ msgid "you win"
-#~ msgstr "you win"
-
-#~ msgid "Game over"
-#~ msgstr "Game over"
-
-#~ msgid "Load default strategy"
-#~ msgstr "Load default strategy"
-
-#~ msgid "customized strategy"
-#~ msgstr "customized strategy"
diff --git a/po/en_GB.po b/po/en_GB.po
deleted file mode 100644
index d19b24f..0000000
--- a/po/en_GB.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-02-02 02:46+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en_GB\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Turtle in a Pond"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Beginner"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Intermediate"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Expert"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "My strategy"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Game"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Start a new game."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Load strategy from Journal"
-
-#~ msgid "turtle is looking for any open dot"
-#~ msgstr "turtle is looking for any open dot"
-
-#~ msgid "Click on the dots to keep the turtle from escaping."
-#~ msgstr "Click on the dots to keep the turtle from escaping."
-
-#~ msgid "turtle wins"
-#~ msgstr "turtle wins"
-
-#~ msgid "you win"
-#~ msgstr "you win"
-
-#~ msgid "Game over"
-#~ msgstr "Game over"
-
-#~ msgid "Load default strategy"
-#~ msgstr "Load default strategy"
-
-#~ msgid "customized strategy"
-#~ msgstr "customised strategy"
diff --git a/po/en_US.po b/po/en_US.po
deleted file mode 100644
index b1b313d..0000000
--- a/po/en_US.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-01-31 06:42+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Turtle in a Pond"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Beginner"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Intermediate"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Expert"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "My strategy"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Game"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Start a new game."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Load strategy from Journal"
-
-#~ msgid "turtle is looking for any open dot"
-#~ msgstr "turtle is looking for any open dot"
-
-#~ msgid "Click on the dots to keep the turtle from escaping."
-#~ msgstr "Click on the dots to keep the turtle from escaping."
-
-#~ msgid "turtle wins"
-#~ msgstr "turtle wins"
-
-#~ msgid "you win"
-#~ msgstr "you win"
-
-#~ msgid "Game over"
-#~ msgstr "Game over"
-
-#~ msgid "Load default strategy"
-#~ msgstr "Load default strategy"
-
-#~ msgid "customized strategy"
-#~ msgstr "customized strategy"
diff --git a/po/es.po b/po/es.po
deleted file mode 100644
index 403c1b3..0000000
--- a/po/es.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-02-07 22:05+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Tortuga en el Estanque"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Principiante"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Intermedio"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Experto"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "Mi estrategia"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Juego"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Comenzar un nuevo juego."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Cargar estrategia desde el Diario"
diff --git a/po/hus.po b/po/hus.po
deleted file mode 100644
index 5f2820c..0000000
--- a/po/hus.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-03-01 22:32+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: hus\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr ""
-
-#: TurtlePondActivity.py:55
-#, fuzzy
-msgid "Beginner"
-msgstr "Exobal ubat"
-
-#: TurtlePondActivity.py:55
-#, fuzzy
-msgid "Intermediate"
-msgstr "Tse'jeltal"
-
-#: TurtlePondActivity.py:55
-#, fuzzy
-msgid "Expert"
-msgstr "Ts'alpadh"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr ""
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Ubat'intaláb"
-
-#: TurtlePondActivity.py:116
-#, fuzzy
-msgid "Start a new game."
-msgstr "Tujél ít ubat'intaláb."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr ""
diff --git a/po/hy.po b/po/hy.po
deleted file mode 100644
index 27968aa..0000000
--- a/po/hy.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-02-06 20:53+0200\n"
-"Last-Translator: anush.mkrtchyan <anush.mkrtchyan@ca1492.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: hy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Կրիան Ավազանում"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Սկսնակ"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Միջին"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Մասնագետ"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "Իմ ռազմավարությունը"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Խաղ"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Սկսել նոր խաղ"
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Բեռնել ռազմավարությունը Մատյանից"
-
-#~ msgid "turtle is looking for any open dot"
-#~ msgstr "կրիան փնտրում է որևէ բաց կետ"
-
-#~ msgid "Click on the dots to keep the turtle from escaping."
-#~ msgstr "Սեղմել կետերի վրա, որպեսզի կրիան չկարողանա փախչել:"
-
-#~ msgid "turtle wins"
-#~ msgstr "կրիան հաղթում է"
-
-#~ msgid "you win"
-#~ msgstr "դու հաղթում ես"
-
-#~ msgid "Game over"
-#~ msgstr "Խաղը ավարտվեց"
-
-#~ msgid "Load default strategy"
-#~ msgstr "Բեռնել լռելյայն(ամբողջական) ռազմավարությունը"
-
-#~ msgid "customized strategy"
-#~ msgstr "ընտրված/առանձնացված ռազմավարություն"
diff --git a/po/nl.po b/po/nl.po
deleted file mode 100644
index f0d33bc..0000000
--- a/po/nl.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-08-20 10:52+0200\n"
-"Last-Translator: whe <heppew@yahoo.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Schildpad in Vijver"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Beginner"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Ervaren"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Expert"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "Mijn strategie"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Spel"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Start een nieuw spel."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Laad strategie uit logboek"
-
-#~ msgid "turtle is looking for any open dot"
-#~ msgstr "schildpad zoekt naar open stip"
-
-#~ msgid "Click on the dots to keep the turtle from escaping."
-#~ msgstr "Klik op de stippen in ontsnappen van het schildpad te voorkomen."
-
-#~ msgid "turtle wins"
-#~ msgstr "schildpad wint"
-
-#~ msgid "you win"
-#~ msgstr "jij wint"
-
-#~ msgid "Game over"
-#~ msgstr "Spel klaar"
-
-#~ msgid "Load default strategy"
-#~ msgstr "Laad standaard strategie"
-
-#~ msgid "customized strategy"
-#~ msgstr "aangepaste strategie"
diff --git a/po/pl.po b/po/pl.po
deleted file mode 100644
index 9f84b03..0000000
--- a/po/pl.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-02-01 15:15+0200\n"
-"Last-Translator: lkjlkj <agniechka@o2.pl>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Żółw w stawie"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Początkujący"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Średnio zaawansowany"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Ekspert"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "Moja strategia"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Gra"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Rozpocznij nową grę."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Załaduj strategię z Dziennika"
-
-#, fuzzy
-#~ msgid "turtle is looking for any open dot"
-#~ msgstr "zółw szuka otwartej kropki"
-
-#~ msgid "Click on the dots to keep the turtle from escaping."
-#~ msgstr "Klikaj na kropki, żeby żółw nie uciekł."
-
-#~ msgid "turtle wins"
-#~ msgstr "wygrywa żółw"
-
-#~ msgid "you win"
-#~ msgstr "ty wygrywasz"
-
-#~ msgid "Game over"
-#~ msgstr "Koniec gry"
-
-#~ msgid "Load default strategy"
-#~ msgstr "Załaduj domyślną strategię"
-
-#, fuzzy
-#~ msgid "customized strategy"
-#~ msgstr "przystosowana strategia"
diff --git a/po/pt.po b/po/pt.po
deleted file mode 100644
index 066d7aa..0000000
--- a/po/pt.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-04-12 23:36+0200\n"
-"Last-Translator: Eduardo H. <hoboprimate@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "Tartaruga num Charco"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "Iniciante"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "Intermediário"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "Experiente"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "A minha estratégia"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "Jogo"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "Inicia um novo jogo."
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "Carregar estratégia do Diário"
diff --git a/po/th.po b/po/th.po
deleted file mode 100644
index 135578b..0000000
--- a/po/th.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-03-12 10:59+0200\n"
-"Last-Translator: Meechai <malaku38@hotmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: th\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "เต่าในบ่อ"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "ระดับเริ่มต้น"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "ระดับปานกลาง"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "ระดับผู้เชี่ยวชาญ"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "กลยุทธ์ของฉัน"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "เกม"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "เริ่มเกมใหม่"
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "โหลดกลยุทธ์จากบันทึกประจำวัน"
diff --git a/po/zh_CN.po b/po/zh_CN.po
deleted file mode 100644
index 78c7377..0000000
--- a/po/zh_CN.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 00:33-0500\n"
-"PO-Revision-Date: 2012-02-01 04:20+0200\n"
-"Last-Translator: lite <litekok@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "Turtle in a Pond"
-msgstr "池塘中的乌龟"
-
-#: TurtlePondActivity.py:55
-msgid "Beginner"
-msgstr "入门级"
-
-#: TurtlePondActivity.py:55
-msgid "Intermediate"
-msgstr "中级"
-
-#: TurtlePondActivity.py:55
-msgid "Expert"
-msgstr "专家级"
-
-#: TurtlePondActivity.py:56
-msgid "My strategy"
-msgstr "我的策略"
-
-#: TurtlePondActivity.py:109
-msgid "Game"
-msgstr "游戏"
-
-#: TurtlePondActivity.py:116
-msgid "Start a new game."
-msgstr "开始新游戏。"
-
-#: TurtlePondActivity.py:157
-msgid "Load strategy from Journal"
-msgstr "从日志加载策略"
diff --git a/sprites.py b/sprites.py
index 2b8bb55..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])
@@ -125,11 +124,10 @@ class Sprites:
         if spr in self.list:
             self.list.remove(spr)
 
-    def find_sprite(self, pos, inverse=False):
+    def find_sprite(self, pos):
         ''' Search based on (x, y) position. Return the 'top/first' one. '''
         list = self.list[:]
-        if not inverse:
-            list.reverse()
+        list.reverse()
         for spr in list:
             if spr.hit(pos):
                 return spr
@@ -161,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
@@ -173,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
@@ -182,58 +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) or \
-           isinstance(image, cairo.ImageSurface):
-            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
-        if isinstance(image, cairo.ImageSurface):
-            self.cached_surfaces[i] = image
-        else:  # Convert to Cairo surface
-            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 '''
@@ -251,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
@@ -284,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 '''
@@ -305,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 '''
@@ -324,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/sprites.pyc b/sprites.pyc
new file mode 100644
index 0000000..2b46a25
--- /dev/null
+++ b/sprites.pyc
diff --git a/toolbar_utils.py b/toolbar_utils.py
index 94e6883..72f7100 100644
--- a/toolbar_utils.py
+++ b/toolbar_utils.py
@@ -1,6 +1,7 @@
 # -*- 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
@@ -11,12 +12,12 @@
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
 
-import gtk
+from gi.repository 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 +33,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 +47,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 +88,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 +106,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 +123,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 +135,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 +150,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/utils.py b/utils.py
index d2256b6..0f9fd16 100644
--- a/utils.py
+++ b/utils.py
@@ -10,7 +10,7 @@
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
 
-import gtk
+from gi.repository import GdkPixbuf
 from StringIO import StringIO
 try:
     OLD_SUGAR_SYSTEM = False
@@ -56,7 +56,7 @@ def json_dump(data):
 
 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()