[orca] Present a message, and don't regenerate speech, when a bookmark is entered



commit 1cf976970bd5701a0ced7b8b016f5c802ee51990
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Jan 17 02:59:45 2014 -0500

    Present a message, and don't regenerate speech, when a bookmark is entered

 src/orca/bookmarks.py                        |    8 +-------
 src/orca/scripts/toolkits/Gecko/bookmarks.py |    5 +----
 2 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/src/orca/bookmarks.py b/src/orca/bookmarks.py
index 2c4839f..8ab6c3e 100644
--- a/src/orca/bookmarks.py
+++ b/src/orca/bookmarks.py
@@ -23,7 +23,6 @@ import pickle
 import os
 
 from . import messages
-from . import speech
 from . import orca_state
 from . import settings_manager
 
@@ -70,12 +69,7 @@ class Bookmarks:
         """ Add an in-page accessible object bookmark for this key. """
         context = self._script.getFlatReviewContext()
         self._bookmarks[inputEvent.hw_code] = self._contextToBookmark(context)
-
-        utterances = [messages.BOOKMARK_ENTERED]
-        utterances.extend(
-            self._script.speechGenerator.generateSpeech(
-                context.getCurrentAccessible()))
-        speech.speak(utterances)
+        self._script.presentMessage(messages.BOOKMARK_ENTERED)
 
     def bookmarkCurrentWhereAmI(self, inputEvent):
         """ Report "Where am I" information for this bookmark relative to the 
diff --git a/src/orca/scripts/toolkits/Gecko/bookmarks.py b/src/orca/scripts/toolkits/Gecko/bookmarks.py
index 38bfe33..ff49b76 100644
--- a/src/orca/scripts/toolkits/Gecko/bookmarks.py
+++ b/src/orca/scripts/toolkits/Gecko/bookmarks.py
@@ -34,7 +34,6 @@ import urllib.parse
 
 import orca.bookmarks as bookmarks
 import orca.messages as messages
-import orca.speech as speech
 
 ####################################################################
 #                                                                  #
@@ -56,9 +55,7 @@ class GeckoBookmarks(bookmarks.Bookmarks):
         obj, characterOffset = self._script.getCaretContext()
         path = self._objToPath()
         self._bookmarks[index] = path, characterOffset
-        utterances = [(messages.BOOKMARK_ENTERED)]
-        utterances.extend(self._script.speechGenerator.generateSpeech(obj))
-        speech.speak(utterances)
+        self._script.presentMessage(messages.BOOKMARK_ENTERED)
         
     def goToBookmark(self, inputEvent, index=None):
         """ Go to the bookmark indexed at this key and this page's URI """


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]