sync up with v7; new translationsv9

8 files changed, 217 insertions, 223 deletions

diff --git a/NEWS b/NEWS
index de2b07b..a6fb3e2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+9
+ENHANCEMENTS:
+* New translations
+
+7
+ENHANCEMENTS:
+* Ignacio Rodriguez port to GTK3
+
 5
 ENHANCEMENTS:
 * New translations
diff --git a/StoryActivity.py b/StoryActivity.py
index ef5e37d..18d3008 100644
--- a/StoryActivity.py
+++ b/StoryActivity.py
@@ -10,27 +10,28 @@
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
 
-import gtk
-import gobject
+from gi.repository import Gdk
+from gi.repository import Gtk
+from gi.repository import GObject
 import subprocess
 import cairo
 import os
 import time
 
-from sugar.activity import activity
-from sugar import profile
-from sugar.datastore import datastore
-try:
-    from sugar.graphics.toolbarbox import ToolbarBox
+from sugar3.activity import activity
+from sugar3 import profile
+from sugar3.datastore import datastore
+try: # Intente , siempre da TRUE, En Sugar 3 ya esta..
+    from sugar3.graphics.toolbarbox import ToolbarBox
     _have_toolbox = True
-except ImportError:
+except ImportError: # Si hay error
     _have_toolbox = False
 
 if _have_toolbox:
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
+    from sugar3.activity.widgets import ActivityToolbarButton
+    from sugar3.activity.widgets import StopButton
 
-from sugar.graphics.alert import Alert
+from sugar3.graphics.alert import Alert
 
 from toolbar_utils import button_factory, label_factory, separator_factory
 from utils import json_load, json_dump, play_audio_from_file
@@ -40,8 +41,8 @@ import telepathy
 import dbus
 from dbus.service import signal
 from dbus.gobject_service import ExportedGObject
-from sugar.presence import presenceservice
-from sugar.presence.tubeconn import TubeConnection
+from sugar3.presence import presenceservice
+from sugar3.presence.tubeconn import TubeConnection
 
 from gettext import gettext as _
 
@@ -66,7 +67,7 @@ class StoryActivity(activity.Activity):
             _logger.error(str(e))
 
         self.path = activity.get_bundle_path()
-
+	print self.path
         self.nick = profile.get_nick_name()
         if profile.get_color() is not None:
             self.colors = profile.get_color().to_string().split(',')
@@ -81,9 +82,9 @@ class StoryActivity(activity.Activity):
         self._setup_dispatch_table()
 
         # Create a canvas
-        canvas = gtk.DrawingArea()
-        canvas.set_size_request(gtk.gdk.screen_width(), \
-                                gtk.gdk.screen_height())
+        canvas = Gtk.DrawingArea()
+        canvas.set_size_request(Gdk.Screen.width(), \
+                                Gdk.Screen.height())
         self.set_canvas(canvas)
         canvas.show()
         self.show_all()
@@ -117,7 +118,7 @@ class StoryActivity(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)
@@ -205,17 +206,17 @@ class StoryActivity(activity.Activity):
             _logger.debug('recording...True. Preparing to save.')
             self._grecord.stop_recording_audio()
             self._recording = False
-            self._record_button.set_icon('media-record')
+            self._record_button.set_icon_name('media-record')
             self._record_button.set_tooltip(_('Start recording'))
-            self._playback_button.set_icon('media-playback-start')
+            self._playback_button.set_icon_name('media-playback-start')
             self._playback_button.set_tooltip(_('Play recording'))
             self._notify_successful_save(title=_('Save recording'))
-            gobject.timeout_add(100, self._wait_for_transcoding_to_finish)
+            GObject.timeout_add(100, self._wait_for_transcoding_to_finish)
         else:  # Wasn't recording, so start
             _logger.debug('recording...False. Start recording.')
             self._grecord.record_audio()
             self._recording = True
-            self._record_button.set_icon('media-recording')
+            self._record_button.set_icon_name('media-recording')
             self._record_button.set_tooltip(_('Stop recording'))
 
     def _wait_for_transcoding_to_finish(self, button=None):
diff --git a/activity/activity.info b/activity/activity.info
index b7a1240..e6a1f3c 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,8 +1,9 @@
 [Activity]
 name = Story
-activity_version = 5
+activity_version = 9
 license = GPLv3
 bundle_id = org.sugarlabs.StoryActivity
 exec = sugar-activity StoryActivity.StoryActivity
 icon = activity-story
 show_launcher = yes
+summary = prompts learner to tell a story by displaying images at random
diff --git a/game.py b/game.py
index c1bc398..461c3b8 100644
--- a/game.py
+++ b/game.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 #Copyright (c) 2012 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,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 Gdk, GdkPixbuf, Gtk, GObject
 import cairo
 import os
 import glob
@@ -24,7 +24,7 @@ import logging
 _logger = logging.getLogger('search-activity')
 
 try:
-    from sugar.graphics import style
+    from sugar3.graphics import style
     GRID_CELL_SIZE = style.GRID_CELL_SIZE
 except ImportError:
     GRID_CELL_SIZE = 0
@@ -49,11 +49,10 @@ class Game():
         self._colors.append(colors[0])
         self._colors.append(colors[1])
 
-        self._canvas.set_flags(gtk.CAN_FOCUS)
-        self._canvas.connect("expose-event", self._expose_cb)
+        self._canvas.connect('draw', self.__draw_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 / (3 * DOT_SIZE * 1.2)
         self._scale /= 1.5
         self._dot_size = int(DOT_SIZE * self._scale)
@@ -85,7 +84,7 @@ class Game():
     def _all_clear(self):
         ''' Things to reinitialize when starting up a new game. '''
         if self._timeout_id is not None:
-            gobject.source_remove(self._timeout_id)
+            GObject.source_remove(self._timeout_id)
 
         for dot in self._dots:
             if dot.type != -1:
@@ -103,7 +102,7 @@ class Game():
                     self._colors[int(uniform(0, 3))]))
         self._dance_counter += 1
         if self._dance_counter < 10:
-            self._timeout_id = gobject.timeout_add(500, self._dance_step)
+            self._timeout_id = GObject.timeout_add(500, self._dance_step)
         else:
             self._new_game()
 
@@ -151,21 +150,31 @@ class Game():
         ''' calculate the grid column and row for a dot '''
         return [dot % 3, int(dot / 3)]
 
-    def _expose_cb(self, win, event):
+    def __draw_cb(self, canvas, cr):
+        self._sprites.redraw_sprites(cr=cr)
+
+    def __expose_cb(self, win, event):
+        ''' Callback to handle window expose events '''
         self.do_expose_event(event)
+        return True
 
+    # Handle the expose-event by drawing
     def do_expose_event(self, event):
-        ''' Handle the expose-event by drawing '''
-        # Restrict Cairo to the exposed area
+
+        # Create the cairo context
         cr = self._canvas.window.cairo_create()
+
+        # Restrict Cairo to the exposed area; avoid extra work
         cr.rectangle(event.area.x, event.area.y,
                 event.area.width, event.area.height)
         cr.clip()
+
         # Refresh sprite list
-        self._sprites.redraw_sprites(cr=cr)
+        if cr is not None:
+            self._sprites.redraw_sprites(cr=cr)
 
     def _destroy_cb(self, win, event):
-        gtk.main_quit()
+        Gtk.main_quit()
 
     def export(self):
         ''' Write dot to cairo surface. '''
@@ -179,8 +188,7 @@ class Game():
             y = self._space + int(i / 3.) * (self._dot_size + self._space)
             x = self._space + (i % 3) * (self._dot_size + self._space)
             cr.save()
-            cr = gtk.gdk.CairoContext(cr)
-            cr.set_source_surface(self._dots[i].cached_surfaces[0], x, y)
+            cr.set_source_surface(self._dots[i].images[0], x, y)
             cr.rectangle(x, y, self._dot_size, self._dot_size)
             cr.fill()
             cr.restore()
@@ -198,11 +206,6 @@ class Game():
             fd.close()
             pixbuf = svg_str_to_pixbuf(svg_string, w=self._dot_size,
                                        h = self._dot_size)
-            '''
-            pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
-                os.path.join(self._path, self._PATHS[image]),
-                self._dot_size, self._dot_size)
-            '''
         else:
             if color in self._dot_cache:
                 return self._dot_cache[color]
@@ -217,11 +220,11 @@ class Game():
                     self._circle(self._dot_size / 2., self._dot_size / 2.,
                                  self._dot_size / 2.) + \
                     self._footer())
+
         surface = cairo.ImageSurface(cairo.FORMAT_ARGB32,
                                      self._svg_width, self._svg_height)
         context = cairo.Context(surface)
-        context = gtk.gdk.CairoContext(context)
-        context.set_source_pixbuf(pixbuf, 0, 0)
+        Gdk.cairo_set_source_pixbuf(context, pixbuf, 0, 0)
         context.rectangle(0, 0, self._svg_width, self._svg_height)
         context.fill()
         if image is None:
@@ -257,7 +260,8 @@ class Game():
 
 def svg_str_to_pixbuf(svg_string, w=None, h=None):
     ''' Load pixbuf from SVG string '''
-    pl = gtk.gdk.PixbufLoader('svg') 
+     # Admito que fue la parte mas dificil..
+    pl = GdkPixbuf.PixbufLoader.new_with_type('svg') 
     if w is not None:
         pl.set_size(w, h)
     pl.write(svg_string)
diff --git a/grecord.py b/grecord.py
index 02fcbd3..fd1a794 100644
--- a/grecord.py
+++ b/grecord.py
@@ -22,14 +22,14 @@
 import os
 import time
 
-import gtk
+from gi.repository import Gtk
 import gst
 
 import logging
 _logger = logging.getLogger("portfolio-activity")
 
-import gobject
-gobject.threads_init()
+from gi.repository import GObject
+GObject.threads_init()
 
 
 class Grecord:
@@ -150,7 +150,7 @@ filesink name=audioFilesink'
         audioBus.add_signal_watch()
         self._audio_transcode_handler = audioBus.connect(
             'message', self._onMuxedAudioMessageCb, self._audioline)
-        self._transcode_id = gobject.timeout_add(200, self._transcodeUpdateCb,
+        self._transcode_id = GObject.timeout_add(200, self._transcodeUpdateCb,
                                                  self._audioline)
         self._audiopos = 0
         self._audioline.set_state(gst.STATE_PLAYING)
@@ -216,9 +216,9 @@ filesink name=audioFilesink'
         return False
 
     def _clean_up_transcoding_pipeline(self, pipe):
-        gobject.source_remove(self._audio_transcode_handler)
+        GObject.source_remove(self._audio_transcode_handler)
         self._audio_transcode_handler = None
-        gobject.source_remove(self._transcode_id)
+        GObject.source_remove(self._transcode_id)
         self._transcode_id = None
         pipe.set_state(gst.STATE_NULL)
         pipe.get_bus().remove_signal_watch()
diff --git a/setup.py b/setup.py
index e5026ee..bdeaed6 100755
--- a/setup.py
+++ b/setup.py
@@ -1,32 +1,5 @@
 #!/usr/bin/env python
-import os
-import sys
+from sugar3.activity import bundlebuilder
+if __name__ == "__main__":
+    bundlebuilder.start()
 
-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()
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/toolbar_utils.py b/toolbar_utils.py
index 94e6883..ef2382d 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)
@@ -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)