[orca/570658] Remove already_focused as an explicit parameter to getSpeech
- From: William Walker <wwalker src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca/570658] Remove already_focused as an explicit parameter to getSpeech
- Date: Thu, 14 May 2009 12:55:19 -0400 (EDT)
commit 5baddb1d4d7179b6a56ee7ae63311ffa1086b7e5
Author: Willie Walker <william walker sun com>
Date: Thu May 14 12:54:44 2009 -0400
Remove already_focused as an explicit parameter to getSpeech
---
src/orca/bookmarks.py | 3 +--
src/orca/default.py | 16 ++++++++--------
src/orca/mouse_review.py | 3 +--
src/orca/scripts/apps/acroread.py | 6 +++---
src/orca/scripts/apps/evolution/script.py | 15 +++++++--------
src/orca/scripts/apps/gedit/script.py | 3 ++-
src/orca/scripts/apps/gnome-terminal.py | 2 +-
src/orca/scripts/apps/liferea.py | 2 +-
src/orca/scripts/apps/soffice/script.py | 11 ++++-------
src/orca/scripts/apps/yelp.py | 2 +-
src/orca/scripts/toolkits/Gecko/script.py | 10 +++++-----
src/orca/speechgenerator.py | 5 ++---
src/orca/structural_navigation.py | 2 +-
13 files changed, 37 insertions(+), 43 deletions(-)
diff --git a/src/orca/bookmarks.py b/src/orca/bookmarks.py
index 1d73107..7a86bec 100644
--- a/src/orca/bookmarks.py
+++ b/src/orca/bookmarks.py
@@ -79,8 +79,7 @@ class Bookmarks:
utterances = [_('bookmark entered')]
utterances.extend(
self._script.speechGenerator.getSpeech(
- context.getCurrentAccessible(),
- False))
+ context.getCurrentAccessible()))
speech.speak(utterances)
def bookmarkCurrentWhereAmI(self, inputEvent):
diff --git a/src/orca/default.py b/src/orca/default.py
index f95140b..04cec3b 100644
--- a/src/orca/default.py
+++ b/src/orca/default.py
@@ -2055,7 +2055,7 @@ class Script(script.Script):
orca_state.locusOfFocus.queryText()
except NotImplementedError:
utterances = self.speechGenerator.getSpeech(
- orca_state.locusOfFocus, False)
+ orca_state.locusOfFocus)
utterances.extend(self.tutorialGenerator.getTutorial(
orca_state.locusOfFocus, False))
speech.speak(utterances)
@@ -2949,7 +2949,7 @@ class Script(script.Script):
# Get the text for the object itself.
#
utterances.extend(
- self.speechGenerator.getSpeech(newLocusOfFocus, False))
+ self.speechGenerator.getSpeech(newLocusOfFocus))
utterances.extend(
self.tutorialGenerator.getTutorial(newLocusOfFocus, False))
# Now speak the new tree node level if it has changed.
@@ -3120,7 +3120,8 @@ class Script(script.Script):
target = relation.getTarget(0)
if target == orca_state.locusOfFocus:
self.updateBraille(target)
- utterances = self.speechGenerator.getSpeech(target, True)
+ utterances = self.speechGenerator.getSpeech(
+ target, already_focused=True)
utterances.extend(self.tutorialGenerator.getTutorial(
target, True))
speech.speak(utterances)
@@ -3139,7 +3140,7 @@ class Script(script.Script):
if target == orca_state.locusOfFocus:
self.updateBraille(target)
utterances = self.speechGenerator.getSpeech(
- target, True)
+ target, already_focused=True)
utterances.extend(self.tutorialGenerator.getTutorial(
target, True))
speech.speak(utterances)
@@ -3173,7 +3174,7 @@ class Script(script.Script):
mag.magnifyAccessible(event, obj)
self.updateBraille(obj)
- utterances = self.speechGenerator.getSpeech(obj, True)
+ utterances = self.speechGenerator.getSpeech(obj, already_focused=True)
utterances.extend(self.tutorialGenerator.getTutorial(obj, True))
speech.speak(utterances)
@@ -3948,8 +3949,7 @@ class Script(script.Script):
== "F1"):
self.updateBraille(orca_state.locusOfFocus)
utterances = self.speechGenerator.getSpeech(
- orca_state.locusOfFocus,
- False)
+ orca_state.locusOfFocus)
utterances.extend(self.tutorialGenerator.getTutorial(
orca_state.locusOfFocus, False))
speech.speak(utterances)
@@ -5283,7 +5283,7 @@ class Script(script.Script):
#
if not isinstance(inputEvent, input_event.BrailleEvent):
utterances = self.speechGenerator.getSpeech(
- context.getCurrentAccessible(), False)
+ context.getCurrentAccessible())
utterances.extend(self.tutorialGenerator.getTutorial(
context.getCurrentAccessible(), False))
speech.speak(utterances)
diff --git a/src/orca/mouse_review.py b/src/orca/mouse_review.py
index ed7d73d..45ac68a 100644
--- a/src/orca/mouse_review.py
+++ b/src/orca/mouse_review.py
@@ -267,8 +267,7 @@ class MouseReviewer:
else:
speech.speak(
self._currentMouseOver.script.speechGenerator.getSpeech(
- obj,
- False))
+ obj))
self._currentMouseOver.script.updateBraille(obj)
def _getZOrder(self, frame_name):
diff --git a/src/orca/scripts/apps/acroread.py b/src/orca/scripts/apps/acroread.py
index cefb1da..94ae5b5 100644
--- a/src/orca/scripts/apps/acroread.py
+++ b/src/orca/scripts/apps/acroread.py
@@ -436,7 +436,7 @@ class Script(default.Script):
return
utterances = \
- self.speechGenerator.getSpeech(newLocusOfFocus, False)
+ self.speechGenerator.getSpeech(newLocusOfFocus)
speech.speak(utterances)
brailleRegions = \
self.brailleGenerator.getBrailleRegions(newLocusOfFocus)
@@ -465,7 +465,7 @@ class Script(default.Script):
# verboseness: reporting the drawing area(s) in which this link
# is contained, speaking the periods in a table of contents, etc.
#
- utterances = self.speechGenerator.getSpeech(newLocusOfFocus, False)
+ utterances = self.speechGenerator.getSpeech(newLocusOfFocus)
adjustedUtterances = []
for utterance in utterances:
adjustedUtterances.append(self.adjustForRepeats(utterance))
@@ -549,7 +549,7 @@ class Script(default.Script):
# Try to minimize chattiness in the Search panel
#
utterances = \
- self.speechGenerator.getSpeech(event.source, False)
+ self.speechGenerator.getSpeech(event.source)
speech.speak(utterances)
brailleRegions = \
self.brailleGenerator.getBrailleRegions(event.source)
diff --git a/src/orca/scripts/apps/evolution/script.py b/src/orca/scripts/apps/evolution/script.py
index ea2c7bb..5f626fe 100644
--- a/src/orca/scripts/apps/evolution/script.py
+++ b/src/orca/scripts/apps/evolution/script.py
@@ -285,7 +285,7 @@ class Script(default.Script):
self.updateBraille(orca_state.locusOfFocus)
speech.speak(
self.speechGenerator.getSpeech(
- orca_state.locusOfFocus, False))
+ orca_state.locusOfFocus))
except NotImplementedError:
pass
@@ -337,7 +337,7 @@ class Script(default.Script):
savedSpeechVerbosityLevel = settings.speechVerbosityLevel
settings.speechVerbosityLevel = settings.VERBOSITY_LEVEL_BRIEF
- utterances = speechGen.getSpeech(tab, False)
+ utterances = speechGen.getSpeech(tab)
speech.speak(utterances)
settings.speechVerbosityLevel = savedSpeechVerbosityLevel
@@ -942,7 +942,7 @@ class Script(default.Script):
settings.speechVerbosityLevel = \
settings.VERBOSITY_LEVEL_BRIEF
- utterances = speechGen.getSpeech(header, False)
+ utterances = speechGen.getSpeech(header)
[headerRegions, focusedRegion] = \
brailleGen.getBrailleRegions(header)
brailleRegions.extend(headerRegions)
@@ -968,7 +968,7 @@ class Script(default.Script):
settings.VERBOSITY_LEVEL_BRIEF
settings.speechVerbosityLevel = \
savedSpeechVerbosityLevel
- utterances = speechGen.getSpeech(cell, False)
+ utterances = speechGen.getSpeech(cell)
[cellRegions, focusedRegion] = \
brailleGen.getBrailleRegions(cell)
@@ -1059,7 +1059,7 @@ class Script(default.Script):
+ "day view: tabbing to day with appts.")
parent = event.source.parent
- utterances = speechGen.getSpeech(parent, False)
+ utterances = speechGen.getSpeech(parent)
[brailleRegions, focusedRegion] = \
brailleGen.getBrailleRegions(parent)
speech.speak(utterances)
@@ -1075,8 +1075,7 @@ class Script(default.Script):
appt = childTable.getAccessibleAt(row, 0)
extents = appt.queryComponent().getExtents(0)
if extents.y == apptExtents.y:
- utterances = speechGen.getSpeech(event.source,
- False)
+ utterances = speechGen.getSpeech(event.source)
[apptRegions, focusedRegion] = \
brailleGen.getBrailleRegions(event.source)
brailleRegions.extend(apptRegions)
@@ -1137,7 +1136,7 @@ class Script(default.Script):
apptExtents = child.queryComponent().getExtents(0)
if extents.y == apptExtents.y:
- utterances = speechGen.getSpeech(child, False)
+ utterances = speechGen.getSpeech(child)
[apptRegions, focusedRegion] = \
brailleGen.getBrailleRegions(child)
brailleRegions.extend(apptRegions)
diff --git a/src/orca/scripts/apps/gedit/script.py b/src/orca/scripts/apps/gedit/script.py
index 5131fb2..6483bad 100644
--- a/src/orca/scripts/apps/gedit/script.py
+++ b/src/orca/scripts/apps/gedit/script.py
@@ -569,7 +569,8 @@ class Script(default.Script):
# finding something.
#
speech.speak(_("Phrase found."))
- utterances = self.speechGenerator.getSpeech(event.source, True)
+ utterances = self.speechGenerator.getSpeech(
+ event.source, already_focused=True)
speech.speak(utterances)
# If Ctrl+G was used to repeat a find command, speak the line that
diff --git a/src/orca/scripts/apps/gnome-terminal.py b/src/orca/scripts/apps/gnome-terminal.py
index 006af43..8b905d0 100644
--- a/src/orca/scripts/apps/gnome-terminal.py
+++ b/src/orca/scripts/apps/gnome-terminal.py
@@ -100,7 +100,7 @@ class Script(default.Script):
pageTab.getRole() == pyatspi.ROLE_PAGE_TAB and \
pageTab.getState().contains(pyatspi.STATE_SENSITIVE):
self.updateBraille(newLocusOfFocus)
- utterances = self.speechGenerator.getSpeech(pageTab, False)
+ utterances = self.speechGenerator.getSpeech(pageTab)
speech.speak(utterances)
default.Script.locusOfFocusChanged(self, event,
diff --git a/src/orca/scripts/apps/liferea.py b/src/orca/scripts/apps/liferea.py
index a3172cb..32a0a05 100644
--- a/src/orca/scripts/apps/liferea.py
+++ b/src/orca/scripts/apps/liferea.py
@@ -119,7 +119,7 @@ class Script(default.Script):
# Here we extend the utterances with the speech generator for
# the object with focus (the push button).
#
- utterances.extend(speechGen.getSpeech(event.source, False))
+ utterances.extend(speechGen.getSpeech(event.source))
# Finally we speak/braille the utterances/regions.
#
diff --git a/src/orca/scripts/apps/soffice/script.py b/src/orca/scripts/apps/soffice/script.py
index 24c411a..3d6313f 100644
--- a/src/orca/scripts/apps/soffice/script.py
+++ b/src/orca/scripts/apps/soffice/script.py
@@ -741,7 +741,7 @@ class Script(default.Script):
return (cell != None)
self.updateBraille(cell)
- utterances = self.speechGenerator.getSpeech(cell, False)
+ utterances = self.speechGenerator.getSpeech(cell)
# [[[TODO: WDW - need to make sure assumption about utterances[0]
# is still correct with the new speech generator stuff.]]]
#
@@ -1499,8 +1499,7 @@ class Script(default.Script):
if self.isSpreadSheetCell(event.source, True):
if newLocusOfFocus:
self.updateBraille(newLocusOfFocus)
- utterances = self.speechGenerator.getSpeech(newLocusOfFocus,
- False)
+ utterances = self.speechGenerator.getSpeech(newLocusOfFocus)
speech.speak(utterances)
# Save the current row and column information in the table
@@ -1537,8 +1536,7 @@ class Script(default.Script):
for tab in child:
eventState = tab.getState()
if eventState.contains(pyatspi.STATE_SELECTED):
- utterances = self.speechGenerator.getSpeech(tab,
- False)
+ utterances = self.speechGenerator.getSpeech(tab)
speech.speak(utterances)
# Fall-thru to process the event with the default handler.
@@ -1830,8 +1828,7 @@ class Script(default.Script):
weToggledIt = wasCommand and keyString not in navKeys
if weToggledIt:
- speech.speak(self.speechGenerator.getSpeech(event.source,
- False))
+ speech.speak(self.speechGenerator.getSpeech(event.source))
# When a new paragraph receives focus, we get a caret-moved event and
# two focus events (the first being object:state-changed:focused).
diff --git a/src/orca/scripts/apps/yelp.py b/src/orca/scripts/apps/yelp.py
index 8e95ecb..0b3979a 100644
--- a/src/orca/scripts/apps/yelp.py
+++ b/src/orca/scripts/apps/yelp.py
@@ -202,7 +202,7 @@ class Script(Gecko.Script):
self._currentFrameName = event.source.name
self.setCaretPosition(obj, characterOffset)
if obj.getState().contains(pyatspi.STATE_FOCUSED):
- speech.speak(self.speechGenerator.getSpeech(obj, False))
+ speech.speak(self.speechGenerator.getSpeech(obj))
elif not Gecko.script_settings.sayAllOnLoad:
self.speakContents(\
self.getLineContentsAtOffset(obj, characterOffset))
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 12fd408..0f688eb 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -1549,7 +1549,7 @@ class Script(default.Script):
if settings.speechVerbosityLevel == \
settings.VERBOSITY_LEVEL_VERBOSE:
utterances.extend(
- self.speechGenerator.getSpeech(event.any_data, False))
+ self.speechGenerator.getSpeech(event.any_data))
speech.speak(utterances)
def onDocumentReload(self, event):
@@ -1682,7 +1682,7 @@ class Script(default.Script):
#
if eventSourceRole == pyatspi.ROLE_ALERT:
speech.speak(self.speechGenerator.getSpeech(
- event.source, False))
+ event.source))
self.updateBraille(obj)
else:
self.presentLine(obj, characterOffset)
@@ -1871,7 +1871,7 @@ class Script(default.Script):
self.updateBraille(obj)
if obj.getState().contains(pyatspi.STATE_FOCUSABLE):
- speech.speak(self.speechGenerator.getSpeech(obj, False))
+ speech.speak(self.speechGenerator.getSpeech(obj))
elif not script_settings.sayAllOnLoad:
self.speakContents(\
self.getLineContentsAtOffset(obj,
@@ -5420,7 +5420,7 @@ class Script(default.Script):
#
if not len(string) \
or role in [pyatspi.ROLE_ENTRY, pyatspi.ROLE_PASSWORD_TEXT]:
- utterance = self.speechGenerator.getSpeech(obj, False)
+ utterance = self.speechGenerator.getSpeech(obj)
else:
utterance = [string]
if speakRole and not role in doNotSpeakRoles:
@@ -5506,7 +5506,7 @@ class Script(default.Script):
# characterOffset (lists). In these latter cases, we'll just
# speak the entire component.
#
- utterances = self.speechGenerator.getSpeech(obj, False)
+ utterances = self.speechGenerator.getSpeech(obj)
speech.speak(utterances)
####################################################################
diff --git a/src/orca/speechgenerator.py b/src/orca/speechgenerator.py
index 5279774..d4aa48a 100755
--- a/src/orca/speechgenerator.py
+++ b/src/orca/speechgenerator.py
@@ -707,7 +707,7 @@ class SpeechGenerator:
#####################################################################
def _getTutorial(self, obj, **args):
- already_focused = args.get('already_focused')
+ already_focused = args.get('already_focused', False)
forceMessage = args.get('forceMessage', False)
return self._script.tutorialGenerator.getTutorial(
obj,
@@ -784,7 +784,7 @@ class SpeechGenerator:
voice = settings.voices[settings.DEFAULT_VOICE]
return [voice]
- def getSpeech(self, obj, already_focused=False, **args):
+ def getSpeech(self, obj, **args):
# pylint: disable-msg=W0142
result = []
methods = {}
@@ -805,7 +805,6 @@ class SpeechGenerator:
# and get its results, placing them in the globals for the
# the call to eval.
#
- args['already_focused'] = already_focused
format = self._script.formatting.getFormat('speech',
**args)
assert(format)
diff --git a/src/orca/structural_navigation.py b/src/orca/structural_navigation.py
index abae738..67d3610 100644
--- a/src/orca/structural_navigation.py
+++ b/src/orca/structural_navigation.py
@@ -1766,7 +1766,7 @@ class StructuralNavigation:
self._script.updateBraille(obj)
utterances = []
- strings = self._script.speechGenerator.getSpeech(obj, False)
+ strings = self._script.speechGenerator.getSpeech(obj)
for string in strings:
voice = self._getVoice(obj, string)
speech.speak(string, voice)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
