[orca/570658] Change 'isAria' to 'useDefaultFormatting'
- From: William Walker <wwalker src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca/570658] Change 'isAria' to 'useDefaultFormatting'
- Date: Thu, 2 Jul 2009 14:24:28 +0000 (UTC)
commit 3d085b8c4baefe201fbae3693acc2f4a5765bc2d
Author: Willie Walker <william walker sun com>
Date: Thu Jul 2 10:22:47 2009 -0400
Change 'isAria' to 'useDefaultFormatting'
The directive to use the default formatting can go beyond whether the widget
is an ARIA widget or not.
.../scripts/toolkits/Gecko/braille_generator.py | 4 ++--
src/orca/scripts/toolkits/Gecko/formatting.py | 2 +-
.../scripts/toolkits/Gecko/speech_generator.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/braille_generator.py b/src/orca/scripts/toolkits/Gecko/braille_generator.py
index 733683c..587f342 100644
--- a/src/orca/scripts/toolkits/Gecko/braille_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/braille_generator.py
@@ -232,11 +232,11 @@ class BrailleGenerator(braille_generator.BrailleGenerator):
# ARIA widgets get treated like regular default widgets.
#
args['includeContext'] = not self._script.inDocumentContent()
- args['isAria'] = self._script.isAriaWidget(obj)
+ args['useDefaultFormatting'] = self._script.isAriaWidget(obj)
result.extend(braille_generator.BrailleGenerator.\
generateBraille(self, obj, **args))
del args['includeContext']
- del args['isAria']
+ del args['useDefaultFormatting']
return result
########################################################################
diff --git a/src/orca/scripts/toolkits/Gecko/formatting.py b/src/orca/scripts/toolkits/Gecko/formatting.py
index 4f30639..95e5451 100644
--- a/src/orca/scripts/toolkits/Gecko/formatting.py
+++ b/src/orca/scripts/toolkits/Gecko/formatting.py
@@ -130,7 +130,7 @@ class Formatting(orca.formatting.Formatting):
def getFormat(self, **args):
# ARIA widgets get treated like regular default widgets.
#
- if args.get('isAria', False):
+ if args.get('useDefaultFormatting', False):
return self._defaultFormatting.getFormat(**args)
else:
return orca.formatting.Formatting.getFormat(self, **args)
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index 6c0dd66..1344376 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -505,8 +505,8 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
# ARIA widgets get treated like regular default widgets.
#
else:
- args['isAria'] = self._script.isAriaWidget(obj)
+ args['useDefaultFormatting'] = self._script.isAriaWidget(obj)
result.extend(speech_generator.SpeechGenerator.\
generateSpeech(self, obj, **args))
- del args['isAria']
+ del args['useDefaultFormatting']
return result
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]