diff options
| author | Ignacio Rodríguez <ignacio@Ignacio-Magallanes.(none)> | 2012-10-26 14:43:07 (GMT) |
|---|---|---|
| committer | Ignacio Rodríguez <ignacio@Ignacio-Magallanes.(none)> | 2012-10-26 14:43:07 (GMT) |
| commit | 7afe20bedb91275ab57703dfdd05d8d85ac6af1a (patch) | |
| tree | de1718987dd37f3ccac5a49d8e02a1981b835b68 | |
| parent | 6acfac5536fa996760a530feb30504f187d2e497 (diff) | |
Port finish, but i need a Summary!!
39 files changed, 550 insertions, 260 deletions
@@ -1,3 +1,13 @@ +10 + +ENHANCEMENTS +* Ignacio Rodriguez port to gtk3 + +9 + +ENHANCEMENT +* New translations + 8 ENHANCEMENTS diff --git a/PukllanapacActivity.py b/PukllanapacActivity.py index 9777b5e..e0dc125 100644 --- a/PukllanapacActivity.py +++ b/PukllanapacActivity.py @@ -1,4 +1,5 @@ #Copyright (c) 2010 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,27 +10,19 @@ # License 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 GObject, Gtk, Gdk import pygtk pygtk.require('2.0') -import gtk -import gobject - -import sugar -from sugar.activity import activity -try: - from sugar.graphics.toolbarbox import ToolbarBox - _have_toolbox = True -except ImportError: - _have_toolbox = False -if _have_toolbox: - from sugar.bundle.activitybundle import ActivityBundle - from sugar.activity.widgets import ActivityToolbarButton - from sugar.activity.widgets import StopButton - from sugar.graphics.toolbarbox import ToolbarButton +import sugar3 +from sugar3.activity import activity +from sugar3.graphics.toolbarbox import ToolbarBox +from sugar3.bundle.activitybundle import ActivityBundle +from sugar3.activity.widgets import ActivityToolbarButton +from sugar3.activity.widgets import StopButton +from sugar3.graphics.toolbarbox import ToolbarButton -from sugar.datastore import datastore +from sugar3.datastore import datastore from gettext import gettext as _ import locale @@ -55,12 +48,12 @@ class PukllanapacActivity(activity.Activity): self._play_level = 0 self._play_mode = 0 - self._setup_toolbars(_have_toolbox) + self._setup_toolbars() # 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() @@ -95,31 +88,19 @@ class PukllanapacActivity(activity.Activity): self.metadata['rotate' + str(i)] = str( self.win.grid.card_table[self.win.grid.grid[i]].orientation) - def _setup_toolbars(self, have_toolbox): + def _setup_toolbars(self): """ Setup the toolbars.. """ - if have_toolbox: - toolbox = ToolbarBox() - - # Activity toolbar - activity_button = ActivityToolbarButton(self) + toolbox = ToolbarBox() - toolbox.toolbar.insert(activity_button, 0) - activity_button.show() + # Activity toolbar + activity_button = ActivityToolbarButton(self) - self.set_toolbar_box(toolbox) - toolbox.show() - toolbar = toolbox.toolbar - - else: - # Use pre-0.86 toolbar design - games_toolbar = gtk.Toolbar() - toolbox = activity.ActivityToolbox(self) - self.set_toolbox(toolbox) - toolbox.add_toolbar(_('Game'), games_toolbar) - toolbox.show() - toolbox.set_current_toolbar(1) - toolbar = games_toolbar + toolbox.toolbar.insert(activity_button, 0) + activity_button.show() + self.set_toolbar_box(toolbox) + toolbox.show() + toolbar = toolbox.toolbar # Add the buttons and labels to the toolbars self.level_button = button_factory( @@ -144,13 +125,12 @@ class PukllanapacActivity(activity.Activity): separator_factory(toolbar, False, True) self.status_label = label_factory(toolbar, _("drag to swap")) - if _have_toolbox: - separator_factory(toolbox.toolbar, True, False) + separator_factory(toolbox.toolbar, True, False) - stop_button = StopButton(self) - stop_button.props.accelerator = '<Ctrl>q' - toolbox.toolbar.insert(stop_button, -1) - stop_button.show() + stop_button = StopButton(self) + stop_button.props.accelerator = '<Ctrl>q' + toolbox.toolbar.insert(stop_button, -1) + stop_button.show() def change_play_level_cb(self, button=None, play_level=None): """ Cycle between levels """ @@ -162,7 +142,7 @@ class PukllanapacActivity(activity.Activity): self._play_level = 0 else: self._play_level = play_level - self.level_button.set_icon(LEVEL_ICONS[self._play_level]) + self.level_button.set_icon_name(LEVEL_ICONS[self._play_level]) self.win.grid.reset(GAME_ICONS[self._play_mode]) self.win.mask(self._play_level) @@ -185,6 +165,6 @@ class PukllanapacActivity(activity.Activity): GAME_ICONS[self._play_mode]) if self._play_mode > 0: self._play_level = len(LEVEL_ICONS) - 1 - self.level_button.set_icon(LEVEL_ICONS[self._play_level]) + self.level_button.set_icon_name(LEVEL_ICONS[self._play_level]) self.win.mask(self._play_level) self.win.grid.reset(GAME_ICONS[self._play_mode]) diff --git a/activity/activity.info b/activity/activity.info index c1f03ed..1aaba26 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Pukllanapac -activity_version = 8 +activity_version = 10 license = GPLv3 bundle_id = org.sugarlabs.PukllanapacActivity exec = sugar-activity PukllanapacActivity.PukllanapacActivity @@ -1,4 +1,5 @@ #Copyright (c) 2010, 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 @@ -10,16 +11,15 @@ # Free Software Foundation, 51 Franklin Street, Suite 500 Boston, MA # 02110-1335 USA +from gi.repository import Gtk, Gdk, GdkPixbuf import pygtk pygtk.require('2.0') -import gtk - from sprites import Sprite def load_image(file, w, h): """ Convert from file to pixbuf at size w, h """ - return gtk.gdk.pixbuf_new_from_file_at_size(file, int(w), int(h)) + return GdkPixbuf.Pixbuf.new_from_file_at_size(file, int(w), int(h)) class Card: diff --git a/gentiles.py b/gentiles.py index 781080d..781080d 100755..100644 --- a/gentiles.py +++ b/gentiles.py @@ -1,4 +1,5 @@ #Copyright (c) 2010, 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 @@ -9,11 +10,9 @@ # License 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 GObject, Gtk, Gdk import pygtk pygtk.require('2.0') -import gtk -import gobject from card import Card diff --git a/locale/af/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/af/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..b4e0193 --- /dev/null +++ b/locale/af/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/af/activity.linfo b/locale/af/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/af/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/da/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/da/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..73d334b --- /dev/null +++ b/locale/da/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/da/activity.linfo b/locale/da/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/da/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/de/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/de/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..20fc7f4 --- /dev/null +++ b/locale/de/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/de/activity.linfo b/locale/de/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/de/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/en/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/en/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..8c79621 --- /dev/null +++ b/locale/en/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/en/activity.linfo b/locale/en/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/en/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/en_GB/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/en_GB/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..8c79621 --- /dev/null +++ b/locale/en_GB/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/en_GB/activity.linfo b/locale/en_GB/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/en_GB/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/en_US/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/en_US/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..ae5f593 --- /dev/null +++ b/locale/en_US/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/en_US/activity.linfo b/locale/en_US/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/en_US/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/es/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/es/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..55e979d --- /dev/null +++ b/locale/es/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/es/activity.linfo b/locale/es/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/es/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/fr/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/fr/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..bb498b0 --- /dev/null +++ b/locale/fr/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/fr/activity.linfo b/locale/fr/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/fr/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/hy/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/hy/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..14c27e9 --- /dev/null +++ b/locale/hy/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/hy/activity.linfo b/locale/hy/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/hy/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/nl/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/nl/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..f9f67eb --- /dev/null +++ b/locale/nl/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/nl/activity.linfo b/locale/nl/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/nl/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/pt/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/pt/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..cca29a3 --- /dev/null +++ b/locale/pt/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/pt/activity.linfo b/locale/pt/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/pt/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/th/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/th/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..52662f7 --- /dev/null +++ b/locale/th/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/th/activity.linfo b/locale/th/activity.linfo new file mode 100644 index 0000000..f9c2ca1 --- /dev/null +++ b/locale/th/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Pukllanapac diff --git a/locale/zh_CN/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo b/locale/zh_CN/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo Binary files differnew file mode 100644 index 0000000..afefc85 --- /dev/null +++ b/locale/zh_CN/LC_MESSAGES/org.sugarlabs.PukllanapacActivity.mo diff --git a/locale/zh_CN/activity.linfo b/locale/zh_CN/activity.linfo new file mode 100644 index 0000000..48cec62 --- /dev/null +++ b/locale/zh_CN/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = 方块拼图 diff --git a/po/cs.po b/po/cs.po deleted file mode 100644 index a821726..0000000 --- a/po/cs.po +++ /dev/null @@ -1,38 +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: 2011-08-03 10:21-0400\n" -"PO-Revision-Date: 2012-06-29 10:16+0200\n" -"Last-Translator: jui <appukonrad@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Pukllanapac" -msgstr "Pukllanapac" - -#: PukllanapacActivity.py:162 -msgid "Game" -msgstr "Hra" - -#: PukllanapacActivity.py:169 -msgid "Set difficulty level." -msgstr "Nastavit úroveň obtížnosti." - -#: PukllanapacActivity.py:176 -msgid "Select game." -msgstr "Vybrat hru." - -#: PukllanapacActivity.py:179 -msgid "drag to swap" -msgstr "tažením vyměnit" diff --git a/po/el.po b/po/el.po deleted file mode 100644 index b3fd8f3..0000000 --- a/po/el.po +++ /dev/null @@ -1,38 +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: 2011-08-03 10:21-0400\n" -"PO-Revision-Date: 2012-09-25 12:23+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 "Pukllanapac" -msgstr "Pukllanapac" - -#: PukllanapacActivity.py:162 -msgid "Game" -msgstr "Παιχνίδι" - -#: PukllanapacActivity.py:169 -msgid "Set difficulty level." -msgstr "Ορισμός επιπέδου δυσκολίας" - -#: PukllanapacActivity.py:176 -msgid "Select game." -msgstr "Επιλογή παιχνιδιού" - -#: PukllanapacActivity.py:179 -msgid "drag to swap" -msgstr "μεταφορά για ανταλλαγή" diff --git a/po/pl.po b/po/pl.po deleted file mode 100644 index b8683ed..0000000 --- a/po/pl.po +++ /dev/null @@ -1,39 +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: 2011-08-03 10:21-0400\n" -"PO-Revision-Date: 2012-02-01 15:10+0200\n" -"Last-Translator: lkjlkj <agniechka@o2.pl>\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=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Pukllanapac" -msgstr "Pukllanapac" - -#: PukllanapacActivity.py:162 -msgid "Game" -msgstr "Gra" - -#: PukllanapacActivity.py:169 -msgid "Set difficulty level." -msgstr "Ustaw poziom trudności." - -#: PukllanapacActivity.py:176 -msgid "Select game." -msgstr "Wybierz grę." - -#: PukllanapacActivity.py:179 -msgid "drag to swap" -msgstr "przeciągnij, aby wymienić" @@ -1,5 +1,5 @@ #!/usr/bin/env python -from sugar.activity import bundlebuilder +from sugar3.activity import bundlebuilder if __name__ == "__main__": bundlebuilder.start() @@ -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 @@ -84,35 +87,35 @@ 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,21 +124,22 @@ class Sprites: self.list.insert(i, spr) 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): - ''' 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): 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 @@ -154,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) @@ -180,14 +184,15 @@ 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) self._dy.append(0) self._dx[i] = dx self._dy[i] = dy - if isinstance(image, gtk.gdk.Pixbuf): + if isinstance(image, gtk.gdk.Pixbuf) or \ + isinstance(image, cairo.ImageSurface): w = image.get_width() h = image.get_height() else: @@ -200,48 +205,51 @@ class Sprite: 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 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 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 @@ -254,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 @@ -264,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: @@ -281,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', @@ -301,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 @@ -309,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 @@ -342,7 +350,7 @@ class Sprite: self.draw_label(cr) def hit(self, pos): - ''' Is (x, y) on top of the sprite? ''' + # Is (x, y) on top of the sprite? # x, y = pos if x < self.rect.x: return False @@ -355,7 +363,7 @@ class Sprite: 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] @@ -404,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 @@ -421,19 +429,19 @@ 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 \ @@ -452,3 +460,393 @@ class Sprite: 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) @@ -1,4 +1,5 @@ #Copyright (c) 2010,11 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,15 @@ # License 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 pygtk pygtk.require('2.0') -import gtk -import gobject from math import sqrt from gettext import gettext as _ -try: - from sugar.graphics import style - GRID_CELL_SIZE = style.GRID_CELL_SIZE -except: - GRID_CELL_SIZE = 0 +from sugar3.graphics import style +GRID_CELL_SIZE = style.GRID_CELL_SIZE from grid import Grid from sprites import Sprites @@ -57,15 +53,14 @@ class Game(): self.canvas = canvas parent.show_all() - self.canvas.set_flags(gtk.CAN_FOCUS) - self.canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK) - self.canvas.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.canvas.connect("button-press-event", self._button_press_cb) 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() - GRID_CELL_SIZE + self.width = Gdk.Screen.width() + self.height = Gdk.Screen.height() - GRID_CELL_SIZE self.card_dim = CARD_DIM self.scale = 0.6 * self.height / (self.card_dim * 3) @@ -127,12 +122,10 @@ class Game(): def _keypress_cb(self, area, event): """ Keypress is used to ... """ - k = gtk.gdk.keyval_name(event.keyval) + k = Gdk.keyval_name(event.keyval) - def _expose_cb(self, win, event): - ''' Callback to handle window expose events ''' - self.do_expose_event(event) - return True + def __draw_cb(self, canvas, cr): + self.sprites.redraw_sprites(cr=cr) def do_expose_event(self, event): ''' Handle the expose-event by drawing ''' @@ -145,7 +138,7 @@ class Game(): self.sprites.redraw_sprites(cr=cr) def _destroy_cb(self, win, event): - gtk.main_quit() + Gtk.main_quit() def mask(self, level): """ mask out cards not on play level """ |