gtk3 port

Author: walterbender

LetterMatch.py

@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2012, 2013 Walter Bender
 # Copyright (c) 2013 Aneesh Dogra <lionaneesh@gmail.com>
+# Copyright (c) 2013 Ignacio Rodríguez <ignacio@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
@@ -12,19 +14,19 @@
 # Boston, MA 02111-1307, USA.
 
 
-import gtk
+from gi.repository import Gtk, Gdk, GdkPixbuf
 
-from sugar.activity import activity
-from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
-from sugar.activity.widgets import ActivityToolbarButton
-from sugar.activity.widgets import StopButton
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.combobox import ComboBox
-from sugar.graphics.toolcombobox import ToolComboBox
-from sugar.datastore import datastore
-from sugar import profile
-from sugar.graphics.objectchooser import ObjectChooser
-from sugar import mime
+from sugar3.activity import activity
+from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.activity.widgets import StopButton
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.combobox import ComboBox
+from sugar3.graphics.toolcombobox import ToolComboBox
+from sugar3.datastore import datastore
+from sugar3 import profile
+from sugar3.graphics.objectchooser import ObjectChooser
+from sugar3 import mime
 from utils.sprites import Sprites, Sprite
 
 from gettext import gettext as _
@@ -89,10 +91,10 @@ def __init__(self, handle):
                 str(self.metadata['data_from_journal']))
         self._setup_toolbars()
 
-        self.canvas = gtk.DrawingArea()
-        self.canvas.set_size_request(gtk.gdk.screen_width(),
-                                     gtk.gdk.screen_height())
-        self.canvas.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#000000"))
+        self.canvas = Gtk.DrawingArea()
+        self.canvas.set_size_request(Gdk.Screen.width(),
+                                     Gdk.Screen.height())
+        self.canvas.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse("#000000"))
         self.canvas.show()
         self.set_canvas(self.canvas)
 
@@ -103,7 +105,6 @@ def __init__(self, handle):
                           parent=self)
 
     def _setup_toolbars(self):
-        ''' Just 0.86+ toolbars '''
         self.max_participants = 1  # no sharing
 
         toolbox = ToolbarBox()
@@ -112,6 +113,9 @@ def _setup_toolbars(self):
         toolbox.toolbar.insert(activity_button, 0)
         activity_button.show()
 
+        separator = Gtk.SeparatorToolItem()
+        toolbox.toolbar.insert(separator, -1)
+
         self.set_toolbar_box(toolbox)
         toolbox.show()
         primary_toolbar = toolbox.toolbar
@@ -143,8 +147,8 @@ def _setup_toolbars(self):
                                            self._choose_audio_from_journal_cb,
                                            tooltip=_("Import Audio"))
 
-        container = gtk.ToolItem()
-        self.letter_entry = gtk.Entry()
+        container = Gtk.ToolItem()
+        self.letter_entry = Gtk.Entry()
         self.letter_entry.set_max_length(1)
         self.letter_entry.set_width_chars(3)  # because 1 char looks funny
         self.letter_entry.connect('changed', self._set_letter)
@@ -208,7 +212,7 @@ def _init_preview(self):
         x = int(self._page._grid_x_offset + w + 12)
         y = int(self._page._grid_y_offset + 40)
 
-        pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
             os.path.join(self._images_path,'../drawing.png'), w, h)
         self.status.set_text(
             _('Please choose image and audio objects from the Journal.'))
@@ -256,7 +260,7 @@ def _choose_audio_from_journal_cb(self, event):
         self.audio_id = None
         chooser = ObjectChooser(what_filter=mime.GENERIC_TYPE_AUDIO)
         result = chooser.run()
-        if result == gtk.RESPONSE_ACCEPT:
+        if result == Gtk.ResponseType.ACCEPT:
             jobject = chooser.get_selected_object()
             self.audio_id = str(jobject._object_id)
         self.image_button.set_sensitive(True)
@@ -282,7 +286,7 @@ def _choose_image_from_journal_cb(self, event):
         self.image_id = None
         chooser = ObjectChooser(what_filter=mime.GENERIC_TYPE_IMAGE)
         result = chooser.run()
-        if result == gtk.RESPONSE_ACCEPT:
+        if result == Gtk.ResponseType.ACCEPT:
             jobject = chooser.get_selected_object()
             self.image_id = str(jobject._object_id)
 
@@ -291,7 +295,7 @@ def _choose_image_from_journal_cb(self, event):
             w = self._page._card_width
             h = self._page._card_height
 
-            pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+            pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
                 jobject.get_file_path(), w, h)
             self.preview_image.set_image(pixbuf)
             self.preview_image.move((x, y))

NEWS

@@ -1,3 +1,7 @@
+5
+
+* GTK3 port by Ignacio Rodríguez
+
 3
 
 * Add customization toolbar (Aneesh Dogra)

activity/activity.info

@@ -1,6 +1,6 @@
 [Activity]
 name = Letter Match
-activity_version = 3
+activity_version = 5
 license = GPLv3
 bundle_id = org.sugarlabs.LetterMatch
 exec = sugar-activity LetterMatch.LetterMatch

page.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2012 Walter Bender
+# Copyright (c) 2012 Walter Bender <walter.bender@gmail.com>
 # Copyright (c) 2013 Aneesh Dogra <lionaneesh@gmail.com>
+# Copyright (c) 2013 Ignacio Rodríguez <ignacio@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,25 +12,22 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-import gtk
-import gobject
+
+from gi.repository import Gtk, Gdk, GObject, GdkPixbuf
 import os
 import codecs
 from random import uniform, choice
 
 from gettext import gettext as _
 
-from sugar.datastore import datastore
+from sugar3.datastore import datastore
 from utils.play_audio import play_audio_from_file
 
 import logging
 _logger = logging.getLogger('lettermatch-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 genpieces import generate_card
 from utils.sprites import Sprites, Sprite
@@ -66,18 +64,17 @@ def __init__(self, canvas, lessons_path, images_path, sounds_path,
             self._canvas = canvas
             self._activity.show_all()
 
-        self._canvas.set_flags(gtk.CAN_FOCUS)
-        self._canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK)
-        self._canvas.add_events(gtk.gdk.BUTTON_RELEASE_MASK)
-        self._canvas.connect("expose-event", self._expose_cb)
+        self._canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
+        self._canvas.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK)
+        self._canvas.connect("draw", self.__draw_cb)
         self.button_release_event_id = \
           self._canvas.connect("button-release-event", self._button_release_cb)
         self.button_press_event_id = \
           self._canvas.connect("button-press-event", self._button_press_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._card_height = int((self._height - GRID_CELL_SIZE) / YDIM) \
             - GUTTER * 2
         self._card_width = int(self._card_height * 4 / 3.)
@@ -106,7 +103,7 @@ def __init__(self, canvas, lessons_path, images_path, sounds_path,
     def new_page(self):
         ''' Load a page of cards '''
         if self.timeout is not None:
-            gobject.source_remove(self.timeout)
+            GObject.source_remove(self.timeout)
         self._hide_cards()
         self.new_target()
         x = self._grid_x_offset + self._card_width + GUTTER * 3
@@ -173,7 +170,7 @@ def _alpha_cards(self):
                 h2 = 1.0 - h1
                 bot.composite(top, 0, int(h1 * top.get_height()),
                               top.get_width(), int(h2 * top.get_height()),
-                              0, 0, 1, 1, gtk.gdk.INTERP_NEAREST, 255)
+                              0, 0, 1, 1, GdkPixbuf.InterpType.NEAREST, 255)
                 self._cards.append(Sprite(self._sprites, 0, 0, top))
             else:
                 stroke = self._test_for_stroke()
@@ -207,8 +204,8 @@ def new_target(self):
         self.answers[i] = self.target
 
         if self.timeout is not None:
-            gobject.source_remove(self.timeout)
-        self.timeout = gobject.timeout_add(1000, self._play_target_sound)
+            GObject.source_remove(self.timeout)
+        self.timeout = GObject.timeout_add(1000, self._play_target_sound)
 
     def _bad_answer(self, i):
         ''' Make sure answer is unique '''
@@ -275,18 +272,29 @@ def _button_release_cb(self, win, event):
 
         if self.current_card == self.target:
             self._activity.status.set_text(_('Very good!'))
+            self._play(True)
             if self.timeout is not None:
-                gobject.source_remove(self.timeout)
-            self.timeout = gobject.timeout_add(1000, self.new_page)
+                GObject.source_remove(self.timeout)
+            self.timeout = GObject.timeout_add(1000, self.new_page)
         else:
             self._activity.status.set_text(_('Please try again.'))
+            self._play(False)
             self._play_target_sound()
-
+            
+    def _play(self, great):
+        if great:
+                play_audio_from_file(os.getcwd() + '/sounds/great.ogg')
+        else:
+                play_audio_from_file(os.getcwd() + '/sounds/bad.ogg')
+                
     def _keypress_cb(self, area, event):
         ''' No keyboard shortcuts at the moment. Perhaps jump to the page
         associated with the key pressed? '''
         return True
-
+        
+    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)
@@ -308,12 +316,16 @@ def do_expose_event(self, event):
 
     def _destroy_cb(self, win, event):
         ''' Make a clean exit. '''
-        gtk.main_quit()
+        Gtk.main_quit()
 
     def invalt(self, x, y, w, h):
         ''' Mark a region for refresh '''
-        self._canvas.window.invalidate_rect(
-            gtk.gdk.Rectangle(int(x), int(y), int(w), int(h)), False)
+        rectangle = Gdk.Rectangle()
+        rectangle.x = x
+        rectangle.y = y
+        rectangle.width = w
+        rectangle.height = h
+        self._canvas.window.invalidate_rect(rectangle)
 
     def load_level(self, path):
         ''' Load a level (CSV) from path: letter, word, color, image,
@@ -371,14 +383,14 @@ def _clear_all(self):
 
 def svg_str_to_pixbuf(svg_string):
     ''' Load pixbuf from SVG string. '''
-    pl = gtk.gdk.PixbufLoader('svg')
+    pl = GdkPixbuf.PixbufLoader.new_with_type('svg')
+    if type(svg_string) == unicode:
+        svg_string = svg_string.encode('ascii', 'replace')
     pl.write(svg_string)
     pl.close()
-    pixbuf = pl.get_pixbuf()
-    return pixbuf
+    return pl.get_pixbuf()
 
 
 def image_file_to_pixbuf(file_path, w, h):
     ''' Load pixbuf from file '''
-    return gtk.gdk.pixbuf_new_from_file_at_size(file_path, int(w), int(h))
-        
+    return GdkPixbuf.Pixbuf.new_from_file_at_size(file_path, int(w), int(h))

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()