Port Finish!, But... I need Summary!!

25 files changed, 546 insertions, 309 deletions

diff --git a/LocoSugarActivity.py b/LocoSugarActivity.py
index fd80ca5..5c0ac5f 100644
--- a/LocoSugarActivity.py
+++ b/LocoSugarActivity.py
@@ -1,4 +1,5 @@
 #Copyright (c) 2012 Walter Bender
+#Copyright (c) 2012 Ignacio Rodriguez
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -9,20 +10,18 @@
 # 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
-
-from sugar.activity import activity
-from sugar import profile
-from sugar.graphics.toolbarbox import ToolbarBox
-from sugar.activity.widgets import ActivityToolbarButton
-from sugar.graphics.toolbarbox import ToolbarButton
-from sugar.activity.widgets import StopButton
-from sugar.graphics.alert import NotifyAlert
-from sugar.graphics.objectchooser import ObjectChooser
-from sugar.datastore import datastore
-from sugar import mime
+from sugar3.activity import activity
+from sugar3 import profile
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.graphics.toolbarbox import ToolbarButton
+from sugar3.activity.widgets import StopButton
+from sugar3.graphics.alert import NotifyAlert
+from sugar3.graphics.objectchooser import ObjectChooser
+from sugar3.datastore import datastore
+from sugar3 import mime
 
 from gettext import gettext as _
 
@@ -44,9 +43,9 @@ class LocoSugarActivity(activity.Activity):
 
         self._setup_toolbars()
 
-        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()
@@ -57,7 +56,7 @@ class LocoSugarActivity(activity.Activity):
         if 'score' in self.metadata:
             self._game.score = int(self.metadata['score'])
         self.fullscreen()
-        gobject.timeout_add(1000, self._game.new_game, True)
+        GObject.timeout_add(1000, self._game.new_game, True)
 
     def _setup_toolbars(self):
         ''' Setup the toolbars. '''
diff --git a/NEWS b/NEWS
index 6d53e0b..8bb61c9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+6
+
+ENHANCEMENTS:
+* Ignacio Rodriguez port to gtk3
+
 5
 
 ENHANCEMENTS:
diff --git a/activity/activity.info b/activity/activity.info
index 3dda20c..46ddfc0 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = LocoSugar
-activity_version = 5
+activity_version = 6
 license = GPLv3
 bundle_id = org.sugarlabs.LocoSugar
 exec = sugar-activity LocoSugarActivity.LocoSugarActivity
diff --git a/game.py b/game.py
index b64e31c..26be43f 100644
--- a/game.py
+++ b/game.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #Copyright (c) 2012 Walter Bender
-
+#Copyright (c) 2012 Ignacio Rodriguez
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -10,8 +10,7 @@
 # along with this library; if not, write to the Free Software
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
-import gtk
-import gobject
+from gi.repository import Gtk, Gdk, GdkPixbuf, GObject
 import cairo
 import os
 import glob
@@ -22,11 +21,8 @@ from gettext import gettext as _
 import logging
 _logger = logging.getLogger('loco-activity')
 
-try:
-    from sugar.graphics import style
-    GRID_CELL_SIZE = style.GRID_CELL_SIZE
-except ImportError:
-    GRID_CELL_SIZE = 0
+from sugar3.graphics import style
+GRID_CELL_SIZE = style.GRID_CELL_SIZE
 
 from sprites import Sprites, Sprite
 from play_audio import play_audio_from_file
@@ -79,18 +75,17 @@ class Game():
         self._parent.show_all()
         self._path = path
 
-        self._canvas.set_flags(gtk.CAN_FOCUS)
-        self._canvas.connect("expose-event", self._expose_cb)
-        self._canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK)
+        self._canvas.connect("draw", self.__draw_cb)
+        self._canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
         self._canvas.connect("button-press-event", self._button_press_cb)
-        self._canvas.add_events(gtk.gdk.POINTER_MOTION_MASK)
+        self._canvas.add_events(Gdk.EventMask.POINTER_MOTION_MASK)
         self._canvas.connect("motion-notify-event", self._mouse_move_cb)
-        self._canvas.add_events(gtk.gdk.BUTTON_RELEASE_MASK)
+        self._canvas.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK)
         self._canvas.connect('button-release-event', self._button_release_cb)
         self._canvas.connect('key_press_event', self._keypress_cb)
 
-        self._width = gtk.gdk.screen_width()
-        self._height = gtk.gdk.screen_height()
+        self._width = Gdk.Screen.width()
+        self._height = Gdk.Screen.height()
         self._scale = self._width / 1200.
         self._first_time = True
         self._loco_pos = (0, 0)
@@ -120,7 +115,7 @@ class Game():
         self._backgrounds = []
         for bg in self._BG:
             self._backgrounds.append(Sprite(
-                    self._sprites, 0, 0, gtk.gdk.pixbuf_new_from_file_at_size(
+                    self._sprites, 0, 0, GdkPixbuf.Pixbuf.new_from_file_at_size(
                         os.path.join(self._path, 'images', bg),
                         self._width, self._height)))
             self._backgrounds[-1].type = 'background'
@@ -128,7 +123,7 @@ class Game():
 
         self._panel = Sprite(
             self._sprites, int(400 * self._scale), int(400 * self._scale),
-            gtk.gdk.pixbuf_new_from_file_at_size(
+            GdkPixbuf.Pixbuf.new_from_file_at_size(
                 os.path.join(self._path, 'images', 'ventana.png'),
                 int(720 * self._scale), int(370 * self._scale)))
         self._panel.type = 'panel'
@@ -140,7 +135,7 @@ class Game():
                 os.path.join(self._path, 'images', 'loco*.png'))
         self._loco_cards = []
         for loco in self._LOCOS:
-            pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+            pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
                 loco, int(150 * self._scale), int(208 * self._scale))
             self._loco_cards.append(Sprite(self._sprites, 0, 0, pixbuf))
             self._loco_cards[-1].type = 'loco'
@@ -150,7 +145,7 @@ class Game():
                 os.path.join(self._path, 'images', 'man*.png'))
         self._man_cards = []
         for loco in self._MEN:
-            pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+            pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
                 loco, int(150 * self._scale), int(208 * self._scale))
             self._man_cards.append(Sprite(self._sprites, 0, 0, pixbuf))
             self._man_cards[-1].type = 'loco'
@@ -159,7 +154,7 @@ class Game():
                 os.path.join(self._path, 'images', 'taunt*.png'))
         self._taunt_cards = []
         for loco in self._TAUNTS:
-            pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+            pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
                 loco, int(150 * self._scale), int(208 * self._scale))
             self._taunt_cards.append(Sprite(self._sprites, 0, 0, pixbuf))
             self._taunt_cards[-1].type = 'loco'
@@ -168,17 +163,17 @@ class Game():
                 os.path.join(self._path, 'images', 'ghost*.png'))
         self._ghost_cards = []
         for loco in self._GHOSTS:
-            pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+            pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
                 loco, int(150 * self._scale), int(208 * self._scale))
             self._ghost_cards.append(Sprite(self._sprites, 0, 0, pixbuf))
             self._ghost_cards[-1].type = 'loco'
 
         self._sticky_cards = []
-        self._loco_pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+        self._loco_pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
             self._LOCOS[0], int(150 * self._scale), int(208 * self._scale))
-        self._man_pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+        self._man_pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
             self._MEN[0], int(150 * self._scale), int(208 * self._scale))
-        self._ghost_pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+        self._ghost_pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
             self._GHOSTS[0], int(150 * self._scale), int(208 * self._scale))
         for i in range(len(MSGS[1])):  # Check re i18n
             self._sticky_cards.append(Sprite(self._sprites, 0, 0,
@@ -191,14 +186,14 @@ class Game():
 
     def _time_increment(self):
         ''' Track seconds since start_time. '''
-        self._seconds = int(gobject.get_current_time() - self._start_time)
-        self.timer_id = gobject.timeout_add(1000, self._time_increment)
+        self._seconds = int(GObject.get_current_time() - self._start_time)
+        self.timer_id = GObject.timeout_add(1000, self._time_increment)
 
     def _timer_reset(self):
         ''' Reset the timer for each level '''
-        self._start_time = gobject.get_current_time()
+        self._start_time = GObject.get_current_time()
         if self._timer_id is not None:
-            gobject.source_remove(self._timer_id)
+            GObject.source_remove(self._timer_id)
             self._timer_id = None
         self.score += self._seconds
         self._time_increment()
@@ -232,9 +227,9 @@ class Game():
             x += int(self._loco_dim[0] / 2.)
         self.score = 0
         self._parent.unfullscreen()
-        gobject.idle_add(play_audio_from_file, self, os.path.join(
+        GObject.idle_add(play_audio_from_file, self, os.path.join(
                 self._path, 'sounds', 'sonar.ogg'))
-        gobject.timeout_add(5000, self.new_game, True)
+        GObject.timeout_add(5000, self.new_game, True)
 
     def new_game(self, first_time):
         ''' Start a new game at the current level. '''
@@ -362,7 +357,7 @@ class Game():
         else:
             self._taunt_cards[i % n].move((x, y))
             self._taunt_cards[i % n].set_layer(LOCO_LAYER)
-            self._timeout_id = gobject.timeout_add(
+            self._timeout_id = GObject.timeout_add(
                 200, self._taunt, x, y, i + 1)
 
     def _move_loco(self, x, y, i):
@@ -394,7 +389,7 @@ class Game():
             self._loco_pos = (cx, cy)
             self._loco_cards[j].set_layer(LOCO_LAYER)
             self._loco_cards[i].hide()
-            self._timeout_id = gobject.timeout_add(
+            self._timeout_id = GObject.timeout_add(
                 self._pause, self._move_loco, x, y, j)
 
     def _keypress_cb(self, area, event):
@@ -402,8 +397,8 @@ class Game():
         # Games 4, 5, and 6 use the keyboard
         if self.level not in [4, 5, 6]:
             return True
-        k = gtk.gdk.keyval_name(event.keyval)
-        u = gtk.gdk.keyval_to_unicode(event.keyval)
+        k = Gdk.keyval_name(event.keyval)
+        u = Gdk.keyval_to_unicode(event.keyval)
 
         if self._waiting_for_enter:
             if k == 'Return':
@@ -411,7 +406,7 @@ class Game():
                 self._panel.hide()
                 self._counter += 1
                 self._correct = 0
-                gobject.timeout_add(1000, self.new_game, False)
+                GObject.timeout_add(1000, self.new_game, False)
             return
 
         if k in NOISE_KEYS or k in WHITE_SPACE:
@@ -482,7 +477,7 @@ class Game():
             self._panel.set_label(ALERTS[0])
             self._panel.set_layer(PANEL_LAYER)
             self._waiting_for_enter = True
-            gobject.idle_add(play_audio_from_file, self, os.path.join(
+            GObject.idle_add(play_audio_from_file, self, os.path.join(
                     self._path, 'sounds', 'drip.ogg'))
             return
         else:
@@ -491,7 +486,7 @@ class Game():
                     return True
         self._counter += 1
         self._correct = 0
-        gobject.timeout_add(1000, self.new_game, False)
+        GObject.timeout_add(1000, self.new_game, False)
 
     def _mouse_move_cb(self, win, event):
         ''' Move the mouse. '''
@@ -507,7 +502,7 @@ class Game():
             if dx * dx + dy * dy < 200:
                 self._clicked = True
                 if self._timeout_id is not None:
-                    gobject.source_remove(self._timeout_id)
+                    GObject.source_remove(self._timeout_id)
                 # Play again
                 self._all_clear()
                 self._man_cards[0].move((x - int(self._loco_dim[0] / 2.),
@@ -515,7 +510,7 @@ class Game():
                 self._man_cards[0].set_layer(LOCO_LAYER)
                 self._correct += 1
                 self._counter += 1
-                gobject.timeout_add(1000, self.new_game, False)
+                GObject.timeout_add(1000, self.new_game, False)
         elif self.level in [4, 5]:
             # For Game 4 and 5, we allow dragging
             if self._press is None:
@@ -548,7 +543,7 @@ class Game():
             if self._correct == self._counter + 1:
                 self._counter += 1
                 self._correct = 0
-                gobject.timeout_add(2000, self.new_game, False)
+                GObject.timeout_add(2000, self.new_game, False)
         self._press = None
         self._drag_pos = [0, 0]
         return True
@@ -579,15 +574,15 @@ class Game():
             self._counter += 1
             self._correct += 1
             if self._timeout_id is not None:
-                gobject.source_remove(self._timeout_id)
-            gobject.timeout_add(2000, self.new_game, False)
+                GObject.source_remove(self._timeout_id)
+            GObject.timeout_add(2000, self.new_game, False)
         elif self.level == 2:
             spr.set_shape(self._ghost_pixbuf)
             spr.type = 'ghost'
             if self._correct == self._counter:
                 self._counter += 1
                 self._correct = 0
-                gobject.timeout_add(2000, self.new_game, False)
+                GObject.timeout_add(2000, self.new_game, False)
             else:
                 self._correct += 1
         elif self.level in [3, 4, 5]:
@@ -596,8 +591,8 @@ class Game():
             self._drag_pos = [x, y]
         return True
 
-    def _expose_cb(self, win, event):
-        self.do_expose_event(event)
+    def __draw_cb(self, canvas, cr):
+        self._sprites.redraw_sprites(cr=cr)
 
     def do_expose_event(self, event):
         ''' Handle the expose-event by drawing '''
@@ -610,4 +605,4 @@ class Game():
         self._sprites.redraw_sprites(cr=cr)
 
     def _destroy_cb(self, win, event):
-        gtk.main_quit()
+        Gtk.main_quit()
diff --git a/locale/da/LC_MESSAGES/org.sugarlabs.LocoSugar.mo b/locale/da/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
new file mode 100644
index 0000000..9d4e6fc
--- /dev/null
+++ b/locale/da/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
diff --git a/locale/da/activity.linfo b/locale/da/activity.linfo
new file mode 100644
index 0000000..3dff74b
--- /dev/null
+++ b/locale/da/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = LocoSugar
diff --git a/locale/en/LC_MESSAGES/org.sugarlabs.LocoSugar.mo b/locale/en/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
new file mode 100644
index 0000000..986d3ba
--- /dev/null
+++ b/locale/en/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
diff --git a/locale/en/activity.linfo b/locale/en/activity.linfo
new file mode 100644
index 0000000..3dff74b
--- /dev/null
+++ b/locale/en/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = LocoSugar
diff --git a/locale/en_GB/LC_MESSAGES/org.sugarlabs.LocoSugar.mo b/locale/en_GB/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
new file mode 100644
index 0000000..986d3ba
--- /dev/null
+++ b/locale/en_GB/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
diff --git a/locale/en_GB/activity.linfo b/locale/en_GB/activity.linfo
new file mode 100644
index 0000000..3dff74b
--- /dev/null
+++ b/locale/en_GB/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = LocoSugar
diff --git a/locale/en_US/LC_MESSAGES/org.sugarlabs.LocoSugar.mo b/locale/en_US/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
new file mode 100644
index 0000000..a58c2c7
--- /dev/null
+++ b/locale/en_US/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
diff --git a/locale/en_US/activity.linfo b/locale/en_US/activity.linfo
new file mode 100644
index 0000000..3dff74b
--- /dev/null
+++ b/locale/en_US/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = LocoSugar
diff --git a/locale/es/LC_MESSAGES/org.sugarlabs.LocoSugar.mo b/locale/es/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
new file mode 100644
index 0000000..b0aba18
--- /dev/null
+++ b/locale/es/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
diff --git a/locale/es/activity.linfo b/locale/es/activity.linfo
new file mode 100644
index 0000000..3dff74b
--- /dev/null
+++ b/locale/es/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = LocoSugar
diff --git a/locale/hy/LC_MESSAGES/org.sugarlabs.LocoSugar.mo b/locale/hy/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
new file mode 100644
index 0000000..b9fcf60
--- /dev/null
+++ b/locale/hy/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
diff --git a/locale/hy/activity.linfo b/locale/hy/activity.linfo
new file mode 100644
index 0000000..72c4c76
--- /dev/null
+++ b/locale/hy/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = ԼոկոՇաքար
diff --git a/locale/nl/LC_MESSAGES/org.sugarlabs.LocoSugar.mo b/locale/nl/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
new file mode 100644
index 0000000..135f029
--- /dev/null
+++ b/locale/nl/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
diff --git a/locale/nl/activity.linfo b/locale/nl/activity.linfo
new file mode 100644
index 0000000..3dff74b
--- /dev/null
+++ b/locale/nl/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = LocoSugar
diff --git a/locale/pl/LC_MESSAGES/org.sugarlabs.LocoSugar.mo b/locale/pl/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
new file mode 100644
index 0000000..5e9baa3
--- /dev/null
+++ b/locale/pl/LC_MESSAGES/org.sugarlabs.LocoSugar.mo
diff --git a/locale/pl/activity.linfo b/locale/pl/activity.linfo
new file mode 100644
index 0000000..3dff74b
--- /dev/null
+++ b/locale/pl/activity.linfo
@@ -0,0 +1,2 @@
+[Activity]
+name = LocoSugar
diff --git a/po/el.po b/po/el.po
deleted file mode 100644
index beda874..0000000
--- a/po/el.po
+++ /dev/null
@@ -1,68 +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-05-24 12:03-0400\n"
-"PO-Revision-Date: 2012-09-27 15:59+0200\n"
-"Last-Translator: Yannis <kiolalis@gmail.com>\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 "LocoSugar"
-msgstr "LocoSugar"
-
-#: game.py:37
-msgid "Move the mouse to the Loco XO."
-msgstr "Μετακίνησε το ποντίκι στο Loco XO"
-
-#: game.py:38
-msgid "Click on the Loco XO with the left button."
-msgstr "Κάνε κλικ στο Loco XO με το αριστερό πλήκτρο του ποντικιού"
-
-#: game.py:39
-msgid "Click on the Loco XOs with the left button."
-msgstr "Κάνε κλικ στο Loco XO με το αριστερό πλήκτρο του ποντικιού"
-
-#: game.py:40
-msgid "Click and drag the Loco XOs to the right."
-msgstr "Κάνε κλικ στο Loco XO και τράβηξέ το στα δεξιά"
-
-#: game.py:41
-msgid "Type the letter on the Loco XO."
-msgstr "Πληκτρολόγησε το γράμμα που φαίνεται κάτω από το Loco XO"
-
-#: game.py:42
-msgid "Use the SHIFT key for capital letters."
-msgstr "Χρησιμοποίησε  το πλήκτρο Shift για να γράψεις κεφαλαία γράμματα"
-
-#: game.py:43
-msgid "Type the letters on the Loco XO in word order."
-msgstr ""
-"Πληκτρολόγησε τα γράμματα που εμφανίζονται κάτω από τα Loco XO, με τη σειρά "
-"που εμφανίζονται στις λέξεις"
-
-#: game.py:44
-msgid "Press ENTER to confirm."
-msgstr "Πάτα ENTER για επιβεβαίωση"
-
-#: game.py:45
-msgid "Press DELETE to delete text."
-msgstr "Πάτα DELETE για να διαγράψεις το κείμενο"
-
-#: game.py:47
-msgid "Hello LocoXO"
-msgstr "Γεια σου LocoXO"
-
-#: game.py:47
-msgid "LocoXOs are not real."
-msgstr "Τα LocoXOs δεν είναι αληθινά."
diff --git a/po/zh_CN.po b/po/zh_CN.po
deleted file mode 100644
index 39dc5a6..0000000
--- a/po/zh_CN.po
+++ /dev/null
@@ -1,66 +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-05-24 12:03-0400\n"
-"PO-Revision-Date: 2012-06-19 04:34+0200\n"
-"Last-Translator: lite <litekok@gmail.com>\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=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: activity/activity.info:2
-msgid "LocoSugar"
-msgstr "LocoSugar"
-
-#: game.py:37
-msgid "Move the mouse to the Loco XO."
-msgstr "将鼠标移动到Loco XO。"
-
-#: game.py:38
-msgid "Click on the Loco XO with the left button."
-msgstr "在Loco XO上用鼠标左键点击。"
-
-#: game.py:39
-msgid "Click on the Loco XOs with the left button."
-msgstr "在Loco XOs上用鼠标左键点击。"
-
-#: game.py:40
-msgid "Click and drag the Loco XOs to the right."
-msgstr "点击并拖动Loco XOs到右边。"
-
-#: game.py:41
-msgid "Type the letter on the Loco XO."
-msgstr "在Loco XO上键入字母。"
-
-#: game.py:42
-msgid "Use the SHIFT key for capital letters."
-msgstr "大写字母请使用SHIFT键。"
-
-#: game.py:43
-msgid "Type the letters on the Loco XO in word order."
-msgstr "在loco XO上按单词顺序输入字母。"
-
-#: game.py:44
-msgid "Press ENTER to confirm."
-msgstr "按ENTER键确认。"
-
-#: game.py:45
-msgid "Press DELETE to delete text."
-msgstr "按DELETE键删除文本。"
-
-#: game.py:47
-msgid "Hello LocoXO"
-msgstr "你好，LocoXO"
-
-#: game.py:47
-msgid "LocoXOs are not real."
-msgstr "LocoXOs 不是真正的。"
diff --git a/setup.py b/setup.py
index e5026ee..468572c 100755..100644
--- a/setup.py
+++ b/setup.py
@@ -1,32 +1,4 @@
 #!/usr/bin/env python
-import os
-import sys
-
-if len(sys.argv) > 1 and '--no-sugar' == sys.argv[1]:
-    # Remove the argument from the stack so we don't cause problems
-    # for distutils
-    sys.argv.pop(1)
-    
-    import glob, os.path, string
-    from distutils.core import setup
-    
-    DATA_FILES = [
-        ('icons', glob.glob('icons/*')),
-        ('images', glob.glob('images/*')),
-        ('/usr/share/applications', ['turtleart.desktop'])
-        ]
-
-    setup (name = 'Turtle Art',
-           description = "A LOGO-like tool for teaching programming",
-           author = "Walter Bender",
-           author_email = "walter.bender@gmail.com",
-           version = '0.9.4',
-           packages = ['TurtleArt'],
-           scripts = ['turtleart'],
-           data_files = DATA_FILES,
-           )
-else: 
-    from sugar.activity import bundlebuilder
-
-    if __name__ == "__main__":
-        bundlebuilder.start()
+from sugar3.activity import bundlebuilder
+if __name__ == "__main__":
+	bundlebuilder.start()
diff --git a/sprites.py b/sprites.py
index c400d88..0ef8dca 100644
--- a/sprites.py
+++ b/sprites.py
@@ -73,9 +73,12 @@ def svg_str_to_pixbuf(svg_string):
     pl.close()
     pixbuf = pl.get_pixbuf()
     return pixbuf
+'''
+## <-----------GTK2---------------->##
 
 '''
 
+
 import pygtk
 pygtk.require('2.0')
 import gtk
@@ -83,37 +86,36 @@ import pango
 import pangocairo
 import cairo
 
-
 class Sprites:
-    ''' A class for the list of sprites and everything they share in common '''
+    # A class for the list of sprites and everything they share in common #
 
     def __init__(self, widget):
-        ''' Initialize an empty array of sprites '''
+        # Initialize an empty array of sprites #
         self.widget = widget
         self.list = []
         self.cr = None
 
     def set_cairo_context(self, cr):
-        ''' Cairo context may be set or reset after __init__ '''
+        # Cairo context may be set or reset after __init__ #
         self.cr = cr
 
     def get_sprite(self, i):
-        ''' Return a sprint from the array '''
+        # Return a sprint from the array #
         if i < 0 or i > len(self.list) - 1:
             return(None)
         else:
             return(self.list[i])
 
     def length_of_list(self):
-        ''' How many sprites are there? '''
+        # How many sprites are there? #
         return(len(self.list))
 
     def append_to_list(self, spr):
-        ''' Append a new sprite to the end of the list. '''
+        # Append a new sprite to the end of the list. #
         self.list.append(spr)
 
     def insert_in_list(self, spr, i):
-        ''' Insert a sprite at position i. '''
+        # Insert a sprite at position i. #
         if i < 0:
             self.list.insert(0, spr)
         elif i > len(self.list) - 1:
@@ -121,27 +123,23 @@ class Sprites:
         else:
             self.list.insert(i, spr)
 
-    def find_in_list(self, spr):
-        if spr in self.list:
-            return True
-        return False
-
     def remove_from_list(self, spr):
-        ''' Remove a sprite from the list. '''
+        # Remove a sprite from the list. #
         if spr in self.list:
             self.list.remove(spr)
 
-    def find_sprite(self, pos, region=False):
-        ''' Search based on (x, y) position. Return the 'top/first' one. '''
+    def find_sprite(self, pos, inverse=False):
+        # Search based on (x, y) position. Return the 'top/first' one. #
         list = self.list[:]
-        list.reverse()
+        if not inverse:
+            list.reverse()
         for spr in list:
-            if spr.hit(pos, readpixel=not region):
+            if spr.hit(pos):
                 return spr
         return None
 
     def redraw_sprites(self, area=None, cr=None):
-        ''' Redraw the sprites that intersect area. '''
+        # Redraw the sprites that intersect area. #
         # I think I need to do this to save Cairo some work
         if cr is None:
             cr = self.cr
@@ -160,10 +158,10 @@ class Sprites:
 
 
 class Sprite:
-    ''' A class for the individual sprites '''
+    # A class for the individual sprites #
 
     def __init__(self, sprites, x, y, image):
-        ''' Initialize an individual sprite '''
+        # Initialize an individual sprite #
         self._sprites = sprites
         self.save_xy = (x, y)  # remember initial (x, y) position
         self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0)
@@ -186,7 +184,7 @@ class Sprite:
         self._sprites.append_to_list(self)
 
     def set_image(self, image, i=0, dx=0, dy=0):
-        ''' Add an image to the sprite. '''
+        # Add an image to the sprite. #
         while len(self.cached_surfaces) < i + 1:
             self.cached_surfaces.append(None)
             self._dx.append(0)
@@ -220,38 +218,38 @@ class Sprite:
             self.cached_surfaces[i] = surface
 
     def move(self, pos):
-        ''' Move to new (x, y) position '''
+        # Move to new (x, y) position #
         self.inval()
         self.rect.x, self.rect.y = int(pos[0]), int(pos[1])
         self.inval()
 
     def move_relative(self, pos):
-        ''' Move to new (x+dx, y+dy) position '''
+        # Move to new (x+dx, y+dy) position #
         self.inval()
         self.rect.x += int(pos[0])
         self.rect.y += int(pos[1])
         self.inval()
 
     def get_xy(self):
-        ''' Return current (x, y) position '''
+        # Return current (x, y) position #
         return (self.rect.x, self.rect.y)
 
     def get_dimensions(self):
-        ''' Return current size '''
+        # Return current size #
         return (self.rect.width, self.rect.height)
 
     def get_layer(self):
-        ''' Return current layer '''
+        # Return current layer #
         return self.layer
 
     def set_shape(self, image, i=0):
-        ''' Set the current image associated with the sprite '''
+        # Set the current image associated with the sprite #
         self.inval()
         self.set_image(image, i)
         self.inval()
 
     def set_layer(self, layer=None):
-        ''' Set the layer for a sprite '''
+        # Set the layer for a sprite #
         self._sprites.remove_from_list(self)
         if layer is not None:
             self.layer = layer
@@ -264,7 +262,7 @@ class Sprite:
         self.inval()
 
     def set_label(self, new_label, i=0):
-        ''' Set the label drawn on the sprite '''
+        # Set the label drawn on the sprite #
         self._extend_labels_array(i)
         if type(new_label) is str or type(new_label) is unicode:
             # pango doesn't like nulls
@@ -274,11 +272,11 @@ class Sprite:
         self.inval()
 
     def set_margins(self, l=0, t=0, r=0, b=0):
-        ''' Set the margins for drawing the label '''
+        # Set the margins for drawing the label #
         self._margins = [l, t, r, b]
 
     def _extend_labels_array(self, i):
-        ''' Append to the labels attribute list '''
+        # Append to the labels attribute list #
         if self._fd is None:
             self.set_font('Sans')
         if self._color is None:
@@ -291,11 +289,11 @@ class Sprite:
             self._vert_align.append(self._vert_align[0])
 
     def set_font(self, font):
-        ''' Set the font for a label '''
+        # Set the font for a label #
         self._fd = pango.FontDescription(font)
 
     def set_label_color(self, rgb):
-        ''' Set the font color for a label '''
+        # Set the font color for a label #
         COLORTABLE = {'black': '#000000', 'white': '#FFFFFF',
                       'red': '#FF0000', 'yellow': '#FFFF00',
                       'green': '#00FF00', 'cyan': '#00FFFF',
@@ -311,7 +309,7 @@ class Sprite:
 
     def set_label_attributes(self, scale, rescale=True, horiz_align="center",
                              vert_align="middle", i=0):
-        ''' Set the various label attributes '''
+        # Set the various label attributes #
         self._extend_labels_array(i)
         self._scale[i] = scale
         self._rescale[i] = rescale
@@ -319,23 +317,23 @@ class Sprite:
         self._vert_align[i] = vert_align
 
     def hide(self):
-        ''' Hide a sprite '''
+        # Hide a sprite #
         self.inval()
         self._sprites.remove_from_list(self)
 
     def restore(self):
-        ''' Restore a hidden sprite '''
+        # Restore a hidden sprite #
         self.set_layer()
 
     def inval(self):
-        ''' Invalidate a region for gtk '''
+        # Invalidate a region for gtk #
         self._sprites.widget.queue_draw_area(self.rect.x,
                                              self.rect.y,
                                              self.rect.width,
                                              self.rect.height)
 
     def draw(self, cr=None):
-        ''' Draw the sprite (and label) '''
+        # Draw the sprite (and label) #
         if cr is None:
             print 'sprite.draw: no Cairo context.'
             return
@@ -351,8 +349,8 @@ class Sprite:
         if len(self.labels) > 0:
             self.draw_label(cr)
 
-    def hit(self, pos, readpixel=False):
-        ''' Is (x, y) on top of the sprite? '''
+    def hit(self, pos):
+        # Is (x, y) on top of the sprite? #
         x, y = pos
         if x < self.rect.x:
             return False
@@ -362,16 +360,10 @@ class Sprite:
             return False
         if y > self.rect.y + self.rect.height:
             return False
-        if readpixel:
-            r, g, b, a = self.get_pixel(pos)
-            if r == g == b == a == 0:
-                return False
-            if a == -1:
-                return False
-        return self._sprites.find_in_list(self)
+        return True
 
     def draw_label(self, cr):
-        ''' Draw the label based on its attributes '''
+        # Draw the label based on its attributes #
         # Create a pangocairo context
         cr = pangocairo.CairoContext(cr)
         my_width = self.rect.width - self._margins[0] - self._margins[2]
@@ -403,14 +395,14 @@ class Sprite:
                 x = int(self.rect.x + self._margins[0] + (my_width - w) / 2)
             elif self._horiz_align[i] == 'left':
                 x = int(self.rect.x + self._margins[0])
-            else:  # right
+            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)
             elif self._vert_align[i] == "top":
                 y = int(self.rect.y + self._margins[1])
-            else:  # bottom
+            else: # bottom
                 y = int(self.rect.y + self.rect.height - h - self._margins[3])
             cr.save()
             cr.translate(x, y)
@@ -420,7 +412,7 @@ class Sprite:
             cr.restore()
 
     def label_width(self):
-        ''' Calculate the width of a label '''
+        # Calculate the width of a label #
         cr = pangocairo.CairoContext(self._sprites.cr)
         if cr is not None:
             max = 0
@@ -437,31 +429,424 @@ class Sprite:
             return self.rect.width
 
     def label_safe_width(self):
-        ''' Return maximum width for a label '''
+        # Return maximum width for a label #
         return self.rect.width - self._margins[0] - self._margins[2]
 
     def label_safe_height(self):
-        ''' Return maximum height for a label '''
+        # Return maximum height for a label #
         return self.rect.height - self._margins[1] - self._margins[3]
 
     def label_left_top(self):
-        ''' Return the upper-left corner of the label safe zone '''
+        # Return the upper-left corner of the label safe zone #
         return(self._margins[0], self._margins[1])
 
     def get_pixel(self, pos, i=0):
-        ''' Return the pixel at (x, y) '''
+        # Return the pixel at (x, y) #
         x = int(pos[0] - self.rect.x)
         y = int(pos[1] - self.rect.y)
         if x < 0 or x > (self.rect.width - 1) or \
                 y < 0 or y > (self.rect.height - 1):
             return(-1, -1, -1, -1)
-        # Create a new 1x1 cairo surface.
-        cs = cairo.ImageSurface(cairo.FORMAT_RGB24, 1, 1)
+
+        # 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.rectangle(0,0,1,1)
         cr.set_operator(cairo.OPERATOR_SOURCE)
         cr.fill()
-        cs.flush()  # Ensure all the writing is done.
-        pixels = cs.get_data()  # Read the pixel.
+        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)
+
+'''
+
+#<-----------------------GTK3----------->#
+import gi
+from gi.repository import Gtk, GdkPixbuf, Gdk
+from gi.repository import Pango, PangoCairo
+import cairo
+
+
+class Sprites:
+    ''' A class for the list of sprites and everything they share in common '''
+
+    def __init__(self, widget):
+        ''' Initialize an empty array of sprites '''
+        self.cr = None
+        self.widget = widget
+        self.list = []
+
+    def set_cairo_context(self, cr):
+        ''' Cairo context may be set or reset after __init__ '''
+        self.cr = cr
+
+    def get_sprite(self, i):
+        ''' Return a sprint from the array '''
+        if i < 0 or i > len(self.list)-1:
+            return(None)
+        else:
+            return(self.list[i])
+
+    def length_of_list(self):
+        ''' How many sprites are there? '''
+        return(len(self.list))
+
+    def append_to_list(self, spr):
+        ''' Append a new sprite to the end of the list. '''
+        self.list.append(spr)
+
+    def insert_in_list(self, spr, i):
+        ''' Insert a sprite at position i. '''
+        if i < 0:
+            self.list.insert(0, spr)
+        elif i > len(self.list) - 1:
+            self.list.append(spr)
+        else:
+            self.list.insert(i, spr)
+
+    def remove_from_list(self, spr):
+        ''' Remove a sprite from the list. '''
+        if spr in self.list:
+            self.list.remove(spr)
+
+    def find_sprite(self, pos):
+        ''' Search based on (x, y) position. Return the 'top/first' one. '''
+        list = self.list[:]
+        list.reverse()
+        for spr in list:
+            if spr.hit(pos):
+                return spr
+        return None
+
+    def redraw_sprites(self, area=None, cr=None):
+        ''' Redraw the sprites that intersect area. '''
+        # I think I need to do this to save Cairo some work
+        if cr is None:
+            cr = self.cr
+        else:
+            self.cr = cr
+        if cr is None:
+            print 'sprites.redraw_sprites: no Cairo context'
+            return
+        for spr in self.list:
+            if area == None:
+                spr.draw(cr=cr)
+            else:
+                intersection = spr.rect.intersect(area)
+                if intersection.width > 0 or intersection.height > 0:
+                    spr.draw(cr=cr)
+
+
+class Sprite:
+    ''' A class for the individual sprites '''
+
+    def __init__(self, sprites, x, y, image):
+        ''' Initialize an individual sprite '''
+        self._sprites = sprites
+        self.save_xy = (x, y)  # remember initial (x, y) position
+        self.rect = [int(x), int(y), 0, 0]
+        self._scale = [12]
+        self._rescale = [True]
+        self._horiz_align = ["center"]
+        self._vert_align = ["middle"]
+        self._x_pos = [None]
+        self._y_pos = [None]
+        self._fd = None
+        self._bold = False
+        self._italic = False
+        self._color = None
+        self._margins = [0, 0, 0, 0]
+        self.layer = 100
+        self.labels = []
+        self.images = []
+        self._dx = []  # image offsets
+        self._dy = []
+        self.type = None
+        self.set_image(image)
+        self._sprites.append_to_list(self)
+
+    def set_image(self, image, i=0, dx=0, dy=0):
+        ''' Add an image to the sprite. '''
+        while len(self.images) < i + 1:
+            self.images.append(None)
+            self._dx.append(0)
+            self._dy.append(0)
+        self.images[i] = image
+        self._dx[i] = dx
+        self._dy[i] = dy
+        if hasattr(self.images[i], 'get_width'):
+            w = self.images[i].get_width()
+            h = self.images[i].get_height()
+        else:
+            w, h = self.images[i].get_size()
+        if i == 0:  # Always reset width and height when base image changes.
+            self.rect[2] = w + dx
+            self.rect[3] = h + dy
+        else:
+            if w + dx > self.rect[2]:
+                self.rect[2] = w + dx
+            if h + dy > self.rect[3]:
+                self.rect[3] = h + dy
+
+    def move(self, pos):
+        ''' Move to new (x, y) position '''
+        self.inval()
+        self.rect[0], self.rect[1] = int(pos[0]), int(pos[1])
+        self.inval()
+
+    def move_relative(self, pos):
+        ''' Move to new (x+dx, y+dy) position '''
+        self.inval()
+        self.rect[0] += int(pos[0])
+        self.rect[1] += int(pos[1])
+        self.inval()
+
+    def get_xy(self):
+        ''' Return current (x, y) position '''
+        return (self.rect[0], self.rect[1])
+
+    def get_dimensions(self):
+        ''' Return current size '''
+        return (self.rect[2], self.rect[3])
+
+    def get_layer(self):
+        ''' Return current layer '''
+        return self.layer
+
+    def set_shape(self, image, i=0):
+        ''' Set the current image associated with the sprite '''
+        self.inval()
+        self.set_image(image, i)
+        self.inval()
+
+    def set_layer(self, layer=None):
+        ''' Set the layer for a sprite '''
+        self._sprites.remove_from_list(self)
+        if layer is not None:
+            self.layer = layer
+        for i in range(self._sprites.length_of_list()):
+            if self.layer < self._sprites.get_sprite(i).layer:
+                self._sprites.insert_in_list(self, i)
+                self.inval()
+                return
+        self._sprites.append_to_list(self)
+        self.inval()
+
+    def set_label(self, new_label, i=0):
+        ''' Set the label drawn on the sprite '''
+        self._extend_labels_array(i)
+        if type(new_label) is str or type(new_label) is unicode:
+            # pango doesn't like nulls
+            self.labels[i] = new_label.replace("\0", " ")
+        else:
+            self.labels[i] = str(new_label)
+        self.inval()
+
+    def set_margins(self, l=0, t=0, r=0, b=0):
+        ''' Set the margins for drawing the label '''
+        self._margins = [l, t, r, b]
+
+    def _extend_labels_array(self, i):
+        ''' Append to the labels attribute list '''
+        if self._fd is None:
+            self.set_font('Sans')
+        if self._color is None:
+            self._color = (0., 0., 0.)
+        while len(self.labels) < i + 1:
+            self.labels.append(" ")
+            self._scale.append(self._scale[0])
+            self._rescale.append(self._rescale[0])
+            self._horiz_align.append(self._horiz_align[0])
+            self._vert_align.append(self._vert_align[0])
+            self._x_pos.append(self._x_pos[0])
+            self._y_pos.append(self._y_pos[0])
+
+    def set_font(self, font):
+        ''' Set the font for a label '''
+        self._fd = Pango.FontDescription(font)
+
+    def set_label_color(self, rgb):
+        ''' Set the font color for a label '''
+        COLORTABLE = {'black': '#000000', 'white': '#FFFFFF',
+                      'red': '#FF0000', 'yellow': '#FFFF00',
+                      'green': '#00FF00', 'cyan': '#00FFFF',
+                      'blue': '#0000FF', 'purple': '#FF00FF',
+                      'gray': '#808080'}
+        if rgb.lower() in COLORTABLE:
+            rgb = COLORTABLE[rgb.lower()]
+        # Convert from '#RRGGBB' to floats
+        self._color = (int('0x' + rgb[1:3], 16) / 256.,
+                       int('0x' + rgb[3:5], 16) / 256.,
+                       int('0x' + rgb[5:7], 16) / 256.)
+        return
+
+    def set_label_attributes(self, scale, rescale=True, horiz_align="center",
+                             vert_align="middle", x_pos=None, y_pos=None, i=0):
+        ''' Set the various label attributes '''
+        self._extend_labels_array(i)
+        self._scale[i] = scale
+        self._rescale[i] = rescale
+        self._horiz_align[i] = horiz_align
+        self._vert_align[i] = vert_align
+        self._x_pos[i] = x_pos
+        self._y_pos[i] = y_pos
+
+    def hide(self):
+        ''' Hide a sprite '''
+        self.inval()
+        self._sprites.remove_from_list(self)
+
+    def restore(self):
+        ''' Restore a hidden sprite '''
+        self.set_layer()
+
+    def inval(self):
+        ''' Invalidate a region for gtk '''
+        # self._sprites.window.invalidate_rect(self.rect, False)
+        self._sprites.widget.queue_draw_area(self.rect[0],
+                                             self.rect[1],
+                                             self.rect[2],
+                                             self.rect[3])
+
+    def draw(self, cr=None):
+        ''' Draw the sprite (and label) '''
+        if cr is None:
+            cr = self._sprites.cr
+        if cr is None:
+            print 'sprite.draw: no Cairo context.'
+            return
+        for i, img in enumerate(self.images):
+            if isinstance(img, GdkPixbuf.Pixbuf):
+                Gdk.cairo_set_source_pixbuf(cr, img,
+                                            self.rect[0] + self._dx[i],
+                                            self.rect[1] + self._dy[i])
+                cr.rectangle(self.rect[0] + self._dx[i],
+                             self.rect[1] + self._dy[i],
+                             self.rect[2],
+                             self.rect[3])
+                cr.fill()
+            elif type(img) == cairo.ImageSurface:
+                cr.set_source_surface(img, self.rect[0] + self._dx[i],
+                                      self.rect[1] + self._dy[i])
+                cr.rectangle(self.rect[0] + self._dx[i],
+                             self.rect[1] + self._dy[i],
+                             self.rect[2],
+                             self.rect[3])
+                cr.fill()
+            else:
+                print 'sprite.draw: source not a pixbuf (%s)' % (type(img))
+        if len(self.labels) > 0:
+            self.draw_label(cr)
+
+    def hit(self, pos):
+        ''' Is (x, y) on top of the sprite? '''
+        x, y = pos
+        if x < self.rect[0]:
+            return False
+        if x > self.rect[0] + self.rect[2]:
+            return False
+        if y < self.rect[1]:
+            return False
+        if y > self.rect[1] + self.rect[3]:
+            return False
+        return True
+
+    def draw_label(self, cr):
+        ''' Draw the label based on its attributes '''
+        my_width = self.rect[2] - self._margins[0] - self._margins[2]
+        if my_width < 0:
+            my_width = 0
+        my_height = self.rect[3] - self._margins[1] - self._margins[3]
+        for i in range(len(self.labels)):
+            pl = PangoCairo.create_layout(cr)
+            pl.set_text(str(self.labels[i]), -1)
+            self._fd.set_size(int(self._scale[i] * Pango.SCALE))
+            pl.set_font_description(self._fd)
+            w = pl.get_size()[0] / Pango.SCALE
+            if w > my_width:
+                if self._rescale[i]:
+                    self._fd.set_size(
+                            int(self._scale[i] * Pango.SCALE * my_width / w))
+                    pl.set_font_description(self._fd)
+                    w = pl.get_size()[0] / Pango.SCALE
+                else:
+                    j = len(self.labels[i]) - 1
+                    while(w > my_width and j > 0):
+                        pl.set_text(
+                            "…" + self.labels[i][len(self.labels[i]) - j:], -1)
+                        self._fd.set_size(int(self._scale[i] * Pango.SCALE))
+                        pl.set_font_description(self._fd)
+                        w = pl.get_size()[0] / Pango.SCALE
+                        j -= 1
+            if self._x_pos[i] is not None:
+                x = int(self.rect[0] + self._x_pos[i])
+            elif self._horiz_align[i] == "center":
+                x = int(self.rect[0] + self._margins[0] + (my_width - w) / 2)
+            elif self._horiz_align[i] == 'left':
+                x = int(self.rect[0] + self._margins[0])
+            else: # right
+                x = int(self.rect[0] + self.rect[2] - w - self._margins[2])
+            h = pl.get_size()[1] / Pango.SCALE
+            if self._y_pos[i] is not None:
+                y = int(self.rect[1] + self._y_pos[i])
+            elif self._vert_align[i] == "middle":
+                y = int(self.rect[1] + self._margins[1] + (my_height - h) / 2)
+            elif self._vert_align[i] == "top":
+                y = int(self.rect[1] + self._margins[1])
+            else: # bottom
+                y = int(self.rect[1] + self.rect[3] - h - self._margins[3])
+            cr.save()
+            cr.translate(x, y)
+            cr.set_source_rgb(self._color[0], self._color[1], self._color[2])
+            PangoCairo.update_layout(cr, pl)
+            PangoCairo.show_layout(cr, pl)
+            cr.restore()
+
+    def label_width(self, cr=None):
+        ''' Calculate the width of a label '''
+        if cr is None:
+            cr = self._sprites.cr
+        max = 0
+        for i in range(len(self.labels)):
+            pl = PangoCairo.create_layout(cr)
+            pl.set_text(str(self.labels[i]), -1)
+            self._fd.set_size(int(self._scale[i] * Pango.SCALE))
+            pl.set_font_description(self._fd)
+            w = pl.get_size()[0] / Pango.SCALE
+            if w > max:
+                max = w
+        return max
+
+    def label_safe_width(self):
+        ''' Return maximum width for a label '''
+        return self.rect[2] - self._margins[0] - self._margins[2]
+
+    def label_safe_height(self):
+        ''' Return maximum height for a label '''
+        return self.rect[3] - self._margins[1] - self._margins[3]
+
+    def label_left_top(self):
+        ''' Return the upper-left corner of the label safe zone '''
+        return(self._margins[0], self._margins[1])
+
+    def get_pixel(self, pos, i=0):
+        ''' Return the pixl at (x, y) '''
+        x, y = pos
+        x = x - self.rect[0]
+        y = y - self.rect[1]
+        if y > self.images[i].get_height() - 1:
+            return(-1, -1, -1, -1)
+        try:
+            array = self.images[i].get_pixels()
+            if array is not None:
+                offset = (y * self.images[i].get_width() + x) * 4
+                r, g, b, a = ord(array[offset]), ord(array[offset + 1]),\
+                             ord(array[offset + 2]), ord(array[offset + 3])
+                return(r, g, b, a)
+            else:
+                return(-1, -1, -1, -1)
+        except IndexError:
+            print "Index Error: %d %d" % (len(array), offset)
+            return(-1, -1, -1, -1)
diff --git a/toolbar_utils.py b/toolbar_utils.py
index 94e6883..03f5461 100644
--- a/toolbar_utils.py
+++ b/toolbar_utils.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2011, Walter Bender
-
+# Copyright (c) 2012, Ignacio Rodriguez
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -10,13 +10,12 @@
 # along with this library; if not, write to the Free Software
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
+from gi.repository import Gtk
 
-import gtk
-
-from sugar.graphics.radiotoolbutton import RadioToolButton
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.combobox import ComboBox
-from sugar.graphics.toolcombobox import ToolComboBox
+from sugar3.graphics.radiotoolbutton import RadioToolButton
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.combobox import ComboBox
+from sugar3.graphics.toolcombobox import ToolComboBox
 
 
 def combo_factory(combo_array, toolbar, callback, cb_arg=None,
@@ -32,7 +31,7 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None,
     for i, selection in enumerate(combo_array):
         combo.append_item(i, selection, None)
     combo.show()
-    toolitem = gtk.ToolItem()
+    toolitem = Gtk.ToolItem()
     toolitem.add(combo)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
@@ -46,13 +45,13 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None,
 
 def entry_factory(default_string, toolbar, tooltip=None, max=3):
     ''' Factory for adding a text box to a toolbar '''
-    entry = gtk.Entry()
+    entry = Gtk.Entry()
     entry.set_text(default_string)
     if tooltip is not None and hasattr(entry, 'set_tooltip_text'):
         entry.set_tooltip_text(tooltip)
     entry.set_width_chars(max)
     entry.show()
-    toolitem = gtk.ToolItem()
+    toolitem = Gtk.ToolItem()
     toolitem.add(entry)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
@@ -87,7 +86,7 @@ def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None,
                   group=None):
     ''' Add a radio button to a toolbar '''
     button = RadioToolButton(group=group)
-    button.set_named_icon(name)
+    button.set_icon_name(name)
     if callback is not None:
         if cb_arg is None:
             button.connect('clicked', callback)
@@ -105,12 +104,12 @@ def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None,
 
 def label_factory(toolbar, label_text, width=None):
     ''' Factory for adding a label to a toolbar '''
-    label = gtk.Label(label_text)
+    label = Gtk.Label(label_text)
     label.set_line_wrap(True)
     if width is not None:
         label.set_size_request(width, -1)  # doesn't work on XOs
     label.show()
-    toolitem = gtk.ToolItem()
+    toolitem = Gtk.ToolItem()
     toolitem.add(label)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
@@ -122,7 +121,7 @@ def label_factory(toolbar, label_text, width=None):
 
 def separator_factory(toolbar, expand=False, visible=True):
     ''' add a separator to a toolbar '''
-    separator = gtk.SeparatorToolItem()
+    separator = Gtk.SeparatorToolItem()
     separator.props.draw = visible
     separator.set_expand(expand)
     if hasattr(toolbar, 'insert'):  # the main toolbar
@@ -134,9 +133,9 @@ def separator_factory(toolbar, expand=False, visible=True):
 
 def image_factory(image, toolbar, tooltip=None):
     ''' Add an image to the toolbar '''
-    img = gtk.Image()
+    img = Gtk.Image()
     img.set_from_pixbuf(image)
-    img_tool = gtk.ToolItem()
+    img_tool = Gtk.ToolItem()
     img_tool.add(img)
     if tooltip is not None:
         img.set_tooltip_text(tooltip)
@@ -149,12 +148,12 @@ def image_factory(image, toolbar, tooltip=None):
 
 
 def spin_factory(default, min, max, callback, toolbar):
-    spin_adj = gtk.Adjustment(default, min, max, 1, 32, 0)
-    spin = gtk.SpinButton(spin_adj, 0, 0)
+    spin_adj = Gtk.Adjustment(default, min, max, 1, 32, 0)
+    spin = Gtk.SpinButton(spin_adj, 0, 0)
     spin_id = spin.connect('value-changed', callback)
     spin.set_numeric(True)
     spin.show()
-    toolitem = gtk.ToolItem()
+    toolitem = Gtk.ToolItem()
     toolitem.add(spin)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)