diff options
author | flavio <fdanesse@gmail.com> | 2012-07-31 22:09:07 (GMT) |
---|---|---|
committer | flavio <fdanesse@gmail.com> | 2012-07-31 22:09:07 (GMT) |
commit | b8956e91ff674fd2afb459dbe0a811f5dbeffd5a (patch) | |
tree | 5eed86cf194e3afd08d8953671a19e89f473458f | |
parent | 94e71e0bb0314aeeb26effacc95be8bc9b11cdfb (diff) |
Corrections
-rw-r--r-- | activity.py | 19 | ||||
-rw-r--r-- | espeak.py | 7 | ||||
-rw-r--r-- | toolitem.py | 37 |
3 files changed, 21 insertions, 42 deletions
diff --git a/activity.py b/activity.py index 1090ad5..44f8057 100644 --- a/activity.py +++ b/activity.py @@ -38,7 +38,6 @@ from sugar3.activity.widgets import StopButton #from shared_activity import SharedActivity from sugar3.activity import activity from combobox import ComboBox -from toolitem import ToolWidget from messenger import Messenger, SERVICE from gettext import gettext as _ @@ -589,6 +588,22 @@ class SpeakActivity(activity.Activity): if self._mode == MODE_BOT: brain.load(self, voice) - # activate gtk threads when this module loads Gdk.threads_init() + +class ToolWidget(Gtk.ToolItem): + + def __init__(self, widget=None, label_text=""): + Gtk.ToolItem.__init__(self) + self.wid = widget + self.label = Gtk.Label(label_text) + self._box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + + if self.label: + self._box.pack_start(self.label, True, True, 5) + if self.wid: + self._box.pack_start(self.wid, True, True, 5) + + self.add(self._box) + self.show_all() +
\ No newline at end of file @@ -87,8 +87,6 @@ class BaseAudioGrab(GObject.GObject): self._new_buffer, str(buffer)) return True - sink = self.pipeline.get_by_name('sink') - def gstmessage_cb(bus, message): self._was_message = True @@ -105,7 +103,10 @@ class BaseAudioGrab(GObject.GObject): self.andle2 = GObject.timeout_add(500, self._new_buffer, str(buffer)) - elif message.type in (Gst.MessageType.EOS, Gst.MessageType.ERROR): + elif message.type == Gst.MessageType.EOS: + pass + + elif message.type == Gst.MessageType.ERROR: logger.debug(message.type) self.stop_sound_device() diff --git a/toolitem.py b/toolitem.py deleted file mode 100644 index ca97a34..0000000 --- a/toolitem.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2009, Aleksey Lim -# -# 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. - -"""A set of toolitem widets""" - -from gi.repository import Gtk - - -class ToolWidget(Gtk.ToolItem): - - def __init__(self, widget=None, label_text=""): - Gtk.ToolItem.__init__(self) - self.wid = widget - self.label = Gtk.Label(label_text) - self._box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) - - if self.label: - self._box.pack_start(self.label, True, True, 5) - if self.wid: - self._box.pack_start(self.wid, True, True, 5) - - self.add(self._box) - self.show_all() |