gtk3 port

6 files changed, 263 insertions, 270 deletions

diff --git a/ErikosActivity.py b/ErikosActivity.py
index 2cf79ae..b30f0c4 100644
--- a/ErikosActivity.py
+++ b/ErikosActivity.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #Copyright (c) 2009, 2011 Walter Bender
+#Copyright (c) 2012, Ignacio Rodríguez
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,23 +13,19 @@
 
 import pygtk
 pygtk.require('2.0')
-import gtk
-import gobject
-
-import sugar
-from sugar.activity import activity
-try: # 0.86+ toolbar widgets
-    from sugar.bundle.activitybundle import ActivityBundle
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
-    from sugar.graphics.toolbarbox import ToolbarBox
-    from sugar.graphics.toolbarbox import ToolbarButton
-except ImportError:
-    pass
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.icon import Icon
-from sugar.datastore import datastore
+from gi.repository import Gtk, Gdk, GObject
+
+import sugar3
+from sugar3.activity import activity
+from sugar3.bundle.activitybundle import ActivityBundle
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.activity.widgets import StopButton
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.graphics.toolbarbox import ToolbarButton
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.icon import Icon
+from sugar3.datastore import datastore
 
 from gettext import gettext as _
 import locale
@@ -48,71 +45,63 @@ class ErikosActivity(activity.Activity):
     def __init__(self, handle):
         super(ErikosActivity,self).__init__(handle)
 
-        try:
-            # Use 0.86 toolbar design
-            toolbar_box = ToolbarBox()
-
-            # Buttons added to the Activity toolbar
-            activity_button = ActivityToolbarButton(self)
-            toolbar_box.toolbar.insert(activity_button, 0)
-            activity_button.show()
-
-            # Play Button
-            self.play = ToolButton( "media-playback-start" )
-            self.play.set_tooltip(_('Play'))
-            self.play.props.sensitive = True
-            self.play.connect('clicked', self._play_cb)
-            toolbar_box.toolbar.insert(self.play, -1)
-            self.play.show()
-
-            # Sound Toggle Button
-            self.sound = ToolButton( "speaker-muted-100" )
-            self.sound.set_tooltip(_('Mute'))
-            self.sound.props.sensitive = True
-            self.sound.connect('clicked', self._sound_cb)
-            toolbar_box.toolbar.insert(self.sound, -1)
-            self.sound.show()
-
-            separator = gtk.SeparatorToolItem()
-            separator.show()
-            toolbar_box.toolbar.insert(separator, -1)
-
-            # Label for showing level
-            self.level_label = gtk.Label("%s %d" % (_("Level"),1))
-            self.level_label.show()
-            level_toolitem = gtk.ToolItem()
-            level_toolitem.add(self.level_label)
-            toolbar_box.toolbar.insert(level_toolitem,-1)
-
-            separator = gtk.SeparatorToolItem()
-            separator.props.draw = False
-            separator.set_expand(True)
-            separator.show()
-            toolbar_box.toolbar.insert(separator, -1)
-
-            # The ever-present Stop Button
-            stop_button = StopButton(self)
-            stop_button.props.accelerator = '<Ctrl>Q'
-            toolbar_box.toolbar.insert(stop_button, -1)
-            stop_button.show()
+        # Ignacio 2012:
+        # Removed support for old toolbars!
+	toolbar_box = ToolbarBox()
+
+	# Buttons added to the Activity toolbar
+	activity_button = ActivityToolbarButton(self)
+	toolbar_box.toolbar.insert(activity_button, 0)
+	activity_button.show()
+
+	# Play Button
+	self.play = ToolButton( "media-playback-start" )
+	self.play.set_tooltip(_('Play'))
+	self.play.props.sensitive = True
+	self.play.connect('clicked', self._play_cb)
+	toolbar_box.toolbar.insert(self.play, -1)
+	self.play.show()
+
+	# Sound Toggle Button
+	self.sound = ToolButton( "speaker-muted-100" )
+	self.sound.set_tooltip(_('Mute'))
+	self.sound.props.sensitive = True
+	self.sound.connect('clicked', self._sound_cb)
+	toolbar_box.toolbar.insert(self.sound, -1)
+	self.sound.show()
+
+	separator = Gtk.SeparatorToolItem()
+	separator.show()
+	toolbar_box.toolbar.insert(separator, -1)
+
+	# Label for showing level
+	self.level_label = Gtk.Label("%s %d" % (_("Level"),1))
+
+	self.level_label.show()
+	level_toolitem = Gtk.ToolItem()
+	level_toolitem.add(self.level_label)
+	toolbar_box.toolbar.insert(level_toolitem,-1)
+
+	separator = Gtk.SeparatorToolItem()
+	separator.props.draw = False
+	separator.set_expand(True)
+	separator.show()
+	toolbar_box.toolbar.insert(separator, -1)
+
+	# The ever-present Stop Button
+	stop_button = StopButton(self)
+	stop_button.props.accelerator = '<Ctrl>Q'
+	toolbar_box.toolbar.insert(stop_button, -1)
+	stop_button.show()
+
+	self.set_toolbar_box(toolbar_box)
+	toolbar_box.show()
 
-            self.set_toolbar_box(toolbar_box)
-            toolbar_box.show()
-
-        except NameError:
-            # Use pre-0.86 toolbar design
-            self.toolbox = activity.ActivityToolbox(self)
-            self.set_toolbox(self.toolbox)
-
-            self.projectToolbar = ProjectToolbar(self)
-            self.toolbox.add_toolbar( _('Project'), self.projectToolbar )
-
-            self.toolbox.show()
 
         # Create a canvas
-        canvas = gtk.DrawingArea()
-        canvas.set_size_request(gtk.gdk.screen_width(), \
-                                gtk.gdk.screen_height())
+        canvas = Gtk.DrawingArea()
+        canvas.set_size_request(Gdk.Screen.width(), \
+                                Gdk.Screen.height())
         self.set_canvas(canvas)
         canvas.show()
         self.show_all()
@@ -136,12 +125,14 @@ class ErikosActivity(activity.Activity):
 
     def _sound_cb(self, button):
         if self.sw.sound is True:
-            self.sound.set_icon("speaker-muted-000")            
+            self.sound.set_icon_name("speaker-muted-000")            
             self.sound.set_tooltip(_('Unmute'))
             self.sw.sound = False
-        else:
-            self.sound.set_icon("speaker-muted-100")
+            self.sound.show()
+	else:
+            self.sound.set_icon_name("speaker-muted-100")
             self.sound.set_tooltip(_('Mute'))
+	    self.sound.show()
             self.sw.sound = True
         return True
 
@@ -152,40 +143,4 @@ class ErikosActivity(activity.Activity):
         _logger.debug("Write level: " + str(self.sw.level))
         self.metadata['level'] = self.sw.level
 
-#
-# Project toolbar for pre-0.86 toolbars
-#
-class ProjectToolbar(gtk.Toolbar):
-
-    def __init__(self, pc):
-        gtk.Toolbar.__init__(self)
-        self.activity = pc
-
-        # Play button
-        self.activity.play = ToolButton( "media-playback-start" )
-        self.activity.play.set_tooltip(_('Play'))
-        self.activity.play.props.sensitive = True
-        self.activity.play.connect('clicked', self.activity._play_cb)
-        self.insert(self.activity.play, -1)
-        self.activity.play.show()
-
-        # Sound toggle button
-        self.activity.sound = ToolButton( "speaker-muted-100" )
-        self.activity.sound.set_tooltip(_('Mute'))
-        self.activity.sound.props.sensitive = True
-        self.activity.sound.connect('clicked', self.activity._sound_cb)
-        self.insert(self.activity.sound, -1)
-        self.activity.sound.show()
-
-        separator = gtk.SeparatorToolItem()
-        separator.set_draw(True)
-        self.insert(separator, -1)
-        separator.show()
-
-        # Label for showing play status
-        self.activity.level_label = gtk.Label("%s %d" % (_("Level"),1))
-        self.activity.level_label.show()
-        self.activity.level_toolitem = gtk.ToolItem()
-        self.activity.level_toolitem.add(self.activity.level_label)
-        self.insert(self.activity.level_toolitem, -1)
-        self.activity.level_toolitem.show()
+
diff --git a/NEWS b/NEWS
index 7c3009f..ea31271 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+7
+
+* Port to GTK3 by Ignacio Rodriguez
+
+6
+
+* New translations
+
+5
+
+* New translations
+
 4
 
 * Upgrade to Cairo
diff --git a/activity/activity.info b/activity/activity.info
index 0a22541..85cf143 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,8 +1,9 @@
 [Activity]
 name = Erikos
-activity_version = 4
+activity_version = 7
 license = GPLv3
 bundle_id = org.sugarlabs.ErikosActivity
 exec = sugar-activity ErikosActivity.ErikosActivity
 icon = activity-erikos
 show_launcher = yes
+summary = game modeled after Simon, a classic sequence game
\ No newline at end of file
diff --git a/sprite_factory.py b/sprite_factory.py
index 05bd851..7dc6552 100644
--- a/sprite_factory.py
+++ b/sprite_factory.py
@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
 #Copyright (c) 2009, 2011 Walter Bender
-
+#Copyright (c) 2012, Ignacio Rodríguez
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -9,10 +10,10 @@
 # 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, GdkPixbuf
 import pygtk
 pygtk.require('2.0')
-import gtk
-import gobject
+
 import os.path
 
 import sprites
@@ -31,7 +32,7 @@ class Sprite:
         self.spr.draw()
 
     def load_image(self, file, name, w, h):
-        return gtk.gdk.pixbuf_new_from_file_at_size(os.path.join(file + 
+        return GdkPixbuf.Pixbuf.new_from_file_at_size(os.path.join(file + 
                                                                  name + 
                                                                  '.svg'),
                                                     w, h)
diff --git a/sprites.py b/sprites.py
index baae94f..75116fc 100644
--- a/sprites.py
+++ b/sprites.py
@@ -24,7 +24,7 @@
 '''
 
 sprites.py is a simple sprites library for managing graphics objects,
-'sprites', on a gtk.DrawingArea. It manages multiple sprites with
+'sprites', on a Gtk.DrawingArea. It manages multiple sprites with
 methods such as move, hide, set_layer, etc.
 
 There are two classes:
@@ -68,7 +68,7 @@ Example usage:
 
 # method for converting SVG to a gtk pixbuf
 def svg_str_to_pixbuf(svg_string):
-    pl = gtk.gdk.PixbufLoader('svg')
+    pl = GdkPixbuf.PixbufLoader('svg')
     pl.write(svg_string)
     pl.close()
     pixbuf = pl.get_pixbuf()
@@ -76,21 +76,20 @@ def svg_str_to_pixbuf(svg_string):
 
 '''
 
-import pygtk
-pygtk.require('2.0')
-import gtk
-import pango
-import pangocairo
+import gi
+from gi.repository import Gtk, GdkPixbuf, Gdk
+from gi.repository import Pango, PangoCairo
 import cairo
 
+
 class Sprites:
     ''' A class for the list of sprites and everything they share in common '''
 
     def __init__(self, widget):
         ''' Initialize an empty array of sprites '''
+        self.cr = None
         self.widget = widget
         self.list = []
-        self.cr = None
 
     def set_cairo_context(self, cr):
         ''' Cairo context may be set or reset after __init__ '''
@@ -98,7 +97,7 @@ class Sprites:
 
     def get_sprite(self, i):
         ''' Return a sprint from the array '''
-        if i < 0 or i > len(self.list) - 1:
+        if i < 0 or i > len(self.list)-1:
             return(None)
         else:
             return(self.list[i])
@@ -160,11 +159,13 @@ class Sprite:
         ''' Initialize an individual sprite '''
         self._sprites = sprites
         self.save_xy = (x, y)  # remember initial (x, y) position
-        self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0)
+        self.rect = [int(x), int(y), 0, 0]
         self._scale = [12]
         self._rescale = [True]
         self._horiz_align = ["center"]
         self._vert_align = ["middle"]
+        self._x_pos = [None]
+        self._y_pos = [None]
         self._fd = None
         self._bold = False
         self._italic = False
@@ -172,7 +173,7 @@ class Sprite:
         self._margins = [0, 0, 0, 0]
         self.layer = 100
         self.labels = []
-        self.cached_surfaces = []
+        self.images = []
         self._dx = []  # image offsets
         self._dy = []
         self.type = None
@@ -181,54 +182,47 @@ class Sprite:
 
     def set_image(self, image, i=0, dx=0, dy=0):
         ''' Add an image to the sprite. '''
-        while len(self.cached_surfaces) < i + 1:
-            self.cached_surfaces.append(None)
+        while len(self.images) < i + 1:
+            self.images.append(None)
             self._dx.append(0)
             self._dy.append(0)
+        self.images[i] = image
         self._dx[i] = dx
         self._dy[i] = dy
-        if isinstance(image, gtk.gdk.Pixbuf):
-            w = image.get_width()
-            h = image.get_height()
+        if hasattr(self.images[i], 'get_width'):
+            w = self.images[i].get_width()
+            h = self.images[i].get_height()
         else:
-            w, h = image.get_size()
+            w, h = self.images[i].get_size()
         if i == 0:  # Always reset width and height when base image changes.
-            self.rect.width = w + dx
-            self.rect.height = h + dy
+            self.rect[2] = w + dx
+            self.rect[3] = h + dy
         else:
-            if w + dx > self.rect.width:
-                self.rect.width = w + dx
-            if h + dy > self.rect.height:
-                self.rect.height = h + dy
-        surface = cairo.ImageSurface(
-            cairo.FORMAT_ARGB32, self.rect.width, self.rect.height)
-        context = cairo.Context(surface)
-        context = gtk.gdk.CairoContext(context)
-        context.set_source_pixbuf(image, 0, 0)
-        context.rectangle(0, 0, self.rect.width, self.rect.height)
-        context.fill()
-        self.cached_surfaces[i] = surface
+            if w + dx > self.rect[2]:
+                self.rect[2] = w + dx
+            if h + dy > self.rect[3]:
+                self.rect[3] = h + dy
 
     def move(self, pos):
         ''' Move to new (x, y) position '''
         self.inval()
-        self.rect.x, self.rect.y = int(pos[0]), int(pos[1])
+        self.rect[0], self.rect[1] = int(pos[0]), int(pos[1])
         self.inval()
 
     def move_relative(self, pos):
         ''' Move to new (x+dx, y+dy) position '''
         self.inval()
-        self.rect.x += int(pos[0])
-        self.rect.y += int(pos[1])
+        self.rect[0] += int(pos[0])
+        self.rect[1] += int(pos[1])
         self.inval()
 
     def get_xy(self):
         ''' Return current (x, y) position '''
-        return (self.rect.x, self.rect.y)
+        return (self.rect[0], self.rect[1])
 
     def get_dimensions(self):
         ''' Return current size '''
-        return (self.rect.width, self.rect.height)
+        return (self.rect[2], self.rect[3])
 
     def get_layer(self):
         ''' Return current layer '''
@@ -246,7 +240,7 @@ class Sprite:
         if layer is not None:
             self.layer = layer
         for i in range(self._sprites.length_of_list()):
-            if layer < self._sprites.get_sprite(i).layer:
+            if self.layer < self._sprites.get_sprite(i).layer:
                 self._sprites.insert_in_list(self, i)
                 self.inval()
                 return
@@ -279,10 +273,12 @@ class Sprite:
             self._rescale.append(self._rescale[0])
             self._horiz_align.append(self._horiz_align[0])
             self._vert_align.append(self._vert_align[0])
+            self._x_pos.append(self._x_pos[0])
+            self._y_pos.append(self._y_pos[0])
 
     def set_font(self, font):
         ''' Set the font for a label '''
-        self._fd = pango.FontDescription(font)
+        self._fd = Pango.FontDescription(font)
 
     def set_label_color(self, rgb):
         ''' Set the font color for a label '''
@@ -300,13 +296,15 @@ class Sprite:
         return
 
     def set_label_attributes(self, scale, rescale=True, horiz_align="center",
-                             vert_align="middle", i=0):
+                             vert_align="middle", x_pos=None, y_pos=None, i=0):
         ''' Set the various label attributes '''
         self._extend_labels_array(i)
         self._scale[i] = scale
         self._rescale[i] = rescale
         self._horiz_align[i] = horiz_align
         self._vert_align[i] = vert_align
+        self._x_pos[i] = x_pos
+        self._y_pos[i] = y_pos
 
     def hide(self):
         ''' Hide a sprite '''
@@ -319,136 +317,158 @@ 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)
+        if type(self.images[i]) ==  cairo.ImageSurface:
+            array = self.images[i].get_data()
+        else:
+            array = self.images[i].get_pixels()
 
-        # 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)
-
+        if array is not None:
+            offset = (y * self.images[i].get_width() + x) * 4
+            if offset < 0 or offset > len(array) - 4:
+                print "Index Error: %d %d" % (len(array), offset)
+                return(-1, -1, -1, -1)
+            else:
+                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])
+                if type(self.images[i]) ==  cairo.ImageSurface:
+                    return(b, g, r, a)
+                else:
+                    return(r, g, b, a)
+        else:
+            print "Array is none"
+            return(-1, -1, -1, -1)
diff --git a/window.py b/window.py
index 915c66f..b27bf1b 100644
--- a/window.py
+++ b/window.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #Copyright (c) 2009, 2011 Walter Bender
-
+#Copyright (c) 2012, Ignacio Rodríguez
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -15,15 +15,14 @@ from constants import *
 from time import *
 import pygtk
 pygtk.require('2.0')
-import gtk
-import gobject
+from gi.repository import Gtk, Gdk, GObject
 from sound import playWave, audioWrite
 import os
 import random
 from gettext import gettext as _
-
+import ErikosActivity as erikos
 try:
-    from sugar.graphics import style
+    from sugar3.graphics import style
     GRID_CELL_SIZE = style.GRID_CELL_SIZE
 except:
     GRID_CELL_SIZE = 0
@@ -53,16 +52,16 @@ def new_window(canvas, path, parent=None):
         sw.canvas = canvas
         parent.show_all()
 
-    sw.canvas.set_flags(gtk.CAN_FOCUS)
-    sw.canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK)
-    sw.canvas.add_events(gtk.gdk.BUTTON_RELEASE_MASK)
-    sw.canvas.add_events(gtk.gdk.POINTER_MOTION_MASK)
-    sw.canvas.connect("expose-event", _expose_cb, sw)
+
+    sw.canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
+    sw.canvas.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK)
+    sw.canvas.add_events(Gdk.EventMask.POINTER_MOTION_MASK)
+    sw.canvas.connect("draw", __draw_cb, sw)
     sw.canvas.connect("button-press-event", _button_press_cb, sw)
     sw.canvas.connect("button-release-event", _button_release_cb, sw)
     sw.canvas.connect("motion-notify-event", _mouse_move_cb, sw)
-    sw.width = gtk.gdk.screen_width()
-    sw.height = gtk.gdk.screen_height()-GRID_CELL_SIZE
+    sw.width = Gdk.Screen.width()
+    sw.height = Gdk.Screen.height()-GRID_CELL_SIZE
     sw.sprites = Sprites(sw.canvas)
     sw.sound = True
     sw.scale = 2
@@ -118,13 +117,13 @@ def _stepper(sw,i,j):
      if j is True:
          if i < sw.level*2:
              sw.buttons_on[sw.seq[i]].draw_sprite(1500)
-             gobject.idle_add(__play_sound_cb, 
+             GObject.idle_add(__play_sound_cb, 
                               sw.sound_files[sw.seq[i]], sw.sound)
-             sw.timeout_id = gobject.timeout_add(1000,_stepper,sw,i+1,False)
+             sw.timeout_id = GObject.timeout_add(1000,_stepper,sw,i+1,False)
          else:
              _dance(sw,[0,1,2,3],1,0)
      else:
-         sw.timeout_id = gobject.timeout_add(1000,_stepper,sw,i,True)
+         sw.timeout_id = GObject.timeout_add(1000,_stepper,sw,i,True)
 
 #
 # Button press
@@ -170,31 +169,32 @@ def _button_release_cb(win, event, sw):
     for i in range (0,4):
         if sw.press == sw.buttons_off[i].spr:
             sw.buttons_on[i].draw_sprite(1500)
-            gobject.idle_add(__play_sound_cb, sw.sound_files[i], sw.sound)
-            gobject.timeout_add(500,sw.buttons_on[i].spr.hide)
+            GObject.idle_add(__play_sound_cb, sw.sound_files[i], sw.sound)
+            GObject.timeout_add(500,sw.buttons_on[i].spr.hide)
             if sw.playpushed is False:
                 sw.press = None
                 return
             if sw.seq[sw.counter] == i: # correct reponse
                 sw.counter += 1
                 if sw.counter == sw.level*2:
-                    gobject.timeout_add(1000, _dance, sw, [i], 10, 0)
+                    GObject.timeout_add(1000, _dance, sw, [i], 10, 0)
                     sw.counter = 0
                     sw.level += 1
                     sw.activity.level_label.set_text(
                         "%s %d" % (_("Level"),sw.level))
                     if sw.level*2 < len(sw.seq):
-                        gobject.timeout_add(3000, play_the_game, sw)
+                        GObject.timeout_add(3000, play_the_game, sw)
                     else: # game over
-                        gobject.timeout_add(2000, _flash, sw, 7, True)
+                        GObject.timeout_add(2000, _flash, sw, 7, True)
                         sw.playpushed = False
                         sw.level = 1
                         sw.seq = gen_seq(30)
                         sw.activity.level_label.set_text(
                             "%s %d" % (_("Level"),sw.level))
             else: # incorrect response
-                _all_gone(sw)
-                gobject.timeout_add(1000, _all_off, sw)
+		print ' Incorrect Response'
+		_all_gone(sw)
+                GObject.timeout_add(1000, _all_off, sw)
                 sw.counter = 0
     sw.press = None
 
@@ -216,7 +216,7 @@ def _dance(sw, dancelist, dist, n):
     if n < 10:
         for i in dancelist:
             sw.buttons_off[i].spr.move_relative((xo[i],yo[i]))
-        gobject.timeout_add(30,_dance,sw,dancelist,dist,n+1)
+        GObject.timeout_add(30,_dance,sw,dancelist,dist,n+1)
     else:
         for i in dancelist:
             sw.buttons_off[i].spr.move_relative((-xo[i]*10,-yo[i]*10))
@@ -230,10 +230,10 @@ def _flash(sw, n, i):
         return
     if i is True:
         _all_on(sw)
-        gobject.timeout_add(200,_flash,sw,n-1,False)
+        GObject.timeout_add(200,_flash,sw,n-1,False)
     else:
         _all_off(sw)
-        gobject.timeout_add(200,_flash,sw,n,True)
+        GObject.timeout_add(200,_flash,sw,n,True)
 
 #
 # Turn all the sprites dim
@@ -256,11 +256,11 @@ def _all_gone(sw):
 #
 # Window expose event
 #
-def _expose_cb(sw, win, event):
-    ''' Callback to handle window expose events '''
-    sw.do_expose_event(event)
-    return True
-
+def __draw_cb(sw, event,w):
+	# sw = DrawingArea
+	# event  = CairoContext
+	# w = 'self'
+	w.sprites.redraw_sprites(cr=event)
 def do_expose_event(sw, event):
     ''' Handle the expose-event by drawing '''
     # Restrict Cairo to the exposed area
@@ -269,17 +269,21 @@ def do_expose_event(sw, event):
                  event.area.width, event.area.height)
     cr.clip()
     # Refresh sprite list
-    sw.sprites.redraw_sprites(cr=cr)
+    if cr is not None:
+	sw.sprites.redraw_sprites(cr=cr)
 
 #
 # Shut it down
 #
 def _destroy_cb(win, event, sw):
-    gtk.main_quit()
+    Gtk.main_quit()
 
 #
 # Generate the sample sequences
 #
+def __expose_cb(self, win, event):
+	self.do_expose_event(event)
+	return True
 def gen_seq(n):
     seq = []
     for i in range(1,n+1):