From 89b4f57449d44595788b50ab2e7d51fe2b4f1773 Mon Sep 17 00:00:00 2001 From: Pootle daemon Date: Sat, 17 Nov 2012 21:17:49 +0000 Subject: Merge branch 'master' of git.sugarlabs.org:nutrition/nutrition Conflicts: po/Nutrition.pot --- diff --git a/NEWS b/NEWS index 9ff8157..8ed7921 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ NEWS +7 + +ENHACEMENT: +* Ignacio Rodríguez port to GTK3 + 6 ENHANCEMENT: diff --git a/NutritionActivity.py b/NutritionActivity.py index 4127b0c..b412ed1 100644 --- a/NutritionActivity.py +++ b/NutritionActivity.py @@ -1,5 +1,7 @@ -#Copyright (c) 2011,12 Walter Bender - +# -*- coding: utf-8 -*- +# Copyright (c) 2011,12 Walter Bender +# Ported to GTK3: +# 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,19 +11,17 @@ # along with this library; if not, write to the Free Software # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA - -import gtk - -from sugar.activity import activity -from sugar import profile -from sugar.graphics.toolbarbox import ToolbarBox -from sugar.activity.widgets import ActivityToolbarButton -from sugar.graphics.toolbarbox import ToolbarButton -from sugar.activity.widgets import StopButton -from sugar.graphics.alert import NotifyAlert -from sugar.graphics.objectchooser import ObjectChooser -from sugar.datastore import datastore -from sugar import mime +from gi.repository import Gtk, Gdk +from sugar3.activity import activity +from sugar3 import profile +from sugar3.graphics.toolbarbox import ToolbarBox +from sugar3.activity.widgets import ActivityToolbarButton +from sugar3.graphics.toolbarbox import ToolbarButton +from sugar3.activity.widgets import StopButton +from sugar3.graphics.alert import NotifyAlert +from sugar3.graphics.objectchooser import ObjectChooser +from sugar3.datastore import datastore +from sugar3 import mime from gettext import gettext as _ @@ -56,9 +56,9 @@ class NutritionActivity(activity.Activity): self._custom_food_counter = 0 # 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() @@ -147,7 +147,7 @@ class NutritionActivity(activity.Activity): self._label = label_factory(toolbox.toolbar, LABELS[0]) separator_factory(toolbox.toolbar, True, False) - tools_toolbar = gtk.Toolbar() + tools_toolbar = Gtk.Toolbar() tools_toolbar_button = ToolbarButton( page=tools_toolbar, icon_name='view-source') @@ -216,11 +216,11 @@ class NutritionActivity(activity.Activity): except TypeError: chooser = ObjectChooser( None, self, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT) + Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT) if chooser is not None: try: result = chooser.run() - if result == gtk.RESPONSE_ACCEPT: + if result == Gtk.ResponseType.ACCEPT: jobject = chooser.get_selected_object() if jobject and jobject.file_path: name = jobject.metadata['title'] diff --git a/NutritionActivity.pyo b/NutritionActivity.pyo new file mode 100644 index 0000000..0b4a88f --- /dev/null +++ b/NutritionActivity.pyo Binary files differ diff --git a/activity/activity.info b/activity/activity.info index c95a57a..c10b421 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Nutrition -activity_version = 6 +activity_version = 7 license = GPLv3 bundle_id = org.sugarlabs.NutritionActivity exec = sugar-activity NutritionActivity.NutritionActivity diff --git a/food.pyc b/food.pyc new file mode 100644 index 0000000..8705424 --- /dev/null +++ b/food.pyc Binary files differ diff --git a/food.pyo b/food.pyo new file mode 100644 index 0000000..5c03d10 --- /dev/null +++ b/food.pyo Binary files differ diff --git a/game.py b/game.py index c676331..a788e7c 100644 --- a/game.py +++ b/game.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- -#Copyright (c) 2011,12 Walter Bender - +# Copyright (c) 2011,12 Walter Bender +# Ported to GTK3: +# 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,9 +11,7 @@ # along with this library; if not, write to the Free Software # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA - -import gtk -import gobject +from gi.repository import Gtk, Gdk, GObject, GdkPixbuf import cairo import os from random import uniform @@ -23,7 +22,7 @@ import logging _logger = logging.getLogger('nutrition-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 @@ -49,13 +48,12 @@ class Game(): self._parent.show_all() self._path = path - self._canvas.set_flags(gtk.CAN_FOCUS) - self._canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK) - self._canvas.connect("expose-event", self._expose_cb) + self._canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) + self._canvas.connect("draw", self.__draw_cb) self._canvas.connect("button-press-event", self._button_press_cb) - self._width = gtk.gdk.screen_width() - self._height = gtk.gdk.screen_height() + self._width = Gdk.Screen.width() + self._height = Gdk.Screen.height() self._scale = self._width / 1200. self._target = 0 self._tries = 0 @@ -74,14 +72,14 @@ class Game(): # Generate the sprites we'll need... self._sprites = Sprites(self._canvas) self._background = Sprite( - self._sprites, 0, 0, gtk.gdk.pixbuf_new_from_file_at_size( + self._sprites, 0, 0, GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(self._path, 'images','background.png'), self._width, self._height)) self._background.set_layer(0) self._background.type = None self._background.hide() - self.pixbuf = gtk.gdk.pixbuf_new_from_file_at_size( + self.pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(self._path, 'images', 'word-box.png'), int(350 * self._scale), int(100 * self._scale)) @@ -124,7 +122,7 @@ class Game(): self._smile = Sprite(self._sprites, int(self._width / 4), int(self._height / 4), - gtk.gdk.pixbuf_new_from_file_at_size( + GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(self._path, 'images', 'correct.png'), int(self._width / 2), int(self._height / 2))) @@ -134,7 +132,7 @@ class Game(): self._frown = Sprite(self._sprites, int(self._width / 4), int(self._height / 4), - gtk.gdk.pixbuf_new_from_file_at_size( + GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(self._path, 'images', 'wrong.png'), int(self._width / 2), int(self._height / 2))) @@ -168,7 +166,7 @@ class Game(): self._sprites, int(self._width / 2.), int(self._height / 4.), - gtk.gdk.pixbuf_new_from_file_at_size( + GdkPixbuf.Pixbuf.new_from_file_at_size( path, int(self._width / 3.), int(9 * self._width / 12.))) self._picture_cards[i].type = 'picture' self._picture_cards[i].hide() @@ -179,7 +177,7 @@ class Game(): for j in range(6): # up to 6 of each card self._small_picture_cards[i * 6 + j] = Sprite( self._sprites, x, y, - gtk.gdk.pixbuf_new_from_file_at_size( + GdkPixbuf.Pixbuf.new_from_file_at_size( path, int(self._width / 6.), int(3 * self._width / 8.))) @@ -448,9 +446,9 @@ class Game(): # Play again if self._tries == 3: - gobject.timeout_add(2000, self.new_game) + GObject.timeout_add(2000, self.new_game) else: - gobject.timeout_add(1000, self._reset_game) + GObject.timeout_add(1000, self._reset_game) return True def _reset_game(self): @@ -472,8 +470,8 @@ class Game(): w.set_label_color('black') w.set_label(BALANCE[i]) - def _expose_cb(self, win, event): - self.do_expose_event(event) + def __draw_cb(self, canvas, cr): + self._sprites.redraw_sprites(cr=cr) def do_expose_event(self, event): ''' Handle the expose-event by drawing ''' @@ -486,4 +484,4 @@ class Game(): self._sprites.redraw_sprites(cr=cr) def _destroy_cb(self, win, event): - gtk.main_quit() + Gtk.main_quit() diff --git a/game.pyo b/game.pyo new file mode 100644 index 0000000..8d57b6d --- /dev/null +++ b/game.pyo Binary files differ diff --git a/po/en.po b/po/en.po index 36b5db2..ee3238c 100644 --- a/po/en.po +++ b/po/en.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-10 00:34-0400\n" -"PO-Revision-Date: 2012-08-10 07:44+0200\n" +"POT-Creation-Date: 2012-11-06 00:35-0500\n" +"PO-Revision-Date: 2012-11-09 08:54+0200\n" "Last-Translator: Chris \n" "Language-Team: LANGUAGE \n" "Language: en\n" @@ -17,7 +17,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 +#. TRANS: "name" option from activity.info file +#. TRANS: "summary" option from activity.info file +#. TRANS: "description" option from activity.info file msgid "Nutrition" msgstr "Nutrition" @@ -361,27 +363,27 @@ msgstr "carrot" msgid "sapote" msgstr "sapote" -#: game.py:39 +#: game.py:38 msgid "minimum" msgstr "minimum" -#: game.py:39 +#: game.py:38 msgid "moderate" msgstr "moderate" -#: game.py:39 +#: game.py:38 msgid "more" msgstr "more" -#: game.py:39 +#: game.py:38 msgid "most" msgstr "most" -#: game.py:40 +#: game.py:39 msgid "balanced" msgstr "balanced" -#: game.py:40 +#: game.py:39 msgid "unbalanced" msgstr "unbalanced" diff --git a/po/en_GB.po b/po/en_GB.po index 80dc19d..bc4122e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-10 00:34-0400\n" -"PO-Revision-Date: 2012-08-13 07:32+0200\n" +"POT-Creation-Date: 2012-07-30 00:33-0400\n" +"PO-Revision-Date: 2012-07-30 17:01+0200\n" "Last-Translator: Chris \n" "Language-Team: LANGUAGE \n" "Language: en_GB\n" @@ -112,7 +112,7 @@ msgid "vegetables" msgstr "vegetables" #: food.py:12 -msgid "avocado" +msgid "avacado" msgstr "avocado" #: food.py:13 @@ -185,7 +185,7 @@ msgid "sweet pepper" msgstr "sweet pepper" #: food.py:31 -msgid "coconut" +msgid "coco" msgstr "coconut" #: food.py:32 @@ -228,6 +228,10 @@ msgstr "lemon" msgid "flax seed" msgstr "flax seed" +#: food.py:42 +msgid "corn" +msgstr "corn" + #: food.py:43 msgid "mandarin" msgstr "mandarin" @@ -278,7 +282,7 @@ msgid "fish" msgstr "fish" #: food.py:56 -msgid "pineapple" +msgid "pinapple" msgstr "pineapple" #. TRANS: Green pumpkin squash (source of seeds used in Central American) @@ -333,6 +337,10 @@ msgstr "watermelon" msgid "jicaro" msgstr "jicaro" +#: food.py:72 +msgid "tamale" +msgstr "tamale" + #: food.py:73 msgid "tomato" msgstr "tomato" @@ -350,7 +358,7 @@ msgid "yogurt" msgstr "yogurt" #: food.py:77 -msgid "yucca" +msgid "yuca" msgstr "yucca" #: food.py:78 @@ -386,15 +394,6 @@ msgstr "balanced" msgid "unbalanced" msgstr "unbalanced" -#~ msgid "coco" -#~ msgstr "coconut" - -#~ msgid "corn" -#~ msgstr "corn" - -#~ msgid "tamale" -#~ msgstr "tamale" - #~ msgid "How many calories are there?" #~ msgstr "How many calories are there?" diff --git a/po/en_US.po b/po/en_US.po index 4453c85..6f8748f 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-10 00:34-0400\n" -"PO-Revision-Date: 2012-08-13 07:27+0200\n" +"POT-Creation-Date: 2012-11-06 00:35-0500\n" +"PO-Revision-Date: 2012-11-09 18:04+0200\n" "Last-Translator: Chris \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -17,7 +17,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 +#. TRANS: "name" option from activity.info file +#. TRANS: "summary" option from activity.info file +#. TRANS: "description" option from activity.info file msgid "Nutrition" msgstr "Nutrition" @@ -361,27 +363,27 @@ msgstr "carrot" msgid "sapote" msgstr "sapote" -#: game.py:39 +#: game.py:38 msgid "minimum" msgstr "minimum" -#: game.py:39 +#: game.py:38 msgid "moderate" msgstr "moderate" -#: game.py:39 +#: game.py:38 msgid "more" msgstr "more" -#: game.py:39 +#: game.py:38 msgid "most" msgstr "most" -#: game.py:40 +#: game.py:39 msgid "balanced" msgstr "balanced" -#: game.py:40 +#: game.py:39 msgid "unbalanced" msgstr "unbalanced" diff --git a/po/es.po b/po/es.po index eae9aa0..850b008 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-10 00:34-0400\n" +"POT-Creation-Date: 2012-11-06 00:35-0500\n" "PO-Revision-Date: 2012-08-10 09:31+0200\n" "Last-Translator: AlanJAS \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 +#. TRANS: "name" option from activity.info file +#. TRANS: "summary" option from activity.info file +#. TRANS: "description" option from activity.info file msgid "Nutrition" msgstr "Nutrición" @@ -361,27 +363,27 @@ msgstr "zanahoria" msgid "sapote" msgstr "zapote" -#: game.py:39 +#: game.py:38 msgid "minimum" msgstr "mínimo" -#: game.py:39 +#: game.py:38 msgid "moderate" msgstr "moderado" -#: game.py:39 +#: game.py:38 msgid "more" msgstr "más" -#: game.py:39 +#: game.py:38 msgid "most" msgstr "mucho" -#: game.py:40 +#: game.py:39 msgid "balanced" msgstr "balanceado" -#: game.py:40 +#: game.py:39 msgid "unbalanced" msgstr "desbalanceado" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0ff21cf..2e08de8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-10 00:34-0400\n" -"PO-Revision-Date: 2012-08-10 16:36+0200\n" +"POT-Creation-Date: 2012-11-06 00:35-0500\n" +"PO-Revision-Date: 2012-11-11 03:51+0200\n" "Last-Translator: lite \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -17,7 +17,9 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 +#. TRANS: "name" option from activity.info file +#. TRANS: "summary" option from activity.info file +#. TRANS: "description" option from activity.info file msgid "Nutrition" msgstr "营养" @@ -27,11 +29,11 @@ msgstr "把食物和名称配对" #: NutritionActivity.py:40 msgid "What is the food group?" -msgstr "是什么食物组？" +msgstr "食物组是什么？" #: NutritionActivity.py:41 msgid "Which has the most calories?" -msgstr "谁有最多的热量？" +msgstr "哪一个有最多的热量？" #: NutritionActivity.py:42 msgid "How much should you eat?" @@ -121,7 +123,7 @@ msgstr "芹菜" #: food.py:14 msgid "rice" -msgstr "米饭" +msgstr "米" #: food.py:15 msgid "oats" @@ -174,7 +176,7 @@ msgstr "樱桃" #: food.py:28 msgid "pear squash" -msgstr "梨壁球" +msgstr "佛手瓜" #: food.py:29 msgid "chili pepper" @@ -226,11 +228,11 @@ msgstr "柠檬" #: food.py:41 msgid "flax seed" -msgstr "亚麻籽" +msgstr "亚麻种子" #: food.py:43 msgid "mandarin" -msgstr "柑桔" +msgstr "普通话" #: food.py:44 msgid "mango" @@ -284,7 +286,7 @@ msgstr "菠萝" #. TRANS: Green pumpkin squash (source of seeds used in Central American) #: food.py:58 msgid "green pumpkin" -msgstr "绿南瓜" +msgstr "绿色南瓜" #. TRANS: a cactus fruit #: food.py:60 @@ -293,7 +295,7 @@ msgstr "火龙果" #: food.py:61 msgid "plantain" -msgstr "芭蕉" +msgstr "车前草" #: food.py:62 msgid "chicken" @@ -330,7 +332,7 @@ msgstr "西瓜" #. TRANS: A seed used to make horchata (common in Central America) #: food.py:71 msgid "jicaro" -msgstr "蒲瓜" +msgstr "希卡罗" #: food.py:73 msgid "tomato" @@ -359,41 +361,32 @@ msgstr "胡萝卜" #. TRANS: a soft, edible fruit native to Central America #: food.py:80 msgid "sapote" -msgstr "香肉果" +msgstr "美果榄" -#: game.py:39 +#: game.py:38 msgid "minimum" msgstr "最小" -#: game.py:39 +#: game.py:38 msgid "moderate" msgstr "中等" -#: game.py:39 +#: game.py:38 msgid "more" msgstr "更多" -#: game.py:39 +#: game.py:38 msgid "most" msgstr "最多" -#: game.py:40 +#: game.py:39 msgid "balanced" msgstr "平衡" -#: game.py:40 +#: game.py:39 msgid "unbalanced" msgstr "不平衡" -#~ msgid "coco" -#~ msgstr "可可" - -#~ msgid "corn" -#~ msgstr "玉米" - -#~ msgid "tamale" -#~ msgstr "玉米粽子" - #~ msgid "How many calories are there?" #~ msgstr "有多少卡路里？" @@ -403,9 +396,15 @@ msgstr "不平衡" #~ msgid "water" #~ msgstr "水" +#~ msgid "corn" +#~ msgstr "玉米" + #~ msgid "sweetpotato" #~ msgstr "红薯" +#~ msgid "tamale" +#~ msgstr "玉米粽子" + #, python-format #~ msgid "%d calories" #~ msgstr "%d 卡路里" diff --git a/setup.py b/setup.py index e5026ee..1911ac7 100755..100644 --- a/setup.py +++ b/setup.py @@ -1,32 +1,22 @@ #!/usr/bin/env python -import os -import sys -if len(sys.argv) > 1 and '--no-sugar' == sys.argv[1]: - # Remove the argument from the stack so we don't cause problems - # for distutils - sys.argv.pop(1) - - import glob, os.path, string - from distutils.core import setup - - DATA_FILES = [ - ('icons', glob.glob('icons/*')), - ('images', glob.glob('images/*')), - ('/usr/share/applications', ['turtleart.desktop']) - ] +# Copyright (C) 2006, Red Hat, Inc. +# +# Ported to gtk 3: Ignacio Rodriguez +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - setup (name = 'Turtle Art', - description = "A LOGO-like tool for teaching programming", - author = "Walter Bender", - author_email = "walter.bender@gmail.com", - version = '0.9.4', - packages = ['TurtleArt'], - scripts = ['turtleart'], - data_files = DATA_FILES, - ) -else: - from sugar.activity import bundlebuilder +from sugar3.activity import bundlebuilder - if __name__ == "__main__": - bundlebuilder.start() +bundlebuilder.start() diff --git a/sprites.py b/sprites.py index 2b8bb55..8cad6a6 100644 --- a/sprites.py +++ b/sprites.py @@ -24,7 +24,7 @@ ''' sprites.py is a simple sprites library for managing graphics objects, -'sprites', on a gtk.DrawingArea. It manages multiple sprites with +'sprites', on a Gtk.DrawingArea. It manages multiple sprites with methods such as move, hide, set_layer, etc. There are two classes: @@ -68,7 +68,7 @@ Example usage: # method for converting SVG to a gtk pixbuf def svg_str_to_pixbuf(svg_string): - pl = gtk.gdk.PixbufLoader('svg') + pl = GdkPixbuf.PixbufLoader('svg') pl.write(svg_string) pl.close() pixbuf = pl.get_pixbuf() @@ -76,21 +76,20 @@ def svg_str_to_pixbuf(svg_string): ''' -import pygtk -pygtk.require('2.0') -import gtk -import pango -import pangocairo +import gi +from gi.repository import Gtk, GdkPixbuf, Gdk +from gi.repository import Pango, PangoCairo import cairo + class Sprites: ''' A class for the list of sprites and everything they share in common ''' def __init__(self, widget): ''' Initialize an empty array of sprites ''' + self.cr = None self.widget = widget self.list = [] - self.cr = None def set_cairo_context(self, cr): ''' Cairo context may be set or reset after __init__ ''' @@ -98,7 +97,7 @@ class Sprites: def get_sprite(self, i): ''' Return a sprint from the array ''' - if i < 0 or i > len(self.list) - 1: + if i < 0 or i > len(self.list)-1: return(None) else: return(self.list[i]) @@ -125,11 +124,10 @@ class Sprites: if spr in self.list: self.list.remove(spr) - def find_sprite(self, pos, inverse=False): + def find_sprite(self, pos): ''' Search based on (x, y) position. Return the 'top/first' one. ''' list = self.list[:] - if not inverse: - list.reverse() + list.reverse() for spr in list: if spr.hit(pos): return spr @@ -161,11 +159,13 @@ class Sprite: ''' Initialize an individual sprite ''' self._sprites = sprites self.save_xy = (x, y) # remember initial (x, y) position - self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0) + self.rect = [int(x), int(y), 0, 0] self._scale = [12] self._rescale = [True] self._horiz_align = ["center"] self._vert_align = ["middle"] + self._x_pos = [None] + self._y_pos = [None] self._fd = None self._bold = False self._italic = False @@ -173,7 +173,7 @@ class Sprite: self._margins = [0, 0, 0, 0] self.layer = 100 self.labels = [] - self.cached_surfaces = [] + self.images = [] self._dx = [] # image offsets self._dy = [] self.type = None @@ -182,58 +182,47 @@ class Sprite: def set_image(self, image, i=0, dx=0, dy=0): ''' Add an image to the sprite. ''' - while len(self.cached_surfaces) < i + 1: - self.cached_surfaces.append(None) + while len(self.images) < i + 1: + self.images.append(None) self._dx.append(0) self._dy.append(0) + self.images[i] = image self._dx[i] = dx self._dy[i] = dy - if isinstance(image, gtk.gdk.Pixbuf) or \ - isinstance(image, cairo.ImageSurface): - w = image.get_width() - h = image.get_height() + if hasattr(self.images[i], 'get_width'): + w = self.images[i].get_width() + h = self.images[i].get_height() else: - w, h = image.get_size() + w, h = self.images[i].get_size() if i == 0: # Always reset width and height when base image changes. - self.rect.width = w + dx - self.rect.height = h + dy + self.rect[2] = w + dx + self.rect[3] = h + dy else: - if w + dx > self.rect.width: - self.rect.width = w + dx - if h + dy > self.rect.height: - self.rect.height = h + dy - 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 + if w + dx > self.rect[2]: + self.rect[2] = w + dx + if h + dy > self.rect[3]: + self.rect[3] = h + dy def move(self, pos): ''' Move to new (x, y) position ''' self.inval() - self.rect.x, self.rect.y = int(pos[0]), int(pos[1]) + self.rect[0], self.rect[1] = int(pos[0]), int(pos[1]) self.inval() def move_relative(self, pos): ''' Move to new (x+dx, y+dy) position ''' self.inval() - self.rect.x += int(pos[0]) - self.rect.y += int(pos[1]) + self.rect[0] += int(pos[0]) + self.rect[1] += int(pos[1]) self.inval() def get_xy(self): ''' Return current (x, y) position ''' - return (self.rect.x, self.rect.y) + return (self.rect[0], self.rect[1]) def get_dimensions(self): ''' Return current size ''' - return (self.rect.width, self.rect.height) + return (self.rect[2], self.rect[3]) def get_layer(self): ''' Return current layer ''' @@ -251,7 +240,7 @@ class Sprite: if layer is not None: self.layer = layer for i in range(self._sprites.length_of_list()): - if layer < self._sprites.get_sprite(i).layer: + if self.layer < self._sprites.get_sprite(i).layer: self._sprites.insert_in_list(self, i) self.inval() return @@ -284,10 +273,12 @@ class Sprite: self._rescale.append(self._rescale[0]) self._horiz_align.append(self._horiz_align[0]) self._vert_align.append(self._vert_align[0]) + self._x_pos.append(self._x_pos[0]) + self._y_pos.append(self._y_pos[0]) def set_font(self, font): ''' Set the font for a label ''' - self._fd = pango.FontDescription(font) + self._fd = Pango.FontDescription(font) def set_label_color(self, rgb): ''' Set the font color for a label ''' @@ -305,13 +296,15 @@ class Sprite: return def set_label_attributes(self, scale, rescale=True, horiz_align="center", - vert_align="middle", i=0): + vert_align="middle", x_pos=None, y_pos=None, i=0): ''' Set the various label attributes ''' self._extend_labels_array(i) self._scale[i] = scale self._rescale[i] = rescale self._horiz_align[i] = horiz_align self._vert_align[i] = vert_align + self._x_pos[i] = x_pos + self._y_pos[i] = y_pos def hide(self): ''' Hide a sprite ''' @@ -324,136 +317,149 @@ class Sprite: def inval(self): ''' Invalidate a region for gtk ''' - self._sprites.widget.queue_draw_area(self.rect.x, - self.rect.y, - self.rect.width, - self.rect.height) + # self._sprites.window.invalidate_rect(self.rect, False) + self._sprites.widget.queue_draw_area(self.rect[0], + self.rect[1], + self.rect[2], + self.rect[3]) def draw(self, cr=None): ''' Draw the sprite (and label) ''' if cr is None: + cr = self._sprites.cr + if cr is None: print 'sprite.draw: no Cairo context.' return - for i, surface in enumerate(self.cached_surfaces): - cr.set_source_surface(surface, - self.rect.x + self._dx[i], - self.rect.y + self._dy[i]) - cr.rectangle(self.rect.x + self._dx[i], - self.rect.y + self._dy[i], - self.rect.width, - self.rect.height) - cr.fill() + for i, img in enumerate(self.images): + if isinstance(img, GdkPixbuf.Pixbuf): + Gdk.cairo_set_source_pixbuf(cr, img, + self.rect[0] + self._dx[i], + self.rect[1] + self._dy[i]) + cr.rectangle(self.rect[0] + self._dx[i], + self.rect[1] + self._dy[i], + self.rect[2], + self.rect[3]) + cr.fill() + elif type(img) == cairo.ImageSurface: + cr.set_source_surface(img, self.rect[0] + self._dx[i], + self.rect[1] + self._dy[i]) + cr.rectangle(self.rect[0] + self._dx[i], + self.rect[1] + self._dy[i], + self.rect[2], + self.rect[3]) + cr.fill() + else: + print 'sprite.draw: source not a pixbuf (%s)' % (type(img)) if len(self.labels) > 0: self.draw_label(cr) def hit(self, pos): ''' Is (x, y) on top of the sprite? ''' x, y = pos - if x < self.rect.x: + if x < self.rect[0]: return False - if x > self.rect.x + self.rect.width: + if x > self.rect[0] + self.rect[2]: return False - if y < self.rect.y: + if y < self.rect[1]: return False - if y > self.rect.y + self.rect.height: + if y > self.rect[1] + self.rect[3]: return False return True def draw_label(self, cr): ''' Draw the label based on its attributes ''' - # Create a pangocairo context - cr = pangocairo.CairoContext(cr) - my_width = self.rect.width - self._margins[0] - self._margins[2] + my_width = self.rect[2] - self._margins[0] - self._margins[2] if my_width < 0: my_width = 0 - my_height = self.rect.height - self._margins[1] - self._margins[3] + my_height = self.rect[3] - self._margins[1] - self._margins[3] for i in range(len(self.labels)): - pl = cr.create_layout() - pl.set_text(str(self.labels[i])) - self._fd.set_size(int(self._scale[i] * pango.SCALE)) + pl = PangoCairo.create_layout(cr) + pl.set_text(str(self.labels[i]), -1) + self._fd.set_size(int(self._scale[i] * Pango.SCALE)) pl.set_font_description(self._fd) - w = pl.get_size()[0] / pango.SCALE + w = pl.get_size()[0] / Pango.SCALE if w > my_width: if self._rescale[i]: self._fd.set_size( - int(self._scale[i] * pango.SCALE * my_width / w)) + int(self._scale[i] * Pango.SCALE * my_width / w)) pl.set_font_description(self._fd) - w = pl.get_size()[0] / pango.SCALE + w = pl.get_size()[0] / Pango.SCALE else: j = len(self.labels[i]) - 1 while(w > my_width and j > 0): pl.set_text( - "…" + self.labels[i][len(self.labels[i]) - j:]) - self._fd.set_size(int(self._scale[i] * pango.SCALE)) + "…" + self.labels[i][len(self.labels[i]) - j:], -1) + self._fd.set_size(int(self._scale[i] * Pango.SCALE)) pl.set_font_description(self._fd) - w = pl.get_size()[0] / pango.SCALE + w = pl.get_size()[0] / Pango.SCALE j -= 1 - if self._horiz_align[i] == "center": - x = int(self.rect.x + self._margins[0] + (my_width - w) / 2) + if self._x_pos[i] is not None: + x = int(self.rect[0] + self._x_pos[i]) + elif self._horiz_align[i] == "center": + x = int(self.rect[0] + self._margins[0] + (my_width - w) / 2) elif self._horiz_align[i] == 'left': - x = int(self.rect.x + self._margins[0]) + x = int(self.rect[0] + self._margins[0]) else: # right - x = int(self.rect.x + self.rect.width - w - self._margins[2]) - h = pl.get_size()[1] / pango.SCALE - if self._vert_align[i] == "middle": - y = int(self.rect.y + self._margins[1] + (my_height - h) / 2) + x = int(self.rect[0] + self.rect[2] - w - self._margins[2]) + h = pl.get_size()[1] / Pango.SCALE + if self._y_pos[i] is not None: + y = int(self.rect[1] + self._y_pos[i]) + elif self._vert_align[i] == "middle": + y = int(self.rect[1] + self._margins[1] + (my_height - h) / 2) elif self._vert_align[i] == "top": - y = int(self.rect.y + self._margins[1]) + y = int(self.rect[1] + self._margins[1]) else: # bottom - y = int(self.rect.y + self.rect.height - h - self._margins[3]) + y = int(self.rect[1] + self.rect[3] - h - self._margins[3]) cr.save() cr.translate(x, y) cr.set_source_rgb(self._color[0], self._color[1], self._color[2]) - cr.update_layout(pl) - cr.show_layout(pl) + PangoCairo.update_layout(cr, pl) + PangoCairo.show_layout(cr, pl) cr.restore() - def label_width(self): + def label_width(self, cr=None): ''' Calculate the width of a label ''' - cr = pangocairo.CairoContext(self._sprites.cr) - if cr is not None: - max = 0 - for i in range(len(self.labels)): - pl = cr.create_layout() - pl.set_text(self.labels[i]) - self._fd.set_size(int(self._scale[i] * pango.SCALE)) - pl.set_font_description(self._fd) - w = pl.get_size()[0] / pango.SCALE - if w > max: - max = w - return max - else: - return self.rect.width + if cr is None: + cr = self._sprites.cr + max = 0 + for i in range(len(self.labels)): + pl = PangoCairo.create_layout(cr) + pl.set_text(str(self.labels[i]), -1) + self._fd.set_size(int(self._scale[i] * Pango.SCALE)) + pl.set_font_description(self._fd) + w = pl.get_size()[0] / Pango.SCALE + if w > max: + max = w + return max def label_safe_width(self): ''' Return maximum width for a label ''' - return self.rect.width - self._margins[0] - self._margins[2] + return self.rect[2] - self._margins[0] - self._margins[2] def label_safe_height(self): ''' Return maximum height for a label ''' - return self.rect.height - self._margins[1] - self._margins[3] + return self.rect[3] - self._margins[1] - self._margins[3] def label_left_top(self): ''' Return the upper-left corner of the label safe zone ''' return(self._margins[0], self._margins[1]) def get_pixel(self, pos, i=0): - ''' Return the pixel at (x, y) ''' - x = int(pos[0] - self.rect.x) - y = int(pos[1] - self.rect.y) - if x < 0 or x > (self.rect.width - 1) or \ - y < 0 or y > (self.rect.height - 1): + ''' Return the pixl at (x, y) ''' + x, y = pos + x = x - self.rect[0] + y = y - self.rect[1] + if y > self.images[i].get_height() - 1: + return(-1, -1, -1, -1) + 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) - - # create a new 1x1 cairo surface - cs = cairo.ImageSurface(cairo.FORMAT_RGB24, 1, 1); - cr = cairo.Context(cs) - cr.set_source_surface(self.cached_surfaces[i], -x, -y) - cr.rectangle(0,0,1,1) - cr.set_operator(cairo.OPERATOR_SOURCE) - cr.fill() - cs.flush() # ensure all writing is done - # Read the pixel - pixels = cs.get_data() - return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0) - diff --git a/sprites.pyc b/sprites.pyc new file mode 100644 index 0000000..dde1dd9 --- /dev/null +++ b/sprites.pyc Binary files differ diff --git a/sprites.pyo b/sprites.pyo new file mode 100644 index 0000000..30bf5b0 --- /dev/null +++ b/sprites.pyo Binary files differ diff --git a/toolbar_utils.py b/toolbar_utils.py index 94e6883..72f7100 100644 --- a/toolbar_utils.py +++ b/toolbar_utils.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (c) 2011, Walter Bender - +# Port To GTK3: +# Ignacio Rodriguez # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or @@ -11,12 +12,12 @@ # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA -import gtk +from gi.repository import Gtk -from sugar.graphics.radiotoolbutton import RadioToolButton -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.combobox import ComboBox -from sugar.graphics.toolcombobox import ToolComboBox +from sugar3.graphics.radiotoolbutton import RadioToolButton +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics.combobox import ComboBox +from sugar3.graphics.toolcombobox import ToolComboBox def combo_factory(combo_array, toolbar, callback, cb_arg=None, @@ -32,7 +33,7 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None, for i, selection in enumerate(combo_array): combo.append_item(i, selection, None) combo.show() - toolitem = gtk.ToolItem() + toolitem = Gtk.ToolItem() toolitem.add(combo) if hasattr(toolbar, 'insert'): # the main toolbar toolbar.insert(toolitem, -1) @@ -46,13 +47,13 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None, def entry_factory(default_string, toolbar, tooltip=None, max=3): ''' Factory for adding a text box to a toolbar ''' - entry = gtk.Entry() + entry = Gtk.Entry() entry.set_text(default_string) if tooltip is not None and hasattr(entry, 'set_tooltip_text'): entry.set_tooltip_text(tooltip) entry.set_width_chars(max) entry.show() - toolitem = gtk.ToolItem() + toolitem = Gtk.ToolItem() toolitem.add(entry) if hasattr(toolbar, 'insert'): # the main toolbar toolbar.insert(toolitem, -1) @@ -87,7 +88,7 @@ def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None, group=None): ''' Add a radio button to a toolbar ''' button = RadioToolButton(group=group) - button.set_named_icon(name) + button.set_icon_name(name) if callback is not None: if cb_arg is None: button.connect('clicked', callback) @@ -105,12 +106,12 @@ def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None, def label_factory(toolbar, label_text, width=None): ''' Factory for adding a label to a toolbar ''' - label = gtk.Label(label_text) + label = Gtk.Label(label_text) label.set_line_wrap(True) if width is not None: label.set_size_request(width, -1) # doesn't work on XOs label.show() - toolitem = gtk.ToolItem() + toolitem = Gtk.ToolItem() toolitem.add(label) if hasattr(toolbar, 'insert'): # the main toolbar toolbar.insert(toolitem, -1) @@ -122,7 +123,7 @@ def label_factory(toolbar, label_text, width=None): def separator_factory(toolbar, expand=False, visible=True): ''' add a separator to a toolbar ''' - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() separator.props.draw = visible separator.set_expand(expand) if hasattr(toolbar, 'insert'): # the main toolbar @@ -134,9 +135,9 @@ def separator_factory(toolbar, expand=False, visible=True): def image_factory(image, toolbar, tooltip=None): ''' Add an image to the toolbar ''' - img = gtk.Image() + img = Gtk.Image() img.set_from_pixbuf(image) - img_tool = gtk.ToolItem() + img_tool = Gtk.ToolItem() img_tool.add(img) if tooltip is not None: img.set_tooltip_text(tooltip) @@ -149,12 +150,12 @@ def image_factory(image, toolbar, tooltip=None): def spin_factory(default, min, max, callback, toolbar): - spin_adj = gtk.Adjustment(default, min, max, 1, 32, 0) - spin = gtk.SpinButton(spin_adj, 0, 0) + spin_adj = Gtk.Adjustment(default, min, max, 1, 32, 0) + spin = Gtk.SpinButton(spin_adj, 0, 0) spin_id = spin.connect('value-changed', callback) spin.set_numeric(True) spin.show() - toolitem = gtk.ToolItem() + toolitem = Gtk.ToolItem() toolitem.add(spin) if hasattr(toolbar, 'insert'): # the main toolbar toolbar.insert(toolitem, -1) diff --git a/toolbar_utils.pyo b/toolbar_utils.pyo new file mode 100644 index 0000000..6807f76 --- /dev/null +++ b/toolbar_utils.pyo Binary files differ -- cgit v0.9.1