[orca/570658] Make speech generator files be speech_generator.py for consistency
- From: William Walker <wwalker src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca/570658] Make speech generator files be speech_generator.py for consistency
- Date: Sat, 23 May 2009 12:06:43 -0400 (EDT)
commit 0182baaa76f6183de1ff47f972e233fdb6dc7efb
Author: Willie Walker <william walker sun com>
Date: Sat May 23 12:05:12 2009 -0400
Make speech generator files be speech_generator.py for consistency
---
src/orca/Makefile.am | 2 +-
src/orca/script.py | 4 +-
.../scripts/apps/evolution/speech_generator.py | 8 +++---
.../scripts/apps/gcalctool/speech_generator.py | 8 +++---
src/orca/scripts/apps/pidgin/speech_generator.py | 18 +++++++-------
src/orca/scripts/apps/planner/speech_generator.py | 8 +++---
src/orca/scripts/apps/rhythmbox/formatting.py | 2 +-
.../scripts/apps/rhythmbox/speech_generator.py | 8 +++---
src/orca/scripts/apps/soffice/speech_generator.py | 18 +++++++-------
src/orca/scripts/toolkits/Gecko/script.py | 2 +-
.../scripts/toolkits/Gecko/speech_generator.py | 24 ++++++++++----------
.../toolkits/J2SE-access-bridge/Makefile.am | 2 +-
.../toolkits/J2SE-access-bridge/__init__.py | 2 +-
.../scripts/toolkits/J2SE-access-bridge/script.py | 2 +-
.../{speechgenerator.py => speech_generator.py} | 0
.../{speechgenerator.py => speech_generator.py} | 0
16 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index 7aaff74..ef2a770 100644
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@ -56,7 +56,7 @@ orca_python_PYTHON = \
settings.py \
speech.py \
speechdispatcherfactory.py \
- speechgenerator.py \
+ speech_generator.py \
speechserver.py \
structural_navigation.py \
text_attribute_names.py \
diff --git a/src/orca/script.py b/src/orca/script.py
index 859f83a..6b67418 100644
--- a/src/orca/script.py
+++ b/src/orca/script.py
@@ -46,7 +46,7 @@ import formatting
import keybindings
import orca_state
import settings
-import speechgenerator
+import speech_generator
import structural_navigation
import where_am_I
import bookmarks
@@ -192,7 +192,7 @@ class Script:
def getSpeechGenerator(self):
"""Returns the speech generator for this script.
"""
- return speechgenerator.SpeechGenerator(self)
+ return speech_generator.SpeechGenerator(self)
def getTutorialGenerator(self):
"""Returns the tutorial generator for this script.
diff --git a/src/orca/scripts/apps/evolution/speech_generator.py b/src/orca/scripts/apps/evolution/speech_generator.py
index c8dad0a..0d71bee 100644
--- a/src/orca/scripts/apps/evolution/speech_generator.py
+++ b/src/orca/scripts/apps/evolution/speech_generator.py
@@ -27,9 +27,9 @@ __license__ = "LGPL"
import pyatspi
-import orca.speechgenerator as speechgenerator
+import orca.speech_generator as speech_generator
-class SpeechGenerator(speechgenerator.SpeechGenerator):
+class SpeechGenerator(speech_generator.SpeechGenerator):
"""Overrides _getSpeechForTableCell so that, if this is an expanded
table cell, we can strip off the "0 items".
"""
@@ -37,7 +37,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
# pylint: disable-msg=W0142
def __init__(self, script):
- speechgenerator.SpeechGenerator.__init__(self, script)
+ speech_generator.SpeechGenerator.__init__(self, script)
def _getRealTableCell(self, obj, **args):
# Check that we are in a table cell in the mail message header list.
@@ -57,5 +57,5 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
result = self.getSpeech(obj, **args)
self._restoreRole(oldRole, args)
return result
- return speechgenerator.SpeechGenerator._getRealTableCell(
+ return speech_generator.SpeechGenerator._getRealTableCell(
self, obj, **args)
diff --git a/src/orca/scripts/apps/gcalctool/speech_generator.py b/src/orca/scripts/apps/gcalctool/speech_generator.py
index a196bdc..ea2fe5f 100644
--- a/src/orca/scripts/apps/gcalctool/speech_generator.py
+++ b/src/orca/scripts/apps/gcalctool/speech_generator.py
@@ -25,15 +25,15 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2009 Sun Microsystems Inc."
__license__ = "LGPL"
-import orca.speechgenerator as speechgenerator
+import orca.speech_generator as speech_generator
import pyatspi
-class SpeechGenerator(speechgenerator.SpeechGenerator):
+class SpeechGenerator(speech_generator.SpeechGenerator):
"""Overrides _getSpeechForPushButton to handle 'unspeakable'
button labels displayed on the screen.
"""
def __init__(self, script):
- speechgenerator.SpeechGenerator.__init__(self, script)
+ speech_generator.SpeechGenerator.__init__(self, script)
def _getName(self, obj, **args):
"""Gives preference to the object name versus what is being
@@ -42,7 +42,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
operator buttons."""
if obj.getRole() != pyatspi.ROLE_PUSH_BUTTON:
- return speechgenerator.SpeechGenerator._getName(\
+ return speech_generator.SpeechGenerator._getName(\
self, obj)
if obj.name:
diff --git a/src/orca/scripts/apps/pidgin/speech_generator.py b/src/orca/scripts/apps/pidgin/speech_generator.py
index 82f19c4..6c91709 100644
--- a/src/orca/scripts/apps/pidgin/speech_generator.py
+++ b/src/orca/scripts/apps/pidgin/speech_generator.py
@@ -23,7 +23,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2009 Sun Microsystems Inc."
__license__ = "LGPL"
-import orca.speechgenerator as speechgenerator
+import orca.speech_generator as speech_generator
########################################################################
# #
@@ -31,7 +31,7 @@ import orca.speechgenerator as speechgenerator
# #
########################################################################
-class SpeechGenerator(speechgenerator.SpeechGenerator):
+class SpeechGenerator(speech_generator.SpeechGenerator):
"""Overrides _getSpeechForTableCell() so that we can provide access
to the expanded/collapsed state and node count for the buddy list.
"""
@@ -39,7 +39,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
# pylint: disable-msg=W0142
def __init__(self, script):
- speechgenerator.SpeechGenerator.__init__(self, script)
+ speech_generator.SpeechGenerator.__init__(self, script)
def _getExpandableState(self, obj, **args):
result = []
@@ -54,15 +54,15 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
expanderCell = obj.parent[obj.getIndexInParent() - 1]
if expanderCell:
result.extend(
- speechgenerator.SpeechGenerator._getExpandableState(
+ speech_generator.SpeechGenerator._getExpandableState(
self, expanderCell, **args))
else:
result.extend(
- speechgenerator.SpeechGenerator._getExpandableState(
+ speech_generator.SpeechGenerator._getExpandableState(
self, obj, **args))
else:
result.extend(
- speechgenerator.SpeechGenerator._getExpandableState(
+ speech_generator.SpeechGenerator._getExpandableState(
self, obj, **args))
return result
@@ -79,14 +79,14 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
expanderCell = obj.parent[obj.getIndexInParent() - 1]
if expanderCell:
result.extend(
- speechgenerator.SpeechGenerator._getNumberOfChildren(
+ speech_generator.SpeechGenerator._getNumberOfChildren(
self, expanderCell, **args))
else:
result.extend(
- speechgenerator.SpeechGenerator._getNumberOfChildren(
+ speech_generator.SpeechGenerator._getNumberOfChildren(
self, obj, **args))
else:
result.extend(
- speechgenerator.SpeechGenerator._getNumberOfChildren(
+ speech_generator.SpeechGenerator._getNumberOfChildren(
self, obj, **args))
return result
diff --git a/src/orca/scripts/apps/planner/speech_generator.py b/src/orca/scripts/apps/planner/speech_generator.py
index a6df0c4..0f31c6a 100644
--- a/src/orca/scripts/apps/planner/speech_generator.py
+++ b/src/orca/scripts/apps/planner/speech_generator.py
@@ -27,16 +27,16 @@ __license__ = "LGPL"
import pyatspi
-import orca.speechgenerator as speechgenerator
+import orca.speech_generator as speech_generator
from orca.orca_i18n import _ # for gettext support
-class SpeechGenerator(speechgenerator.SpeechGenerator):
+class SpeechGenerator(speech_generator.SpeechGenerator):
# pylint: disable-msg=W0142
def __init__(self, script):
- speechgenerator.SpeechGenerator.__init__(self, script)
+ speech_generator.SpeechGenerator.__init__(self, script)
def _getLabelAndName(self, obj, **args):
"""Gets the label and the name if the name is different from the label.
@@ -64,7 +64,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
elif handleTabButton:
result.append(self._script.getDisplayedText(obj.parent[1]))
else:
- result.append(speechgenerator.SpeechGenerator._getLabelAndName(
+ result.append(speech_generator.SpeechGenerator._getLabelAndName(
self, obj, **args))
return result
diff --git a/src/orca/scripts/apps/rhythmbox/formatting.py b/src/orca/scripts/apps/rhythmbox/formatting.py
index acdb492..4d1e33b 100644
--- a/src/orca/scripts/apps/rhythmbox/formatting.py
+++ b/src/orca/scripts/apps/rhythmbox/formatting.py
@@ -33,7 +33,7 @@ formatting = {
'speech': {
# When the rating widget changes values, it emits an accessible
# name changed event. Because it is of ROLE_UNKNOWN, the default
- # speechgenerator's _getDefaultSpeech handles it. And because
+ # speech_generator's _getDefaultSpeech handles it. And because
# the widget is already focused, it doesn't speak anything. We
# want to speak the widget's name as it contains the number of
# stars being displayed.
diff --git a/src/orca/scripts/apps/rhythmbox/speech_generator.py b/src/orca/scripts/apps/rhythmbox/speech_generator.py
index 2315613..5279aa6 100644
--- a/src/orca/scripts/apps/rhythmbox/speech_generator.py
+++ b/src/orca/scripts/apps/rhythmbox/speech_generator.py
@@ -25,9 +25,9 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2009 Sun Microsystems Inc."
__license__ = "LGPL"
-import orca.speechgenerator as speechgenerator
+import orca.speech_generator as speech_generator
-class SpeechGenerator(speechgenerator.SpeechGenerator):
+class SpeechGenerator(speech_generator.SpeechGenerator):
# pylint: disable-msg=W0142
@@ -35,7 +35,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
cells in the Library table.
"""
def __init__(self, script):
- speechgenerator.SpeechGenerator.__init__(self, script)
+ speech_generator.SpeechGenerator.__init__(self, script)
def _getRealTableCell(self, obj, **args):
# Check to see if this is a table cell from the Library table.
@@ -44,5 +44,5 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
#
if obj.childCount == 5:
obj = obj[3]
- return speechgenerator.SpeechGenerator._getRealTableCell(
+ return speech_generator.SpeechGenerator._getRealTableCell(
self, obj, **args)
diff --git a/src/orca/scripts/apps/soffice/speech_generator.py b/src/orca/scripts/apps/soffice/speech_generator.py
index 45d9a71..a7363b5 100644
--- a/src/orca/scripts/apps/soffice/speech_generator.py
+++ b/src/orca/scripts/apps/soffice/speech_generator.py
@@ -27,14 +27,14 @@ __license__ = "LGPL"
import pyatspi
-import orca.speechgenerator as speechgenerator
+import orca.speech_generator as speech_generator
import orca.settings as settings
from orca.orca_i18n import _ # for gettext support
import script_settings
-class SpeechGenerator(speechgenerator.SpeechGenerator):
+class SpeechGenerator(speech_generator.SpeechGenerator):
"""Overrides _getSpeechForComboBox so that we can provide a name for
the Calc Name combo box.
Overrides _getSpeechForTableCellRow so that , when we are in a
@@ -50,7 +50,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
on the Formatting toolbar claim to be push buttons.
"""
def __init__(self, script):
- speechgenerator.SpeechGenerator.__init__(self, script)
+ speech_generator.SpeechGenerator.__init__(self, script)
def getSpeechForObjectRole(self, obj, role=None):
if obj.getRoleName() == "text frame" \
@@ -60,7 +60,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
[pyatspi.ROLE_APPLICATION])):
role = pyatspi.ROLE_TEXT
- return speechgenerator.SpeechGenerator.\
+ return speech_generator.SpeechGenerator.\
getSpeechForObjectRole(self, obj, role)
def _getSpeechForComboBox(self, obj, already_focused):
@@ -240,7 +240,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
utterances.extend(self._getSpeechForTableCell(obj,
already_focused))
else:
- utterances.extend(speechgenerator.SpeechGenerator.\
+ utterances.extend(speech_generator.SpeechGenerator.\
_getSpeechForTableCellRow(self, obj, already_focused))
return utterances
@@ -300,7 +300,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
# and call this method again.
#
if obj.childCount <= 1:
- utterances = speechgenerator.SpeechGenerator.\
+ utterances = speech_generator.SpeechGenerator.\
_getSpeechForTableCell(self, obj, already_focused)
else:
utterances = []
@@ -348,7 +348,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
already_focused,
utterances)
else:
- utterances.extend(speechgenerator.SpeechGenerator.\
+ utterances.extend(speech_generator.SpeechGenerator.\
_getSpeechForText(self, obj, already_focused))
return utterances
@@ -378,7 +378,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
utterances.append(obj.name)
utterances.append(checkedState)
else:
- utterances.extend(speechgenerator.SpeechGenerator.\
+ utterances.extend(speech_generator.SpeechGenerator.\
_getSpeechForToggleButton(self, obj, already_focused))
return utterances
@@ -408,7 +408,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
utterances.append(obj.name)
utterances.append(checkedState)
else:
- utterances.extend(speechgenerator.SpeechGenerator.\
+ utterances.extend(speech_generator.SpeechGenerator.\
_getSpeechForPushButton(self, obj, already_focused))
return utterances
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index c1e21df..00ff7ff 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -2436,7 +2436,7 @@ class Script(default.Script):
# Ideally in an entry we would just let default.sayWord() handle
# things. That fails to work when navigating backwords by word.
- # Because getUtterancesFromContents() now uses the speechgenerator
+ # Because getUtterancesFromContents() now uses the speech_generator
# with entries, we need to handle word navigation in entries here.
#
wordContents = self.getWordContentsAtOffset(obj, characterOffset)
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index 13d92db..3f08fd1 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -32,7 +32,7 @@ __license__ = "LGPL"
import pyatspi
import orca.rolenames as rolenames
-import orca.speechgenerator as speechgenerator
+import orca.speech_generator as speech_generator
from orca.orca_i18n import _
from orca.orca_i18n import ngettext # for ngettext support
@@ -43,14 +43,14 @@ from orca.orca_i18n import ngettext # for ngettext support
# #
########################################################################
-class SpeechGenerator(speechgenerator.SpeechGenerator):
+class SpeechGenerator(speech_generator.SpeechGenerator):
"""Provides a speech generator specific to Gecko.
"""
# pylint: disable-msg=W0142
def __init__(self, script):
- speechgenerator.SpeechGenerator.__init__(self, script)
+ speech_generator.SpeechGenerator.__init__(self, script)
def _getName(self, obj, **args):
result = []
@@ -75,7 +75,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
# It's probably a Gtk combo box.
#
result = \
- speechgenerator.SpeechGenerator._getDisplayedText(
+ speech_generator.SpeechGenerator._getDisplayedText(
self, obj, **args)
except:
# But just in case, we'll fall back on this.
@@ -89,9 +89,9 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
if child and child.name:
result.append(child.name)
else:
- result.extend(speechgenerator.SpeechGenerator._getName(self,
- obj,
- **args))
+ result.extend(speech_generator.SpeechGenerator._getName(self,
+ obj,
+ **args))
link = None
if role == pyatspi.ROLE_LINK:
link = obj
@@ -110,7 +110,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
return result
def _getLabel(self, obj, **args):
- result = speechgenerator.SpeechGenerator._getLabel(self, obj, **args)
+ result = speech_generator.SpeechGenerator._getLabel(self, obj, **args)
role = args.get('role', obj.getRole())
# We'll attempt to guess the label under some circumstances.
#
@@ -151,7 +151,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
and self._script.getDisplayedLabel(obj):
pass
else:
- result.extend(speechgenerator.SpeechGenerator._getLabelAndName(
+ result.extend(speech_generator.SpeechGenerator._getLabelAndName(
self, obj, **args))
return result
@@ -164,7 +164,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
#
result.extend(self._getLabelOrName(obj.parent, **args))
else:
- result.extend(speechgenerator.SpeechGenerator._getLabelOrName(
+ result.extend(speech_generator.SpeechGenerator._getLabelOrName(
self, obj, **args))
return result
@@ -255,7 +255,7 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
"List with %d items",
obj.childCount) % obj.childCount)
else:
- result.extend(speechgenerator.SpeechGenerator._getNumberOfChildren(
+ result.extend(speech_generator.SpeechGenerator._getNumberOfChildren(
self, obj, **args))
return result
@@ -386,6 +386,6 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
#
result = []
args['isAria'] = self._script.isAriaWidget(obj)
- result = speechgenerator.SpeechGenerator.getSpeech(self, obj, **args)
+ result = speech_generator.SpeechGenerator.getSpeech(self, obj, **args)
del args['isAria']
return result
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am b/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am
index f39c230..a322361 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am
@@ -5,7 +5,7 @@ orca_python_PYTHON = \
braillegenerator.py \
formatting.py \
script.py \
- speechgenerator.py \
+ speech_generator.py \
where_am_I.py
orca_pythondir=$(pyexecdir)/orca/scripts/toolkits/J2SE-access-bridge
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py b/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
index 5c2a804..325b44a 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
@@ -1,4 +1,4 @@
from script import Script
-from speechgenerator import SpeechGenerator
+from speech_generator import SpeechGenerator
from braillegenerator import BrailleGenerator
from where_am_I import WhereAmI
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
index 13a4c58..5e3a540 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
@@ -32,7 +32,7 @@ import orca.orca_state as orca_state
import orca.keybindings as keybindings
from braillegenerator import BrailleGenerator
-from speechgenerator import SpeechGenerator
+from speech_generator import SpeechGenerator
from formatting import Formatting
from where_am_I import WhereAmI
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py b/src/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.py
similarity index 100%
rename from src/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py
rename to src/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.py
diff --git a/src/orca/speechgenerator.py b/src/orca/speech_generator.py
similarity index 100%
rename from src/orca/speechgenerator.py
rename to src/orca/speech_generator.py
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
