From 86cf791555969678988c4f1ce416c1f9d233a403 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Fri, 24 May 2013 23:37:23 +0000 Subject: merge with v15 (gtk3); new translations --- diff --git a/FractionBounceActivity.py b/FractionBounceActivity.py index db2b7e6..54ff4b2 100644 --- a/FractionBounceActivity.py +++ b/FractionBounceActivity.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- #Copyright (c) 2011, Walter Bender, Paulina Clares, Chris Rowe +# Ported to GTK3 - 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,28 +12,21 @@ # 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 - - -import gtk +from gi.repository import Gdk, GdkPixbuf, GObject, Gtk import os -from sugar.activity import activity -from sugar import profile -try: # 0.86+ toolbar widgets - from sugar.graphics.toolbarbox import ToolbarBox - HAS_TOOLBARBOX = True -except ImportError: - HAS_TOOLBARBOX = False -if HAS_TOOLBARBOX: - from sugar.graphics.toolbarbox import ToolbarButton - from sugar.activity.widgets import ActivityToolbarButton - from sugar.activity.widgets import StopButton +from sugar3.activity import activity +from sugar3 import profile +from sugar3.graphics.toolbarbox import ToolbarBox +from sugar3.graphics.toolbarbox import ToolbarButton +from sugar3.activity.widgets import ActivityToolbarButton +from sugar3.activity.widgets import StopButton import telepathy 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 _ @@ -39,7 +35,8 @@ _logger = logging.getLogger('fractionbounce-activity') from toolbar_utils import image_factory, separator_factory, combo_factory, \ label_factory, radio_factory, button_factory, entry_factory -from utils import json_load, json_dump, chooser + +# from utils import json_load, json_dump, chooser from svg_utils import svg_str_to_pixbuf, generate_xo_svg from bounce import Bounce @@ -63,8 +60,10 @@ class FractionBounceActivity(activity.Activity): else: self.colors = ['#A0FFA0', '#FF8080'] - self.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK) + ''' + self.add_events(Gdk.EventMask.VISIBILITY_NOTIFY_MASK) self.connect('visibility-notify-event', self.__visibility_notify_cb) + ''' self.max_participants = 4 # sharing @@ -91,39 +90,30 @@ class FractionBounceActivity(activity.Activity): def _setup_toolbars(self): ''' Add buttons to toolbars ''' - custom_toolbar = gtk.Toolbar() - if HAS_TOOLBARBOX: - toolbox = ToolbarBox() - self.toolbar = toolbox.toolbar - activity_button = ActivityToolbarButton(self) - self.toolbar.insert(activity_button, 0) - activity_button.show() - - custom_toolbar_button = ToolbarButton( - label=_('Custom'), - page=custom_toolbar, - icon_name='view-source') - custom_toolbar.show() - self.toolbar.insert(custom_toolbar_button, -1) - custom_toolbar_button.show() - - self._load_standard_buttons(self.toolbar) - separator_factory(self.toolbar, expand=True, visible=False) - - stop_button = StopButton(self) - stop_button.props.accelerator = _('Q') - self.toolbar.insert(stop_button, -1) - stop_button.show() - - self.set_toolbox(toolbox) - toolbox.show() - else: - toolbox = activity.ActivityToolbox(self) - self.set_toolbox(toolbox) - self.toolbar = gtk.Toolbar() - toolbox.add_toolbar(_('Project'), self.toolbar) - toolbox.add_toolbar(_('Custom'), custom_toolbar) - self._load_standard_buttons(self.toolbar) + custom_toolbar = Gtk.Toolbar() + toolbox = ToolbarBox() + self.toolbar = toolbox.toolbar + activity_button = ActivityToolbarButton(self) + self.toolbar.insert(activity_button, 0) + activity_button.show() + + custom_toolbar_button = ToolbarButton( + label=_('Custom'), + page=custom_toolbar, + icon_name='view-source') + custom_toolbar.show() + self.toolbar.insert(custom_toolbar_button, -1) + custom_toolbar_button.show() + + self._load_standard_buttons(self.toolbar) + separator_factory(self.toolbar, expand=True, visible=False) + + stop_button = StopButton(self) + stop_button.props.accelerator = _('Q') + self.toolbar.insert(stop_button, -1) + stop_button.show() + self.set_toolbar_box(toolbox) + toolbox.show() self._load_custom_buttons(custom_toolbar) @@ -146,7 +136,8 @@ class FractionBounceActivity(activity.Activity): colors=['#282828', '#000000'])), toolbar, tooltip=self.nick) separator_factory(toolbar, expand=False, visible=True) - self.challenge = label_factory(toolbar, _("Click the ball to start.")) + self.challenge = label_factory(toolbar, _("Click the ball to start."), + width=400) # FIXME: default not working def _load_custom_buttons(self, toolbar): ''' Entry fields and buttons for adding custom fractions ''' @@ -167,9 +158,9 @@ class FractionBounceActivity(activity.Activity): def _setup_canvas(self): ''' 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() @@ -252,18 +243,6 @@ class FractionBounceActivity(activity.Activity): # _logger.debug('%s', str(event.state)) return - ''' - # Awaiting resolution of #2570 - if event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED: - _logger.debug('pause it') - self.bounce_window.pause() - elif event.state in \ - [gtk.gdk.VISIBILITY_UNOBSCURED, gtk.gdk.VISIBILITY_PARTIAL]: - if not self.bounce_window.paused: - _logger.debug('unpause it') - self.challenge.set_label(_('Click the ball to continue')) - ''' - # Collaboration-related methods def _setup_presence_service(self): diff --git a/NEWS b/NEWS index 5e57369..0160371 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,13 @@ -15 +17 ENHANCEMENT: * New translations +15 + +ENHANCEMENT: +* Ignacio Rodríguez port to gtk3 + 14 ENHANCEMENT: diff --git a/activity/activity.info b/activity/activity.info index b768521..583a8b5 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,10 +1,9 @@ [Activity] name = FractionBounce -activity_version = 15 +activity_version = 17 license = GPLv3 bundle_id = org.sugarlabs.FractionBounceActivity exec = sugar-activity FractionBounceActivity.FractionBounceActivity icon = activity-fractionbounce show_launcher = yes -summary = interactive fraction game - +summary = interactive fraction game \ No newline at end of file diff --git a/ball.py b/ball.py index 7750468..b17dbfa 100644 --- a/ball.py +++ b/ball.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- #Copyright (c) 2011, Walter Bender, Paulina Clares, Chris Rowe +# Ported to GTK3 - 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,8 +13,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 +from gi.repository import Gtk, Gdk, GObject from math import pi from sprites import Sprite @@ -117,7 +119,7 @@ class Ball(): _logger.debug('Image file not found.') return try: - self.ball.set_shape(gtk.gdk.pixbuf_new_from_file_at_size( + self.ball.set_shape(GdkPixbuf.Pixbuf.new_from_file_at_size( filename, SIZE, SIZE)) except: _logger.debug('Could not load image from %s.', filename) diff --git a/bounce.py b/bounce.py index 6d428bf..d12c75a 100644 --- a/bounce.py +++ b/bounce.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- #Copyright (c) 2011, Walter Bender, Paulina Clares, Chris Rowe +# Ported to GTK3 - 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 @@ -46,11 +48,11 @@ ACCELEROMETER_DEVICE = '/sys/devices/platform/lis3lv02d/position' CRASH = 'crash.ogg' # wrong answer sound LAUGH = 'bottle.ogg' # correct answer sound BUBBLES = 'bubbles.ogg' # Easter Egg sound +from gi.repository import Gtk, Gdk, GdkPixbuf, GObject -import gtk from random import uniform import os -import gobject + from svg_utils import svg_header, svg_footer, svg_rect, svg_str_to_pixbuf, \ svg_from_file @@ -65,7 +67,7 @@ import logging _logger = logging.getLogger('fractionbounce-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 @@ -96,21 +98,20 @@ class Bounce(): else: self.accelerometer = False - 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.add_events(gtk.gdk.POINTER_MOTION_MASK) - self.canvas.add_events(gtk.gdk.KEY_PRESS_MASK) - self.canvas.add_events(gtk.gdk.KEY_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.add_events(Gdk.EventMask.POINTER_MOTION_MASK) + self.canvas.add_events(Gdk.EventMask.KEY_PRESS_MASK) + self.canvas.add_events(Gdk.EventMask.KEY_RELEASE_MASK) + self.canvas.connect('draw', self.__draw_cb) self.canvas.connect('button-press-event', self._button_press_cb) self.canvas.connect('button-release-event', self._button_release_cb) self.canvas.connect('key_press_event', self._keypress_cb) self.canvas.connect('key_release_event', self._keyrelease_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.sprites = Sprites(self.canvas) - self.scale = gtk.gdk.screen_height() / 900.0 + self.scale = Gdk.Screen.height() / 900.0 self.timeout = None self.buddies = [] # used for sharing @@ -119,7 +120,7 @@ class Bounce(): self.easter_egg = int(uniform(1, 100)) - # Find paths to sound files + # Find paths to sound files self.path_to_success = os.path.join(path, LAUGH) self.path_to_failure = os.path.join(path, CRASH) self.path_to_bubbles = os.path.join(path, BUBBLES) @@ -141,7 +142,7 @@ class Bounce(): self.n = 0 self.dx = 0. # ball horizontal trajectory - # acceleration (with dampening) + # acceleration (with dampening) self.ddy = (6.67 * self.height) / (STEPS * STEPS) self.dy = self.ddy * (1 - STEPS) / 2. # initial step size @@ -176,7 +177,7 @@ class Bounce(): def pause(self): ''' Pause play when visibility changes ''' if self.timeout is not None: - gobject.source_remove(self.timeout) + GObject.source_remove(self.timeout) self.timeout = None def we_are_sharing(self): @@ -186,7 +187,7 @@ class Bounce(): def its_my_turn(self): ''' When sharing, it is your turn... ''' - gobject.timeout_add(1000, self._take_a_turn) + GObject.timeout_add(1000, self._take_a_turn) def _take_a_turn(self): ''' On your turn, choose a fraction. ''' @@ -198,7 +199,7 @@ class Bounce(): def its_their_turn(self, nick): ''' When sharing, it is nick's turn... ''' - gobject.timeout_add(1000, self._wait_your_turn, nick) + GObject.timeout_add(1000, self._wait_your_turn, nick) def _wait_your_turn(self, nick): ''' Wait for nick to choose a fraction. ''' @@ -304,12 +305,12 @@ class Bounce(): if self._easter_egg_test(): self._animate() else: - self.timeout = gobject.timeout_add( + self.timeout = GObject.timeout_add( max(STEP_PAUSE, BOUNCE_PAUSE - self.count * STEP_PAUSE), self._move_ball) else: - self.timeout = gobject.timeout_add(STEP_PAUSE, self._move_ball) + self.timeout = GObject.timeout_add(STEP_PAUSE, self._move_ball) def _animate(self): ''' A little Easter Egg just for fun. ''' @@ -321,7 +322,7 @@ class Bounce(): self.ball.move_frame(self.current_frame, (self.ball.ball_x(), self.ball.ball_y())) self.ball.move_ball((self.ball.ball_x(), self.height)) - gobject.idle_add(play_audio_from_file, self, self.path_to_bubbles) + GObject.idle_add(play_audio_from_file, self, self.path_to_bubbles) if self.accelerometer: fh = open(ACCELEROMETER_DEVICE) @@ -344,9 +345,9 @@ class Bounce(): self.ball.hide_frames() self._test(easter_egg=True) self.new_bounce = True - self.timeout = gobject.timeout_add(BOUNCE_PAUSE, self._move_ball) + self.timeout = GObject.timeout_add(BOUNCE_PAUSE, self._move_ball) else: - gobject.timeout_add(STEP_PAUSE, self._animate) + GObject.timeout_add(STEP_PAUSE, self._animate) def add_fraction(self, string): ''' Add a new challenge; set bar to 2x demominator ''' @@ -419,11 +420,11 @@ class Bounce(): if not easter_egg: spr = Sprite(self.sprites, 0, 0, self.smiley_graphic) self.correct += 1 - gobject.idle_add(play_audio_from_file, self, self.path_to_success) + GObject.idle_add(play_audio_from_file, self, self.path_to_success) else: if not easter_egg: spr = Sprite(self.sprites, 0, 0, self.frown_graphic) - gobject.idle_add(play_audio_from_file, self, self.path_to_failure) + GObject.idle_add(play_audio_from_file, self, self.path_to_failure) if easter_egg: spr = Sprite(self.sprites, 0, 0, self.egg_graphic) @@ -445,7 +446,7 @@ class Bounce(): def _keypress_cb(self, area, event): ''' Keypress: moving the slides with the arrow keys ''' - k = gtk.gdk.keyval_name(event.keyval) + k = Gdk.keyval_name(event.keyval) if k in ['h', 'Left', 'KP_Left']: self.dx = -DX * self.scale elif k in ['l', 'Right', 'KP_Right']: @@ -462,10 +463,8 @@ class Bounce(): self.dx = 0. return True - 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 ''' @@ -474,9 +473,8 @@ class Bounce(): 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 _destroy_cb(self, win, event): ''' Callback to handle quit ''' - gtk.main_quit() + Gtk.main_quit() diff --git a/setup.py b/setup.py index bd1e319..bdeaed6 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from sugar.activity import bundlebuilder +from sugar3.activity import bundlebuilder if __name__ == "__main__": bundlebuilder.start() diff --git a/sprites.py b/sprites.py index baae94f..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]) @@ -160,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 @@ -172,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 @@ -181,54 +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): - 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 - 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 ''' @@ -246,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 @@ -279,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 ''' @@ -300,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 ''' @@ -319,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/svg_utils.py b/svg_utils.py index 2bbc67d..662b5e8 100644 --- a/svg_utils.py +++ b/svg_utils.py @@ -9,9 +9,8 @@ # 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 GdkPixbuf - -import gtk from math import sin, cos, pi @@ -24,7 +23,7 @@ def generate_xo_svg(scale=1.0, colors=["#C0C0C0", "#282828"]): 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/toolbar_utils.py b/toolbar_utils.py index 9b7f6be..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) @@ -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 toolbar buttons''' + '''Factory for making tooplbar buttons''' button = ToolButton(icon_name) if tooltip is not None: button.set_tooltip(tooltip) @@ -83,11 +84,11 @@ def button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None, return button -def radio_factory(button_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 ''' button = RadioToolButton(group=group) - button.set_named_icon(button_name) + button.set_icon_name(name) if callback is not None: if cb_arg is None: button.connect('clicked', callback) @@ -105,35 +106,60 @@ def radio_factory(button_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) - toolbar.insert(toolitem, -1) + 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 = Gtk.SeparatorToolItem() separator.props.draw = visible separator.set_expand(expand) - toolbar.insert(separator, -1) + 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 = 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) - toolbar.insert(img_tool, -1) + 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 diff --git a/utils.py b/utils.py index 148b05e..003642e 100644 --- a/utils.py +++ b/utils.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (c) 2011, Walter Bender +# Ported to gtk 3: 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 @@ -11,51 +13,35 @@ # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA -import gtk +from gi.repository import Gtk from sugar.graphics.objectchooser import ObjectChooser from StringIO import StringIO -try: - USING_JSON_READWRITE = False - import json - json.dumps - from json import load as jload - from json import dump as jdump -except (ImportError, AttributeError): - try: - import simplejson as json - from simplejson import load as jload - from simplejson import dump as jdump - except (ImportError, AttributeError): - USING_JSON_READWRITE = True - +import json +json.dumps +from json import load as jload +from json import dump as jdump def json_load(text): """ Load JSON data using what ever resources are available. """ - if USING_JSON_READWRITE is True: - listdata = json.read(text) - else: - # strip out leading and trailing whitespace, nulls, and newlines - io = StringIO(text) - try: - listdata = jload(io) - except ValueError: - # assume that text is ascii list - listdata = text.split() - for i, value in enumerate(listdata): - listdata[i] = int(value) + # strip out leading and trailing whitespace, nulls, and newlines + io = StringIO(text) + try: + listdata = jload(io) + except ValueError: + # assume that text is ascii list + listdata = text.split() + for i, value in enumerate(listdata): + listdata[i] = int(value) return listdata def json_dump(data): """ Save data using available JSON tools. """ - if USING_JSON_READWRITE is True: - return json.write(data) - else: - _io = StringIO() - jdump(data, _io) - return _io.getvalue() + _io = StringIO() + jdump(data, _io) + return _io.getvalue() def chooser(parent_window, filter, action): @@ -65,11 +51,11 @@ def chooser(parent_window, filter, action): chooser = ObjectChooser(parent=parent_window, what_filter=filter) except TypeError: chooser = ObjectChooser(None, parent_window, - 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: dsobject = chooser.get_selected_object() action(dsobject) dsobject.destroy() -- cgit v0.9.1