diff options
author | Ignacio Rodríguez <ignaciorodriguez@sugarlabs.org> | 2012-10-15 21:22:16 (GMT) |
---|---|---|
committer | Ignacio Rodríguez <ignaciorodriguez@sugarlabs.org> | 2012-10-15 21:22:16 (GMT) |
commit | f48d25483584a6df1df5bf540e9291376fe2c360 (patch) | |
tree | 31fb1706b8b8a466947941c27e1aea2b8815d6f3 | |
parent | c311d7153e24832aac3b85489ccedaddc93b2e5a (diff) |
Port finish!
-rw-r--r-- | RecallActivity.py | 31 | ||||
-rw-r--r-- | game.py | 74 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/org.sugarlabs.RecallActivity.mo | bin | 0 -> 1277 bytes | |||
-rw-r--r-- | locale/es/activity.linfo | 2 | ||||
-rw-r--r-- | po/Recall.pot | 26 | ||||
-rw-r--r-- | po/cs.po | 57 | ||||
-rw-r--r-- | po/da.po | 60 | ||||
-rw-r--r-- | po/en.po | 60 | ||||
-rw-r--r-- | po/en_GB.po | 60 | ||||
-rw-r--r-- | po/en_US.po | 60 | ||||
-rw-r--r-- | po/es.po | 60 | ||||
-rw-r--r-- | po/hy.po | 57 | ||||
-rw-r--r-- | po/nl.po | 57 | ||||
-rw-r--r-- | po/pl.po | 47 | ||||
-rw-r--r-- | po/zh_CN.po | 56 | ||||
-rw-r--r--[-rwxr-xr-x] | setup.py | 0 | ||||
-rw-r--r-- | sprites.py | 467 | ||||
-rw-r--r-- | toolbar_utils.py | 171 |
18 files changed, 663 insertions, 682 deletions
diff --git a/RecallActivity.py b/RecallActivity.py index 53825ae..abc6fd0 100644 --- a/RecallActivity.py +++ b/RecallActivity.py @@ -1,4 +1,6 @@ +#-*- coding: utf-8 -*- #Copyright (c) 2012 Walter Bender +# Ported to GTK3: Ignacio Rodríguez <ignaciorodriguez@sugarlabs.org> # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -10,19 +12,19 @@ # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA -import gtk +from gi.repository import Gtk, Gdk -from sugar.activity import activity -from sugar import profile -try: - from sugar.graphics.toolbarbox import ToolbarBox +from sugar3.activity import activity +from sugar3 import profile +try: # Everything True (Siempre Veradero) + from sugar3.graphics.toolbarbox import ToolbarBox _have_toolbox = True except ImportError: _have_toolbox = False if _have_toolbox: - from sugar.activity.widgets import ActivityToolbarButton - from sugar.activity.widgets import StopButton + from sugar3.activity.widgets import ActivityToolbarButton + from sugar3.activity.widgets import StopButton from toolbar_utils import button_factory, radio_factory, label_factory, \ separator_factory @@ -32,8 +34,8 @@ import telepathy import dbus from dbus.service import signal from dbus.gobject_service import ExportedGObject -from sugar.presence import presenceservice -from sugar.presence.tubeconn import TubeConnection +from sugar3.presence import presenceservice +from sugar3.presence.tubeconn import TubeConnection from gettext import gettext as _ @@ -70,15 +72,14 @@ class RecallActivity(activity.Activity): self._setup_dispatch_table() # Create a canvas - canvas = gtk.DrawingArea() - canvas.set_size_request(gtk.gdk.screen_width(), \ - gtk.gdk.screen_height()) + canvas = Gtk.DrawingArea() + canvas.set_size_request(Gdk.Screen.width(), \ + Gdk.Screen.height()) self.set_canvas(canvas) canvas.show() self.show_all() - self._game = Game(canvas, parent=self, path=self.path, - colors=self.colors) + self._game = Game(canvas, parent=self, path=self.path,colors=self.colors) self._setup_presence_service() if 'dotlist' in self.metadata: @@ -106,7 +107,7 @@ class RecallActivity(activity.Activity): else: # Use pre-0.86 toolbar design - games_toolbar = gtk.Toolbar() + games_toolbar = Gtk.Toolbar() toolbox = activity.ActivityToolbox(self) self.set_toolbox(toolbox) toolbox.add_toolbar(_('Game'), games_toolbar) @@ -17,13 +17,11 @@ Three different games: (2) recall the image shown previously ''' -import gtk -import gobject +from gi.repository import Gtk, GObject, Gdk, GdkPixbuf import cairo import os import glob from random import uniform - from gettext import gettext as _ from gettext import ngettext @@ -31,7 +29,7 @@ import logging _logger = logging.getLogger('search-activity') try: - from sugar.graphics import style + from sugar3.graphics import style GRID_CELL_SIZE = style.GRID_CELL_SIZE except ImportError: GRID_CELL_SIZE = 0 @@ -54,14 +52,12 @@ class Game(): self._colors = ['#FFFFFF'] self._colors.append(colors[0]) self._colors.append(colors[1]) + self._canvas.connect("draw", self.__draw_cb) + self._canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) + self._canvas.connect("button-press-event", self._button_press_cb) - self._canvas.set_flags(gtk.CAN_FOCUS) - self._canvas.connect("expose-event", self._expose_cb) - self._canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK) - self._canvas.connect("button-press-event", self._button_press_cb) - - self._width = gtk.gdk.screen_width() - self._height = gtk.gdk.screen_height() - (GRID_CELL_SIZE * 1.5) + self._width = Gdk.Screen.width() + self._height = Gdk.Screen.height() - (GRID_CELL_SIZE * 1.5) self._scale = self._height / (4 * DOT_SIZE * 1.2) self._dot_size = int(DOT_SIZE * self._scale) self._space = int(self._dot_size / 5.) @@ -112,11 +108,15 @@ class Game(): self._opts[-1].type = -1 # No image self._opts[-1].set_label_attributes(72) self._opts[-1].hide() - + def __draw_cb(self, canvas, cr): + self._sprites.redraw_sprites(cr=cr) + def __expose_cb(self, win, event): + self.do_expose_event(event) + return True def _all_clear(self): ''' Things to reinitialize when starting up a new game. ''' if self._timeout_id is not None: - gobject.source_remove(self._timeout_id) + GObject.source_remove(self._timeout_id) # Auto advance levels if self._correct > 3 and self._level < len(self._dots): @@ -154,7 +154,7 @@ class Game(): self._colors[int(uniform(0, 3))])) self._dance_counter += 1 if self._dance_counter < 10: - self._timeout_id = gobject.timeout_add(500, self._dance_step) + self._timeout_id = GObject.timeout_add(500, self._dance_step) else: self._new_game() @@ -202,7 +202,7 @@ class Game(): def _load_image_from_list(self): if self._recall_counter == len(self._recall_list): - self._timeout_id = gobject.timeout_add( + self._timeout_id = GObject.timeout_add( 1000, self._ask_the_question) return for dot in self._dots: @@ -211,7 +211,7 @@ class Game(): dot.set_layer(100) dot.set_label('') self._recall_counter += 1 - self._timeout_id = gobject.timeout_add( + self._timeout_id = GObject.timeout_add( 1000, self._load_image_from_list) def _find_repeat(self): @@ -257,7 +257,7 @@ class Game(): self._parent.send_new_game() if self._game in [0, 1, 3]: - self._timeout_id = gobject.timeout_add( + self._timeout_id = GObject.timeout_add( 3000, self._ask_the_question) def _ask_the_question(self): @@ -379,7 +379,7 @@ class Game(): win.grab_focus() x, y = map(int, event.get_coords()) - spr = self._sprites.find_sprite((x, y), inverse=True) + spr = self._sprites.find_sprite((x, y)) if spr == None: return @@ -418,9 +418,9 @@ class Game(): dot.set_layer(100) if self._correct == 0: - self._timeout_id = gobject.timeout_add(5000, self.new_game) + self._timeout_id = GObject.timeout_add(5000, self.new_game) else: - self._timeout_id = gobject.timeout_add(3000, self.new_game) + self._timeout_id = GObject.timeout_add(3000, self.new_game) return True def remote_button_press(self, dot, color): @@ -432,36 +432,29 @@ class Game(): def set_sharing(self, share=True): _logger.debug('enabling sharing') self.we_are_sharing = share - - def _expose_cb(self, win, event): - self.do_expose_event(event) - - def do_expose_event(self, event): - ''' Handle the expose-event by drawing ''' - # Restrict Cairo to the exposed area - cr = self._canvas.window.cairo_create() - cr.rectangle(event.area.x, event.area.y, - event.area.width, event.area.height) - cr.clip() - # Refresh sprite list - self._sprites.redraw_sprites(cr=cr) + def do_expose_event(self, event): + cr = self._canvas.window.cairo_create() + cr.rectangle(event.area.x, event.area.y,event.area.width, event.area.height) + cr.clip() + if cr is not None: + self._sprites.redraw_sprites(cr=cr) def _destroy_cb(self, win, event): - gtk.main_quit() + Gtk.main_quit() def _new_dot_surface(self, color='#000000', image=None, color_image=None): ''' generate a dot of a color color ''' - self._dot_cache = {} + self._dot_cache = {} if color_image is not None: if color_image + 10000 in self._dot_cache: return self._dot_cache[color_image + 10000] - pixbuf = gtk.gdk.pixbuf_new_from_file_at_size( + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(self._path, self._CPATHS[color_image]), self._svg_width, self._svg_height) elif image is not None: if image in self._dot_cache: return self._dot_cache[image] - pixbuf = gtk.gdk.pixbuf_new_from_file_at_size( + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(self._path, self._PATHS[image]), self._svg_width, self._svg_height) else: @@ -481,8 +474,8 @@ class Game(): surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, self._svg_width, self._svg_height) context = cairo.Context(surface) - context = gtk.gdk.CairoContext(context) - context.set_source_pixbuf(pixbuf, 0, 0) + #context = gtk.gdk.CairoContext(context) + Gdk.cairo_set_source_pixbuf(context,pixbuf,0,0) context.rectangle(0, 0, self._svg_width, self._svg_height) context.fill() if color_image is not None: @@ -493,6 +486,7 @@ class Game(): self._dot_cache[color] = surface return surface + def _line(self, vertical=True): ''' Generate a center line ''' if vertical: @@ -539,7 +533,7 @@ class Game(): def svg_str_to_pixbuf(svg_string): """ Load pixbuf from SVG string """ - pl = gtk.gdk.PixbufLoader('svg') + pl = GdkPixbuf.PixbufLoader.new_with_type('svg') pl.write(svg_string) pl.close() pixbuf = pl.get_pixbuf() diff --git a/locale/es/LC_MESSAGES/org.sugarlabs.RecallActivity.mo b/locale/es/LC_MESSAGES/org.sugarlabs.RecallActivity.mo Binary files differnew file mode 100644 index 0000000..f10622f --- /dev/null +++ b/locale/es/LC_MESSAGES/org.sugarlabs.RecallActivity.mo diff --git a/locale/es/activity.linfo b/locale/es/activity.linfo new file mode 100644 index 0000000..25439c8 --- /dev/null +++ b/locale/es/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Recordar diff --git a/po/Recall.pot b/po/Recall.pot index 15a1ebe..06e144e 100644 --- a/po/Recall.pot +++ b/po/Recall.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-11 11:55-0400\n" +"POT-Creation-Date: 2012-05-12 17:28-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -22,25 +22,37 @@ msgstr "" msgid "Recall" msgstr "" -#: game.py:253 +#: game.py:275 msgid "Recall which image was repeated." msgstr "" -#: game.py:274 +#: game.py:296 game.py:314 msgid "Recall which image was not shown." msgstr "" -#: game.py:293 +#: game.py:333 #, python-format msgid "Recall which image was displayed %d time ago" msgid_plural "Recall which image was displayed %d times ago" msgstr[0] "" msgstr[1] "" -#: RecallActivity.py:110 +#: RecallActivity.py:112 msgid "Game" msgstr "" -#: RecallActivity.py:117 -msgid "Load new images." +#: RecallActivity.py:120 +msgid "Play attention game (repeated symbol)." +msgstr "" + +#: RecallActivity.py:124 +msgid "Play attention game (missing symbol)." +msgstr "" + +#: RecallActivity.py:128 +msgid "Play n-back game." +msgstr "" + +#: RecallActivity.py:132 +msgid "Play attention game (color symbols)." msgstr "" diff --git a/po/cs.po b/po/cs.po deleted file mode 100644 index 657598b..0000000 --- a/po/cs.po +++ /dev/null @@ -1,57 +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: 2012-06-28 17:55-0400\n" -"PO-Revision-Date: 2012-06-29 11:36+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 "Recall" -msgstr "Vzpomeň si" - -#: RecallActivity.py:112 -msgid "Game" -msgstr "Hra" - -#: RecallActivity.py:120 -msgid "Play attention game (repeated symbol)." -msgstr "Zahrajte si hru na pozornost (opakované symboly)." - -#: RecallActivity.py:124 -msgid "Play attention game (missing symbol)." -msgstr "Zahrajte si hru na pozornost (chějící symboly)." - -#: RecallActivity.py:128 -msgid "Play n-back game." -msgstr "" - -#: RecallActivity.py:132 -msgid "Play attention game (color symbols)." -msgstr "Hrát hru na pozornost (barevné symboly)." - -#: game.py:275 -msgid "Recall which image was repeated." -msgstr "Vzpomeňte si, který obraz se opakoval." - -#: game.py:296 game.py:314 -msgid "Recall which image was not shown." -msgstr "Vzpomeňte si, který obraz se nezobrazil." - -#: game.py:333 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "" -msgstr[1] "" diff --git a/po/da.po b/po/da.po deleted file mode 100644 index 4da3e49..0000000 --- a/po/da.po +++ /dev/null @@ -1,60 +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: 2012-05-27 00:34-0400\n" -"PO-Revision-Date: 2012-06-08 04:36+0200\n" -"Last-Translator: Aputsiaq Niels <aj@isit.gl>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: da\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 "Recall" -msgstr "Genkald" - -#: RecallActivity.py:112 -msgid "Game" -msgstr "Spil" - -#: RecallActivity.py:120 -msgid "Play attention game (repeated symbol)." -msgstr "Spil opmærksomheds-spillet (gentagelse af symbol)." - -#: RecallActivity.py:124 -msgid "Play attention game (missing symbol)." -msgstr "Spil opmærksomheds-spillet (manglende symbol)" - -#: RecallActivity.py:128 -msgid "Play n-back game." -msgstr "Spil spillet n-back." - -#: RecallActivity.py:132 -msgid "Play attention game (color symbols)." -msgstr "Spil opmærksomheds-spillet (farve-symboler)." - -#: game.py:275 -msgid "Recall which image was repeated." -msgstr "Genkald hvilket billede som blev gentaget." - -#: game.py:296 game.py:314 -msgid "Recall which image was not shown." -msgstr "Genkald hvilket billede som ikke blev vist." - -#: game.py:333 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "Genkald hvilket billede som blev vist for %d gang siden" -msgstr[1] "Genkald hvilket billede som blev vist for %d gange siden" - -#~ msgid "Load new images." -#~ msgstr "Indlæs nye billeder." diff --git a/po/en.po b/po/en.po deleted file mode 100644 index 138db56..0000000 --- a/po/en.po +++ /dev/null @@ -1,60 +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: 2012-06-28 17:55-0400\n" -"PO-Revision-Date: 2012-06-02 02:23+0200\n" -"Last-Translator: Chris <cjl@laptop.org>\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 "Recall" -msgstr "Recall" - -#: RecallActivity.py:112 -msgid "Game" -msgstr "Game" - -#: RecallActivity.py:120 -msgid "Play attention game (repeated symbol)." -msgstr "Play attention game (repeated symbol)." - -#: RecallActivity.py:124 -msgid "Play attention game (missing symbol)." -msgstr "Play attention game (missing symbol)." - -#: RecallActivity.py:128 -msgid "Play n-back game." -msgstr "Play n-back game." - -#: RecallActivity.py:132 -msgid "Play attention game (color symbols)." -msgstr "Play attention game (color symbols)." - -#: game.py:275 -msgid "Recall which image was repeated." -msgstr "Recall which image was repeated." - -#: game.py:296 game.py:314 -msgid "Recall which image was not shown." -msgstr "Recall which image was not shown." - -#: game.py:333 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "Recall which image was displayed %d time ago" -msgstr[1] "Recall which image was displayed %d times ago" - -#~ msgid "Load new images." -#~ msgstr "Load new images." diff --git a/po/en_GB.po b/po/en_GB.po deleted file mode 100644 index d68d12c..0000000 --- a/po/en_GB.po +++ /dev/null @@ -1,60 +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: 2012-06-28 17:55-0400\n" -"PO-Revision-Date: 2012-06-02 02:23+0200\n" -"Last-Translator: Chris <cjl@laptop.org>\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 "Recall" -msgstr "Recall" - -#: RecallActivity.py:112 -msgid "Game" -msgstr "Game" - -#: RecallActivity.py:120 -msgid "Play attention game (repeated symbol)." -msgstr "Play attention game (repeated symbol)." - -#: RecallActivity.py:124 -msgid "Play attention game (missing symbol)." -msgstr "Play attention game (missing symbol)." - -#: RecallActivity.py:128 -msgid "Play n-back game." -msgstr "Play n-back game." - -#: RecallActivity.py:132 -msgid "Play attention game (color symbols)." -msgstr "Play attention game (colour symbols)." - -#: game.py:275 -msgid "Recall which image was repeated." -msgstr "Recall which image was repeated." - -#: game.py:296 game.py:314 -msgid "Recall which image was not shown." -msgstr "Recall which image was not shown." - -#: game.py:333 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "Recall which image was displayed %d time ago" -msgstr[1] "Recall which image was displayed %d times ago" - -#~ msgid "Load new images." -#~ msgstr "Load new images." diff --git a/po/en_US.po b/po/en_US.po deleted file mode 100644 index 138db56..0000000 --- a/po/en_US.po +++ /dev/null @@ -1,60 +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: 2012-06-28 17:55-0400\n" -"PO-Revision-Date: 2012-06-02 02:23+0200\n" -"Last-Translator: Chris <cjl@laptop.org>\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 "Recall" -msgstr "Recall" - -#: RecallActivity.py:112 -msgid "Game" -msgstr "Game" - -#: RecallActivity.py:120 -msgid "Play attention game (repeated symbol)." -msgstr "Play attention game (repeated symbol)." - -#: RecallActivity.py:124 -msgid "Play attention game (missing symbol)." -msgstr "Play attention game (missing symbol)." - -#: RecallActivity.py:128 -msgid "Play n-back game." -msgstr "Play n-back game." - -#: RecallActivity.py:132 -msgid "Play attention game (color symbols)." -msgstr "Play attention game (color symbols)." - -#: game.py:275 -msgid "Recall which image was repeated." -msgstr "Recall which image was repeated." - -#: game.py:296 game.py:314 -msgid "Recall which image was not shown." -msgstr "Recall which image was not shown." - -#: game.py:333 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "Recall which image was displayed %d time ago" -msgstr[1] "Recall which image was displayed %d times ago" - -#~ msgid "Load new images." -#~ msgstr "Load new images." diff --git a/po/es.po b/po/es.po deleted file mode 100644 index 89bdffd..0000000 --- a/po/es.po +++ /dev/null @@ -1,60 +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: 2012-06-28 17:55-0400\n" -"PO-Revision-Date: 2012-06-05 10:01+0200\n" -"Last-Translator: AlanJAS <alanjas@hotmail.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 "Recall" -msgstr "Recordar" - -#: RecallActivity.py:112 -msgid "Game" -msgstr "Juego" - -#: RecallActivity.py:120 -msgid "Play attention game (repeated symbol)." -msgstr "Juego de atención (símbolo repetido)." - -#: RecallActivity.py:124 -msgid "Play attention game (missing symbol)." -msgstr "Juego de atención (símbolo perdido)." - -#: RecallActivity.py:128 -msgid "Play n-back game." -msgstr "Juego n-back." - -#: RecallActivity.py:132 -msgid "Play attention game (color symbols)." -msgstr "Juego de atención (color del símbolo)." - -#: game.py:275 -msgid "Recall which image was repeated." -msgstr "Recuerda cual imagen estaba repetida." - -#: game.py:296 game.py:314 -msgid "Recall which image was not shown." -msgstr "Recuerda cual imagen no fue mostrada." - -#: game.py:333 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "Recuerda cual imagen fue mostrada %d turno antes" -msgstr[1] "Recuerda cuales imágenes fueron mostradas %d turnos antes" - -#~ msgid "Load new images." -#~ msgstr "Cargar nuevas imágenes." diff --git a/po/hy.po b/po/hy.po deleted file mode 100644 index f5548de..0000000 --- a/po/hy.po +++ /dev/null @@ -1,57 +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: 2012-06-28 17:55-0400\n" -"PO-Revision-Date: 2012-08-03 17:14+0200\n" -"Last-Translator: anush.mkrtchyan <anush.mkrtchyan@ca1492.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: hy\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 "Recall" -msgstr "Մտաբերել" - -#: RecallActivity.py:112 -msgid "Game" -msgstr "Խաղ" - -#: RecallActivity.py:120 -msgid "Play attention game (repeated symbol)." -msgstr "Խաղալ ուշադրության խաղը (կրկվող նշաններ)" - -#: RecallActivity.py:124 -msgid "Play attention game (missing symbol)." -msgstr "Խաղալ ուշադրության խաղը (բացակայող նշաններ)" - -#: RecallActivity.py:128 -msgid "Play n-back game." -msgstr "Խաղալ n-ետ խաղ" - -#: RecallActivity.py:132 -msgid "Play attention game (color symbols)." -msgstr "Խաղալ ուշադրության խաղը (գունային նշաններ)" - -#: game.py:275 -msgid "Recall which image was repeated." -msgstr "Մտաբերել, թե որ պատկերն էր կրկնված" - -#: game.py:296 game.py:314 -msgid "Recall which image was not shown." -msgstr "Մտաբերել, թե որ պատկերն էր բացակայում" - -#: game.py:333 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "Մտաբերել, թե որ պատկերն էր ցուցադրված %d ժամանակ առաջ" -msgstr[1] "Մտաբերել, թե որ պատկերն էր ցուցադրված %d ժամանակ առաջ" diff --git a/po/nl.po b/po/nl.po deleted file mode 100644 index c2fff59..0000000 --- a/po/nl.po +++ /dev/null @@ -1,57 +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: 2012-06-28 17:55-0400\n" -"PO-Revision-Date: 2012-08-21 10:29+0200\n" -"Last-Translator: whe <heppew@yahoo.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: nl\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 "Recall" -msgstr "Haal terug" - -#: RecallActivity.py:112 -msgid "Game" -msgstr "Spel" - -#: RecallActivity.py:120 -msgid "Play attention game (repeated symbol)." -msgstr "Speel aandachtspel (herhalend symbool)." - -#: RecallActivity.py:124 -msgid "Play attention game (missing symbol)." -msgstr "Speel aandachtspel (missend symbool)." - -#: RecallActivity.py:128 -msgid "Play n-back game." -msgstr "Speel n-terug spel." - -#: RecallActivity.py:132 -msgid "Play attention game (color symbols)." -msgstr "Speel aandachtspel (kleursymbolen)." - -#: game.py:275 -msgid "Recall which image was repeated." -msgstr "Onthoud welke afbeelding herhaald was." - -#: game.py:296 game.py:314 -msgid "Recall which image was not shown." -msgstr "Onthoud welke afbeelding niet getoond was." - -#: game.py:333 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "Onthoud welke afbeelding getoons was %d keer geleden" -msgstr[1] "Onthoud welke afbeelding getoons was %d keren geleden" diff --git a/po/pl.po b/po/pl.po deleted file mode 100644 index cea755c..0000000 --- a/po/pl.po +++ /dev/null @@ -1,47 +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: 2012-05-11 11:55-0400\n" -"PO-Revision-Date: 2012-05-28 15:41+0200\n" -"Last-Translator: Marcin <ulinski.marcin@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pl\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 "Recall" -msgstr "Przypomnij sobie" - -#: game.py:253 -msgid "Recall which image was repeated." -msgstr "Przypomnij sobie, który obrazek został powtórzony." - -#: game.py:274 -msgid "Recall which image was not shown." -msgstr "Przypomnij sobie, który obrazek nie został pokazany." - -#: game.py:293 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "Przypomnij sobie, który obrazek został pokazany %d czas temu." -msgstr[1] "Przypomnij sobie, który obrazek został pokazany %d czasy temu." -msgstr[2] "Przypomnij sobie, który obrazek został pokazany %d czasów temu." - -#: RecallActivity.py:110 -msgid "Game" -msgstr "Gra" - -#: RecallActivity.py:117 -msgid "Load new images." -msgstr "Załaduj nowe obrazki." diff --git a/po/zh_CN.po b/po/zh_CN.po deleted file mode 100644 index 9d695c5..0000000 --- a/po/zh_CN.po +++ /dev/null @@ -1,56 +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: 2012-06-28 17:55-0400\n" -"PO-Revision-Date: 2012-07-01 03:21+0200\n" -"Last-Translator: lite <litekok@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Recall" -msgstr "回想" - -#: RecallActivity.py:112 -msgid "Game" -msgstr "游戏" - -#: RecallActivity.py:120 -msgid "Play attention game (repeated symbol)." -msgstr "开始注意力游戏(重复符号)。" - -#: RecallActivity.py:124 -msgid "Play attention game (missing symbol)." -msgstr "开始注意力游戏(缺少符号)。" - -#: RecallActivity.py:128 -msgid "Play n-back game." -msgstr "开始 n-回退 游戏。" - -#: RecallActivity.py:132 -msgid "Play attention game (color symbols)." -msgstr "开始注意力游戏(带颜色符号)。" - -#: game.py:275 -msgid "Recall which image was repeated." -msgstr "回想重复的图像。" - -#: game.py:296 game.py:314 -msgid "Recall which image was not shown." -msgstr "回想没显示的图像。" - -#: game.py:333 -#, python-format -msgid "Recall which image was displayed %d time ago" -msgid_plural "Recall which image was displayed %d times ago" -msgstr[0] "回想 %d 次前显示的图像" @@ -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,12 +124,12 @@ 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, inverse=False): - ''' Search based on (x, y) position. Return the 'top/first' one. ''' + # Search based on (x, y) position. Return the 'top/first' one. # list = self.list[:] if not inverse: list.reverse() @@ -136,7 +139,7 @@ class Sprites: 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 @@ -155,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) @@ -181,7 +184,7 @@ 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) @@ -215,38 +218,38 @@ class Sprite: 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 @@ -259,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 @@ -269,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: @@ -286,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', @@ -306,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 @@ -314,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 @@ -347,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 @@ -360,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] @@ -409,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 @@ -426,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 \ @@ -457,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..4b3b046 100644 --- a/toolbar_utils.py +++ b/toolbar_utils.py @@ -10,7 +10,8 @@ # along with this library; if not, write to the Free Software # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA - +''' +# Gtk 2 import gtk from sugar.graphics.radiotoolbutton import RadioToolButton @@ -21,7 +22,7 @@ from sugar.graphics.toolcombobox import ToolComboBox def combo_factory(combo_array, toolbar, callback, cb_arg=None, tooltip=None, default=None): - '''Factory for making a toolbar combo box''' + #Factory for making a toolbar combo box combo = ComboBox() if tooltip is not None and hasattr(combo, 'set_tooltip_text'): combo.set_tooltip_text(tooltip) @@ -45,7 +46,7 @@ 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 ''' + # Factory for adding a text box to a toolbar entry = gtk.Entry() entry.set_text(default_string) if tooltip is not None and hasattr(entry, 'set_tooltip_text'): @@ -64,7 +65,7 @@ def entry_factory(default_string, toolbar, tooltip=None, max=3): def button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None, accelerator=None): - '''Factory for making tooplbar buttons''' + # Factory for making tooplbar buttons button = ToolButton(icon_name) if tooltip is not None: button.set_tooltip(tooltip) @@ -85,9 +86,9 @@ def button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None, def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None, group=None): - ''' Add a radio button to a toolbar ''' + #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) @@ -104,7 +105,7 @@ 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 ''' + #Factory for adding a label to a toolbar label = gtk.Label(label_text) label.set_line_wrap(True) if width is not None: @@ -121,7 +122,7 @@ def label_factory(toolbar, label_text, width=None): def separator_factory(toolbar, expand=False, visible=True): - ''' add a separator to a toolbar ''' + #add a separator to a toolbar separator = gtk.SeparatorToolItem() separator.props.draw = visible separator.set_expand(expand) @@ -133,7 +134,7 @@ def separator_factory(toolbar, expand=False, visible=True): def image_factory(image, toolbar, tooltip=None): - ''' Add an image to the toolbar ''' + # Add an image to the toolbar img = gtk.Image() img.set_from_pixbuf(image) img_tool = gtk.ToolItem() @@ -162,3 +163,155 @@ def spin_factory(default, min, max, callback, toolbar): toolbar.props.page.insert(toolitem, -1) toolitem.show() return spin +''' +from gi.repository import Gtk + +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, + tooltip=None, default=None): + '''Factory for making a toolbar combo box''' + combo = ComboBox() + if tooltip is not None and hasattr(combo, 'set_tooltip_text'): + combo.set_tooltip_text(tooltip) + if cb_arg is not None: + combo.connect('changed', callback, cb_arg) + else: + combo.connect('changed', callback) + for i, selection in enumerate(combo_array): + combo.append_item(i, selection, None) + combo.show() + toolitem = Gtk.ToolItem() + toolitem.add(combo) + if hasattr(toolbar, 'insert'): # the main toolbar + toolbar.insert(toolitem, -1) + else: # or a secondary toolbar + toolbar.props.page.insert(toolitem, -1) + toolitem.show() + if default is not None: + combo.set_active(combo_array.index(default)) + return combo + + +def entry_factory(default_string, toolbar, tooltip=None, max=3): + ''' Factory for adding a text box to a toolbar ''' + 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.add(entry) + if hasattr(toolbar, 'insert'): # the main toolbar + toolbar.insert(toolitem, -1) + else: # or a secondary toolbar + toolbar.props.page.insert(toolitem, -1) + toolitem.show() + return entry + + +def button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None, + accelerator=None): + '''Factory for making tooplbar buttons''' + button = ToolButton(icon_name) + if tooltip is not None: + button.set_tooltip(tooltip) + button.props.sensitive = True + if accelerator is not None: + button.props.accelerator = accelerator + if cb_arg is not None: + button.connect('clicked', callback, cb_arg) + else: + button.connect('clicked', callback) + if hasattr(toolbar, 'insert'): # the main toolbar + toolbar.insert(button, -1) + else: # or a secondary toolbar + toolbar.props.page.insert(button, -1) + button.show() + return button + + +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_icon_name(name) + if callback is not None: + if cb_arg is None: + button.connect('clicked', callback) + else: + button.connect('clicked', callback, cb_arg) + if hasattr(toolbar, 'insert'): # Add button to the main toolbar... + toolbar.insert(button, -1) + else: # ...or a secondary toolbar. + toolbar.props.page.insert(button, -1) + button.show() + if tooltip is not None: + button.set_tooltip(tooltip) + return button + + +def label_factory(toolbar, label_text, width=None): + ''' Factory for adding a label to a toolbar ''' + 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.add(label) + if hasattr(toolbar, 'insert'): # the main toolbar + toolbar.insert(toolitem, -1) + else: # or a secondary toolbar + toolbar.props.page.insert(toolitem, -1) + toolitem.show() + return label + + +def separator_factory(toolbar, expand=False, visible=True): + ''' add a separator to a toolbar ''' + separator = Gtk.SeparatorToolItem() + separator.props.draw = visible + separator.set_expand(expand) + if hasattr(toolbar, 'insert'): # the main toolbar + toolbar.insert(separator, -1) + else: # or a secondary toolbar + toolbar.props.page.insert(separator, -1) + separator.show() + + +def image_factory(image, toolbar, tooltip=None): + ''' Add an image to the toolbar ''' + img = Gtk.Image() + img.set_from_pixbuf(image) + img_tool = Gtk.ToolItem() + img_tool.add(img) + if tooltip is not None: + img.set_tooltip_text(tooltip) + if hasattr(toolbar, 'insert'): # the main toolbar + toolbar.insert(img_tool, -1) + else: # or a secondary toolbar + toolbar.props.page.insert(img_tool, -1) + img_tool.show() + return img + + +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_id = spin.connect('value-changed', callback) + spin.set_numeric(True) + spin.show() + toolitem = Gtk.ToolItem() + toolitem.add(spin) + if hasattr(toolbar, 'insert'): # the main toolbar + toolbar.insert(toolitem, -1) + else: + toolbar.props.page.insert(toolitem, -1) + toolitem.show() + return spin |