diff options
| author | Ignacio Rodríguez <ignacio@Ignacio-Magallanes.(none)> | 2012-10-26 14:05:22 (GMT) |
|---|---|---|
| committer | Ignacio Rodríguez <ignacio@Ignacio-Magallanes.(none)> | 2012-10-26 14:05:22 (GMT) |
| commit | 61c0cb8aa4c7c08eb8101b7227a32728c4ea95ba (patch) | |
| tree | 9144b24b28e4efda9c22455956f40d4f59dbe742 | |
| parent | 8d11abfe6f8f4ac7d96adf340301fc33afc5ca02 (diff) | |
Port finish, i need summary
| -rw-r--r-- | CardSortActivity.py | 267 | ||||
| -rw-r--r-- | MANIFEST | 39 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | activity/activity.info | 2 | ||||
| -rw-r--r-- | card.py | 11 | ||||
| -rw-r--r--[-rwxr-xr-x] | cardsort.py | 33 | ||||
| -rw-r--r-- | dist/CardSort-1.tar.bz2 | bin | 20417 -> 0 bytes | |||
| -rw-r--r-- | dist/CardSort-1.xo | bin | 32559 -> 0 bytes | |||
| -rw-r--r-- | grid.py | 8 | ||||
| -rw-r--r-- | orientation.py | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | setup.py | 2 | ||||
| -rw-r--r-- | sprites.py | 494 | ||||
| -rw-r--r-- | window.py | 34 |
13 files changed, 632 insertions, 268 deletions
diff --git a/CardSortActivity.py b/CardSortActivity.py index 91abbd1..44ce8ae 100644 --- a/CardSortActivity.py +++ b/CardSortActivity.py @@ -1,5 +1,6 @@ -#Copyright (c) 2009-11 Walter Bender - +# -*- coding: utf-8 -*- +# Copyright (c) 2009-11 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,25 +10,21 @@ # 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, Gdk, GObject 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 +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,87 +45,73 @@ class CardSortActivity(activity.Activity): def __init__(self, handle): super(CardSortActivity,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() - - # 2x2 Button - self.grid2x2 = ToolButton( "2x2on" ) - self.grid2x2.set_tooltip(_('2x2')) - self.grid2x2.props.sensitive = True - self.grid2x2.connect('clicked', self._grid2x2_cb) - toolbar_box.toolbar.insert(self.grid2x2, -1) - self.grid2x2.show() - - # 3x2 Button - self.grid3x2 = ToolButton( "3x2off" ) - self.grid3x2.set_tooltip(_('3x2')) - self.grid3x2.props.sensitive = True - self.grid3x2.connect('clicked', self._grid3x2_cb) - toolbar_box.toolbar.insert(self.grid3x2, -1) - self.grid3x2.show() - - # 2x3 Button - self.grid2x3 = ToolButton( "2x3off" ) - self.grid2x3.set_tooltip(_('2x3')) - self.grid2x3.props.sensitive = True - self.grid2x3.connect('clicked', self._grid2x3_cb) - toolbar_box.toolbar.insert(self.grid2x3, -1) - self.grid2x3.show() - - # 3x3 Button - self.grid3x3 = ToolButton( "3x3off" ) - self.grid3x3.set_tooltip(_('3x3')) - self.grid3x3.props.sensitive = True - self.grid3x3.connect('clicked', self._grid3x3_cb) - toolbar_box.toolbar.insert(self.grid3x3, -1) - self.grid3x3.show() - - separator = gtk.SeparatorToolItem() - separator.show() - toolbar_box.toolbar.insert(separator, -1) - - # Label for showing status - self.results_label = gtk.Label(_("click to rotate; drag to swap")) - self.results_label.show() - results_toolitem = gtk.ToolItem() - results_toolitem.add(self.results_label) - toolbar_box.toolbar.insert(results_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() - - 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()) + toolbar_box = ToolbarBox() + activity_button = ActivityToolbarButton(self) + toolbar_box.toolbar.insert(activity_button, 0) + activity_button.show() + + # 2x2 Button + self.grid2x2 = ToolButton( "2x2on" ) + self.grid2x2.set_tooltip(_('2x2')) + self.grid2x2.props.sensitive = True + self.grid2x2.connect('clicked', self._grid2x2_cb) + toolbar_box.toolbar.insert(self.grid2x2, -1) + self.grid2x2.show() + + # 3x2 Button + self.grid3x2 = ToolButton( "3x2off" ) + self.grid3x2.set_tooltip(_('3x2')) + self.grid3x2.props.sensitive = True + self.grid3x2.connect('clicked', self._grid3x2_cb) + toolbar_box.toolbar.insert(self.grid3x2, -1) + self.grid3x2.show() + + # 2x3 Button + self.grid2x3 = ToolButton( "2x3off" ) + self.grid2x3.set_tooltip(_('2x3')) + self.grid2x3.props.sensitive = True + self.grid2x3.connect('clicked', self._grid2x3_cb) + toolbar_box.toolbar.insert(self.grid2x3, -1) + self.grid2x3.show() + + # 3x3 Button + self.grid3x3 = ToolButton( "3x3off" ) + self.grid3x3.set_tooltip(_('3x3')) + self.grid3x3.props.sensitive = True + self.grid3x3.connect('clicked', self._grid3x3_cb) + toolbar_box.toolbar.insert(self.grid3x3, -1) + self.grid3x3.show() + + separator = Gtk.SeparatorToolItem() + separator.show() + toolbar_box.toolbar.insert(separator, -1) + + # Label for showing status + self.results_label = Gtk.Label(_("click to rotate; drag to swap")) + self.results_label.show() + results_toolitem = Gtk.ToolItem() + results_toolitem.add(self.results_label) + toolbar_box.toolbar.insert(results_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() + + # Create a canvas + canvas = Gtk.DrawingArea() + canvas.set_size_request(Gdk.Screen.width(), + Gdk.Screen.height()) self.set_canvas(canvas) canvas.show() self.show_all() @@ -160,10 +143,10 @@ class CardSortActivity(activity.Activity): return True def show_grid2x2(self): - self.grid2x2.set_icon("2x2on") - self.grid3x2.set_icon("3x2off") - self.grid2x3.set_icon("2x3off") - self.grid3x3.set_icon("3x3off") + self.grid2x2.set_icon_name("2x2on") + self.grid3x2.set_icon_name("3x2off") + self.grid2x3.set_icon_name("2x3off") + self.grid3x3.set_icon_name("3x3off") self.game.test = self.game.grid.test2x2 self.game.grid.reset2x2(self.game) self.metadata['grid'] = "2x2" @@ -173,10 +156,10 @@ class CardSortActivity(activity.Activity): return True def show_grid3x2(self): - self.grid2x2.set_icon("2x2off") - self.grid3x2.set_icon("3x2on") - self.grid2x3.set_icon("2x3off") - self.grid3x3.set_icon("3x3off") + self.grid2x2.set_icon_name("2x2off") + self.grid3x2.set_icon_name("3x2on") + self.grid2x3.set_icon_name("2x3off") + self.grid3x3.set_icon_name("3x3off") self.game.test = self.game.grid.test3x2 self.game.grid.reset3x2(self.game) self.metadata['grid'] = "3x2" @@ -186,10 +169,10 @@ class CardSortActivity(activity.Activity): return True def show_grid2x3(self): - self.grid2x2.set_icon("2x2off") - self.grid3x2.set_icon("3x2off") - self.grid2x3.set_icon("2x3on") - self.grid3x3.set_icon("3x3off") + self.grid2x2.set_icon_name("2x2off") + self.grid3x2.set_icon_name("3x2off") + self.grid2x3.set_icon_name("2x3on") + self.grid3x3.set_icon_name("3x3off") self.game.test = self.game.grid.test2x3 self.game.grid.reset2x3(self.game) self.metadata['grid'] = "2x3" @@ -199,10 +182,10 @@ class CardSortActivity(activity.Activity): return True def show_grid3x3(self): - self.grid2x2.set_icon("2x2off") - self.grid3x2.set_icon("3x2off") - self.grid2x3.set_icon("2x3off") - self.grid3x3.set_icon("3x3on") + self.grid2x2.set_icon_name("2x2off") + self.grid3x2.set_icon_name("3x2off") + self.grid2x3.set_icon_name("2x3off") + self.grid3x3.set_icon_name("3x3on") self.game.test = self.game.grid.test3x3 self.game.grid.reset3x3(self.game) self.metadata['grid'] = "3x3" @@ -213,57 +196,3 @@ class CardSortActivity(activity.Activity): def write_file(self, file_path): pass -# -# Project toolbar for pre-0.86 toolbars -# -class ProjectToolbar(gtk.Toolbar): - - def __init__(self, pc): - gtk.Toolbar.__init__(self) - self.activity = pc - - # 2x2 Button - self.activity.grid2x2 = ToolButton( "2x2on" ) - self.activity.grid2x2.set_tooltip(_('2x2')) - self.activity.grid2x2.props.sensitive = True - self.activity.grid2x2.connect('clicked', self.activity._grid2x2_cb) - self.insert(self.activity.grid2x2, -1) - self.activity.grid2x2.show() - - # 3x2 Button - self.activity.grid3x2 = ToolButton( "3x2off" ) - self.activity.grid3x2.set_tooltip(_('3x2')) - self.activity.grid3x2.props.sensitive = True - self.activity.grid3x2.connect('clicked', self.activity._grid3x2_cb) - self.insert(self.activity.grid3x2, -1) - self.activity.grid3x2.show() - - # 2x3 Button - self.activity.grid2x3 = ToolButton( "2x3off" ) - self.activity.grid2x3.set_tooltip(_('2x3')) - self.activity.grid2x3.props.sensitive = True - self.activity.grid2x3.connect('clicked', self.activity._grid2x3_cb) - self.insert(self.activity.grid2x3, -1) - self.activity.grid2x3.show() - - # 3x3 Button - self.activity.grid3x3 = ToolButton( "3x3off" ) - self.activity.grid3x3.set_tooltip(_('3x3')) - self.activity.grid3x3.props.sensitive = True - self.activity.grid3x3.connect('clicked', self.activity._grid3x3_cb) - self.insert(self.activity.grid3x3, -1) - self.activity.grid3x3.show() - - separator = gtk.SeparatorToolItem() - separator.set_draw(True) - self.insert(separator, -1) - separator.show() - - # Label for showing status - self.activity.results_label = gtk.Label(\ - _("click to rotate; drag to swap")) - self.activity.results_label.show() - self.activity.results_toolitem = gtk.ToolItem() - self.activity.results_toolitem.add(self.activity.results_label) - self.insert(self.activity.results_toolitem, -1) - self.activity.results_toolitem.show() diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..5615588 --- /dev/null +++ b/MANIFEST @@ -0,0 +1,39 @@ +cardsort.desktop +window.py +COPYING +cardsort.py +setup.py +CardSortActivity.py +orientation.py +card.py +sprites.py +grid.py +NEWS +icons/3x3off.svg +icons/3x3on.svg +icons/2x2off.svg +icons/2x3on.svg +icons/2x2on.svg +icons/3x2on.svg +icons/2x3off.svg +icons/3x2off.svg +po/CardSort.pot +activity/activity.info +activity/activity-cardsort.svg +images/card0.svg +images/mask1v.svg +images/card2.svg +images/card4.svg +images/card8.svg +images/mask0v.svg +images/mask0h.svg +images/card5.svg +images/card7.svg +images/mask3h.svg +images/mask3v.svg +images/card1.svg +images/mask2h.svg +images/card6.svg +images/card3.svg +images/mask2v.svg +images/mask1h.svg @@ -1,3 +1,8 @@ +7 +2012! +ENHANCEMENTS: +* Ignacio Rodriguez port to gtk 3 + 6 * convert to Cairo graphics diff --git a/activity/activity.info b/activity/activity.info index 3dc1547..418fcd0 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Card Sort -activity_version = 6 +activity_version = 7 license = GPLv3 bundle_id = org.sugarlabs.CardSortActivity exec = sugar-activity CardSortActivity.CardSortActivity @@ -1,5 +1,6 @@ -#Copyright (c) 2009-11 Walter Bender - +# -*- coding: utf-8 -*- +# Copyright (c) 2009-11 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 @@ -8,17 +9,15 @@ # You should have received a copy of the GNU General Public 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, Gdk, GObject, GdkPixbuf import pygtk pygtk.require('2.0') -import gtk -import gobject import os.path from sprites import Sprite def load_image(file, 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 for defining individual cards diff --git a/cardsort.py b/cardsort.py index fa4f68f..3add8cd 100755..100644 --- a/cardsort.py +++ b/cardsort.py @@ -1,7 +1,7 @@ #!/usr/bin/env python - -#Copyright (c) 2009-11 Walter Bender - +# -*- coding: utf-8 -*- +# Copyright (c) 2009-11 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 @@ -10,10 +10,9 @@ # You should have received a copy of the GNU General Public 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 Gdk, Gtk, GdkPixbuf, GObject import pygtk pygtk.require('2.0') -import gtk from gettext import gettext as _ import os.path @@ -27,27 +26,27 @@ class CardSortMain: self.r = 0 self.tw = None # create a new window - self.win = gtk.Window(gtk.WINDOW_TOPLEVEL) + self.win = Gtk.Window(Gdk.WindowType.TOPLEVEL) self.win.maximize() self.win.set_title(_("CardSort") + ": " + _("click to rotate; drag to swap")) self.win.connect("delete_event", lambda w,e: gtk.main_quit()) - menu = gtk.Menu() + menu = Gtk.Menu() - menu_items = gtk.MenuItem(_("2x2")) + menu_items = Gtk.MenuItem(_("2x2")) menu.append(menu_items) menu_items.connect("activate", self._grid2x2_cb) menu_items.show() - menu_items = gtk.MenuItem(_("2x3")) + menu_items = Gtk.MenuItem(_("2x3")) menu.append(menu_items) menu_items.connect("activate", self._grid2x3_cb) menu_items.show() - menu_items = gtk.MenuItem(_("3x2")) + menu_items = Gtk.MenuItem(_("3x2")) menu.append(menu_items) menu_items.connect("activate", self._grid3x2_cb) menu_items.show() - menu_items = gtk.MenuItem(_("3x3")) + menu_items = Gtk.MenuItem(_("3x3")) menu.append(menu_items) menu_items.connect("activate", self._grid3x3_cb) menu_items.show() @@ -59,21 +58,21 @@ class CardSortMain: menu_items.show() """ - root_menu = gtk.MenuItem("Tools") + root_menu = Gtk.MenuItem("Tools") root_menu.show() root_menu.set_submenu(menu) # A vbox to put a menu and the canvas in: - vbox = gtk.VBox(False, 0) + vbox = Gtk.VBox(False, 0) self.win.add(vbox) vbox.show() - menu_bar = gtk.MenuBar() + menu_bar = Gtk.MenuBar() vbox.pack_start(menu_bar, False, False, 2) menu_bar.show() - canvas = gtk.DrawingArea() - vbox.pack_end(canvas, True, True) + canvas = Gtk.DrawingArea() + vbox.pack_end(canvas, True, True, 3) canvas.show() menu_bar.append(root_menu) @@ -164,7 +163,7 @@ class Permutation: self._sofar.pop() def main(): - gtk.main() + Gtk.main() return 0 if __name__ == "__main__": diff --git a/dist/CardSort-1.tar.bz2 b/dist/CardSort-1.tar.bz2 Binary files differdeleted file mode 100644 index c17a69e..0000000 --- a/dist/CardSort-1.tar.bz2 +++ /dev/null diff --git a/dist/CardSort-1.xo b/dist/CardSort-1.xo Binary files differdeleted file mode 100644 index b482f18..0000000 --- a/dist/CardSort-1.xo +++ /dev/null @@ -1,5 +1,6 @@ -#Copyright (c) 2009-11 Walter Bender - +# -*- coding: utf-8 -*- +# Copyright (c) 2009-11 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 @@ -11,8 +12,7 @@ import pygtk pygtk.require('2.0') -import gtk -import gobject +from gi.repository import Gtk, Gdk, GObject import os.path from random import uniform diff --git a/orientation.py b/orientation.py index f50e86f..dc6113e 100644 --- a/orientation.py +++ b/orientation.py @@ -1,5 +1,6 @@ -#Copyright (c) 2009-11 Walter Bender - +# -*- coding: utf-8 -*- +# Copyright (c) 2009-11 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 @@ -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) @@ -1,5 +1,6 @@ -#Copyright (c) 2009-11 Walter Bender - +# -*- coding: utf-8 -*- +# Copyright (c) 2009-11 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 @@ -8,17 +9,13 @@ # You should have received a copy of the GNU General Public 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, Gdk import pygtk pygtk.require('2.0') -import gtk 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 @@ -47,14 +44,13 @@ 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.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.8 * self.height / (self.card_dim * 3) @@ -139,10 +135,8 @@ class Game(): # # Repaint # - 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 ''' @@ -158,4 +152,4 @@ class Game(): # callbacks # def _destroy_cb(self, win, event): - gtk.main_quit() + Gtk.main_quit() |