diff options
| author | flavio <fdanesse@gmail.com> | 2012-07-27 22:34:58 (GMT) |
|---|---|---|
| committer | flavio <fdanesse@gmail.com> | 2012-07-27 22:34:58 (GMT) |
| commit | 36ecd8177bcd0cc8b52c303ef3b7cc0ac3a4b932 (patch) | |
| tree | 2b84741243ccc07611f4e7f547b8f5cb40371239 | |
| parent | 019dc4ed2b2401cbda2be0a10dd8f1e3ad9f5df3 (diff) | |
| parent | c5b2959dedfd3a4eb2faffef44c8bd94c17d88f6 (diff) | |
Merge branch 'gtk3' of git.sugarlabs.org:speak/mainline into gtk3
| -rw-r--r-- | activity.py | 5 | ||||
| -rw-r--r-- | face.py | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/activity.py b/activity.py index 480d7f8..0b6ea8b 100644 --- a/activity.py +++ b/activity.py @@ -98,7 +98,7 @@ class SpeakActivity(SharedActivity): # make an audio device for playing back and rendering audio self.connect("notify::active", self._activeCb) - # make a box to type into - combo for user + # make a box to type into - combo for user to type self.entrycombo = Gtk.ComboBoxText.new_with_entry() self.entrycombo.connect("changed", self._combo_changed_cb) self.entry = self.entrycombo.get_child() @@ -147,6 +147,7 @@ class SpeakActivity(SharedActivity): toolbox.toolbar.insert(ActivityToolbarButton(self), -1) + #importing voices to combobox self.voices = ComboBox() for name in sorted(voice.allVoices().keys()): vn = voice.allVoices()[name] @@ -181,7 +182,7 @@ class SpeakActivity(SharedActivity): mode_chat.connect('toggled', self.__toggled_mode_chat_cb, all_voices) toolbox.toolbar.insert(mode_chat, -1) - #toolbar: vouces combo (not working) + #toolbar: voices combo (not working) voices_toolitem = ToolWidget(widget=self.voices) toolbox.toolbar.insert(voices_toolitem, -1) @@ -21,11 +21,11 @@ # You should have received a copy of the GNU General Public License # along with Speak.activity. If not, see <http://www.gnu.org/licenses/>. - import logging +import cjson + from gi.repository import Gtk from gi.repository import Gdk -import cjson import sugar3.graphics.style as style @@ -116,9 +116,9 @@ class View(Gtk.EventBox): # layout the screen box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) box.set_homogeneous(False) - box.pack_start(self._eyebox, True, True, 0) - box.pack_start(self._mouthbox, False, False, 0) - box.set_border_width(FACE_PAD) + box.pack_start(self._eyebox, expand=True, fill=True, padding=0) + box.pack_start(self._mouthbox, expand=True, fill=True, padding=100) + box.set_border_width(0) self.modify_bg(0, self.fill_color.get_gdk_color()) self.add(box) |