diff options
| -rw-r--r-- | Speak.activity/activity.py | 91 | ||||
| -rw-r--r-- | Speak.activity/brain.py | 103 | ||||
| -rw-r--r-- | Speak.activity/collab.py | 95 | ||||
| -rw-r--r-- | Speak.activity/port/COPYING | 340 | ||||
| -rw-r--r-- | Speak.activity/port/README | 17 | ||||
| -rw-r--r-- | Speak.activity/port/__init__.py | 0 | ||||
| -rw-r--r-- | Speak.activity/port/activity.py | 298 | ||||
| -rw-r--r-- | Speak.activity/port/combobox.py | 179 | ||||
| -rw-r--r-- | Speak.activity/port/toolcombobox.py | 63 | ||||
| -rw-r--r-- | Speak.activity/voice.py | 6 |
10 files changed, 1034 insertions, 158 deletions
diff --git a/Speak.activity/activity.py b/Speak.activity/activity.py index 240ffa1..f35dc4e 100644 --- a/Speak.activity/activity.py +++ b/Speak.activity/activity.py @@ -32,8 +32,9 @@ import cjson from gettext import gettext as _ from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.toolcombobox import ToolComboBox -from sugar.graphics.combobox import ComboBox +from port.toolcombobox import ToolComboBox +from port.combobox import ComboBox +from port.activity import SharedActivity import eye import glasses @@ -45,17 +46,18 @@ import face import brain import chat import audio -from collab import CollabActivity from messenger import Messenger, SERVICE logger = logging.getLogger('speak') -CHAT_TOOLBAR = 3 +BOT_TOOLBAR = 3 +CHAT_TOOLBAR = 4 -class SpeakActivity(CollabActivity): +class SpeakActivity(SharedActivity): def __init__(self, handle): + self.notebook = gtk.Notebook() - CollabActivity.__init__(self, SERVICE, handle) + SharedActivity.__init__(self, self.notebook, SERVICE, handle) bounds = self.get_allocation() # pick a voice that espeak supports @@ -88,11 +90,9 @@ class SpeakActivity(CollabActivity): box.connect("button_press_event", self._mouse_clicked_cb) # desktop - self.notebook = gtk.Notebook() self.notebook.show() self.notebook.props.show_border = False self.notebook.props.show_tabs = False - self.set_canvas(self.notebook) box.show_all() self.notebook.append_page(box) @@ -102,22 +102,26 @@ class SpeakActivity(CollabActivity): self.notebook.append_page(self.chat) # make some toolbars - toolbox = activity.ActivityToolbox(self) - self.set_toolbox(toolbox) - toolbox.show() + self.toolbox = activity.ActivityToolbox(self) + self.set_toolbox(self.toolbox) + self.toolbox.show() #activitybar = toolbox.get_activity_toolbar() - toolbox.connect('current-toolbar-changed', self._toolbar_changed_cb) + self.toolbox.connect('current-toolbar-changed', self._toolbar_changed_cb) voicebar = self.make_voice_bar() - toolbox.add_toolbar("Voice", voicebar) + self.toolbox.add_toolbar(_('Voice'), voicebar) voicebar.show() facebar = self.make_face_bar() - toolbox.add_toolbar("Face", facebar) + self.toolbox.add_toolbar(_('Face'), facebar) facebar.show() + self.bot = brain.Toolbar(self) + self.toolbox.add_toolbar(_('Robot'), self.bot) + self.bot.show() + chatbar = chat.Toolbar(self.chat) - toolbox.add_toolbar(_('Chat'), chatbar) + self.toolbox.add_toolbar(_('Chat'), chatbar) chatbar.show() # make the text box active right away @@ -150,12 +154,8 @@ class SpeakActivity(CollabActivity): # map(lambda w: w.queue_draw(), self.eyes) # return True # gobject.timeout_add(100, poll_mouse) - - # XXX do it after(possible) read_file() invoking - # have to rely on calling read_file() from map_cb in sugar-toolkit - self.connect_after('map', self.connect_to) - def connect_to(self, widget): + def new_instance(self): self.voice_combo.connect('changed', self.voice_changed_cb) self.pitchadj.connect("value_changed", self.pitch_adjusted_cb, self.pitchadj) self.rateadj.connect("value_changed", self.rate_adjusted_cb, self.rateadj) @@ -167,41 +167,43 @@ class SpeakActivity(CollabActivity): self.face.look_ahead() - self.brain = brain.defaultBrain(self.face.status.voice) - # say hello to the user presenceService = presenceservice.get_instance() xoOwner = presenceService.get_owner() self.face.say(_("Hello %s. Type something.") % xoOwner.props.nick) - def write_file(self, file_path): - cfg = { 'status' : self.face.status.serialize(), - 'text' : self.entry.props.text, - 'history' : map(lambda i: i[0], self.entrycombo.get_model()) } - file(file_path, 'w').write(cjson.encode(cfg)) - - def read_file(self, file_path): + def resume_instance(self, file_path): cfg = cjson.decode(file(file_path, 'r').read()) - def pick_combo_item(combo, col, obj): - for i, item in enumerate(combo.get_model()): - if item[col] == obj: - combo.set_active(i) - return - logger.warning("Unrecognized loaded value: %s" % obj) - status = self.face.status = face.Status().deserialize(cfg['status']) - pick_combo_item(self.voice_combo, 1, status.voice.friendlyname) + self.change_voice(voice,status.voice.friendlyname, True) self.pitchadj.value = self.face.status.pitch self.rateadj.value = self.face.status.rate - pick_combo_item(self.mouth_shape_combo, 0, status.mouth) - pick_combo_item(self.eye_shape_combo, 0, status.eyes[0]) + self.mouth_shape_combo.select(status.mouth) + self.eye_shape_combo.select(status.eyes[0]) self.numeyesadj.value = len(status.eyes) self.entry.props.text = cfg['text'] for i in cfg['history']: self.entrycombo.append_text(i) + self.new_instance() + + def save_instance(self, file_path): + cfg = { 'status' : self.face.status.serialize(), + 'text' : self.entry.props.text, + 'history' : map(lambda i: i[0], self.entrycombo.get_model()) } + file(file_path, 'w').write(cjson.encode(cfg)) + + def share_instance(self, connection, is_initiator): + self.chat.messenger = Messenger(connection, is_initiator, self.chat) + + def change_voice(self, voice, silent): + self.voice_combo.select(voice, + column=1, + silent_cb=(silent and self.voice_changed_cb or None)) + self.face.status.voice = self.voice_combo.get_active_item()[0] + def _cursor_moved_cb(self, entry, *ignored): # make the eyes track the motion of the text cursor index = entry.props.cursor_position @@ -275,7 +277,6 @@ class SpeakActivity(CollabActivity): def voice_changed_cb(self, combo): self.face.status.voice = combo.props.value self.face.say(self.face.status.voice.friendlyname) - self.brain = brain.defaultBrain(self.face.status.voice) def pitch_adjusted_cb(self, get, data=None): self.face.status.pitch = get.value @@ -373,7 +374,10 @@ class SpeakActivity(CollabActivity): self.face.look_ahead() # speak the text - self.face.say(self.brain.respond(text)) + if self.toolbox.get_current_toolbar() == BOT_TOOLBAR: + self.face.say(self.bot.respond(text)) + else: + self.face.say(text) # add this text to our history unless it is the same as the last item history = self.entrycombo.get_model() @@ -404,9 +408,8 @@ class SpeakActivity(CollabActivity): else: self.chat.shut_up() self.notebook.set_current_page(0) - - def on_tube(self, tube_conn, initiating): - self.chat.messenger = Messenger(tube_conn, initiating, self.chat) + if index == BOT_TOOLBAR: + self.bot.update_voice() #def on_quit(self, data=None): # self.audio.on_quit() diff --git a/Speak.activity/brain.py b/Speak.activity/brain.py index 2086f20..cc969cd 100644 --- a/Speak.activity/brain.py +++ b/Speak.activity/brain.py @@ -17,24 +17,93 @@ # You should have received a copy of the GNU General Public License # along with HablarConSara.activity. If not, see <http://www.gnu.org/licenses/>. -import bot.aiml +import gtk +import gobject from gettext import gettext as _ -class defaultBrain: - def __init__(self, voice): - self.language = voice.language - self.kernel = bot.aiml.Kernel() - - if self.language=="es": - self.kernel.loadBrain("bot/sara.brn") - self.kernel.setBotPredicate("nombre_bot","Sara") - self.kernel.setBotPredicate("botmaster","la comunidad Azucar") - elif self.language=="en-uk": - self.kernel.loadBrain("bot/alice.brn") - self.kernel.setBotPredicate("name","Alice") - self.kernel.setBotPredicate("master","the Sugar Community") - else: - self.kernel.respond = lambda x: x +import logging +logger = logging.getLogger('speak') + +from port.toolcombobox import ToolComboBox + +import bot.aiml +import voice + +BOTS = { + _('Spanish'): { 'name': 'Sara', + 'brain': 'bot/sara.brn', + 'predicates': { 'nombre_bot': 'Sara', + 'botmaster': 'la comunidad Azucar' } }, + _('English'): { 'name': 'Alice', + 'brain': 'bot/alice.brn', + 'predicates': { 'name': 'Alice', + 'master': 'the Sugar Community' } } } + +DEFAULT = voice.defaultVoice() +if not BOTS.has_key(DEFAULT): + DEFAULT = _('English') + +class Toolbar(gtk.Toolbar): + def __init__(self, activity): + gtk.Toolbar.__init__(self) + self.activity = activity + self._kernels = {} + self._first_session = True + + self.voices = ToolComboBox() + + for lang in sorted(BOTS.keys()): + self.voices.combo.append_item(lang, lang) + + self.voices.combo.set_active(0) + self.voices.combo.connect('changed', self._changed_cb) + self.voices.show() + + self.insert(self.voices, -1) + + def _changed_cb(self, combo): + self.activity.change_voice(combo.props.value, False) + + def update_voice(self): + voice = self.activity.voice_combo.props.value.friendlyname + new_voice = BOTS.has_key(voice) and voice or DEFAULT + + if voice != new_voice: + self.activity.change_voice(new_voice, True) + self.voices.combo.select(new_voice) + else: + self.voices.combo.select(voice) + + if not self._kernels.has_key(new_voice): + def load_brain(old_cursor, is_first_session): + try: + brain = BOTS[new_voice] + logger.debug('Load bot: %s' % brain) + + kernel = bot.aiml.Kernel() + kernel.loadBrain(brain['brain']) + for name, value in brain['predicates'].items(): + kernel.setBotPredicate(name, value) + self._kernels[new_voice] = kernel + finally: + self.activity.set_cursor(old_cursor) + + if is_first_session: + self.activity.face.say( + _("Hello, I'am a robot \"%s\". " \ + "Ask me any question.") % BOTS[new_voice]['name']) + + old_cursor = self.activity.get_cursor() + self.activity.set_cursor(gtk.gdk.WATCH) + gobject.idle_add(load_brain, old_cursor, self._first_session) + + elif voice != new_voice: + self.activity.face.say( + _("Sorry, I can speak %s, let's speak %s instead.") \ + % (voice, new_voice)) + + self._first_session = False def respond(self, text): - return self.kernel.respond(text) + voice = self.voices.combo.props.value + return self._kernels[voice].respond(text) diff --git a/Speak.activity/collab.py b/Speak.activity/collab.py deleted file mode 100644 index 4638d25..0000000 --- a/Speak.activity/collab.py +++ /dev/null @@ -1,95 +0,0 @@ -# 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 -import telepathy - -from sugar.activity.activity import Activity -from sugar.presence.sugartubeconn import SugarTubeConnection - -logger = logging.getLogger('speak') - -class CollabActivity(Activity): - def __init__(self, service, *args): - Activity.__init__(self, *args) - self.service = service - - self.connect('shared', self._shared_cb) - - # Owner.props.key - if self._shared_activity: - # We are joining the activity - self.connect('joined', self._joined_cb) - if self.get_shared(): - # We've already joined - self._joined_cb() - - def on_tube(self, tube_conn, initiating): - pass - - def _shared_cb(self, activity): - logger.debug('My activity was shared') - self._initiating = True - self._sharing_setup() - - logger.debug('This is my activity: making a tube...') - id = self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube( - self.service, {}) - - def _joined_cb(self, activity): - if not self._shared_activity: - return - - logger.debug('Joined an existing shared activity') - - self._initiating = False - self._sharing_setup() - - logger.debug('This is not my activity: waiting for a tube...') - self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes( - reply_handler=self._list_tubes_reply_cb, - error_handler=self._list_tubes_error_cb) - - def _sharing_setup(self): - if self._shared_activity is None: - logger.error('Failed to share or join activity') - return - self._conn = self._shared_activity.telepathy_conn - self._tubes_chan = self._shared_activity.telepathy_tubes_chan - self._text_chan = self._shared_activity.telepathy_text_chan - - self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal('NewTube', self._new_tube_cb) - - def _list_tubes_reply_cb(self, tubes): - for tube_info in tubes: - self._new_tube_cb(*tube_info) - - def _list_tubes_error_cb(self, e): - logger.error('ListTubes() failed: %s', e) - - def _new_tube_cb(self, id, initiator, type, service, params, state): - logger.debug('New tube: ID=%d initator=%d type=%d service=%s ' - 'params=%r state=%d', id, initiator, type, service, - params, state) - - if (type == telepathy.TUBE_TYPE_DBUS and - service == self.service): - if state == telepathy.TUBE_STATE_LOCAL_PENDING: - self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].AcceptDBusTube(id) - - tube_conn = SugarTubeConnection(self._conn, - self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES], - id, group_iface=self._text_chan[telepathy.CHANNEL_INTERFACE_GROUP]) - - self.on_tube(tube_conn, self._initiating) diff --git a/Speak.activity/port/COPYING b/Speak.activity/port/COPYING new file mode 100644 index 0000000..623b625 --- /dev/null +++ b/Speak.activity/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. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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. + + <signature of Ty Coon>, 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/Speak.activity/port/README b/Speak.activity/port/README new file mode 100644 index 0000000..b6d738f --- /dev/null +++ b/Speak.activity/port/README @@ -0,0 +1,17 @@ +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 the files +you are using directly - sugar-port's files don't import each other. + +Get it +------ + +http://wiki.sugarlabs.org/go/Development_Team/sugar-port diff --git a/Speak.activity/port/__init__.py b/Speak.activity/port/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Speak.activity/port/__init__.py diff --git a/Speak.activity/port/activity.py b/Speak.activity/port/activity.py new file mode 100644 index 0000000..86823a2 --- /dev/null +++ b/Speak.activity/port/activity.py @@ -0,0 +1,298 @@ +# 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 + +"""Extend sugar-toolkit activity class""" + +import gtk +import logging +import telepathy +import gobject + +import sugar.activity.activity as toolkit +from sugar.presence.sugartubeconn import SugarTubeConnection +from sugar.graphics.alert import ConfirmationAlert, NotifyAlert + +_NEW_INSTANCE = 0 +_NEW_INSTANCE = 1 +_PRE_INSTANCE = 2 +_POST_INSTANCE = 3 + +class CursorFactory: + __shared_state = {"cursors": {}} + + def __init__(self): + self.__dict__ = self.__shared_state + + def get_cursor(self, cur_type): + if not self.cursors.has_key(cur_type): + cur = gtk.gdk.Cursor(cur_type) + self.cursors[cur_type] = cur + return self.cursors[cur_type] + +class Activity(toolkit.Activity): + """Basic activity class""" + + def new_instance(self): + """ + New instance was created. + + Will be invoked after __init__() instead of resume_instance(). + Subclass should implement this method to catch creation stage. + """ + pass + + def resume_instance(self, filepath): + """ + Instance was resumed. + + Will be invoked after __init__() instead of new_instance(). + Subclass should implement this method to catch resuming stage. + + """ + pass + + def save_instance(self, filepath): + """ + Save activity instance. + + Subclass should implement this method to save activity data. + """ + raise NotImplementedError + + def share_instance(self, connection, is_initiator): + """ + Activity was shared/joined. + + connection -- SugarTubeConnection object + wich represents telepathy connection + + is_initiator -- boolean + if True activity was shared and + (current activity is an initiator of sharing) + otherwise activity was joined(to existed sharing session) + + Will be invoked after __init__() and {new,resume}_instance(). + Subclass should implement this method to catch sharing stage. + """ + pass + + def notify_alert(self, title, msg): + """Raise standard notify alert""" + alert = NotifyAlert(title=title, msg=msg) + + def response(alert, response_id, self): + self.remove_alert(alert) + + alert.connect('response', response, self) + alert.show_all() + self.add_alert(alert) + + def confirmation_alert(self, title, msg, cb, *cb_args): + """Raise standard confirmation alert""" + alert = ConfirmationAlert(title=title, msg=msg) + + def response(alert, response_id, self, cb, *cb_args): + self.remove_alert(alert) + if response_id is gtk.RESPONSE_OK: + cb(*cb_args) + + alert.connect('response', response, self, cb, *cb_args) + alert.show_all() + self.add_alert(alert) + + def get_cursor(self): + return self._cursor + + def set_cursor(self, cursor): + if not isinstance(cursor, gtk.gdk.Cursor): + cursor = CursorFactory().get_cursor(cursor) + + if self._cursor != cursor: + self._cursor = cursor + self.window.set_cursor(self._cursor) + + def __init__(self, canvas, handle): + """ + Initialise the Activity. + + canvas -- gtk.Widget + root widget for activity content + + handle -- sugar.activity.activityhandle.ActivityHandle + instance providing the activity id and access to the + presence service which *may* provide sharing for this + application + + """ + toolkit.Activity.__init__(self, handle) + + if handle.object_id: + self.__state = _NEW_INSTANCE + else: + self.__state = _NEW_INSTANCE + + self.__resume_filename = None + self.__postponed_share = [] + + self._cursor = None + self.set_cursor(gtk.gdk.LEFT_PTR) + + # XXX do it after(possible) read_file() invoking + # have to rely on calling read_file() from map_cb in sugar-toolkit + canvas.connect_after('map', self.__map_canvasactivity_cb) + self.set_canvas(canvas) + + def __instance(self): + logging.debug('Activity.__instance') + + if self.__resume_filename: + self.resume_instance(self.__resume_filename) + else: + self.new_instance() + + for i in self.__postponed_share: + self.share_instance(*i) + self.__postponed_share = [] + + self.__state = _POST_INSTANCE + + def read_file(self, filepath): + """Subclass should not override this method""" + logging.debug('Activity.read_file state=%s' % self.__state) + + self.__resume_filename = filepath + + if self.__state == _NEW_INSTANCE: + self.__state = _PRE_INSTANCE + elif self.__state == _PRE_INSTANCE: + self.__instance(); + + def write_file(self, filepath): + """Subclass should not override this method""" + self.save_instance(filepath) + + def __map_canvasactivity_cb(self, widget): + logging.debug('Activity.__map_canvasactivity_cb state=%s' % \ + self.__state) + + if self.__state == _NEW_INSTANCE: + self.__instance() + elif self.__state == _NEW_INSTANCE: + self.__state = _PRE_INSTANCE + elif self.__state == _PRE_INSTANCE: + self.__instance(); + + return False + + def _share(self, tube_conn, initiator): + logging.debug('Activity._share state=%s' % self.__state) + + if self.__state == _NEW_INSTANCE: + self.__postponed_share.append((tube_conn, initiator)) + self.__state = _PRE_INSTANCE + elif self.__state == _PRE_INSTANCE: + self.__postponed_share.append((tube_conn, initiator)) + self.__instance(); + elif self.__state == _POST_INSTANCE: + self.share_instance(tube_conn, initiator) + +class SharedActivity(Activity): + """Basic activity class with sharing features""" + + def __init__(self, canvas, service, handle): + """ + Initialise the Activity. + + canvas -- gtk.Widget + root widget for activity content + + service -- string + dbus service for activity + + handle -- sugar.activity.activityhandle.ActivityHandle + instance providing the activity id and access to the + presence service which *may* provide sharing for this + application + + """ + Activity.__init__(self, canvas, handle) + self.service = service + + self.connect('shared', self._shared_cb) + + # Owner.props.key + if self._shared_activity: + # We are joining the activity + self.connect('joined', self._joined_cb) + if self.get_shared(): + # We've already joined + self._joined_cb() + + def _shared_cb(self, activity): + logging.debug('My activity was shared') + self.__initiator = True + self._sharing_setup() + + logging.debug('This is my activity: making a tube...') + id = self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube( + self.service, {}) + + def _joined_cb(self, activity): + if not self._shared_activity: + return + + logging.debug('Joined an existing shared activity') + + self.__initiator = False + self._sharing_setup() + + logging.debug('This is not my activity: waiting for a tube...') + self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes( + reply_handler=self._list_tubes_reply_cb, + error_handler=self._list_tubes_error_cb) + + def _sharing_setup(self): + if self._shared_activity is None: + logging.error('Failed to share or join activity') + return + self._conn = self._shared_activity.telepathy_conn + self._tubes_chan = self._shared_activity.telepathy_tubes_chan + self._text_chan = self._shared_activity.telepathy_text_chan + + self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal( + 'NewTube', self._new_tube_cb) + + def _list_tubes_reply_cb(self, tubes): + for tube_info in tubes: + self._new_tube_cb(*tube_info) + + def _list_tubes_error_cb(self, e): + logging.error('ListTubes() failed: %s', e) + + def _new_tube_cb(self, id, initiator, type, service, params, state): + logging.debug('New tube: ID=%d initator=%d type=%d service=%s ' + 'params=%r state=%d', id, initiator, type, service, + params, state) + + if (type == telepathy.TUBE_TYPE_DBUS and + service == self.service): + if state == telepathy.TUBE_STATE_LOCAL_PENDING: + self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES] \ + .AcceptDBusTube(id) + + tube_conn = SugarTubeConnection(self._conn, + self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES], id, + group_iface=self._text_chan[telepathy.CHANNEL_INTERFACE_GROUP]) + + self._share(tube_conn, self.__initiator) diff --git a/Speak.activity/port/combobox.py b/Speak.activity/port/combobox.py new file mode 100644 index 0000000..bb1a65a --- /dev/null +++ b/Speak.activity/port/combobox.py @@ -0,0 +1,179 @@ +# Copyright (C) 2007, One Laptop Per Child +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +""" +STABLE. +""" + +import gobject +import gtk + +class ComboBox(gtk.ComboBox): + def __init__(self): + gtk.ComboBox.__init__(self) + + self._text_renderer = None + self._icon_renderer = None + + self._model = gtk.ListStore(gobject.TYPE_PYOBJECT, + gobject.TYPE_STRING, + gtk.gdk.Pixbuf, + gobject.TYPE_BOOLEAN) + self.set_model(self._model) + + self.set_row_separator_func(self._is_separator) + + def get_value(self): + """ + Parameters + ---------- + None : + + Returns: + -------- + value : + + """ + row = self.get_active_item() + if not row: + return None + return row[0] + + value = gobject.property( + type=object, getter=get_value, setter=None) + + def _get_real_name_from_theme(self, name, size): + icon_theme = gtk.icon_theme_get_default() + width, height = gtk.icon_size_lookup(size) + info = icon_theme.lookup_icon(name, max(width, height), 0) + if not info: + raise ValueError("Icon '" + name + "' not found.") + fname = info.get_filename() + del info + return fname + + def append_item(self, action_id, text, icon_name=None, file_name=None): + """ + Parameters + ---------- + action_id : + + text : + + icon_name=None : + + file_name=None : + + Returns + ------- + None + + """ + 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 + + self._model.append([action_id, text, pixbuf, False]) + + def append_separator(self): + """ + Parameters + ---------- + None + + Returns + ------- + None + + """ + self._model.append([0, None, None, True]) + + def get_active_item(self): + """ + Parameters + ---------- + None + + Returns + ------- + Active_item : + + """ + index = self.get_active() + if index == -1: + index = 0 + + row = self._model.iter_nth_child(None, index) + if not row: + return None + return self._model[row] + + def remove_all(self): + """ + Parameters + ---------- + None + + Returns + ------- + None + + """ + self._model.clear() + + def _is_separator(self, model, row): + return model[row][3] + + def select(self, value, column=0, silent_cb=None): + for i, item in enumerate(self.get_model()): + if item[column] != value: + continue + try: + if silent_cb: + self.disconnect_by_func(silent_cb) + self.set_active(i) + finally: + if silent_cb: + self.connect('changed', silent_cb) + break diff --git a/Speak.activity/port/toolcombobox.py b/Speak.activity/port/toolcombobox.py new file mode 100644 index 0000000..b198ecc --- /dev/null +++ b/Speak.activity/port/toolcombobox.py @@ -0,0 +1,63 @@ +# Copyright (C) 2007, Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +""" +STABLE. +""" + +import gtk +import gobject + +from sugar.graphics import style +from port.combobox import ComboBox + +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) diff --git a/Speak.activity/voice.py b/Speak.activity/voice.py index 340f6df..38984c6 100644 --- a/Speak.activity/voice.py +++ b/Speak.activity/voice.py @@ -118,6 +118,8 @@ def defaultVoice(): """Try to figure out the default voice, from the current locale ($LANG). Fall back to espeak's voice called Default.""" + voices = allVoices() + def fit(a,b): "Compare two language ids to see if they are similar." as_ = re.split(r'[^a-z]+', a.lower()) @@ -132,8 +134,8 @@ def defaultVoice(): except: lang = "" - best = _allVoices[_("Default")] - for voice in _allVoices.values(): + best = voices[_("Default")] + for voice in voices.values(): voiceMetric = fit(voice.language, lang) bestMetric = fit(best.language, lang) if voiceMetric > bestMetric: |