From 6bd32bf385aa80a2b2053a951b92233644d01b2c Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Sun, 06 Jan 2013 22:48:10 +0000 Subject: gtk3 port --- diff --git a/LetterMatch.py b/LetterMatch.py index 0a1e6c2..08c6278 100644 --- a/LetterMatch.py +++ b/LetterMatch.py @@ -1,5 +1,7 @@ +# -*- coding: utf-8 -*- # Copyright (c) 2012, 2013 Walter Bender # Copyright (c) 2013 Aneesh Dogra +# Copyright (c) 2013 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 @@ -12,19 +14,19 @@ # Boston, MA 02111-1307, USA. -import gtk +from gi.repository import Gtk, Gdk, GdkPixbuf -from sugar.activity import activity -from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton -from sugar.activity.widgets import ActivityToolbarButton -from sugar.activity.widgets import StopButton -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.combobox import ComboBox -from sugar.graphics.toolcombobox import ToolComboBox -from sugar.datastore import datastore -from sugar import profile -from sugar.graphics.objectchooser import ObjectChooser -from sugar import mime +from sugar3.activity import activity +from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton +from sugar3.activity.widgets import ActivityToolbarButton +from sugar3.activity.widgets import StopButton +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics.combobox import ComboBox +from sugar3.graphics.toolcombobox import ToolComboBox +from sugar3.datastore import datastore +from sugar3 import profile +from sugar3.graphics.objectchooser import ObjectChooser +from sugar3 import mime from utils.sprites import Sprites, Sprite from gettext import gettext as _ @@ -89,10 +91,10 @@ class LetterMatch(activity.Activity): str(self.metadata['data_from_journal'])) self._setup_toolbars() - self.canvas = gtk.DrawingArea() - self.canvas.set_size_request(gtk.gdk.screen_width(), - gtk.gdk.screen_height()) - self.canvas.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#000000")) + self.canvas = Gtk.DrawingArea() + self.canvas.set_size_request(Gdk.Screen.width(), + Gdk.Screen.height()) + self.canvas.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse("#000000")) self.canvas.show() self.set_canvas(self.canvas) @@ -103,7 +105,6 @@ class LetterMatch(activity.Activity): parent=self) def _setup_toolbars(self): - ''' Just 0.86+ toolbars ''' self.max_participants = 1 # no sharing toolbox = ToolbarBox() @@ -112,6 +113,9 @@ class LetterMatch(activity.Activity): toolbox.toolbar.insert(activity_button, 0) activity_button.show() + separator = Gtk.SeparatorToolItem() + toolbox.toolbar.insert(separator, -1) + self.set_toolbar_box(toolbox) toolbox.show() primary_toolbar = toolbox.toolbar @@ -143,8 +147,8 @@ class LetterMatch(activity.Activity): self._choose_audio_from_journal_cb, tooltip=_("Import Audio")) - container = gtk.ToolItem() - self.letter_entry = gtk.Entry() + container = Gtk.ToolItem() + self.letter_entry = Gtk.Entry() self.letter_entry.set_max_length(1) self.letter_entry.set_width_chars(3) # because 1 char looks funny self.letter_entry.connect('changed', self._set_letter) @@ -208,7 +212,7 @@ class LetterMatch(activity.Activity): x = int(self._page._grid_x_offset + w + 12) y = int(self._page._grid_y_offset + 40) - pixbuf = gtk.gdk.pixbuf_new_from_file_at_size( + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(self._images_path,'../drawing.png'), w, h) self.status.set_text( _('Please choose image and audio objects from the Journal.')) @@ -256,7 +260,7 @@ class LetterMatch(activity.Activity): self.audio_id = None chooser = ObjectChooser(what_filter=mime.GENERIC_TYPE_AUDIO) result = chooser.run() - if result == gtk.RESPONSE_ACCEPT: + if result == Gtk.ResponseType.ACCEPT: jobject = chooser.get_selected_object() self.audio_id = str(jobject._object_id) self.image_button.set_sensitive(True) @@ -282,7 +286,7 @@ class LetterMatch(activity.Activity): self.image_id = None chooser = ObjectChooser(what_filter=mime.GENERIC_TYPE_IMAGE) result = chooser.run() - if result == gtk.RESPONSE_ACCEPT: + if result == Gtk.ResponseType.ACCEPT: jobject = chooser.get_selected_object() self.image_id = str(jobject._object_id) @@ -291,7 +295,7 @@ class LetterMatch(activity.Activity): w = self._page._card_width h = self._page._card_height - pixbuf = gtk.gdk.pixbuf_new_from_file_at_size( + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( jobject.get_file_path(), w, h) self.preview_image.set_image(pixbuf) self.preview_image.move((x, y)) diff --git a/NEWS b/NEWS index 7535309..d40323e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +5 + +* GTK3 port by Ignacio Rodríguez + 3 * Add customization toolbar (Aneesh Dogra) diff --git a/activity/activity.info b/activity/activity.info index 6c777a3..ecbb41f 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Letter Match -activity_version = 3 +activity_version = 5 license = GPLv3 bundle_id = org.sugarlabs.LetterMatch exec = sugar-activity LetterMatch.LetterMatch diff --git a/page.py b/page.py index 040f967..9cfd71b 100644 --- a/page.py +++ b/page.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 Walter Bender +# Copyright (c) 2012 Walter Bender # Copyright (c) 2013 Aneesh Dogra +# Copyright (c) 2013 Ignacio Rodríguez # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or @@ -11,25 +12,22 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -import gtk -import gobject + +from gi.repository import Gtk, Gdk, GObject, GdkPixbuf import os import codecs from random import uniform, choice from gettext import gettext as _ -from sugar.datastore import datastore +from sugar3.datastore import datastore from utils.play_audio import play_audio_from_file import logging _logger = logging.getLogger('lettermatch-activity') -try: - from sugar.graphics import style - GRID_CELL_SIZE = style.GRID_CELL_SIZE -except ImportError: - GRID_CELL_SIZE = 0 +from sugar3.graphics import style +GRID_CELL_SIZE = style.GRID_CELL_SIZE from genpieces import generate_card from utils.sprites import Sprites, Sprite @@ -66,18 +64,17 @@ class Page(): self._canvas = canvas self._activity.show_all() - self._canvas.set_flags(gtk.CAN_FOCUS) - self._canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK) - self._canvas.add_events(gtk.gdk.BUTTON_RELEASE_MASK) - self._canvas.connect("expose-event", self._expose_cb) + self._canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) + self._canvas.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK) + self._canvas.connect("draw", self.__draw_cb) self.button_release_event_id = \ self._canvas.connect("button-release-event", self._button_release_cb) self.button_press_event_id = \ self._canvas.connect("button-press-event", self._button_press_cb) self._canvas.connect("key_press_event", self._keypress_cb) - self._width = gtk.gdk.screen_width() - self._height = gtk.gdk.screen_height() + self._width = Gdk.Screen.width() + self._height = Gdk.Screen.height() self._card_height = int((self._height - GRID_CELL_SIZE) / YDIM) \ - GUTTER * 2 self._card_width = int(self._card_height * 4 / 3.) @@ -106,7 +103,7 @@ class Page(): def new_page(self): ''' Load a page of cards ''' if self.timeout is not None: - gobject.source_remove(self.timeout) + GObject.source_remove(self.timeout) self._hide_cards() self.new_target() x = self._grid_x_offset + self._card_width + GUTTER * 3 @@ -173,7 +170,7 @@ class Page(): h2 = 1.0 - h1 bot.composite(top, 0, int(h1 * top.get_height()), top.get_width(), int(h2 * top.get_height()), - 0, 0, 1, 1, gtk.gdk.INTERP_NEAREST, 255) + 0, 0, 1, 1, GdkPixbuf.InterpType.NEAREST, 255) self._cards.append(Sprite(self._sprites, 0, 0, top)) else: stroke = self._test_for_stroke() @@ -207,8 +204,8 @@ class Page(): self.answers[i] = self.target if self.timeout is not None: - gobject.source_remove(self.timeout) - self.timeout = gobject.timeout_add(1000, self._play_target_sound) + GObject.source_remove(self.timeout) + self.timeout = GObject.timeout_add(1000, self._play_target_sound) def _bad_answer(self, i): ''' Make sure answer is unique ''' @@ -275,18 +272,29 @@ class Page(): if self.current_card == self.target: self._activity.status.set_text(_('Very good!')) + self._play(True) if self.timeout is not None: - gobject.source_remove(self.timeout) - self.timeout = gobject.timeout_add(1000, self.new_page) + GObject.source_remove(self.timeout) + self.timeout = GObject.timeout_add(1000, self.new_page) else: self._activity.status.set_text(_('Please try again.')) + self._play(False) self._play_target_sound() - + + def _play(self, great): + if great: + play_audio_from_file(os.getcwd() + '/sounds/great.ogg') + else: + play_audio_from_file(os.getcwd() + '/sounds/bad.ogg') + def _keypress_cb(self, area, event): ''' No keyboard shortcuts at the moment. Perhaps jump to the page associated with the key pressed? ''' return True - + + def __draw_cb(self, canvas, cr): + self._sprites.redraw_sprites(cr=cr) + def _expose_cb(self, win, event): ''' Callback to handle window expose events ''' self.do_expose_event(event) @@ -308,12 +316,16 @@ class Page(): def _destroy_cb(self, win, event): ''' Make a clean exit. ''' - gtk.main_quit() + Gtk.main_quit() def invalt(self, x, y, w, h): ''' Mark a region for refresh ''' - self._canvas.window.invalidate_rect( - gtk.gdk.Rectangle(int(x), int(y), int(w), int(h)), False) + rectangle = Gdk.Rectangle() + rectangle.x = x + rectangle.y = y + rectangle.width = w + rectangle.height = h + self._canvas.window.invalidate_rect(rectangle) def load_level(self, path): ''' Load a level (CSV) from path: letter, word, color, image, @@ -371,14 +383,14 @@ class Page(): def svg_str_to_pixbuf(svg_string): ''' Load pixbuf from SVG string. ''' - pl = gtk.gdk.PixbufLoader('svg') + pl = GdkPixbuf.PixbufLoader.new_with_type('svg') + if type(svg_string) == unicode: + svg_string = svg_string.encode('ascii', 'replace') pl.write(svg_string) pl.close() - pixbuf = pl.get_pixbuf() - return pixbuf + return pl.get_pixbuf() def image_file_to_pixbuf(file_path, w, h): ''' Load pixbuf from file ''' - return gtk.gdk.pixbuf_new_from_file_at_size(file_path, int(w), int(h)) - + return GdkPixbuf.Pixbuf.new_from_file_at_size(file_path, int(w), int(h)) diff --git a/setup.py b/setup.py index e5026ee..c17ead5 100755 --- a/setup.py +++ b/setup.py @@ -1,32 +1,4 @@ #!/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']) - ] - - 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 - - if __name__ == "__main__": - bundlebuilder.start() +from sugar3.activity import bundlebuilder +if __name__ == "__main__": + bundlebuilder.start() diff --git a/utils/sprites.py b/utils/sprites.py index 844e171..e94da09 100644 --- a/utils/sprites.py +++ b/utils/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,12 +76,9 @@ def svg_str_to_pixbuf(svg_string): ''' -import pygtk -pygtk.require('2.0') -import gtk -import pango -import pangocairo -import cairo +import gi +from gi.repository import Gtk, GdkPixbuf, Gdk +from gi.repository import Pango, PangoCairo class Sprites: @@ -91,7 +88,6 @@ class 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__ ''' @@ -99,7 +95,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]) @@ -121,22 +117,17 @@ class Sprites: else: self.list.insert(i, spr) - def find_in_list(self, spr): - if spr in self.list: - return True - return False - 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, region=False): + 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, readpixel=not region): + if spr.hit(pos): return spr return None @@ -151,7 +142,7 @@ class Sprites: print 'sprites.redraw_sprites: no Cairo context' return for spr in self.list: - if area is None: + if area == None: spr.draw(cr=cr) else: intersection = spr.rect.intersect(area) @@ -166,7 +157,7 @@ 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"] @@ -180,7 +171,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 @@ -189,58 +180,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 isinstance(self.images[i], GdkPixbuf.Pixbuf): + 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 ''' @@ -296,7 +276,7 @@ class Sprite: 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 ''' @@ -335,149 +315,141 @@ 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() + else: + print 'sprite.draw: source not a pixbuf (%s)' % (type(img)) if len(self.labels) > 0: self.draw_label(cr) - def hit(self, pos, readpixel=False): + 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 - if readpixel: - r, g, b, a = self.get_pixel(pos) - if r == g == b == a == 0: - return False - if a == -1: - return False - return self._sprites.find_in_list(self) + 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)): - if hasattr(self, 'pl'): # Reuse the pango layout - pl = self.pl - else: - self.pl = cr.create_layout() - pl = self.pl - 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._x_pos[i] is not None: - x = int(self.rect.x + self._x_pos[i]) + x = int(self.rect[0] + self._x_pos[i]) elif self._horiz_align[i] == "center": - x = int(self.rect.x + self._margins[0] + (my_width - w) / 2) + 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]) - else: # right - x = int(self.rect.x + self.rect.width - w - self._margins[2]) - h = pl.get_size()[1] / pango.SCALE + 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.y + self._y_pos[i]) + y = int(self.rect[1] + self._y_pos[i]) elif self._vert_align[i] == "middle": - y = int(self.rect.y + self._margins[1] + (my_height - h) / 2) + 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]) - else: # bottom - y = int(self.rect.y + self.rect.height - h - self._margins[3]) - + 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]) - 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 the writing is done. - pixels = cs.get_data() # Read the pixel. - return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0) diff --git a/utils/toolbar_utils.py b/utils/toolbar_utils.py index 563147e..c434645 100644 --- a/utils/toolbar_utils.py +++ b/utils/toolbar_utils.py @@ -11,12 +11,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 +32,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 +46,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 +87,7 @@ def radio_factory(button_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(button_name) if callback is not None: if cb_arg is None: button.connect('clicked', callback) @@ -105,12 +105,12 @@ 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=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 +122,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 +134,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 +149,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) -- cgit v0.9.1