Port to sugar3.speech

sugarlabs · Aug 30, 2018 · ef211f3 · ef211f3
1 parent f24a63d
commit ef211f3
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 347 deletions.
diff --git a/readactivity.py b/readactivity.py
@@ -53,6 +53,7 @@
 from sugar3.activity.widgets import ActivityToolbarButton
 from sugar3.activity.widgets import StopButton
 from sugar3.graphics.tray import HTray
+from sugar3.graphics.menuitem import MenuItem
 from sugar3 import network
 from sugar3 import mime
 from sugar3 import profile
@@ -71,8 +72,8 @@
 from readtoolbar import ViewToolbar
 from bookmarkview import BookmarkView
 from readdb import BookmarkManager
-from sugar3.graphics.menuitem import MenuItem
 from linkbutton import LinkButton
+from speechtoolbar import SpeechToolbar
 
 _HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager'
 _HARDWARE_MANAGER_SERVICE = 'org.laptop.HardwareManager'
@@ -1066,12 +1067,9 @@ def _update_toolbars(self):
         if self._view.can_highlight():
             self._highlight.show()
         if self._view.can_do_text_to_speech():
-            import speech
-            from speechtoolbar import SpeechToolbar
-            if speech.supported:
-                self.speech_toolbar = SpeechToolbar(self)
-                self.speech_toolbar_button.set_page(self.speech_toolbar)
-                self.speech_toolbar_button.show()
+            self.speech_toolbar = SpeechToolbar(self)
+            self.speech_toolbar_button.set_page(self.speech_toolbar)
+            self.speech_toolbar_button.show()
 
     def _share_document(self):
         """Share the document."""

diff --git a/speech.py b/speech.py
diff --git a/speech_dispatcher.py b/speech_dispatcher.py
diff --git a/speech_gst.py b/speech_gst.py