[orca/570658] Moved _overrideRole and _restoreRole into speechGenerator class, to allow the scripts easy access.
- From: Mesar Hameed <mhameed src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca/570658] Moved _overrideRole and _restoreRole into speechGenerator class, to allow the scripts easy access.
- Date: Sun, 17 May 2009 15:47:12 -0400 (EDT)
commit 0ce3df42d72cccc7a3dae6216bf795cca6b20016
Author: Mesar Hameed <mhameed src gnome org>
Date: Sun May 17 20:46:58 2009 +0100
Moved _overrideRole and _restoreRole into speechGenerator class, to allow the scripts easy access.
---
.../scripts/apps/evolution/speech_generator.py | 16 +---------
src/orca/speechgenerator.py | 30 ++++++++++----------
2 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/src/orca/scripts/apps/evolution/speech_generator.py b/src/orca/scripts/apps/evolution/speech_generator.py
index a59ab38..90d44d0 100755
--- a/src/orca/scripts/apps/evolution/speech_generator.py
+++ b/src/orca/scripts/apps/evolution/speech_generator.py
@@ -29,18 +29,6 @@ import pyatspi
import orca.speechgenerator as speechgenerator
-
-def _overrideRole(newRole, args):
- oldRole = args.get('role', None)
- args['role'] = newRole
- return oldRole
-
-def _restoreRole(oldRole, args):
- if oldRole:
- args['role'] = oldRole
- else:
- del args['role']
-
class SpeechGenerator(speechgenerator.SpeechGenerator):
"""Overrides _getSpeechForTableCell so that, if this is an expanded
table cell, we can strip off the "0 items".
@@ -63,10 +51,10 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
state = obj.getState()
if state and state.contains(pyatspi.STATE_EXPANDABLE):
if state.contains(pyatspi.STATE_EXPANDED):
- oldRole = _overrideRole(
+ oldRole = self._overrideRole(
'ALTERNATIVE_REAL_ROLE_TABLE_CELL', args)
result = self.getSpeech(obj, **args)
- _restoreRole(oldRole, args)
+ self._restoreRole(oldRole, args)
return result
return speechgenerator.SpeechGenerator._getRealTableCell(
self, obj, **args)
diff --git a/src/orca/speechgenerator.py b/src/orca/speechgenerator.py
old mode 100644
new mode 100755
index c091f54..82d4fac
--- a/src/orca/speechgenerator.py
+++ b/src/orca/speechgenerator.py
@@ -50,17 +50,6 @@ def _formatExceptionInfo(maxTBlevel=5):
excTb = traceback.format_tb(trbk, maxTBlevel)
return (excName, excArgs, excTb)
-def _overrideRole(newRole, args):
- oldRole = args.get('role', None)
- args['role'] = newRole
- return oldRole
-
-def _restoreRole(oldRole, args):
- if oldRole:
- args['role'] = oldRole
- else:
- del args['role']
-
class SpeechGenerator:
"""Takes accessible objects and produces a string to speak for
those objects. See the getSpeech method, which is the primary
@@ -69,6 +58,17 @@ class SpeechGenerator:
# pylint: disable-msg=W0142
+ def _overrideRole(self, newRole, args):
+ oldRole = args.get('role', None)
+ args['role'] = newRole
+ return oldRole
+
+ def _restoreRole(self, oldRole, args):
+ if oldRole:
+ args['role'] = oldRole
+ else:
+ del args['role']
+
def __init__(self, script):
self._script = script
self._methodsDict = {}
@@ -240,10 +240,10 @@ class SpeechGenerator:
# string used in the *.po file for gail.
#
if action.getName(i) in ["toggle", _("toggle")]:
- oldRole = _overrideRole(pyatspi.ROLE_CHECK_BOX,
+ oldRole = self._overrideRole(pyatspi.ROLE_CHECK_BOX,
args)
result.extend(self.getSpeech(obj, **args))
- _restoreRole(oldRole, args)
+ self._restoreRole(oldRole, args)
return result
def _getRadioState(self, obj, **args):
@@ -595,9 +595,9 @@ class SpeechGenerator:
def _getRealTableCell(self, obj, **args):
result = []
- oldRole = _overrideRole('REAL_ROLE_TABLE_CELL', args)
+ oldRole = self._overrideRole('REAL_ROLE_TABLE_CELL', args)
result.extend(self.getSpeech(obj, **args))
- _restoreRole(oldRole, args)
+ self._restoreRole(oldRole, args)
if not result and settings.speakBlankLines:
# Translators: "blank" is a short word to mean the
# user has navigated to an empty line.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]