From 882c029179c36c848e9f8775bd0d8ce26682c1d4 Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Fri, 28 Aug 2009 21:26:56 +0000 Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:memorize/mainline --- diff --git a/NEWS b/NEWS index 2288bec..2518f06 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +33 + +* Add Speak feature, create speaking tiles +* #1030 Fonts wrap on memorize tiles + 30 * Make activity screen resolution independent diff --git a/activity.py b/activity.py index deb6e17..813b837 100644 --- a/activity.py +++ b/activity.py @@ -15,6 +15,11 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # +import gtk + +# activate threads for gst needs +gtk.gdk.threads_init() + import locale locale.setlocale(locale.LC_NUMERIC, 'C') @@ -26,7 +31,6 @@ from os.path import join, dirname from os import environ import dbus -import gtk import pygtk import pickle import telepathy @@ -46,8 +50,7 @@ import memorizetoolbar import createtoolbar import cardlist import createcardpanel - - +import face SERVICE = 'org.laptop.Memorize' IFACE = SERVICE @@ -90,13 +93,14 @@ class MemorizeActivity(Activity): self.table.connect('card-flipped', self.game.card_flipped) self.table.connect('card-overflipped', self.game.card_overflipped) self.table.connect('card-highlighted', self.game.card_highlighted) - + self.game.connect('set-border', self.table.set_border) self.game.connect('flop-card', self.table.flop_card) self.game.connect('flip-card', self.table.flip_card) + self.game.connect('cement-card', self.table.cement_card) self.game.connect('highlight-card', self.table.highlight_card) self.game.connect('load_mode', self.table.load_msg) - + self.game.connect('msg_buddy', self.scoreboard.set_buddy_message) self.game.connect('add_buddy', self.scoreboard.add_buddy) self.game.connect('rem_buddy', self.scoreboard.rem_buddy) @@ -123,10 +127,14 @@ class MemorizeActivity(Activity): self.connect('focus_out_event', self._focus_out) self.connect('destroy', self._cleanup_cb) + self.add_events(gtk.gdk.POINTER_MOTION_MASK) + self.connect('motion_notify_event', + lambda widget, event: face.look_at()) + # start on the game toolbar, might change this to the create toolbar later self.toolbox.connect('current-toolbar-changed', self.change_mode) self.toolbox.set_current_toolbar(_TOOLBAR_PLAY) - + # Get the Presence Service self.pservice = presenceservice.get_instance() self.initiating = None diff --git a/activity/activity.info b/activity/activity.info index d09de84..ccee90f 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,7 +3,7 @@ name = Memorize bundle_id = org.laptop.Memorize exec = sugar-activity activity.MemorizeActivity icon = activity-memorize -activity_version = 32 +activity_version = 33 show_launcher = yes mime_types = application/x-memorize-project; license = GPLv2+ diff --git a/cardlist.py b/cardlist.py index 55bb2bc..2afe729 100644 --- a/cardlist.py +++ b/cardlist.py @@ -30,6 +30,8 @@ import random from gobject import SIGNAL_RUN_FIRST, TYPE_PYOBJECT from sugar import profile +from sugar.graphics import style +from sugar.graphics.icon import Icon import theme @@ -38,26 +40,26 @@ _logger = logging.getLogger('memorize-activity') class CardList(gtk.EventBox): __gsignals__ = { - 'pair-selected': (SIGNAL_RUN_FIRST, None, 7 * [TYPE_PYOBJECT]), + 'pair-selected': (SIGNAL_RUN_FIRST, None, 9 * [TYPE_PYOBJECT]), 'update-create-toolbar': (SIGNAL_RUN_FIRST, None, 3 * [TYPE_PYOBJECT]), 'update-create-buttons': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), } - + def __init__(self): gtk.EventBox.__init__(self) - self.model = model.Model(environ['SUGAR_ACTIVITY_ROOT']) + self.model = model.Model() self.pairs = [] self.current_pair = None - - self.vbox = gtk.VBox(False) - + + self.vbox = gtk.VBox(False) + fill_box = gtk.Label() fill_box.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('#000000')) fill_box.show() self.vbox.pack_end(fill_box, True, True) scroll = gtk.ScrolledWindow() - scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS) + scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) scroll.add_with_viewport(self.vbox) scroll.set_border_width(0) scroll.get_child().modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('#000000')) @@ -92,7 +94,10 @@ class CardList(gtk.EventBox): else: bsnd = None - self.add_pair(None, game_pairs[key].props.achar, game_pairs[key].props.bchar, aimg, bimg, asnd, bsnd, False) + self.add_pair(None, game_pairs[key].props.achar, + game_pairs[key].props.bchar, aimg, bimg, asnd, bsnd, + game_pairs[key].props.aspeak, game_pairs[key].props.bspeak, + False) def save_game(self, widget, game_name, equal_pairs, grouped): @@ -116,16 +121,24 @@ class CardList(gtk.EventBox): achar = self.pairs[pair].get_text(1) if achar != '': pair_card.set_property('achar', achar) - + # bchar bchar = self.pairs[pair].get_text(2) if bchar != '': pair_card.set_property('bchar', bchar) + # aspeak + aspeak = self.pairs[pair].get_speak(1) + pair_card.set_property('aspeak', aspeak) + + # bspeak + bspeak = self.pairs[pair].get_speak(2) + pair_card.set_property('bspeak', bspeak) + # aimg aimg = self.pairs[pair].get_pixbuf(1) if aimg != None: - + if equal_pairs: aimgfile = 'img'+str(pair)+'.jpg' else: @@ -187,8 +200,9 @@ class CardList(gtk.EventBox): os.rmdir(join(root, name)) os.rmdir(path) - def add_pair(self, widget, achar, bchar, aimg, bimg, asnd, bsnd, show = True): - pair = Pair(achar, bchar, aimg, bimg, asnd, bsnd) + def add_pair(self, widget, achar, bchar, aimg, bimg, asnd, bsnd, + aspeak, bspeak, show = True): + pair = Pair(achar, bchar, aimg, bimg, asnd, bsnd, aspeak, bspeak) self.vbox.pack_end(pair, False, True) self.pairs.append(pair) pair.connect('pair-selected', self.set_selected) @@ -202,7 +216,8 @@ class CardList(gtk.EventBox): self.pairs.remove(widget) del widget self.emit('update-create-buttons', True, True) - self.emit('pair-selected', False, None, None, None, None, None, None) + self.emit('pair-selected', False, None, None, None, None, None, None, + False, False) def set_selected(self, widget, event): if self.current_pair <> None: @@ -213,74 +228,90 @@ class CardList(gtk.EventBox): self.emit('pair-selected', True, self.current_pair.get_text(1), self.current_pair.get_text(2), self.current_pair.get_pixbuf(1), self.current_pair.get_pixbuf(2), - self.current_pair.get_sound(1), self.current_pair.get_sound(2)) - - def update_selected(self, widget, newtext1, newtext2, aimg, bimg, asnd, bsnd): + self.current_pair.get_sound(1), self.current_pair.get_sound(2), + self.current_pair.get_speak(1), self.current_pair.get_speak(2)) + + def update_selected(self, widget, newtext1, newtext2, aimg, bimg, + asnd, bsnd, aspeak, bspeak): self.current_pair.change_text(newtext1, newtext2) self.current_pair.change_pixbuf(aimg, bimg) self.current_pair.change_sound(asnd, bsnd) + self.current_pair.change_speak(aspeak, bspeak) self.emit('update-create-buttons', True, True) class Pair(gtk.EventBox): - + __gsignals__ = { - 'pair-selected': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'pair-closed': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'pair-selected': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'pair-closed': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), } - - def __init__(self, text1, text2 = None, aimg = None, bimg = None, asnd = None, bsnd = None): + + def __init__(self, text1, text2 = None, aimg = None, bimg = None, + asnd = None, bsnd = None, aspeak=None, bspeak=None): gtk.EventBox.__init__(self) self.bg_color = '#000000' - if text2 == None: - self.text2 = text1 - else: - self.text2 = text2 - self.text1 = text1 - + self.asnd = asnd self.bsnd = bsnd - + self.current_game_key = None - - close_button = gtk.Button('X') - close_button.connect('button-press-event', self.emit_close) - table = gtk.Table() - table.connect('button-press-event', self.emit_selected) - table.set_col_spacings(0) - table.set_border_width(10) + + row = gtk.HBox() + row.props.border_width = 10 + row.props.spacing = 10 + self.bcard1 = svgcard.SvgCard(-1, { 'front_text' : { 'card_text' : text1, + 'speak' : aspeak, 'text_color' : '#ffffff' }, 'front' : { 'fill_color' : '#4c4d4f', 'stroke_color' : '#ffffff', 'opacity' : '1' } }, None, theme.PAIR_SIZE, 1, self.bg_color) + self.bcard1.flip() + self.bcard1.set_pixbuf(aimg) + align = gtk.Alignment(.5, .5, 0, 0) + align.add(self.bcard1) + row.pack_start(align) + self.bcard2 = svgcard.SvgCard(-1, { 'front_text' : { 'card_text' : text2, + 'speak' : bspeak, 'text_color' : '#ffffff' }, 'front' : { 'fill_color' : '#4c4d4f', 'stroke_color' : '#ffffff', 'opacity' : '1' } }, None, theme.PAIR_SIZE, 1, self.bg_color) - - self.bcard1.flip() self.bcard2.flip() - self.bcard1.set_pixbuf(aimg) self.bcard2.set_pixbuf(bimg) - - table.attach(self.bcard1, 0, 1, 0, 8) - table.attach(self.bcard2, 1, 2, 0, 8) - table.attach(close_button, 2, 3, 0, 1, gtk.FILL, gtk.FILL) - + align = gtk.Alignment(.5, .5, 0, 0) + align.add(self.bcard2) + row.pack_start(align) + + close_image = Icon( + icon_name='remove', + icon_size=gtk.ICON_SIZE_LARGE_TOOLBAR) + align = gtk.Alignment(.5, .5) + align.add(close_image) + close_button = gtk.ToolButton() + close_button.set_icon_widget(align) + close_button.connect('clicked', self.emit_close) + close_button.set_size_request(style.STANDARD_ICON_SIZE, + style.STANDARD_ICON_SIZE) + align = gtk.Alignment(.5, 0, 0, 0) + align.add(close_button) + row.pack_start(align, False) + + self.connect('button-press-event', self.emit_selected) self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.bg_color)) - self.add(table) + self.add(row) self.show_all() def emit_selected(self, widget, event): self.emit('pair-selected', self) - def emit_close(self, widget, event): + def emit_close(self, widget): self.emit('pair-closed', self) def set_selected(self, status): @@ -304,19 +335,29 @@ class Pair(gtk.EventBox): def change_sound(self, asnd, bsnd): self.asnd = asnd self.bsnd = bsnd - + def get_text(self, card): if card == 1: return self.bcard1.get_text() else: - return self.bcard2.get_text() - + return self.bcard2.get_text() + + def change_speak(self, aspeak, bspeak): + self.bcard1.change_speak(aspeak) + self.bcard2.change_speak(bspeak) + + def get_speak(self, card): + if card == 1: + return self.bcard1.get_speak() + else: + return self.bcard2.get_speak() + def get_pixbuf(self, card): if card == 1: return self.bcard1.get_pixbuf() else: return self.bcard2.get_pixbuf() - + def get_sound(self, card): if card == 1: return self.asnd diff --git a/cardtable.py b/cardtable.py index e66437e..8c34177 100644 --- a/cardtable.py +++ b/cardtable.py @@ -25,14 +25,17 @@ import math import gc from gobject import SIGNAL_RUN_FIRST, TYPE_PYOBJECT +import logging +_logger = logging.getLogger('memorize-activity') + import theme class CardTable(gtk.EventBox): - + __gsignals__ = { - 'card-flipped': (SIGNAL_RUN_FIRST, None, [int, TYPE_PYOBJECT]), - 'card-overflipped': (SIGNAL_RUN_FIRST, None, [int]), - 'card-highlighted': (SIGNAL_RUN_FIRST, None, [int, TYPE_PYOBJECT]), + 'card-flipped': (SIGNAL_RUN_FIRST, None, [int, TYPE_PYOBJECT]), + 'card-overflipped': (SIGNAL_RUN_FIRST, None, [int]), + 'card-highlighted': (SIGNAL_RUN_FIRST, None, [int, TYPE_PYOBJECT]), } def __init__(self): @@ -44,7 +47,7 @@ class CardTable(gtk.EventBox): # set request size to 100x100 to skip first time sizing in _allocate_cb self.set_size_request(100, 100) self.connect('size-allocate', self._allocate_cb) - + # Set table settings self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('#000000')) self.table = gtk.Table() @@ -67,16 +70,22 @@ class CardTable(gtk.EventBox): def _allocate_cb(self, widget, allocation): size = allocation.height + if size == 100: # skip first time sizing return - if self._workspace_size == 0: - # do it once - self.set_size_request(size, size) - self._workspace_size = size - if self.data: - self.load_game(None, self.data, self.cards_data) - + + # do it once + if self._workspace_size: + return + + _logger.debug('Use %s allocation' % str(self.allocation)) + + self.set_size_request(size, size) + self._workspace_size = size + if self.data: + self.load_game(None, self.data, self.cards_data) + def load_game(self, widget, data, grid): self.data = data self.cards_data = grid @@ -105,24 +114,25 @@ class CardTable(gtk.EventBox): else: text1 = str(self.data.get('face', '')) text2 = str(self.data.get('face', '')) - + x = 0 y = 0 id = 0 - - for card in self.cards_data: + + for card in self.cards_data: if card.get('img', None): jpg = os.path.join(self.data['pathimg'], card['img']) else: jpg = None props = {} - props['front_text']= {'card_text':card.get('char', '')} - + props['front_text']= {'card_text':card.get('char', ''), + 'speak': card.get('speak')} + if card['ab']== 'a': props['back_text']= {'card_text':text1} elif card['ab']== 'b': props['back_text']= {'card_text':text2} - + align = self.data.get('align', '1') card = svgcard.SvgCard(id, props, jpg, self.card_size, align) card.connect('enter-notify-event', self.mouse_event, [x, y]) @@ -131,9 +141,9 @@ class CardTable(gtk.EventBox): self.cd2id[card] = id self.id2cd[id] = card self.cards[(x, y)] = card - self.dict[id] = (x, y) - self.table.attach(card, x, x+1, y, y+1) - + self.dict[id] = (x, y) + self.table.attach(card, x, x+1, y, y+1, gtk.SHRINK, gtk.SHRINK) + x += 1 if x == self.size: x = 0 @@ -143,44 +153,45 @@ class CardTable(gtk.EventBox): if self.load_mode: self._set_load_mode(False) self.show_all() - gc.collect() - + #gc.collect() + def change_game(self, widget, data, grid): if not self.first_load: for card in self.cards.values(): self.table.remove(card) del card - gc.collect() + #gc.collect() self.load_game(None, data, grid) - + def get_card_size(self, size_table): - x = self._workspace_size/size_table - theme.CARD_PAD*2 + x = (self._workspace_size+theme.CARD_PAD*(size_table-1)) / size_table \ + - theme.CARD_PAD*2 return x - + def mouse_event(self, widget, event, coord): #self.table.grab_focus() card = self.cards[coord[0], coord[1]] id = self.cd2id.get(card) self.emit('card-highlighted', id, True) self.selected_card = (coord[0], coord[1]) - + def key_press_event(self, widget, event): #self.table.grab_focus() x= self.selected_card[0] y= self.selected_card[1] - + if event.keyval in (gtk.keysyms.Left, gtk.keysyms.KP_Left): if self.table_positions.has_key((x-1, y)): card = self.cards[x-1, y] id = self.cd2id.get(card) self.emit('card-highlighted', id, False) - + elif event.keyval in (gtk.keysyms.Right, gtk.keysyms.KP_Right): if self.table_positions.has_key((x+1, y)): card = self.cards[x+1, y] id = self.cd2id.get(card) self.emit('card-highlighted', id, False) - + elif event.keyval in (gtk.keysyms.Up, gtk.keysyms.KP_Up): if self.table_positions.has_key((x, y-1)): card = self.cards[x, y-1] @@ -217,13 +228,16 @@ class CardTable(gtk.EventBox): def flip_card(self, widget, id): self.id2cd.get(id).flip() - + + def cement_card(self, widget, id): + self.id2cd.get(id).cement() + def highlight_card(self, widget, id, status): if self.dict != None: self.selected_card = self.dict.get(id) self.id2cd.get(id).set_highlight(status) - - def reset(self, widget): + + def reset(self, widget): for id in self.id2cd.keys(): self.id2cd[id].reset() diff --git a/createcardpanel.py b/createcardpanel.py index 5fc1366..5671cd8 100644 --- a/createcardpanel.py +++ b/createcardpanel.py @@ -20,6 +20,7 @@ import gtk from os import environ from os.path import join, dirname, basename +import hippo import shutil import tempfile @@ -31,49 +32,70 @@ from xml.dom.minidom import parse from sugar.graphics.objectchooser import ObjectChooser from sugar import mime from sugar.graphics import style +from sugar.graphics.toolbutton import ToolButton +from sugar.graphics.icon import Icon +from sugar.graphics.palette import Palette +from port.widgets import ToggleToolButton +from port.widgets import CanvasRoundBox, ToolComboBox +from port import chooser import theme +import speak.espeak +import speak.widgets +import speak.face _logger = logging.getLogger('memorize-activity') class CreateCardPanel(gtk.EventBox): - __gsignals__ = { - 'add-pair': (SIGNAL_RUN_FIRST, None, 6 * [TYPE_PYOBJECT]), - 'update-pair': (SIGNAL_RUN_FIRST, None, 6 * [TYPE_PYOBJECT]), + 'add-pair': (SIGNAL_RUN_FIRST, None, 8 * [TYPE_PYOBJECT]), + 'update-pair': (SIGNAL_RUN_FIRST, None, 8 * [TYPE_PYOBJECT]), } - + def __init__(self): + def make_label(icon_name, label): + label_box = gtk.HBox() + icon = Icon( + icon_name=icon_name, + icon_size=gtk.ICON_SIZE_LARGE_TOOLBAR) + label_box.pack_start(icon, False) + label = gtk.Label(label) + label.modify_fg(gtk.STATE_NORMAL, + style.COLOR_TOOLBAR_GREY.get_gdk_color()) + label_box.pack_start(label) + label_box.show_all() + return label_box + gtk.EventBox.__init__(self) - + self.equal_pairs = False self._updatebutton_sensitive = False self._card1_has_sound = False self._card2_has_sound = False - - # Set the add new pair buttom - add_icon = join(dirname(__file__), 'images', 'pair-add.svg') - add_image = gtk.Image() - add_image.set_from_file(add_icon) - self._addbutton = gtk.Button(' ' + _('Add as new pair')) - self._addbutton.set_image(add_image) - self._addbutton.connect('pressed', self.emit_add_pair) - self._addbutton.set_size_request( - theme.PAIR_SIZE + theme.PAD*4, -1) - self._addbutton.set_sensitive(False) - # Set update selected pair buttom - update_icon = join(dirname(__file__), 'images', 'pair-update.svg') - update_image = gtk.Image() - update_image.set_from_file(update_icon) - self._updatebutton = gtk.Button(' ' + _('Update selected pair')) - self._updatebutton.set_image(update_image) - self._updatebutton.connect('pressed', self.emit_update_pair) - self._updatebutton.set_size_request( - theme.PAIR_SIZE + theme.PAD*4, -1) - self._updatebutton.set_sensitive(False) + # save buttons + + buttons_bar = gtk.HBox() + buttons_bar.props.border_width = 10 + + self._addbutton = ToolButton( + tooltip=_('Add as new pair'), + sensitive=False) + self._addbutton.set_icon_widget( + make_label('pair-add', ' ' + _('Add'))) + self._addbutton.connect('clicked', self.emit_add_pair) + buttons_bar.pack_start(self._addbutton, False) + + self._updatebutton = ToolButton( + tooltip=_('Update selected pair'), + sensitive=False) + self._updatebutton.set_icon_widget( + make_label('pair-update', ' ' + _('Update'))) + self._updatebutton.connect('clicked', self.emit_update_pair) + buttons_bar.pack_start(self._updatebutton, False) # Set card editors + self.cardeditor1 = CardEditor() self.cardeditor2 = CardEditor() self.clean(None) @@ -83,20 +105,20 @@ class CreateCardPanel(gtk.EventBox): self.cardeditor2.connect('has-picture', self.receive_picture_signals) self.cardeditor1.connect('has-sound', self.receive_sound_signals) self.cardeditor2.connect('has-sound', self.receive_sound_signals) - - # Create table and add components to the table - self.table = gtk.Table() - self.table.set_homogeneous(False) - self.table.set_col_spacings(theme.PAD) - self.table.set_row_spacings(theme.PAD) - self.table.set_border_width(theme.PAD) - self.table.attach(self.cardeditor1, 0, 1, 0, 1, yoptions=gtk.SHRINK) - self.table.attach(self.cardeditor2, 1, 2, 0, 1, yoptions=gtk.SHRINK) - self.table.attach(self._addbutton, 0, 1, 1, 2, yoptions=gtk.SHRINK) - self.table.attach(self._updatebutton, 1, 2, 1, 2, yoptions=gtk.SHRINK) - self.add(self.table) + + # edit panel + + self.card_box = gtk.HBox() + self.card_box.pack_start(self.cardeditor1) + self.card_box.pack_start(self.cardeditor2) + + box = gtk.VBox() + box.pack_start(self.card_box, False) + box.pack_start(buttons_bar, False) + self.add(box) + self.show_all() - + def emit_add_pair(self, widget): self._addbutton.set_sensitive(False) if self.equal_pairs: @@ -104,15 +126,18 @@ class CreateCardPanel(gtk.EventBox): self.cardeditor1.get_text(), self.cardeditor1.get_pixbuf(), self.cardeditor1.get_pixbuf(), - self.cardeditor1.get_snd(), self.cardeditor1.get_snd()) + self.cardeditor1.get_snd(), self.cardeditor1.get_snd(), + self.cardeditor1.get_speak(), self.cardeditor1.get_speak() + ) else: self.emit('add-pair', self.cardeditor1.get_text(), self.cardeditor2.get_text(), self.cardeditor1.get_pixbuf(), self.cardeditor2.get_pixbuf(), - self.cardeditor1.get_snd(), self.cardeditor2.get_snd()) + self.cardeditor1.get_snd(), self.cardeditor2.get_snd(), + self.cardeditor1.get_speak(), self.cardeditor2.get_speak() + ) self.clean(None) - def emit_update_pair(self, widget): self._addbutton.set_sensitive(False) @@ -121,17 +146,21 @@ class CreateCardPanel(gtk.EventBox): self.cardeditor1.get_text(), self.cardeditor1.get_pixbuf(), self.cardeditor1.get_pixbuf(), - self.cardeditor1.get_snd(), self.cardeditor1.get_snd()) + self.cardeditor1.get_snd(), self.cardeditor1.get_snd(), + self.cardeditor1.get_speak(), self.cardeditor1.get_speak() + ) else: self.emit('update-pair', self.cardeditor1.get_text(), self.cardeditor2.get_text(), self.cardeditor1.get_pixbuf(), self.cardeditor2.get_pixbuf(), - self.cardeditor1.get_snd(), self.cardeditor2.get_snd()) + self.cardeditor1.get_snd(), self.cardeditor2.get_snd(), + self.cardeditor1.get_speak(), self.cardeditor2.get_speak() + ) self.clean(None) - + def pair_selected(self, widget, selected, newtext1, newtext2, aimg, bimg, - asnd, bsnd): + asnd, bsnd, aspeak, bspeak): if selected: self.cardeditor1.set_text(newtext1) self.cardeditor2.set_text(newtext2) @@ -139,6 +168,8 @@ class CreateCardPanel(gtk.EventBox): self.cardeditor2.set_pixbuf(bimg) self.cardeditor1.set_snd(asnd) self.cardeditor2.set_snd(bsnd) + self.cardeditor1.set_speak(aspeak) + self.cardeditor2.set_speak(bspeak) self._addbutton.set_sensitive(True) self._updatebutton.set_sensitive(selected) self._updatebutton_sensitive = selected @@ -146,16 +177,14 @@ class CreateCardPanel(gtk.EventBox): def change_equal_pairs(self, widget, state): self.equal_pairs = state self.clean(None) + if self.equal_pairs: - self.table.remove(self.cardeditor1) - self.table.remove(self.cardeditor2) - self.table.attach(self.cardeditor1, 0, 2, 0, 1, - gtk.SHRINK, gtk.SHRINK) + if self.cardeditor2.parent: + self.card_box.remove(self.cardeditor2) else: - self.table.remove(self.cardeditor1) - self.table.attach(self.cardeditor1, 0, 1, 0, 1, yoptions=gtk.SHRINK) - self.table.attach(self.cardeditor2, 1, 2, 0, 1, yoptions=gtk.SHRINK) - + if not self.cardeditor2.parent: + self.card_box.pack_start(self.cardeditor2) + def clean(self, widget): self.cardeditor1.clean() self.cardeditor2.clean() @@ -164,28 +193,28 @@ class CreateCardPanel(gtk.EventBox): self._card2_has_text = False self._card1_has_picture = False self._card2_has_picture = False - + def receive_text_signals(self, widget, has_text): if widget == self.cardeditor1: self._card1_has_text = has_text if widget == self.cardeditor2: self._card2_has_text = has_text self._update_buttom_status() - + def receive_picture_signals(self, widget, has_picture): if widget == self.cardeditor1: self._card1_has_picture = has_picture if widget == self.cardeditor2: self._card2_has_picture = has_picture self._update_buttom_status() - + def receive_sound_signals(self, widget, has_sound): if widget == self.cardeditor1: self._card1_has_sound = has_sound if widget == self.cardeditor2: self._card2_has_sound = has_sound self._update_buttom_status() - + def _update_buttom_status(self): if not self.equal_pairs: if (self._card1_has_text or self._card1_has_picture or self._card1_has_sound) and (self._card2_has_text or self._card2_has_picture or self._card2_has_sound): @@ -201,48 +230,31 @@ class CreateCardPanel(gtk.EventBox): else: self._addbutton.set_sensitive(False) self._updatebutton.set_sensitive(False) - + class CardEditor(gtk.EventBox): - + __gsignals__ = { - 'has-text': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'has-picture': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'has-sound': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'has-text': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'has-picture': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'has-sound': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), } - + def __init__(self): gtk.EventBox.__init__(self) + self.snd = None + tmp_root = join(environ['SUGAR_ACTIVITY_ROOT'], 'instance') self.temp_folder = tempfile.mkdtemp(dir=tmp_root) - - table = gtk.Table() + + box = gtk.VBox() + box.props.spacing = theme.PAD + box.props.border_width = theme.PAD + self.previewlabel = gtk.Label(_('Preview:')) self.previewlabel.set_alignment(0, 1) - self.textlabel = gtk.Label(_('Text:')) - self.textlabel.set_alignment(0, 1) - - picture_icon = join(dirname(__file__), 'images', 'import_picture.svg') - picture_image = gtk.Image() - picture_image.set_from_file(picture_icon) - self.browsepicture = gtk.Button() - self.browsepicture.set_image(picture_image) - self.browsepicture.connect('button-press-event', self._import_image) - - sound_icon = join(dirname(__file__), 'images', 'import_sound.svg') - sound_image = gtk.Image() - sound_image.set_from_file(sound_icon) - self.browsesound = gtk.Button() - self.browsesound.set_image(sound_image) - self.browsesound.connect('button-press-event', self._import_audio) - self.snd = None - self.textentry = gtk.Entry() - self.textentry.connect('changed', self.update_text) - - table.set_homogeneous(False) - table.set_col_spacings(theme.PAD) - table.set_row_spacings(theme.PAD) - table.set_border_width(theme.PAD) + box.pack_start(self.previewlabel, False) + self.card = svgcard.SvgCard(-1, { 'front_text' : { 'card_text' : '', 'text_color' : '#ffffff' }, @@ -251,28 +263,62 @@ class CardEditor(gtk.EventBox): 'opacity' : '1' } }, None, theme.PAIR_SIZE, 1, '#c0c0c0') self.card.flip() - - table.attach(self.previewlabel, 0, 2, 0, 1, yoptions=gtk.SHRINK) - table.attach(self.card, 0, 2, 1, 2, gtk.SHRINK, gtk.SHRINK, - theme.PAD) - #Text label and entry - table.attach(self.textlabel, 0, 1, 2, 3, yoptions=gtk.SHRINK) - table.attach(self.textentry, 0, 2, 3, 4, yoptions=gtk.SHRINK) - self.textentry.set_size_request(0, -1) - #Picture label and entry - table.attach(self.browsepicture, 0, 1, 4, 5, yoptions=gtk.SHRINK) - #Sound label and entry - table.attach(self.browsesound, 1, 2, 4, 5, yoptions=gtk.SHRINK) - - self.add(table) - + card_align = gtk.Alignment(.5, .5, 0, 0) + card_align.add(self.card) + box.pack_start(card_align, False) + + textlabel = gtk.Label(_('Text:')) + textlabel.set_alignment(0, 1) + box.pack_start(textlabel, False) + + self.textentry = gtk.Entry() + self.textentry.connect('changed', self.update_text) + box.pack_start(self.textentry, False) + + toolbar = gtk.HBox() + + browsepicture = ToolButton( + icon_name='import_picture', + tooltip=_('Insert picture')) + toolbar.pack_start(browsepicture, False) + + browsesound = ToolButton( + icon_name='import_sound', + tooltip=_('Insert sound')) + toolbar.pack_start(browsesound, False) + + browsepicture.connect('clicked', self._load_image) + browsesound.connect('clicked', self._load_audio) + + if speak.espeak.supported: + self.usespeak = ToggleToolButton( + named_icon='speak', + palette=SpeakPalette(self)) + toolbar.pack_start(self.usespeak, False) + self.usespeak.connect('toggled', self._usespeak_cb) + else: + self.usespeak = None + + toolbar_box = CanvasRoundBox( + radius=8, + border=2, + border_color=style.COLOR_BUTTON_GREY.get_int(), + background_color=style.COLOR_PANEL_GREY.get_int()) + toolbar_box.append(hippo.CanvasWidget(widget=toolbar), + hippo.PACK_EXPAND) + toolbar_canvas = hippo.Canvas() + toolbar_canvas.set_root(toolbar_box) + box.pack_start(toolbar_canvas, False) + + self.add(box) + def update_text(self, entry): self.card.change_text(entry.get_text()) if len(entry.get_text()) == 0: self.emit('has-text', False) else: self.emit('has-text', True) - + def get_text(self): return self.textentry.get_text() @@ -280,91 +326,90 @@ class CardEditor(gtk.EventBox): if newtext == None: newtext = '' self.textentry.set_text(newtext) - + + def get_speak(self): + if self.usespeak is None: + return None + if self.usespeak.props.active: + return self.usespeak.palette.face.status.voice.friendlyname + + def set_speak(self, value): + if self.usespeak is None: + return + if value is None: + self.usespeak.props.active = False + else: + try: + self.usespeak.handler_block_by_func(self._usespeak_cb) + self.usespeak.props.active = True + finally: + self.usespeak.handler_unblock_by_func(self._usespeak_cb) + self.usespeak.palette.voices.resume(value) + def get_pixbuf(self): return self.card.get_pixbuf() - + def set_pixbuf(self, pixbuf): self.card.set_pixbuf(pixbuf) - - def _import_image(self, widget, event): - if hasattr(mime, 'GENERIC_TYPE_IMAGE'): - filter = { 'what_filter': mime.GENERIC_TYPE_IMAGE } - else: - filter = { } - - chooser = ObjectChooser(_('Choose image'), None, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, - **filter) - try: - result = chooser.run() - if result == gtk.RESPONSE_ACCEPT: - _logger.debug('ObjectChooser: %r' % chooser.get_selected_object()) - jobject = chooser.get_selected_object() - if jobject and jobject.file_path: - self._load_image(jobject.file_path) - finally: - chooser.destroy() - del chooser - - def _load_image(self, index): - pixbuf_t = gtk.gdk.pixbuf_new_from_file_at_size( - index, theme.PAIR_SIZE - theme.PAD*2, theme.PAIR_SIZE - theme.PAD*2) - if pixbuf_t.get_width() > pixbuf_t.get_height(): - size = pixbuf_t.get_width() - else: - size = pixbuf_t.get_height() - pixbuf_z = gtk.gdk.pixbuf_new_from_file_at_size( - 'images/white.png', size, size) - pixbuf_t.composite(pixbuf_z, 0, 0, pixbuf_t.get_width(), - pixbuf_t.get_height(), 0, 0, 1, 1, - gtk.gdk.INTERP_BILINEAR, 255) - self.card.set_pixbuf(pixbuf_z) - _logger.error('Picture Loaded: '+index) - self.emit('has-picture', True) - del pixbuf_t - del pixbuf_z - - def _import_audio(self, widget, event): - if hasattr(mime, 'GENERIC_TYPE_AUDIO'): - filter = { 'what_filter': mime.GENERIC_TYPE_AUDIO } - else: - filter = { } - - chooser = ObjectChooser(_('Choose audio'), None, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, - **filter) - jobject = '' - try: - result = chooser.run() - if result == gtk.RESPONSE_ACCEPT: - _logger.debug('ObjectChooser: %r' % chooser.get_selected_object()) - jobject = chooser.get_selected_object() - if not jobject or not jobject.file_path: - return - finally: - chooser.destroy() - del chooser - - if jobject and jobject.file_path: - self._load_audio(jobject.file_path) - - def _load_audio(self, index): - dst = join(self.temp_folder, basename(index)) - shutil.copy(index, dst) - self.set_snd(dst) - icon_theme = gtk.icon_theme_get_default() - pixbuf_t = icon_theme.load_icon("audio-x-generic", - style.XLARGE_ICON_SIZE, 0) - self.card.set_pixbuf(pixbuf_t) - self.emit('has-sound', True) - _logger.debug('Audio Loaded: '+dst) - + + def _load_image(self, widget): + def load(index): + self.set_speak(None) + + pixbuf_t = gtk.gdk.pixbuf_new_from_file_at_size( + index, theme.PAIR_SIZE - theme.PAD*2, + theme.PAIR_SIZE - theme.PAD*2) + size = max(pixbuf_t.get_width(), pixbuf_t.get_height()) + pixbuf_z = gtk.gdk.pixbuf_new_from_file_at_size( + 'images/white.png', size, size) + pixbuf_t.composite(pixbuf_z, 0, 0, pixbuf_t.get_width(), + pixbuf_t.get_height(), 0, 0, 1, 1, + gtk.gdk.INTERP_BILINEAR, 255) + self.card.set_pixbuf(pixbuf_z) + _logger.debug('Picture Loaded: '+index) + self.emit('has-picture', True) + del pixbuf_t + del pixbuf_z + + chooser.pick(what=chooser.IMAGE, + cb=lambda jobject: load(jobject.file_path)) + + def _load_audio(self, widget): + def load(index): + self.set_speak(None) + + dst = join(self.temp_folder, basename(index)) + shutil.copy(index, dst) + self.set_snd(dst) + icon_theme = gtk.icon_theme_get_default() + pixbuf_t = icon_theme.load_icon("audio-x-generic", + style.XLARGE_ICON_SIZE, 0) + self.card.set_pixbuf(pixbuf_t) + self.emit('has-sound', True) + _logger.debug('Audio Loaded: '+dst) + + chooser.pick(what=chooser.AUDIO, + cb=lambda jobject: load(jobject.file_path)) + + def _usespeak_cb(self, button): + self.card.change_speak(button.props.active) + + if not button.props.active: + self.usespeak.palette.face.shut_up() + return + + self.snd = None + self.card.set_pixbuf(None) + self.emit('has-sound', False) + self.emit('has-picture', False) + + button.palette.face.say(self.get_text()) + def set_snd(self, snd): self.snd = snd - + def get_snd(self): - return self.snd + return self.snd def clean(self): self.textentry.set_text('') @@ -373,3 +418,26 @@ class CardEditor(gtk.EventBox): self.emit('has-text', False) self.emit('has-picture', False) self.emit('has-sound', False) + if self.usespeak is not None: + self.usespeak.props.active = False + self.usespeak.palette.face.shut_up() + +class SpeakPalette(Palette): + def __init__(self, editor): + Palette.__init__(self, _('Pronounce text while fliping tile')) + + self.face = speak.face.View() + + toolbar = gtk.HBox() + toolbar.modify_bg(gtk.STATE_NORMAL, style.COLOR_BLACK.get_gdk_color()) + + usespeak_play = ToolButton(icon_name='media-playback-start') + usespeak_play.connect('clicked', lambda button: + self.face.say(editor.get_text())) + toolbar.pack_start(usespeak_play, False) + + self.voices = speak.widgets.Voices(self.face) + toolbar.pack_start(ToolComboBox(self.voices)) + + toolbar.show_all() + self.set_content(toolbar) diff --git a/face.py b/face.py new file mode 100644 index 0000000..fd3effb --- /dev/null +++ b/face.py @@ -0,0 +1,78 @@ +# 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 + +import gtk + +import logging +_logger = logging.getLogger('memorize-activity') + +from sugar.graphics import style + +import speak.espeak +import speak.face +import theme + +class Face(gtk.EventBox): + def __init__(self): + gtk.EventBox.__init__(self) + + self.modify_bg(gtk.STATE_NORMAL, style.COLOR_BLACK.get_gdk_color()) + + self.face = speak.face.View(style.Color('#4b4c4e')) + self.face.set_border_width(theme.SVG_PAD) + self.add(self.face) + self.show_all() + + self.set_app_paintable(True) + self.connect('expose-event', self._expose_cb) + self.connect('unrealize', self._unrealize_cb) + + def _unrealize_cb(self, widget): + self.face.shut_up() + + def _expose_cb(self, widget, event): + card = self.parent.parent + pixbuf = card._read_icon_data('front') + self.window.draw_pixbuf(None, pixbuf, 0, 0, 0, 0) + +def look_at(): + if not speak.espeak.supported: + return + + display = gtk.gdk.display_get_default() + screen, x, y, modifiers = display.get_pointer() + + for i in _cache: + if i.parent: + i.face.look_at(x,y) + +def acquire(): + if not speak.espeak.supported: + return None + + face = None + + for i in _cache: + i.face.shut_up() + if not i.parent: + face = i + + if not face: + face = Face() + _cache.append(face) + _logger.debug('face._cache size %s' % len(_cache)) + + return face + +_cache = [] diff --git a/game.py b/game.py index fb86c10..b33c748 100644 --- a/game.py +++ b/game.py @@ -40,23 +40,24 @@ PATH = '/org/laptop/Memorize' class MemorizeGame(GObject): __gsignals__ = { - 'reset_scoreboard': (SIGNAL_RUN_FIRST, None, []), - 'reset_table': (SIGNAL_RUN_FIRST, None, []), - 'load_mode': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'load_game': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'change_game': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'change_game_signal': (SIGNAL_RUN_FIRST, None, 5 * [TYPE_PYOBJECT]), - 'set-border': (SIGNAL_RUN_FIRST, None, 3 * [TYPE_PYOBJECT]), - 'flip-card': (SIGNAL_RUN_FIRST, None, [int]), - 'flip-card-signal': (SIGNAL_RUN_FIRST, None, [int]), - 'flop-card': (SIGNAL_RUN_FIRST, None, [int]), - 'highlight-card': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'add_buddy': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'rem_buddy': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'increase-score': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), - 'wait_mode_buddy': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'msg_buddy': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), - 'change-turn': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'reset_scoreboard': (SIGNAL_RUN_FIRST, None, []), + 'reset_table': (SIGNAL_RUN_FIRST, None, []), + 'load_mode': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'load_game': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), + 'change_game': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), + 'change_game_signal': (SIGNAL_RUN_FIRST, None, 5 * [TYPE_PYOBJECT]), + 'set-border': (SIGNAL_RUN_FIRST, None, 3 * [TYPE_PYOBJECT]), + 'flip-card': (SIGNAL_RUN_FIRST, None, [int]), + 'flip-card-signal': (SIGNAL_RUN_FIRST, None, [int]), + 'cement-card': (SIGNAL_RUN_FIRST, None, [int]), + 'flop-card': (SIGNAL_RUN_FIRST, None, [int]), + 'highlight-card': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), + 'add_buddy': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), + 'rem_buddy': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'increase-score': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'wait_mode_buddy': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), + 'msg_buddy': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), + 'change-turn': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), } def __init__(self): @@ -68,15 +69,15 @@ class MemorizeGame(GObject): self.current_player = None self.last_flipped = -1 self.last_highlight = 1 - self.game_dir = join(dirname(__file__), 'games') self.messenger = None self.sentitive = True - self.model = Model(dirname(__file__)) + + self.model = Model() self.flip_block = False self._flop_cards = None - self.audio = Audio() - + self.audio = Audio() + def load_game(self, game_name, size, mode): self.set_load_mode('Loading game') if self.model.read(game_name) == 0: @@ -220,6 +221,10 @@ class MemorizeGame(GObject): self.model.grid[id]['state'] = self.current_player.props.color self.model.grid[self.last_flipped]['state'] = self.current_player.props.color self.flip_block = False + + self.emit('cement-card', id) + self.emit('cement-card', self.last_flipped) + # Pair didn't match else: self.model.grid[id]['state'] = '1' diff --git a/images/import_picture.svg b/icons/import_picture.svg index 3029498..3029498 100644 --- a/images/import_picture.svg +++ b/icons/import_picture.svg diff --git a/images/import_sound.svg b/icons/import_sound.svg index a2c5ba8..a2c5ba8 100644 --- a/images/import_sound.svg +++ b/icons/import_sound.svg diff --git a/images/pair-add.svg b/icons/pair-add.svg index 37d1e4d..37d1e4d 100644 --- a/images/pair-add.svg +++ b/icons/pair-add.svg diff --git a/images/pair-update.svg b/icons/pair-update.svg index d251be5..d251be5 100644 --- a/images/pair-update.svg +++ b/icons/pair-update.svg diff --git a/icons/speak.svg b/icons/speak.svg new file mode 100644 index 0000000..82d12a5 --- /dev/null +++ b/icons/speak.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + + + + diff --git a/memorize.dtd b/memorize.dtd index 870e18d..3c1fc15 100644 --- a/memorize.dtd +++ b/memorize.dtd @@ -22,4 +22,6 @@ bsnd CDATA #IMPLIED bchar CDATA #IMPLIED color CDATA #IMPLIED + aspeak CDATA #IMPLIED + bspeak CDATA #IMPLIED > diff --git a/model.py b/model.py index 8fef631..fd05b29 100644 --- a/model.py +++ b/model.py @@ -23,29 +23,35 @@ import random import gobject import zipfile import tempfile + from sugar import profile from sugar.datastore import datastore +from sugar.activity.activity import get_bundle_path, get_activity_root _logger = logging.getLogger('model') -class Pair(gobject.GObject): +class Pair(gobject.GObject): __gproperties__ = { - 'aimg' : (str, None, None, None, gobject.PARAM_READWRITE), - 'asnd' : (str, None, None, None, gobject.PARAM_READWRITE), - 'achar': (str, None, None, None, gobject.PARAM_READWRITE), - 'bimg' : (str, None, None, None, gobject.PARAM_READWRITE), - 'bsnd' : (str, None, None, None, gobject.PARAM_READWRITE), - 'bchar': (str, None, None, None, gobject.PARAM_READWRITE), - 'color': (gobject.TYPE_INT, 'Base', 'Base', 0, 10, 0, gobject.PARAM_READWRITE) + 'aimg' : (str, None, None, None, gobject.PARAM_READWRITE), + 'asnd' : (str, None, None, None, gobject.PARAM_READWRITE), + 'achar': (str, None, None, None, gobject.PARAM_READWRITE), + 'bimg' : (str, None, None, None, gobject.PARAM_READWRITE), + 'bsnd' : (str, None, None, None, gobject.PARAM_READWRITE), + 'bchar': (str, None, None, None, gobject.PARAM_READWRITE), + 'aspeak': (str, None, None, None, gobject.PARAM_READWRITE), + 'bspeak': (str, None, None, None, gobject.PARAM_READWRITE), + 'color' : (gobject.TYPE_INT, 'Base', 'Base', 0, 10, 0, \ + gobject.PARAM_READWRITE) } - + def __init__(self): - gobject.GObject.__init__(self) - self._properties = {'aimg':None, 'asnd':None, 'achar':None, 'bimg':None, - 'bsnd':None, 'bchar':None, 'color':100} - + gobject.GObject.__init__(self) + self._properties = {'aimg':None, 'asnd':None, 'achar':None, 'bimg':None, + 'bsnd':None, 'bchar':None, 'color':100, + 'aspeak':None, 'bspeak':None} + def do_get_property(self, pspec): - """Retrieve a particular property from our property dictionary + """Retrieve a particular property from our property dictionary """ if pspec.name == "aimg": return self._properties["aimg"] @@ -61,6 +67,10 @@ class Pair(gobject.GObject): return self._properties["bchar"] elif pspec.name == "color": return self._properties["color"] + elif pspec.name == "aspeak": + return self._properties["aspeak"] + elif pspec.name == "bspeak": + return self._properties["bspeak"] def set_property(self, name, value): if name == 'aimg': @@ -77,36 +87,40 @@ class Pair(gobject.GObject): self._properties["bchar"] = value elif name == "color": self._properties["color"] = value + elif name == "aspeak": + self._properties["aspeak"] = value + elif name == "bspeak": + self._properties["bspeak"] = value class Model(object): ''' The model of the activity. Contains methods to read and write the configuration for a game from xml. Stores the pairs and grid - information. + information. ''' - - def __init__(self, game_path, dtd_path = None): + + def __init__(self, game_path=None): self.data = {} - if dtd_path == None: - self.dtd_path = dirname(__file__) - else: - self.dtd_path = dtd_path - + + if game_path is None: + game_path = get_activity_root() + if isdir(game_path): self.game_path = game_path else: - _logger.error('Game_path not found ' +str(e)) + _logger.error('Game_path not found in %s' % game_path) return - + self.data['face'] = '' self.data['align'] = '1' - + try: - self.dtd = libxml2.parseDTD(None, join(self.dtd_path, 'memorize.dtd')) + self.dtd = libxml2.parseDTD(None, join(get_bundle_path(), + 'memorize.dtd')) except libxml2.parserError, e: _logger.error('Init: no memorize.dtd found ' +str(e)) self.dtd = None - self.ctxt = libxml2.newValidCtxt() + self.ctxt = libxml2.newValidCtxt() self.pairs = {} self.grid = [] @@ -245,8 +259,12 @@ class Model(object): elem.setProp("bsnd", self.pairs[key].props.bsnd) if self.pairs[key].props.bchar != None: elem.setProp("bchar", self.pairs[key].props.bchar) + if self.pairs[key].props.aspeak != None: + elem.setProp("aspeak", self.pairs[key].props.aspeak) + if self.pairs[key].props.bspeak != None: + elem.setProp("bspeak", self.pairs[key].props.bspeak) # elem.setProp("color", str(self.pairs[key].props.color)) - + if doc.validateDtd(self.ctxt, self.dtd): doc.saveFormatFile(join(self.game_path, 'game.xml'), 1) else: @@ -286,8 +304,10 @@ class Model(object): elem['snd'] = self.pairs[key].props.asnd if self.pairs[key].props.achar != None: elem['char'] = self.pairs[key].props.achar + if self.pairs[key].props.aspeak != None: + elem['speak'] = self.pairs[key].props.aspeak temp1.append(elem) - + elem = {} elem['pairkey'] = key elem['state'] = '0' @@ -298,7 +318,9 @@ class Model(object): elem['snd'] = self.pairs[key].props.bsnd if self.pairs[key].props.bchar != None: elem['char'] = self.pairs[key].props.bchar - temp2.append(elem) + if self.pairs[key].props.bspeak != None: + elem['speak'] = self.pairs[key].props.bspeak + temp2.append(elem) i+=1 else: break diff --git a/po/Memorize.pot b/po/Memorize.pot index 1dcf469..af62e62 100644 --- a/po/Memorize.pot +++ b/po/Memorize.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-21 22:31+0100\n" +"POT-Creation-Date: 2009-07-14 10:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,98 +20,246 @@ msgstr "" msgid "Memorize" msgstr "" -#: activity.py:70 -msgid "Play" +#: /home/sugar/src/activities/memorize.activity/game.py:93 +msgid "Loading game..." msgstr "" -#: activity.py:74 -msgid "Create" +#: /home/sugar/src/activities/memorize.activity/messenger.py:192 +msgid "Receiving game" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/messenger.py:192 +msgid "done" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:51 +msgid "New game" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:61 +#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:73 +msgid "Load game" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:71 +msgid "Save game" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:81 +msgid "Game name" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:85 +msgid "Equal pairs" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:97 +#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:156 +msgid "Click for grouped game" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:114 +#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:117 +msgid "Choose memorize game" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:152 +msgid "Click for ungrouped game" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:40 +msgid "Load demo games" msgstr "" -#: createcardpanel.py:52 +#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:41 +msgid "addition" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:42 +msgid "letters" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:43 +msgid "sounds" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:63 +msgid "Restart Game" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:82 msgid "Add as new pair" msgstr "" -#: createcardpanel.py:60 +#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:85 +msgid "Add" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:90 msgid "Update selected pair" msgstr "" -#: createcardpanel.py:180 +#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:93 +msgid "Update" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:254 msgid "Preview:" msgstr "" -#: createcardpanel.py:182 +#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:270 msgid "Text:" msgstr "" -#: createcardpanel.py:243 -msgid "Choose image" +#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:282 +msgid "Insert picture" msgstr "" -#: createcardpanel.py:263 -msgid "Choose audio" +#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:287 +msgid "Insert sound" msgstr "" -#: createtoolbar.py:53 -msgid "New game" +#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:427 +msgid "Pronounce text while fliping tile" msgstr "" -#: createtoolbar.py:63 memorizetoolbar.py:73 -msgid "Load game" +#: /home/sugar/src/activities/memorize.activity/activity.py:74 +msgid "Play" msgstr "" -#: createtoolbar.py:73 -msgid "Save game" +#: /home/sugar/src/activities/memorize.activity/activity.py:78 +msgid "Create" msgstr "" -#: createtoolbar.py:83 -msgid "Game name" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:36 +msgid "Brazil" msgstr "" -#: createtoolbar.py:87 -msgid "Equal pairs" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:37 +msgid "Swedish" msgstr "" -#: createtoolbar.py:99 createtoolbar.py:158 -msgid "Click for grouped game" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:38 +msgid "Icelandic" msgstr "" -#: createtoolbar.py:116 memorizetoolbar.py:117 -msgid "Choose memorize game" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:39 +msgid "Romanian" msgstr "" -#: createtoolbar.py:154 -msgid "Click for ungrouped game" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:40 +msgid "Swahili" msgstr "" -#: game.py:105 -msgid "Loading game..." +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:41 +msgid "Hindi" msgstr "" -#: memorizetoolbar.py:40 -msgid "Load demo games" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:42 +msgid "Dutch" msgstr "" -#: memorizetoolbar.py:41 -msgid "addition" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:43 +msgid "Latin" msgstr "" -#: memorizetoolbar.py:42 -msgid "letters" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:44 +msgid "Hungarian" msgstr "" -#: memorizetoolbar.py:43 -msgid "sounds" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:45 +msgid "Macedonian" msgstr "" -#: memorizetoolbar.py:63 -msgid "Restart Game" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:46 +msgid "Welsh" msgstr "" -#: messenger.py:183 -msgid "Receiving game" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:47 +msgid "French" msgstr "" -#: messenger.py:183 -msgid "done" +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:48 +msgid "Norwegian" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:49 +msgid "Russian" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:50 +msgid "Afrikaans" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:51 +msgid "Finnish" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:52 +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:125 +msgid "Default" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:53 +msgid "Cantonese" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:54 +msgid "Scottish" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:55 +msgid "Greek" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:56 +msgid "Vietnam" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:57 +msgid "English" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:58 +msgid "Lancashire" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:59 +msgid "Italian" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:60 +msgid "Portugal" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:61 +msgid "German" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:62 +msgid "Whisper" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:63 +msgid "Croatian" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:64 +msgid "Czech" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:65 +msgid "Slovak" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:66 +msgid "Spanish" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:67 +msgid "Polish" +msgstr "" + +#: /home/sugar/src/activities/memorize.activity/speak/voice.py:68 +msgid "Esperanto" msgstr "" diff --git a/port/COPYING b/port/COPYING new file mode 100644 index 0000000..623b625 --- /dev/null +++ b/port/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/port/README b/port/README new file mode 100644 index 0000000..256200d --- /dev/null +++ b/port/README @@ -0,0 +1,18 @@ +About +----- + +A set of sugar components/libraries/etc to simplify writing activities. + +Cornerstone purposes for this project: +* Total backwards compatibility for sugar-port API +* Run on all sugar platforms beginning from 0.82 + +In most cases sugar-port could be embedded to activity's directory tree. +There is no need to include the whole sugar-port project only top level +files/directories you are using directly - sugar-port's top level entities +don't import each other. + +Get it +------ + +http://wiki.sugarlabs.org/go/Development_Team/sugar-port diff --git a/port/__init__.py b/port/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/port/__init__.py diff --git a/port/chooser.py b/port/chooser.py new file mode 100644 index 0000000..1ee4023 --- /dev/null +++ b/port/chooser.py @@ -0,0 +1,68 @@ +# 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 + +"""Object chooser method""" + +import gtk +import logging + +from sugar import mime +from sugar.graphics.objectchooser import ObjectChooser + +TEXT = hasattr(mime, 'GENERIC_TYPE_TEXT') and mime.GENERIC_TYPE_TEXT or None +IMAGE = hasattr(mime, 'GENERIC_TYPE_IMAGE') and mime.GENERIC_TYPE_IMAGE or None +AUDIO = hasattr(mime, 'GENERIC_TYPE_AUDIO') and mime.GENERIC_TYPE_AUDIO or None +VIDEO = hasattr(mime, 'GENERIC_TYPE_VIDEO') and mime.GENERIC_TYPE_VIDEO or None +LINK = hasattr(mime, 'GENERIC_TYPE_LINK') and mime.GENERIC_TYPE_LINK or None + +def pick(cb=None, default=None, parent=None, what=None): + """ + Opens object chooser. + + Method returns: + + * cb(jobject), if object was choosen and cb is not None + * jobject, if object was choosen and cb is None + * default, otherwise + + NOTE: 'what' makes sense only for sugar >= 0.84 + """ + what = what and {'what_filter': what} or {} + chooser = ObjectChooser(parent=parent, **what) + + logging.error(chooser) + + jobject = None + out = None + + try: + if chooser.run() == gtk.RESPONSE_ACCEPT: + jobject = chooser.get_selected_object() + logging.debug('ObjectChooser: %r' % jobject) + + if jobject and jobject.file_path: + if cb: + out = cb(jobject) + else: + out = jobject + finally: + if jobject and id(jobject) != id(out): + jobject.destroy() + chooser.destroy() + del chooser + + if out: + return out + else: + return default diff --git a/port/widgets.py b/port/widgets.py new file mode 100644 index 0000000..9531c97 --- /dev/null +++ b/port/widgets.py @@ -0,0 +1,403 @@ +# 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 + +import gtk +import hippo +import gobject +import logging +import math + +from sugar.graphics import style +from sugar.graphics import palette +from sugar.graphics import toolbutton +from sugar.graphics import radiotoolbutton +from sugar.graphics import icon +from sugar.graphics import toggletoolbutton +from sugar.graphics import combobox +from sugar.graphics import roundbox + +def labelize(text, widget): + box = hippo.CanvasBox() + box.props.spacing = style.DEFAULT_SPACING + + text = hippo.CanvasText(text=text) + text.props.color = style.COLOR_SELECTION_GREY.get_int() + if gtk.widget_get_default_direction() == gtk.TEXT_DIR_RTL: + text.props.xalign = hippo.ALIGNMENT_END + else: + text.props.xalign = hippo.ALIGNMENT_START + box.append(text) + + box.append(widget, hippo.PACK_EXPAND) + + return box + +class Entry(hippo.CanvasWidget): + def __init__(self, text=None, frame_color=style.COLOR_WHITE.get_gdk_color(), + **kwargs): + hippo.CanvasWidget.__init__(self, **kwargs) + + self.entry = gtk.Entry() + self.entry.modify_bg(gtk.STATE_INSENSITIVE, frame_color) + + self.props.widget = self.entry + + if text: + self.text = text + + def get_text(self): + return self.entry.props.text + + def set_text(self, value): + self.entry.props.text = value + + text = gobject.property(type=str, setter=set_text, getter=get_text) + text = property(get_text, set_text) + +class TextView(hippo.CanvasWidget): + def __init__(self, text=None, **kwargs): + hippo.CanvasWidget.__init__(self, **kwargs) + + self.view = gtk.TextView() + self.view.props.left_margin = style.DEFAULT_SPACING + self.view.props.right_margin = style.DEFAULT_SPACING + self.view.props.wrap_mode = gtk.WRAP_WORD + self.view.props.accepts_tab = False + self.view.show() + + scrolled_window = gtk.ScrolledWindow() + scrolled_window.set_shadow_type(gtk.SHADOW_OUT) + scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) + scrolled_window.add(self.view) + + self.props.widget = scrolled_window + + if text: + self.text = text + + def get_text(self): + return self.view.props.buffer.props.text + + def set_text(self, value): + self.view.props.buffer.props.text = value or '' + + text = gobject.property(type=str, setter=set_text, getter=get_text) + text = property(get_text, set_text) + +class Image(hippo.CanvasWidget): + def __init__(self, pal=None, tooltip=None, pixbuf=None, **kwargs): + self.image = gtk.Image() + self._invoker = palette.CanvasInvoker() + + hippo.CanvasBox.__init__(self, widget=self.image) + + self._invoker._position_hint = self._invoker.AT_CURSOR + self._invoker.attach(self) + + self.palette_class = None + + self.connect('destroy', self._destroy_cb) + + if pal: + self.palette = pal + if tooltip: + self.tooltip = tooltip + if pixbuf: + self.pixbuf = pixbuf + + def _destroy_cb(self, widget): + if self._invoker is not None: + self._invoker.detach() + + def create_palette(self): + if self.palette_class is None: + return None + if isinstance(self.palette_class, tuple): + return self.palette_class[0](*self.palette_class[1:]) + else: + return self.palette_class() + + def get_palette(self): + return self._invoker.palette + + def set_palette(self, palette): + self._invoker.palette = palette + + palette = gobject.property(type=object, + setter=set_palette, getter=get_palette) + palette = property(get_palette, set_palette) + + def get_tooltip(self): + return self._invoker.palette and self._invoker.palette.primary_text + + def set_tooltip(self, text): + self.set_palette(palette.Palette(text)) + + tooltip = gobject.property(type=str, setter=set_tooltip, getter=get_tooltip) + tooltip = property(get_tooltip, set_tooltip) + + def set_pixbuf(self, value): + self.image.set_from_pixbuf(value) + self.props.box_width = value.get_width() + self.props.box_height = value.get_height() + + pixbuf = gobject.property(type=object, setter=set_pixbuf, getter=None) + pixbuf = property(None, set_pixbuf) + +class ToolButton(toolbutton.ToolButton): + def __init__(self, + icon_name, + size=gtk.ICON_SIZE_SMALL_TOOLBAR, + padding=None, + **kwargs): + + toolbutton.ToolButton.__init__(self, **kwargs) + + image = icon.Icon(icon_name=icon_name, icon_size=size) + image.show() + + # The alignment is a hack to work around gtk.ToolButton code + # that sets the icon_size when the icon_widget is a gtk.Image + alignment = gtk.Alignment(0.5, 0.5) + alignment.show() + alignment.add(image) + + self.set_icon_widget(alignment) + + sizes = { gtk.ICON_SIZE_SMALL_TOOLBAR: style.SMALL_ICON_SIZE, + gtk.ICON_SIZE_LARGE_TOOLBAR: style.STANDARD_ICON_SIZE } + + if padding is not None and sizes.has_key(size): + button_size = sizes[size] + style.DEFAULT_SPACING + padding + self.set_size_request(button_size, button_size) + +class RadioToolButton(radiotoolbutton.RadioToolButton): + def __init__(self, + icon_name, + size=gtk.ICON_SIZE_SMALL_TOOLBAR, + padding=None, + **kwargs): + + radiotoolbutton.RadioToolButton.__init__(self, **kwargs) + + image = icon.Icon(icon_name=icon_name, icon_size=size) + image.show() + + # The alignment is a hack to work around gtk.ToolButton code + # that sets the icon_size when the icon_widget is a gtk.Image + alignment = gtk.Alignment(0.5, 0.5) + alignment.show() + alignment.add(image) + + self.set_icon_widget(alignment) + + sizes = { gtk.ICON_SIZE_SMALL_TOOLBAR: style.SMALL_ICON_SIZE, + gtk.ICON_SIZE_LARGE_TOOLBAR: style.STANDARD_ICON_SIZE } + + if padding is not None and sizes.has_key(size): + button_size = sizes[size] + style.DEFAULT_SPACING + padding + self.set_size_request(button_size, button_size) + +class ToolWidget(gtk.ToolItem): + def __init__(self, widget): + gtk.ToolItem.__init__(self) + self.add(widget) + widget.show() + +class ToggleToolButton(toggletoolbutton.ToggleToolButton): + def __init__(self, named_icon=None, tooltip=None, palette=None, **kwargs): + toggletoolbutton.ToggleToolButton.__init__(self, named_icon, **kwargs) + + if tooltip: + self.set_tooltip(tooltip) + if palette: + self.set_palette(palette) + +class Palette(palette.Palette): + def __init__(self, **kwargs): + palette.Palette.__init__(self, **kwargs) + + def popup(self, immediate=False, state=None): + if not self.props.invoker: + if _none_invoker.palette: + _none_invoker.palette.popdown(immediate=True) + _none_invoker.palette = self + self.props.invoker = _none_invoker + palette.Palette.popup(self, immediate, state) + +class _NoneInvoker(palette.Invoker): + def __init__(self): + palette.Invoker.__init__(self) + self._position_hint = palette.Invoker.AT_CURSOR + + def get_rect(self): + return gtk.gdk.Rectangle(0, 0, 0, 0) + + def get_toplevel(self): + return None + +_none_invoker = _NoneInvoker() + +class ComboBox(combobox.ComboBox): + def __init__(self, **kwargs): + combobox.ComboBox.__init__(self, **kwargs) + + def select(self, id=None, name=None): + if id is not None: + column = 0 + value = id + elif name is not None: + column = 1 + value = name + else: + return + + for i, item in enumerate(self.get_model()): + if item[column] != value: + continue + self.set_active(i) + break + + def append_item(self, action_id, text, icon_name=None, file_name=None): + item = self._item_new(action_id, text, icon_name, file_name) + self.get_model().append(item) + + def set_item(self, action_id, text=None, icon_name=None, file_name=None): + for i, value in enumerate(self.get_model()): + if value[0] == action_id: + item = self._item_new(action_id, text, icon_name, file_name) + iter = self.get_model().iter_nth_child(None, i) + if text is not None: + self.get_model().set(iter, 1, item[1]) + if icon_name is not None or file_name is not None: + self.get_model().set(iter, 2, item[2]) + return True + return False + + def _item_new(self, action_id, text, icon_name, file_name): + if not self._icon_renderer and (icon_name or file_name): + self._icon_renderer = gtk.CellRendererPixbuf() + + settings = self.get_settings() + w, h = gtk.icon_size_lookup_for_settings( + settings, gtk.ICON_SIZE_MENU) + self._icon_renderer.props.stock_size = max(w, h) + + self.pack_start(self._icon_renderer, False) + self.add_attribute(self._icon_renderer, 'pixbuf', 2) + + if not self._text_renderer and text: + self._text_renderer = gtk.CellRendererText() + self.pack_end(self._text_renderer, True) + self.add_attribute(self._text_renderer, 'text', 1) + + if icon_name or file_name: + if text: + size = gtk.ICON_SIZE_MENU + else: + size = gtk.ICON_SIZE_LARGE_TOOLBAR + width, height = gtk.icon_size_lookup(size) + + if icon_name: + file_name = self._get_real_name_from_theme(icon_name, size) + + pixbuf = gtk.gdk.pixbuf_new_from_file_at_size( + file_name, width, height) + else: + pixbuf = None + + return (action_id, text, pixbuf, False) + +class ToolComboBox(gtk.ToolItem): + __gproperties__ = { + 'label-text' : (str, None, None, None, + gobject.PARAM_WRITABLE), + } + + def __init__(self, combo=None, **kwargs): + self.label = None + self._label_text = '' + + gobject.GObject.__init__(self, **kwargs) + + self.set_border_width(style.DEFAULT_PADDING) + + hbox = gtk.HBox(False, style.DEFAULT_SPACING) + + self.label = gtk.Label(self._label_text) + hbox.pack_start(self.label, False) + self.label.show() + + if combo: + self.combo = combo + else: + self.combo = ComboBox() + + hbox.pack_start(self.combo) + self.combo.show() + + self.add(hbox) + hbox.show() + + def do_set_property(self, pspec, value): + if pspec.name == 'label-text': + self._label_text = value + if self.label: + self.label.set_text(self._label_text) + +class CanvasRoundBox(roundbox.CanvasRoundBox): + def __init__(self, radius=style.zoom(10), **kwargs): + hippo.CanvasBox.__init__(self, **kwargs) + self.set_radius(radius) + + def get_radius(self): + return self._radius + + def set_radius(self, radius): + self._radius = radius + self.props.border_left = radius + self.props.border_right = radius + + radius = property(get_radius, set_radius) + + def do_paint_background(self, cr, damaged_box): + [width, height] = self.get_allocation() + + cr.rectangle(0, 0, width, height) + hippo.cairo_set_source_rgba32(cr, self.props.background_color) + cr.fill() + + x = self.props.border_top/2 + y = self.props.border_top/2 + width -= self.props.border_top + height -= self.props.border_top + + cr.move_to(x + self._radius, y) + cr.arc(x + width - self._radius, y + self._radius, + self._radius, math.pi * 1.5, math.pi * 2) + cr.arc(x + width - self._radius, x + height - self._radius, + self._radius, 0, math.pi * 0.5) + cr.arc(x + self._radius, y + height - self._radius, + self._radius, math.pi * 0.5, math.pi) + cr.arc(x + self._radius, y + self._radius, self._radius, + math.pi, math.pi * 1.5) + + hippo.cairo_set_source_rgba32(cr, self.props.background_color) + cr.fill_preserve() + + # TODO: we should be more consistent here with the border properties. + if self.props.border_color: + hippo.cairo_set_source_rgba32(cr, self.props.border_color) + cr.set_line_width(self.props.border_top) + cr.stroke() diff --git a/speak/COPYING b/speak/COPYING new file mode 100644 index 0000000..20d40b6 --- /dev/null +++ b/speak/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + (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, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/speak/__init__.py b/speak/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/speak/__init__.py diff --git a/speak/espeak.py b/speak/espeak.py new file mode 100644 index 0000000..389045d --- /dev/null +++ b/speak/espeak.py @@ -0,0 +1,118 @@ +# 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 + +import gst +import gobject +import subprocess + +import logging +logger = logging.getLogger('speak') + +supported = True + +class BaseAudioGrab(gobject.GObject): + __gsignals__ = { + 'new-buffer': (gobject.SIGNAL_RUN_FIRST, None, [gobject.TYPE_PYOBJECT]) + } + + def __init__(self): + gobject.GObject.__init__(self) + self.pipeline = None + self.quiet = True + + def restart_sound_device(self): + self.quiet = False + + self.pipeline.set_state(gst.STATE_NULL) + self.pipeline.set_state(gst.STATE_PLAYING) + + def stop_sound_device(self): + if self.pipeline is None: + return + + self.pipeline.set_state(gst.STATE_NULL) + # Shut theirs mouths down + self._new_buffer('') + + self.quiet = True + + def make_pipeline(self, cmd): + if self.pipeline is not None: + self.stop_sound_device() + del self.pipeline + + # build a pipeline that reads the given file + # and sends it to both the real audio output + # and a fake one that we use to draw from + self.pipeline = gst.parse_launch( + cmd + ' ' \ + '! decodebin ' \ + '! tee name=tee ' \ + 'tee.! audioconvert ' \ + '! alsasink ' \ + 'tee.! queue ' \ + '! audioconvert ! fakesink name=sink') + + def on_buffer(element, buffer, pad): + # we got a new buffer of data, ask for another + gobject.timeout_add(100, self._new_buffer, str(buffer)) + return True + + sink = self.pipeline.get_by_name('sink') + sink.props.signal_handoffs = True + sink.connect('handoff', on_buffer) + + def gstmessage_cb(bus, message): + self._was_message = True + + if message.type == gst.MESSAGE_WARNING: + def check_after_warnings(): + if not self._was_message: + self.stop_sound_device() + return True + + logger.debug(message.type) + self._was_message = False + gobject.timeout_add(500, self._new_buffer, str(buffer)) + + elif message.type in (gst.MESSAGE_EOS, gst.MESSAGE_ERROR): + logger.debug(message.type) + self.stop_sound_device() + + self._was_message = False + bus = self.pipeline.get_bus() + bus.add_signal_watch() + bus.connect('message', gstmessage_cb) + + def _new_buffer(self, buf): + if not self.quiet: + # pass captured audio to anyone who is interested + self.emit("new-buffer", buf) + return False + +# load proper espeak plugin +try: + import gst + gst.element_factory_make('espeak') + from espeak_gst import AudioGrabGst as AudioGrab + from espeak_gst import * + logger.info('use gst-plugins-espeak') +except Exception, e: + logger.info('disable gst-plugins-espeak: %s' % e) + if subprocess.call('which espeak', shell=True) == 0: + from espeak_cmd import AudioGrabCmd as AudioGrab + from espeak_cmd import * + else: + logger.info('disable espeak_cmd') + supported = False diff --git a/speak/espeak_cmd.py b/speak/espeak_cmd.py new file mode 100644 index 0000000..682bfcd --- /dev/null +++ b/speak/espeak_cmd.py @@ -0,0 +1,64 @@ +# 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 + +import re +import subprocess + +import logging +logger = logging.getLogger('speak') + +import espeak + +PITCH_MAX = 99 +RATE_MAX = 99 +PITCH_DEFAULT = PITCH_MAX/2 +RATE_DEFAULT = RATE_MAX/3 + +class AudioGrabCmd(espeak.BaseAudioGrab): + def speak(self, status, text): + self.make_pipeline('filesrc name=file-source') + + # espeak uses 80 to 370 + rate = 80 + (370-80) * int(status.rate) / 100 + wavpath = "/tmp/speak.wav" + + subprocess.call(["espeak", "-w", wavpath, "-p", str(status.pitch), + "-s", str(rate), "-v", status.voice.name, text], + stdout=subprocess.PIPE) + + self.stop_sound_device() + + # set the source file + self.pipeline.get_by_name("file-source").props.location = wavpath + + # play + self.restart_sound_device() + +def voices(): + out = [] + result = subprocess.Popen(["espeak", "--voices"], stdout=subprocess.PIPE) \ + .communicate()[0] + + for line in result.split('\n'): + m = re.match(r'\s*\d+\s+([\w-]+)\s+([MF])\s+([\w_-]+)\s+(.+)', line) + if not m: + continue + language, gender, name, stuff = m.groups() + if stuff.startswith('mb/') or \ + name in ('en-rhotic','english_rp','english_wmids'): + # these voices don't produce sound + continue + out.append((language, name)) + + return out diff --git a/speak/espeak_gst.py b/speak/espeak_gst.py new file mode 100644 index 0000000..85cfa26 --- /dev/null +++ b/speak/espeak_gst.py @@ -0,0 +1,54 @@ +# 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 + +import logging +logger = logging.getLogger('speak') + +import gst +import espeak + +PITCH_MAX = 200 +RATE_MAX = 200 +PITCH_DEFAULT = PITCH_MAX/2 +RATE_DEFAULT = RATE_MAX/2 + +class AudioGrabGst(espeak.BaseAudioGrab): + def speak(self, status, text): + self.make_pipeline('espeak name=espeak ! wavenc') + src = self.pipeline.get_by_name('espeak') + + pitch = int(status.pitch) - 100 + rate = int(status.rate) - 100 + + logger.debug('pitch=%d rate=%d voice=%s text=%s' % (pitch, rate, + status.voice.name, text)) + + src.props.text = text + src.props.pitch = pitch + src.props.rate = rate + src.props.voice = status.voice.name + + self.restart_sound_device() + +def voices(): + out = [] + + for i in gst.element_factory_make('espeak').props.voices: + name, language, dialect = i + if name in ('en-rhotic','english_rp','english_wmids'): + # these voices don't produce sound + continue + out.append((language, name)) + + return out diff --git a/speak/eye.py b/speak/eye.py new file mode 100644 index 0000000..1fe23f5 --- /dev/null +++ b/speak/eye.py @@ -0,0 +1,157 @@ +# Speak.activity +# A simple front end to the espeak text-to-speech engine on the XO laptop +# http://wiki.laptop.org/go/Speak +# +# Copyright (C) 2008 Joshua Minor +# This file is part of Speak.activity +# +# Parts of Speak.activity are based on code from Measure.activity +# Copyright (C) 2007 Arjun Sarwal - arjun@laptop.org +# +# Speak.activity 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 +# (at your option) any later version. +# +# Speak.activity 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 Speak.activity. If not, see . + +import pygtk +import gtk +import gtk.gdk +import gobject +import cairo +import math + +class Eye(gtk.DrawingArea): + def __init__(self, fill_color): + gtk.DrawingArea.__init__(self) + self.connect("expose_event", self.expose) + self.frame = 0 + self.blink = False + self.x, self.y = 0,0 + self.fill_color = fill_color + + # listen for clicks + self.add_events(gtk.gdk.BUTTON_PRESS_MASK) + self.add_events(gtk.gdk.BUTTON_RELEASE_MASK) + self.connect("button_press_event", self._mouse_pressed_cb) + self.connect("button_release_event", self._mouse_released_cb) + + # Instead of listening for mouse move events we could poll to see if the mouse has moved + # would let us react to the mouse even when it isn't directly over this widget. + # Unfortunately that would cause a lot of CPU usage. So instead we rely on our parent to + # tell us to redraw when the mouse has moved. We still need to call add_events so that + # our parent will get mouse motion events, but we don't connect the callback for them ourselves. + self.add_events(gtk.gdk.POINTER_MOTION_MASK) + # self.connect("motion_notify_event", self._mouse_moved_cb) + + def _mouse_moved_cb(self, widget, event): + self.queue_draw() + + def _mouse_pressed_cb(self, widget, event): + self.blink = True + self.queue_draw() + + def _mouse_released_cb(self, widget, event): + self.blink = False + self.queue_draw() + + def look_at(self, x, y): + self.x = x + self.y = y + self.queue_draw() + + def look_ahead(self): + self.x = None + self.y = None + self.queue_draw() + + # Thanks to xeyes :) + def computePupil(self): + a = self.get_allocation() + + if self.x is None or self.y is None: + # look ahead, but not *directly* in the middle + if a.x + a.width/2 < self.parent.get_allocation().width/2: + cx = a.width * 0.6 + else: + cx = a.width * 0.4 + return cx, a.height * 0.6 + + EYE_X, EYE_Y = self.translate_coordinates( + self.get_toplevel(), a.width/2, a.height/2) + EYE_HWIDTH = a.width + EYE_HHEIGHT = a.height + BALL_DIST = EYE_HWIDTH/4 + + dx = self.x - EYE_X + dy = self.y - EYE_Y + + if dx or dy: + angle = math.atan2(dy, dx) + cosa = math.cos(angle) + sina = math.sin(angle) + h = math.hypot(EYE_HHEIGHT * cosa, EYE_HWIDTH * sina) + x = (EYE_HWIDTH * EYE_HHEIGHT) * cosa / h + y = (EYE_HWIDTH * EYE_HHEIGHT) * sina / h + dist = BALL_DIST * math.hypot(x, y) + + if dist < math.hypot(dx, dy): + dx = dist * cosa + dy = dist * sina + + return a.width/2 + dx, a.height/2 + dy + + def expose(self, widget, event): + self.frame += 1 + bounds = self.get_allocation() + + eyeSize = min(bounds.width, bounds.height) + outlineWidth = eyeSize/20.0 + pupilSize = eyeSize/10.0 + pupilX, pupilY = self.computePupil() + dX = pupilX - bounds.width/2. + dY = pupilY - bounds.height/2. + distance = math.sqrt(dX*dX + dY*dY) + limit = eyeSize/2 - outlineWidth*2 - pupilSize + if distance > limit: + pupilX = bounds.width/2 + dX*limit/distance + pupilY = bounds.height/2 + dY*limit/distance + + self.context = widget.window.cairo_create() + #self.context.set_antialias(cairo.ANTIALIAS_NONE) + + #set a clip region for the expose event. This reduces redrawing work (and time) + self.context.rectangle(event.area.x, event.area.y, event.area.width, event.area.height) + self.context.clip() + + # background + self.context.set_source_rgba(*self.fill_color.get_rgba()) + self.context.rectangle(0,0,bounds.width,bounds.height) + self.context.fill() + + # eye ball + self.context.arc(bounds.width/2,bounds.height/2, eyeSize/2-outlineWidth/2, 0,360) + self.context.set_source_rgb(1,1,1) + self.context.fill() + + # outline + self.context.set_line_width(outlineWidth) + self.context.arc(bounds.width/2,bounds.height/2, eyeSize/2-outlineWidth/2, 0,360) + self.context.set_source_rgb(0,0,0) + self.context.stroke() + + # pupil + self.context.arc(pupilX,pupilY,pupilSize,0,360) + self.context.set_source_rgb(0,0,0) + self.context.fill() + + self.blink = False + + return True diff --git a/speak/face.py b/speak/face.py new file mode 100644 index 0000000..5ad632c --- /dev/null +++ b/speak/face.py @@ -0,0 +1,184 @@ +# Speak.activity +# A simple front end to the espeak text-to-speech engine on the XO laptop +# http://wiki.laptop.org/go/Speak +# +# Copyright (C) 2008 Joshua Minor +# This file is part of Speak.activity +# +# Parts of Speak.activity are based on code from Measure.activity +# Copyright (C) 2007 Arjun Sarwal - arjun@laptop.org +# +# Speak.activity 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 +# (at your option) any later version. +# +# Speak.activity 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 Speak.activity. If not, see . + + +import logging +import gtk +import cjson +from gettext import gettext as _ + +import sugar.graphics.style as style + +import espeak +import eye +import glasses +import mouth +import voice +import fft_mouth +import waveform_mouth + +logger = logging.getLogger('speak') + +FACE_PAD = 2 + +class Status: + def __init__(self): + self.voice = voice.defaultVoice() + self.pitch = espeak.PITCH_DEFAULT + self.rate = espeak.RATE_DEFAULT + self.eyes = [eye.Eye] * 2 + self.mouth = mouth.Mouth + + def serialize(self): + eyes = { eye.Eye : 1, + glasses.Glasses : 2 } + mouths = { mouth.Mouth : 1, + fft_mouth.FFTMouth : 2, + waveform_mouth.WaveformMouth : 3 } + + return cjson.encode({ + 'voice' : { 'language' : self.voice.language, + 'name' : self.voice.name }, + 'pitch' : self.pitch, + 'rate' : self.rate, + 'eyes' : [eyes[i] for i in self.eyes], + 'mouth' : mouths[self.mouth] }) + + def deserialize(self, buf): + eyes = { 1: eye.Eye, + 2: glasses.Glasses } + mouths = { 1: mouth.Mouth, + 2: fft_mouth.FFTMouth, + 3: waveform_mouth.WaveformMouth } + + data = cjson.decode(buf) + self.voice = voice.Voice(data['voice']['language'], + data['voice']['name']) + self.pitch = data['pitch'] + self.rate = data['rate'] + self.eyes = [eyes[i] for i in data['eyes']] + self.mouth = mouths[data['mouth']] + + return self + + def clone(self): + new = Status() + new.voice = self.voice + new.pitch = self.pitch + new.rate = self.rate + new.eyes = self.eyes + new.mouth = self.mouth + return new + +class View(gtk.EventBox): + def __init__(self, fill_color=style.COLOR_BUTTON_GREY): + gtk.EventBox.__init__(self) + + self.status = Status() + self.fill_color = fill_color + + self.connect('size-allocate', self._size_allocate_cb) + + self._audio = espeak.AudioGrab() + + # make an empty box for some eyes + self._eyes = None + self._eyebox = gtk.HBox() + self._eyebox.show() + + # make an empty box to put the mouth in + self._mouth = None + self._mouthbox = gtk.HBox() + self._mouthbox.show() + + # layout the screen + box = gtk.VBox(homogeneous=False) + box.pack_start(self._eyebox) + box.pack_start(self._mouthbox, False) + box.set_border_width(FACE_PAD) + self.modify_bg(gtk.STATE_NORMAL, self.fill_color.get_gdk_color()) + self.add(box) + + self._mapped = False + self._peding = None + self.connect("map_event",self._map_event) + + self.update() + + def _map_event(self, widget, event): + self._mapped = True + if self._peding: + self.update(self._peding) + self._peding = None + + def look_ahead(self): + if self._eyes: + map(lambda e: e.look_ahead(), self._eyes) + + def look_at(self, x, y): + if self._eyes: + map(lambda e, x=x, y=y: e.look_at(x,y), self._eyes) + + def update(self, status = None): + if not status: + status = self.status + else: + if not self._mapped: + self._peding = status + return + self.status = status + + if self._eyes: + for eye in self._eyes: + self._eyebox.remove(eye) + if self._mouth: + self._mouthbox.remove(self._mouth) + + self._eyes = [] + + for i in status.eyes: + eye = i(self.fill_color) + self._eyes.append(eye) + self._eyebox.pack_start(eye, padding=FACE_PAD) + eye.show() + + self._mouth = status.mouth(self._audio, self.fill_color) + self._mouth.show() + self._mouthbox.add(self._mouth) + + # enable mouse move events so we can track the eyes while the mouse is over the mouth + #self._mouth.add_events(gtk.gdk.POINTER_MOTION_MASK) + + def say(self, something): + self._audio.speak(self._peding or self.status, something) + + def say_notification(self, something): + status = (self._peding or self.status).clone() + status.voice = voice.defaultVoice() + self._audio.speak(status, something) + + def shut_up(self): + self._audio.stop_sound_device() + + def _size_allocate_cb(self, widget, allocation): + self._mouthbox.set_size_request(-1, int(allocation.height/2.5)) diff --git a/speak/fft_mouth.py b/speak/fft_mouth.py new file mode 100644 index 0000000..53bcadf --- /dev/null +++ b/speak/fft_mouth.py @@ -0,0 +1,128 @@ +# Speak.activity +# A simple front end to the espeak text-to-speech engine on the XO laptop +# http://wiki.laptop.org/go/Speak +# +# Copyright (C) 2008 Joshua Minor +# This file is part of Speak.activity +# +# Parts of Speak.activity are based on code from Measure.activity +# Copyright (C) 2007 Arjun Sarwal - arjun@laptop.org +# +# Speak.activity 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 +# (at your option) any later version. +# +# Speak.activity 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 Speak.activity. If not, see . + +# This code is a stripped down version of the fft view from Measure + +from mouth import * + +# Newer OLPC builds (and Fedora) have numpy instead of numeric: +try: + from numpy.oldnumeric import ceil + from numpy.fft import * +except: + from Numeric import ceil + from FFT import * + +class FFTMouth(Mouth): + def __init__(self, audioSource, fill_color): + + Mouth.__init__(self, audioSource, fill_color) + + self.peaks = [] + + self.y_mag = 1.7 + self.freq_range=70 + self.draw_interval = 1 + self.num_of_points = 105 + + self.stop=False + + self.y_mag_bias_multiplier = 1 #constant to multiply with self.param2 while scaling values + + self.fftx = [] + + self.scaleX = "10" + self.scaleY = "10" + + + def processBuffer(self, bounds): + self.param1 = bounds.height/65536.0 + self.param2 = bounds.height/2.0 + + if(self.stop==False): + + Fs = 48000 + nfft= 65536 + self.newest_buffer=self.newest_buffer[0:256] + self.fftx = fft(self.newest_buffer, 256,-1) + + self.fftx=self.fftx[0:self.freq_range*2] + self.draw_interval=bounds.width/(self.freq_range*2.) + + NumUniquePts = ceil((nfft+1)/2) + self.buffers=abs(self.fftx)*0.02 + self.y_mag_bias_multiplier=0.1 + self.scaleX = "hz" + self.scaleY = "" + + if(len(self.buffers)==0): + return False + + # Scaling the values + val = [] + for i in self.buffers: + temp_val_float = float(self.param1*i*self.y_mag) + self.y_mag_bias_multiplier * self.param2 + + if(temp_val_float >= bounds.height): + temp_val_float = bounds.height-25 + if(temp_val_float <= 0): + temp_val_float = 25 + val.append( temp_val_float ) + + self.peaks = val + + def expose(self, widget, event): + """This function is the "expose" event handler and does all the drawing.""" + + bounds = self.get_allocation() + + self.processBuffer(bounds) + + #Create context, disable antialiasing + self.context = widget.window.cairo_create() + self.context.set_antialias(cairo.ANTIALIAS_NONE) + + #set a clip region for the expose event. This reduces redrawing work (and time) + self.context.rectangle(event.area.x, event.area.y,event.area.width, event.area.height) + self.context.clip() + + # background + self.context.set_source_rgba(*self.fill_color.get_rgba()) + self.context.rectangle(0,0, bounds.width,bounds.height) + self.context.fill() + + # Draw the waveform + self.context.set_line_width(min(bounds.height/10.0, 10)) + self.context.set_source_rgb(0,0,0) + count = 0 + for peak in self.peaks: + self.context.line_to(bounds.width/2 + count,bounds.height/2 - peak) + count += self.draw_interval + self.context.stroke() + count = 0 + for peak in self.peaks: + self.context.line_to(bounds.width/2 - count,bounds.height/2 - peak) + count += self.draw_interval + self.context.stroke() + + return True diff --git a/speak/glasses.py b/speak/glasses.py new file mode 100644 index 0000000..fb64bbd --- /dev/null +++ b/speak/glasses.py @@ -0,0 +1,81 @@ +# Speak.activity +# A simple front end to the espeak text-to-speech engine on the XO laptop +# http://wiki.laptop.org/go/Speak +# +# Copyright (C) 2008 Joshua Minor +# This file is part of Speak.activity +# +# Parts of Speak.activity are based on code from Measure.activity +# Copyright (C) 2007 Arjun Sarwal - arjun@laptop.org +# +# Speak.activity 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 +# (at your option) any later version. +# +# Speak.activity 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 Speak.activity. If not, see . + +from eye import * + +class Glasses(Eye): + def __init__(self, fill_color): + Eye.__init__(self, fill_color) + + def expose(self, widget, event): + bounds = self.get_allocation() + + eyeSize = min(bounds.width, bounds.height) + outlineWidth = eyeSize/20.0 + pupilSize = eyeSize/10.0 + pupilX, pupilY = self.pupil_position() + dX = pupilX - bounds.width/2. + dY = pupilY - bounds.height/2. + distance = math.sqrt(dX*dX + dY*dY) + limit = eyeSize/2 - outlineWidth*2 - pupilSize + if distance > limit: + pupilX = bounds.width/2 + dX*limit/distance + pupilY = bounds.height/2 + dY*limit/distance + + self.context = widget.window.cairo_create() + #self.context.set_antialias(cairo.ANTIALIAS_NONE) + + #set a clip region for the expose event. This reduces redrawing work (and time) + self.context.rectangle(event.area.x, event.area.y, event.area.width, event.area.height) + self.context.clip() + + # background + self.context.set_source_rgba(*self.fill_color.get_rgba()) + self.context.rectangle(0,0,bounds.width,bounds.height) + self.context.fill() + + def roundrect(x1,y1, x2,y2): + self.context.move_to(x1, (y1+y2)/2.) + self.context.curve_to(x1,y1, x1,y1, (x1+x2)/2.,y1) + self.context.curve_to(x2,y1, x2,y1, x2,(y1+y2)/2.) + self.context.curve_to(x2,y2, x2,y2, (x1+x2)/2.,y2) + self.context.curve_to(x1,y2, x1,y2, x1,(y1+y2)/2.) + + # eye ball + roundrect(outlineWidth,outlineWidth, bounds.width-outlineWidth,bounds.height-outlineWidth) + self.context.set_source_rgb(1,1,1) + self.context.fill() + + # outline + self.context.set_line_width(outlineWidth) + roundrect(outlineWidth,outlineWidth, bounds.width-outlineWidth,bounds.height-outlineWidth) + #roundrect(0,0, bounds.width,bounds.height) + self.context.set_source_rgb(0,0,0) + self.context.stroke() + + # pupil + self.context.arc(pupilX,pupilY,pupilSize,0,360) + self.context.set_source_rgb(0,0,0) + self.context.fill() + + return True diff --git a/speak/mouth.py b/speak/mouth.py new file mode 100644 index 0000000..b01155a --- /dev/null +++ b/speak/mouth.py @@ -0,0 +1,101 @@ +# Speak.activity +# A simple front end to the espeak text-to-speech engine on the XO laptop +# http://wiki.laptop.org/go/Speak +# +# Copyright (C) 2008 Joshua Minor +# This file is part of Speak.activity +# +# Parts of Speak.activity are based on code from Measure.activity +# Copyright (C) 2007 Arjun Sarwal - arjun@laptop.org +# +# Speak.activity 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 +# (at your option) any later version. +# +# Speak.activity 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 Speak.activity. If not, see . + +# This code is a super-stripped down version of the waveform view from Measure + +import gtk +import cairo +from struct import unpack +import numpy.core + +class Mouth(gtk.DrawingArea): + def __init__(self, audioSource, fill_color): + + gtk.DrawingArea.__init__(self) + self.connect("expose_event",self.expose) + self.buffers = [] + self.buffer_size = 256 + self.main_buffers = [] + self.newest_buffer = [] + self.fill_color = fill_color + + audioSource.connect("new-buffer", self._new_buffer) + + def _new_buffer(self, obj, buf): + if len(buf) < 28: + self.newest_buffer = [] + else: + self.newest_buffer = list(unpack( str(int(len(buf))/2)+'h' , buf)) + self.main_buffers += self.newest_buffer + if(len(self.main_buffers)>self.buffer_size): + del self.main_buffers[0:(len(self.main_buffers)- \ + self.buffer_size)] + + self.queue_draw() + return True + + def processBuffer(self, bounds): + if len(self.main_buffers) == 0 or len(self.newest_buffer) == 0: + self.volume = 0 + else: + self.volume = numpy.core.max(self.main_buffers)# - numpy.core.min(self.main_buffers) + + def expose(self, widget, event): + """This function is the "expose" event handler and does all the drawing.""" + bounds = self.get_allocation() + + self.processBuffer(bounds) + + #Create context, disable antialiasing + self.context = widget.window.cairo_create() + self.context.set_antialias(cairo.ANTIALIAS_NONE) + + #set a clip region for the expose event. This reduces redrawing work (and time) + self.context.rectangle(event.area.x, event.area.y,event.area.width, event.area.height) + self.context.clip() + + # background + self.context.set_source_rgba(*self.fill_color.get_rgba()) + self.context.rectangle(0,0, bounds.width,bounds.height) + self.context.fill() + + # Draw the mouth + volume = self.volume / 65535. + mouthH = volume * bounds.height + mouthW = volume**2 * (bounds.width/2.) + bounds.width/2. + # T + # L R + # B + Lx,Ly = bounds.width/2 - mouthW/2, bounds.height/2 + Tx,Ty = bounds.width/2, bounds.height/2 - mouthH/2 + Rx,Ry = bounds.width/2 + mouthW/2, bounds.height/2 + Bx,By = bounds.width/2, bounds.height/2 + mouthH/2 + self.context.set_line_width(min(bounds.height/10.0, 10)) + self.context.move_to(Lx,Ly) + self.context.curve_to(Tx,Ty, Tx,Ty, Rx,Ry) + self.context.curve_to(Bx,By, Bx,By, Lx,Ly) + self.context.set_source_rgb(0,0,0) + self.context.close_path() + self.context.stroke() + + return True diff --git a/speak/voice.py b/speak/voice.py new file mode 100644 index 0000000..5fc732e --- /dev/null +++ b/speak/voice.py @@ -0,0 +1,134 @@ +# Speak.activity +# A simple front end to the espeak text-to-speech engine on the XO laptop +# http://wiki.laptop.org/go/Speak +# +# Copyright (C) 2008 Joshua Minor +# This file is part of Speak.activity +# +# Parts of Speak.activity are based on code from Measure.activity +# Copyright (C) 2007 Arjun Sarwal - arjun@laptop.org +# +# Speak.activity 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 +# (at your option) any later version. +# +# Speak.activity 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 Speak.activity. If not, see . + +import re, os +from gettext import gettext as _ + +import logging +logger = logging.getLogger('speak') + +import espeak + +# Lets trick gettext into generating entries for the voice names we expect espeak to have +# If espeak actually has new or different names then they won't get translated, but they +# should still show up in the interface. +expectedVoiceNames = [ + _("Brazil"), + _("Swedish"), + _("Icelandic"), + _("Romanian"), + _("Swahili"), + _("Hindi"), + _("Dutch"), + _("Latin"), + _("Hungarian"), + _("Macedonian"), + _("Welsh"), + _("French"), + _("Norwegian"), + _("Russian"), + _("Afrikaans"), + _("Finnish"), + _("Default"), + _("Cantonese"), + _("Scottish"), + _("Greek"), + _("Vietnam"), + _("English"), + _("Lancashire"), + _("Italian"), + _("Portugal"), + _("German"), + _("Whisper"), + _("Croatian"), + _("Czech"), + _("Slovak"), + _("Spanish"), + _("Polish"), + _("Esperanto") +] + +_allVoices = {} +_defaultVoice = None + +class Voice: + def __init__(self, language, name): + self.language = language + self.name = name + + friendlyname = name + friendlyname = friendlyname.replace('-test','') + friendlyname = friendlyname.replace('_test','') + friendlyname = friendlyname.replace('en-','') + friendlyname = friendlyname.replace('english-wisper','whisper') + friendlyname = friendlyname.capitalize() + self.friendlyname = _(friendlyname) + +def allVoices(): + if _allVoices: + return _allVoices + + for language, name in espeak.voices(): + voice = Voice(language, name) + _allVoices[voice.friendlyname] = voice + + return _allVoices + +def by_name(name): + return allVoices().get(name, defaultVoice()) + +def defaultVoice(): + """Try to figure out the default voice, from the current locale ($LANG). + Fall back to espeak's voice called Default.""" + + global _defaultVoice + + if _defaultVoice: + return _defaultVoice + + voices = allVoices() + + def fit(a,b): + "Compare two language ids to see if they are similar." + as_ = re.split(r'[^a-z]+', a.lower()) + bs = re.split(r'[^a-z]+', b.lower()) + for count in range(0, min(len(as_),len(bs))): + if as_[count] != bs[count]: + count -= 1 + break + return count + try: + lang = os.environ["LANG"] + except: + lang = "" + + best = voices[_("Default")] + for voice in voices.values(): + voiceMetric = fit(voice.language, lang) + bestMetric = fit(best.language, lang) + if voiceMetric > bestMetric: + best = voice + + print "Best voice for LANG %s seems to be %s %s" % (lang, best.language, best.friendlyname) + _defaultVoice = best + return best diff --git a/speak/waveform_mouth.py b/speak/waveform_mouth.py new file mode 100644 index 0000000..71a10ea --- /dev/null +++ b/speak/waveform_mouth.py @@ -0,0 +1,80 @@ +# Speak.activity +# A simple front end to the espeak text-to-speech engine on the XO laptop +# http://wiki.laptop.org/go/Speak +# +# Copyright (C) 2008 Joshua Minor +# This file is part of Speak.activity +# +# Parts of Speak.activity are based on code from Measure.activity +# Copyright (C) 2007 Arjun Sarwal - arjun@laptop.org +# +# Speak.activity 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 +# (at your option) any later version. +# +# Speak.activity 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 Speak.activity. If not, see . + +# This code is a stripped down version of the waveform view from Measure + +from mouth import * + +class WaveformMouth(Mouth): + def __init__(self, audioSource, fill_color): + + Mouth.__init__(self, audioSource, fill_color) + + self.buffer_size = 100 + self.peaks = [] + + self.stop=False + + self.y_mag_bias_multiplier = 1 + self.y_mag = 0.7 + + def expose(self, widget, event): + """This function is the "expose" event handler and does all the drawing.""" + + bounds = self.get_allocation() + self.param1 = bounds.height/65536.0 + self.param2 = bounds.height/2.0 + + #Create context, disable antialiasing + self.context = widget.window.cairo_create() + self.context.set_antialias(cairo.ANTIALIAS_NONE) + + #set a clip region for the expose event. This reduces redrawing work (and time) + self.context.rectangle(event.area.x, event.area.y,event.area.width, event.area.height) + self.context.clip() + + # background + self.context.set_source_rgba(*self.fill_color.get_rgba()) + self.context.rectangle(0,0, bounds.width,bounds.height) + self.context.fill() + + # Draw the waveform + self.context.set_line_width(min(bounds.height/10.0, 10)) + count = 0 + buflen = float(len(self.main_buffers)) + for value in self.main_buffers: + peak = float(self.param1*value*self.y_mag) + self.y_mag_bias_multiplier * self.param2 + + if peak >= bounds.height: + peak = bounds.height + if peak <= 0: + peak = 0 + + x = count / buflen * bounds.width + self.context.line_to(x,bounds.height - peak) + + count += 1 + self.context.set_source_rgb(0,0,0) + self.context.stroke() + + return True diff --git a/speak/widgets.py b/speak/widgets.py new file mode 100644 index 0000000..e20ae35 --- /dev/null +++ b/speak/widgets.py @@ -0,0 +1,48 @@ +# 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 + +import logging + +from port.widgets import ComboBox + +import voice + +class Voices(ComboBox): + def __init__(self, face, **kwargs): + ComboBox.__init__(self, **kwargs) + + self.face = face + + voices = voice.allVoices() + voicenames = voices.keys() + voicenames.sort() + + for name in voicenames: + self.append_item(voices[name], name) + + self.select(voice.defaultVoice()) + + self.connect('changed', self._changed_cb) + + def _changed_cb(self, widget): + self.face.status.voice = widget.props.value + self.face.say_notification(self.face.status.voice.friendlyname) + + def resume(self, value): + try: + self.handler_block_by_func(self._changed_cb) + self.select(name=value) + self.face.status.voice = self.props.value + finally: + self.handler_unblock_by_func(self._changed_cb) diff --git a/svgcard.py b/svgcard.py index 365aa8e..727cb05 100644 --- a/svgcard.py +++ b/svgcard.py @@ -28,10 +28,12 @@ import logging from sugar.util import LRU import theme +import face +import speak.voice _logger = logging.getLogger('memorize-activity') -class SvgCard(gtk.DrawingArea): +class SvgCard(gtk.EventBox): border_svg = join(dirname(__file__), 'images', 'card.svg') @@ -47,10 +49,9 @@ class SvgCard(gtk.DrawingArea): cache = {} def __init__(self, id, pprops, jpeg, size, align, bg_color='#000000'): - gtk.DrawingArea.__init__(self) - self.set_size_request(size, size) + gtk.EventBox.__init__(self) + self.bg_color = bg_color - self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.bg_color)) self.flipped = False self.flipped_once = False self.id = id @@ -61,6 +62,9 @@ class SvgCard(gtk.DrawingArea): self.align = align self.text_layouts = [None, None] + self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bg_color)) + self.set_size_request(size, size) + # Views properties views = ['back', 'back_h', 'back_text', 'front', 'front_h', 'front_text'] self.pprops = pprops @@ -74,19 +78,29 @@ class SvgCard(gtk.DrawingArea): self.show_text = True self.current_face = 'back' - # Set events and listeners - self.connect('expose-event', self._expose_cb) - self.set_events(gtk.gdk.ALL_EVENTS_MASK) - gc.collect() - self.show() + self.draw = gtk.DrawingArea() + self.draw.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bg_color)) + self.draw.set_events(gtk.gdk.ALL_EVENTS_MASK) + self.draw.connect('expose-event', self._expose_cb) + self.draw.connect('realize', self._realize_cb) + self.draw.show_all() + + self.workspace = gtk.VBox() + self.workspace.add(self.draw) + self.add(self.workspace) + self.show_all() + + #gc.collect() + + def _realize_cb(self, widget): + self.gc = widget.window.new_gc() def _expose_cb(self, widget, event): - gc = self.window.new_gc() pixbuf = self._read_icon_data(self.current_face) - self.window.draw_pixbuf(None, pixbuf, 0, 0, 0, 0) + widget.window.draw_pixbuf(None, pixbuf, 0, 0, 0, 0) if self.show_jpeg: - self.window.draw_pixbuf(None, self.jpeg, 0, 0, + widget.window.draw_pixbuf(None, self.jpeg, 0, 0, theme.SVG_PAD, theme.SVG_PAD) if self.show_text: @@ -105,7 +119,7 @@ class SvgCard(gtk.DrawingArea): elif self.align == '3': # bottom y = self.size - height - widget.window.draw_layout(gc, layout=layout, + widget.window.draw_layout(self.gc, layout=layout, x=(self.size - width)/2, y=y, foreground=gtk.gdk.color_parse(props['text_color'])) @@ -127,23 +141,23 @@ class SvgCard(gtk.DrawingArea): entity = '' % dict.get('stroke_color', '') data = re.sub('', entity, data) - + entity = '' % dict.get('opacity', '') data = re.sub('', entity, data) - + data = re.sub('size_card1', str(self.size), data) data = re.sub('size_card2', str(self.size-6), data) data = re.sub('size_card3', str(self.size-17), data) pixbuf = rsvg.Handle(data=data).get_pixbuf() self.cache[set] = pixbuf return pixbuf - + def set_border(self, stroke_color, fill_color): self.props['front'].update({'fill_color':fill_color, 'stroke_color':stroke_color}) self.queue_draw() while gtk.events_pending(): - gtk.main_iteration() - + gtk.main_iteration() + def set_pixbuf(self, pixbuf): if pixbuf == None: self.jpeg = None @@ -151,7 +165,7 @@ class SvgCard(gtk.DrawingArea): else: if self.jpeg != None: del self.jpeg - + self.jpeg = pixbuf del pixbuf self.show_jpeg = True @@ -200,14 +214,27 @@ class SvgCard(gtk.DrawingArea): else: self.show_text = False - self.current_face = 'front' + if self.id != -1 and self.get_speak(): + speaking_face = face.acquire() + if speaking_face: + self._switch_to_face(speaking_face) + speaking_face.face.status.voice = \ + speak.voice.by_name(self.get_speak()) + speaking_face.face.say(self.get_text()) + self.current_face = 'front' self.flipped = True self.queue_draw() while gtk.events_pending(): gtk.main_iteration() - gc.collect() + + #gc.collect() + + def cement(self): + if not self.get_speak(): + return + self._switch_to_face(self.draw) def flop(self): self.current_face = 'back' @@ -217,14 +244,24 @@ class SvgCard(gtk.DrawingArea): self.show_text = False self.flipped = False self.show_jpeg = False + + if self.id != -1 and self.get_speak(): + self._switch_to_face(self.draw) + self.queue_draw() - + + def _switch_to_face(self, widget): + for i in self.workspace.get_children(): + self.workspace.remove(i) + self.workspace.add(widget) + widget.set_size_request(self.size, self.size) + def is_flipped(self): return self.flipped - + def get_id(self): return self.id - + def reset(self): if self.flipped: fill_color = self.default_props.get('front_border').get('fill_color') @@ -241,14 +278,17 @@ class SvgCard(gtk.DrawingArea): for size in range(80, 66, -8) + range(66, 44, -6) + \ range(44, 24, -4) + range(24, 15, -2) + range(15, 7, -1): + + card_size = self.size - theme.SVG_PAD*2 layout = self.create_pango_layout(text) - layout.set_width(PIXELS_PANGO(self.size - theme.SVG_PAD)) - layout.set_wrap(pango.WRAP_WORD_CHAR) + layout.set_width(PIXELS_PANGO(card_size)) + layout.set_wrap(pango.WRAP_WORD) desc = pango.FontDescription('Deja Vu Sans bold ' + str(size)) layout.set_font_description(desc) if layout.get_line_count() <= max_lines_count and \ - layout.get_pixel_size()[1] <= self.size: + layout.get_pixel_size()[0] <= card_size and \ + layout.get_pixel_size()[1] <= card_size: break if layout.get_line_count() > 1: @@ -262,7 +302,7 @@ class SvgCard(gtk.DrawingArea): def set_background(self, color): self.bg_color = color - self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.bg_color)) + self.draw.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.bg_color)) def change_text(self, newtext): self.text_layouts[self.flipped] = None @@ -270,9 +310,16 @@ class SvgCard(gtk.DrawingArea): if len(newtext) > 0: self.show_text = True self.queue_draw() + def get_text(self): return self.props['front_text'].get('card_text', '') + def change_speak(self, value): + self.props['front_text']['speak'] = value + + def get_speak(self): + return self.props['front_text'].get('speak') + def PIXELS_PANGO(x): return x * 1000 diff --git a/theme.py b/theme.py index 4f1cfc0..4250629 100644 --- a/theme.py +++ b/theme.py @@ -20,7 +20,7 @@ import gtk PAIR_SIZE = gtk.gdk.screen_width() / 5 PAD = 10 SVG_PAD = 10 -CARD_PAD = 2 +CARD_PAD = 4 BODY_WIDTH = 45 BODY_HEIGHT = 55 STARS_COLS = 6 -- cgit v0.9.1