[orca] Fix for bgo#570070 - Remove 'item' from spoken string that represents position/index information
- From: William Walker <wwalker src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca] Fix for bgo#570070 - Remove 'item' from spoken string that represents position/index information
- Date: Tue, 28 Jul 2009 21:55:16 +0000 (UTC)
commit 8cd51a8c2d7532616568ee63dc724e69c172ebe9
Author: Willie Walker <william walker sun com>
Date: Tue Jul 28 17:52:41 2009 -0400
Fix for bgo#570070 - Remove 'item' from spoken string that represents position/index information
src/orca/formatting.py | 2 +
src/orca/settings.py | 12 +++++++++
src/orca/speech_generator.py | 27 +++++++++----------
test/keystrokes/firefox/codetalks_tree.py | 4 +-
test/keystrokes/firefox/dojo_button.py | 2 +-
test/keystrokes/firefox/dojo_combo_box.py | 2 +-
test/keystrokes/firefox/dojo_dialog.py | 2 +-
test/keystrokes/firefox/dojo_tabcontainer.py | 2 +-
test/keystrokes/firefox/dojo_tree.py | 2 +-
test/keystrokes/firefox/html_role_combo_box.py | 2 +-
.../firefox/html_role_list_item_where_am_i.py | 12 ++++----
test/keystrokes/firefox/html_role_lists.py | 2 +-
test/keystrokes/firefox/moz_menu.py | 2 +-
test/keystrokes/firefox/moz_tabpanel.py | 2 +-
test/keystrokes/firefox/ms_tree_bug_570571.py | 4 +-
test/keystrokes/firefox/uiuc_tabpanel.py | 2 +-
test/keystrokes/firefox/uiuc_tree.py | 2 +-
test/keystrokes/firefox/xul_role_accel_label.py | 2 +-
.../keystrokes/firefox/xul_role_check_menu_item.py | 2 +-
test/keystrokes/firefox/xul_role_combo_box.py | 4 +-
test/keystrokes/firefox/xul_role_list_item.py | 2 +-
test/keystrokes/firefox/xul_role_page_tab.py | 4 +-
test/keystrokes/firefox/xul_role_radio_button.py | 4 +-
.../keystrokes/firefox/xul_role_radio_menu_item.py | 4 +-
test/keystrokes/firefox/xul_role_tree.py | 6 ++--
test/keystrokes/firefox/yahoo_tab_view.py | 2 +-
test/keystrokes/gtk-demo/role_accel_label.py | 2 +-
test/keystrokes/gtk-demo/role_check_menu_item.py | 2 +-
test/keystrokes/gtk-demo/role_combo_box.py | 4 +-
test/keystrokes/gtk-demo/role_combo_box2.py | 4 +-
test/keystrokes/gtk-demo/role_icon.py | 6 ++--
test/keystrokes/gtk-demo/role_menu.py | 8 +++---
test/keystrokes/gtk-demo/role_page_tab.py | 4 +-
test/keystrokes/gtk-demo/role_radio_button.py | 4 +-
test/keystrokes/gtk-demo/role_radio_menu_item.py | 4 +-
test/keystrokes/java/role_accel_label.py | 2 +-
test/keystrokes/java/role_page_tab.py | 8 +++---
test/keystrokes/java/role_radio_button.py | 12 ++++----
test/keystrokes/java/role_radio_menu_item.py | 4 +-
39 files changed, 95 insertions(+), 82 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 9abb4b2..079c09c 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -61,6 +61,8 @@ formatting = {
'nodelevel' : settings.speechNodeLevelString,
'nestinglevel' : settings.speechNestingLevelString,
'multiselect' : settings.speechMultiSelectString,
+ 'iconindex' : settings.speechIconIndexString,
+ 'groupindex' : settings.speechGroupIndexString,
},
'braille' : {
'eol' : settings.brailleEOLIndicator,
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 28ae378..e9253d5 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -1300,6 +1300,18 @@ speechNodeLevelString = _("tree level %d")
#
speechNestingLevelString = _("Nesting level %d")
+# Translators: this is a indication of the focused icon and the
+# count of the total number of icons within an icon panel. An
+# example of an icon panel is the Nautilus folder view.
+#
+speechIconIndexString = _("on %(index)d of %(total)d")
+
+# Translators: this refers to the position of an item in a list
+# or group of objects, such as menu items in a menu, radio buttons
+# in a radio button group, combobox item in a combobox, etc.
+#
+speechGroupIndexString = _("%(index)d of %(total)d")
+
# string to indicate end of printed line for braille displays:
#
disableBrailleEOL = False
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 34e016d..26a4f89 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -1068,14 +1068,13 @@ class SpeechGenerator(generator.Generator):
% {"index" : totalSelectedItems,
"total" : childCount}
result.append(countString)
- # Translators: this is a indication of the focused icon and the
- # count of the total number of icons within an icon panel. An
- # example of an icon panel is the Nautilus folder view.
- #
- itemString = _("on item %(index)d of %(total)d") \
- % {"index" : currentItem,
- "total" : childCount}
- result.append(itemString)
+
+ result.append(self._script.formatting.getString(
+ mode='speech',
+ stringType='iconindex') \
+ % {"index" : currentItem,
+ "total" : childCount})
+
return result
def _generateSelectedItems(self, obj, **args):
@@ -1226,9 +1225,9 @@ class SpeechGenerator(generator.Generator):
break
if position >= 0:
- # Translators: this is an item in a list.
- #
- result.append(_("item %(index)d of %(total)d") \
+ result.append(self._script.formatting.getString(
+ mode='speech',
+ stringType='groupindex') \
% {"index" : position,
"total" : total})
@@ -1308,9 +1307,9 @@ class SpeechGenerator(generator.Generator):
if (settings.enablePositionSpeaking \
or args.get('forceList', False)) \
and position >= 0:
- # Translators: this is an item in a list.
- #
- result.append(_("item %(index)d of %(total)d") \
+ result.append(self._script.formatting.getString(
+ mode='speech',
+ stringType='groupindex') \
% {"index" : position,
"total" : total})
diff --git a/test/keystrokes/firefox/codetalks_tree.py b/test/keystrokes/firefox/codetalks_tree.py
index 8e39b71..d282aa7 100644
--- a/test/keystrokes/firefox/codetalks_tree.py
+++ b/test/keystrokes/firefox/codetalks_tree.py
@@ -65,7 +65,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: ' Fruits'",
" VISIBLE: ' Fruits', cursor=1",
- "SPEECH OUTPUT: 'Fruits list item Fruits item 1 of 2 collapsed tree level 1'"]))
+ "SPEECH OUTPUT: 'Fruits list item Fruits 1 of 2 collapsed tree level 1'"]))
########################################################################
# Right Arrow to expand fruits.
@@ -90,7 +90,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: ' Fruits'",
" VISIBLE: ' Fruits', cursor=1",
- "SPEECH OUTPUT: 'Fruits list item Fruits item 1 of 2 expanded tree level 1'"]))
+ "SPEECH OUTPUT: 'Fruits list item Fruits 1 of 2 expanded tree level 1'"]))
########################################################################
# Close the demo
diff --git a/test/keystrokes/firefox/dojo_button.py b/test/keystrokes/firefox/dojo_button.py
index b6830aa..48bd242 100644
--- a/test/keystrokes/firefox/dojo_button.py
+++ b/test/keystrokes/firefox/dojo_button.py
@@ -171,7 +171,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I on Create from template",
["BRAILLE LINE: 'Create from template'",
" VISIBLE: 'Create from template', cursor=1",
- "SPEECH OUTPUT: 'Create from template item 1 of 1'"]))
+ "SPEECH OUTPUT: 'Create from template 1 of 1'"]))
########################################################################
# Close the menu and go to the Edit! button
diff --git a/test/keystrokes/firefox/dojo_combo_box.py b/test/keystrokes/firefox/dojo_combo_box.py
index ef6b94d..9bb923a 100644
--- a/test/keystrokes/firefox/dojo_combo_box.py
+++ b/test/keystrokes/firefox/dojo_combo_box.py
@@ -135,7 +135,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I - Combo box expanded",
["BRAILLE LINE: 'â?¢ California'",
" VISIBLE: 'â?¢ California', cursor=1",
- "SPEECH OUTPUT: 'list item â?¢ California item 1 of 3'"]))
+ "SPEECH OUTPUT: 'list item â?¢ California 1 of 3'"]))
########################################################################
# Escape to collapse the combo box.
diff --git a/test/keystrokes/firefox/dojo_dialog.py b/test/keystrokes/firefox/dojo_dialog.py
index b8f1d64..3e4c5f3 100644
--- a/test/keystrokes/firefox/dojo_dialog.py
+++ b/test/keystrokes/firefox/dojo_dialog.py
@@ -87,7 +87,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic whereAmI",
["BRAILLE LINE: 'First tab Page Second tab Page'",
" VISIBLE: 'First tab Page Second tab Page', cursor=1",
- "SPEECH OUTPUT: 'tab list First tab page item 1 of 2'"]))
+ "SPEECH OUTPUT: 'tab list First tab page 1 of 2'"]))
########################################################################
# Close the dialog, focus goes back to button.
diff --git a/test/keystrokes/firefox/dojo_tabcontainer.py b/test/keystrokes/firefox/dojo_tabcontainer.py
index 34336ce..19dbc3d 100644
--- a/test/keystrokes/firefox/dojo_tabcontainer.py
+++ b/test/keystrokes/firefox/dojo_tabcontainer.py
@@ -50,7 +50,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: 'Tab 1 Page Tab 2 Page Tab 3 Page Inlined Sub TabContainer Page Sub TabContainer from href Page SplitContainer from href Page'",
" VISIBLE: 'Tab 1 Page Tab 2 Page Tab 3 Page', cursor=1",
- "SPEECH OUTPUT: 'tab list Tab 1 page item 1 of 7'"]))
+ "SPEECH OUTPUT: 'tab list Tab 1 page 1 of 7'"]))
########################################################################
# Use arrows to move between tabs: 'Tab 2'. The following will be presented.
diff --git a/test/keystrokes/firefox/dojo_tree.py b/test/keystrokes/firefox/dojo_tree.py
index 27f20f8..041705b 100644
--- a/test/keystrokes/firefox/dojo_tree.py
+++ b/test/keystrokes/firefox/dojo_tree.py
@@ -62,7 +62,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: 'Africa collapsed ListItem'",
" VISIBLE: 'Africa collapsed ListItem', cursor=1",
- "SPEECH OUTPUT: 'list item Africa item 1 of 6 collapsed tree level 2'"]))
+ "SPEECH OUTPUT: 'list item Africa 1 of 6 collapsed tree level 2'"]))
########################################################################
# Use arrows to expand/collapse/navigate tree.
diff --git a/test/keystrokes/firefox/html_role_combo_box.py b/test/keystrokes/firefox/html_role_combo_box.py
index 47a19e4..408f839 100644
--- a/test/keystrokes/firefox/html_role_combo_box.py
+++ b/test/keystrokes/firefox/html_role_combo_box.py
@@ -249,7 +249,7 @@ sequence.append(utils.AssertPresentationAction(
["BUG? - The item count appears to be incorrect",
"BRAILLE LINE: 'Braille Combo'",
" VISIBLE: 'Braille Combo', cursor=1",
- "SPEECH OUTPUT: 'Component combo box Braille item 1 of 1'"]))
+ "SPEECH OUTPUT: 'Component combo box Braille 1 of 1'"]))
########################################################################
# Press Shift Tab once to return to the Version combo box.
diff --git a/test/keystrokes/firefox/html_role_list_item_where_am_i.py b/test/keystrokes/firefox/html_role_list_item_where_am_i.py
index 16fdbac..bc354ac 100644
--- a/test/keystrokes/firefox/html_role_list_item_where_am_i.py
+++ b/test/keystrokes/firefox/html_role_list_item_where_am_i.py
@@ -50,7 +50,7 @@ sequence.append(utils.AssertPresentationAction(
"1. Basic Where Am I",
["BRAILLE LINE: 'â?¢ In a paragraph'",
" VISIBLE: 'â?¢ In a paragraph', cursor=1",
- "SPEECH OUTPUT: 'list item â?¢ In a paragraph item 2 of 4'"]))
+ "SPEECH OUTPUT: 'list item â?¢ In a paragraph 2 of 4'"]))
sequence.append(KeyComboAction("Down"))
sequence.append(utils.StartRecordingAction())
@@ -60,7 +60,7 @@ sequence.append(utils.AssertPresentationAction(
"2. Basic Where Am I",
["BRAILLE LINE: 'â?¢ In a section'",
" VISIBLE: 'â?¢ In a section', cursor=1",
- "SPEECH OUTPUT: 'list item â?¢ In a section item 3 of 4'"]))
+ "SPEECH OUTPUT: 'list item â?¢ In a section 3 of 4'"]))
sequence.append(KeyComboAction("Down"))
sequence.append(utils.StartRecordingAction())
@@ -70,7 +70,7 @@ sequence.append(utils.AssertPresentationAction(
"3. Basic Where Am I",
["BRAILLE LINE: '1. A nested list item, not in a paragraph'",
" VISIBLE: '1. A nested list item, not in a ', cursor=1",
- "SPEECH OUTPUT: 'list item 1. A nested list item, not in a paragraph item 1 of 3 Nesting level 1'"]))
+ "SPEECH OUTPUT: 'list item 1. A nested list item, not in a paragraph 1 of 3 Nesting level 1'"]))
sequence.append(KeyComboAction("Down"))
sequence.append(utils.StartRecordingAction())
@@ -80,7 +80,7 @@ sequence.append(utils.AssertPresentationAction(
"4. Basic Where Am I",
["BRAILLE LINE: '2. A nested list item, in a paragraph'",
" VISIBLE: '2. A nested list item, in a para', cursor=1",
- "SPEECH OUTPUT: 'list item 2. A nested list item, in a paragraph item 2 of 3 Nesting level 1'"]))
+ "SPEECH OUTPUT: 'list item 2. A nested list item, in a paragraph 2 of 3 Nesting level 1'"]))
sequence.append(KeyComboAction("Down"))
sequence.append(utils.StartRecordingAction())
@@ -90,7 +90,7 @@ sequence.append(utils.AssertPresentationAction(
"5. Basic Where Am I",
["BRAILLE LINE: '3. A nested list item, in a section'",
" VISIBLE: '3. A nested list item, in a sect', cursor=1",
- "SPEECH OUTPUT: 'list item 3. A nested list item, in a section item 3 of 3 Nesting level 1'"]))
+ "SPEECH OUTPUT: 'list item 3. A nested list item, in a section 3 of 3 Nesting level 1'"]))
sequence.append(KeyComboAction("Down"))
sequence.append(utils.StartRecordingAction())
@@ -100,7 +100,7 @@ sequence.append(utils.AssertPresentationAction(
"6. Basic Where Am I",
["BRAILLE LINE: 'â?¢ In a paragraph that's in a section'",
" VISIBLE: 'â?¢ In a paragraph that's in a sec', cursor=1",
- "SPEECH OUTPUT: 'list item â?¢ In a paragraph that's in a section item 4 of 4'"]))
+ "SPEECH OUTPUT: 'list item â?¢ In a paragraph that's in a section 4 of 4'"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
diff --git a/test/keystrokes/firefox/html_role_lists.py b/test/keystrokes/firefox/html_role_lists.py
index c3331ce..91b9897 100644
--- a/test/keystrokes/firefox/html_role_lists.py
+++ b/test/keystrokes/firefox/html_role_lists.py
@@ -164,7 +164,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: 'ix. or small roman numerals'",
" VISIBLE: 'ix. or small roman numerals', cursor=1",
- "SPEECH OUTPUT: 'list item ix. or small roman numerals item 4 of 6'"]))
+ "SPEECH OUTPUT: 'list item ix. or small roman numerals 4 of 6'"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
diff --git a/test/keystrokes/firefox/moz_menu.py b/test/keystrokes/firefox/moz_menu.py
index 5415afe..d710d1e 100644
--- a/test/keystrokes/firefox/moz_menu.py
+++ b/test/keystrokes/firefox/moz_menu.py
@@ -47,7 +47,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: 'Edit'",
" VISIBLE: 'Edit', cursor=1",
- "SPEECH OUTPUT: 'Edit item 1 of 1'"]))
+ "SPEECH OUTPUT: 'Edit 1 of 1'"]))
########################################################################
# Use arrows to navigate menu structure.
diff --git a/test/keystrokes/firefox/moz_tabpanel.py b/test/keystrokes/firefox/moz_tabpanel.py
index 301b8c8..17d8f1c 100644
--- a/test/keystrokes/firefox/moz_tabpanel.py
+++ b/test/keystrokes/firefox/moz_tabpanel.py
@@ -40,7 +40,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: 'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
" VISIBLE: 'Tab Zero Page Tab One Page Tab T', cursor=1",
- "SPEECH OUTPUT: 'tab list Tab Zero page item 1 of 5'"]))
+ "SPEECH OUTPUT: 'tab list Tab Zero page 1 of 5'"]))
########################################################################
# Move to tab 2.
diff --git a/test/keystrokes/firefox/ms_tree_bug_570571.py b/test/keystrokes/firefox/ms_tree_bug_570571.py
index 59df07e..ea4a135 100644
--- a/test/keystrokes/firefox/ms_tree_bug_570571.py
+++ b/test/keystrokes/firefox/ms_tree_bug_570571.py
@@ -49,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
["BUG? - There are visually two items here, but we say this is 1 of 1",
"BRAILLE LINE: '+Colors collapsed ListItem LEVEL 1'",
" VISIBLE: '+Colors collapsed ListItem LEVEL', cursor=1",
- "SPEECH OUTPUT: 'list item +Colors item 1 of 1 collapsed tree level 1'"]))
+ "SPEECH OUTPUT: 'list item +Colors 1 of 1 collapsed tree level 1'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
@@ -73,7 +73,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: '-Colors expanded ListItem LEVEL 1'",
" VISIBLE: '-Colors expanded ListItem LEVEL ', cursor=1",
- "SPEECH OUTPUT: 'list item -Colors item 1 of 2 expanded tree level 1'"]))
+ "SPEECH OUTPUT: 'list item -Colors 1 of 2 expanded tree level 1'"]))
########################################################################
# Down Arrow. Independent of Orca, the first item claims focus as one
diff --git a/test/keystrokes/firefox/uiuc_tabpanel.py b/test/keystrokes/firefox/uiuc_tabpanel.py
index 3d769d5..5e60df7 100644
--- a/test/keystrokes/firefox/uiuc_tabpanel.py
+++ b/test/keystrokes/firefox/uiuc_tabpanel.py
@@ -57,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: 'Crust Page Veges Page Carnivore Page Delivery Page'",
" VISIBLE: 'Carnivore Page Delivery Page', cursor=1",
- "SPEECH OUTPUT: 'tab list Carnivore page item 3 of 4'"]))
+ "SPEECH OUTPUT: 'tab list Carnivore page 3 of 4'"]))
########################################################################
# Navigate to fourth tab
diff --git a/test/keystrokes/firefox/uiuc_tree.py b/test/keystrokes/firefox/uiuc_tree.py
index 00d61ce..f17e450 100644
--- a/test/keystrokes/firefox/uiuc_tree.py
+++ b/test/keystrokes/firefox/uiuc_tree.py
@@ -51,7 +51,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: 'Fruits expanded ListItem'",
" VISIBLE: 'Fruits expanded ListItem', cursor=1",
- "SPEECH OUTPUT: 'list item Fruits item 1 of 2 expanded tree level 1'"]))
+ "SPEECH OUTPUT: 'list item Fruits 1 of 2 expanded tree level 1'"]))
########################################################################
# Navigate the tree using the arrows.
diff --git a/test/keystrokes/firefox/xul_role_accel_label.py b/test/keystrokes/firefox/xul_role_accel_label.py
index fe4bac0..519aac1 100755
--- a/test/keystrokes/firefox/xul_role_accel_label.py
+++ b/test/keystrokes/firefox/xul_role_accel_label.py
@@ -70,7 +70,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open File...\(Control O\)'",
" VISIBLE: 'Open File...(Control O)', cursor=1",
- "SPEECH OUTPUT: 'tool bar File menu Open Fileâ?¦ Control O item 4 of [0-9]+'"]))
+ "SPEECH OUTPUT: 'tool bar File menu Open Fileâ?¦ Control O 4 of [0-9]+'"]))
########################################################################
# Dismiss the menu by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_check_menu_item.py b/test/keystrokes/firefox/xul_role_check_menu_item.py
index 4ec0cb1..f2caec9 100755
--- a/test/keystrokes/firefox/xul_role_check_menu_item.py
+++ b/test/keystrokes/firefox/xul_role_check_menu_item.py
@@ -49,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar < > Full Screen CheckItem\(F11\)'",
" VISIBLE: '< > Full Screen CheckItem(F11)', cursor=1",
- "SPEECH OUTPUT: 'tool bar View menu Full Screen check item not checked F11 item 10 of 10'"]))
+ "SPEECH OUTPUT: 'tool bar View menu Full Screen check item not checked F11 10 of 10'"]))
########################################################################
# Dismiss the menu by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_combo_box.py b/test/keystrokes/firefox/xul_role_combo_box.py
index 2254531..4e1c993 100644
--- a/test/keystrokes/firefox/xul_role_combo_box.py
+++ b/test/keystrokes/firefox/xul_role_combo_box.py
@@ -159,10 +159,10 @@ sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BUG? - We claim this is item 1 of 1. This is how it was before the refactor as well.",
+ ["BUG? - We claim this is 1 of 1. This is how it was before the refactor as well.",
"BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
" VISIBLE: 'When " + utils.firefoxAppNames + " starts: Show a blan', cursor=22",
- "SPEECH OUTPUT: 'When " + utils.firefoxAppNames + " starts: combo box Show a blank page item 1 of 1'"]))
+ "SPEECH OUTPUT: 'When " + utils.firefoxAppNames + " starts: combo box Show a blank page 1 of 1'"]))
########################################################################
# Press Shift+Tab to move back to the Main list item.
diff --git a/test/keystrokes/firefox/xul_role_list_item.py b/test/keystrokes/firefox/xul_role_list_item.py
index 921e51e..643b6d0 100755
--- a/test/keystrokes/firefox/xul_role_list_item.py
+++ b/test/keystrokes/firefox/xul_role_list_item.py
@@ -55,7 +55,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
" VISIBLE: 'Main ListItem', cursor=1",
- "SPEECH OUTPUT: 'list item Main item 1 of 7'"]))
+ "SPEECH OUTPUT: 'list item Main 1 of 7'"]))
########################################################################
# Dismiss the dialog by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_page_tab.py b/test/keystrokes/firefox/xul_role_page_tab.py
index f8bf441..cf43447 100755
--- a/test/keystrokes/firefox/xul_role_page_tab.py
+++ b/test/keystrokes/firefox/xul_role_page_tab.py
@@ -33,7 +33,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog General Page'",
" VISIBLE: 'General Page', cursor=1",
- "SPEECH OUTPUT: 'tab list General page item 1 of [0-9]+'"]))
+ "SPEECH OUTPUT: 'tab list General page 1 of [0-9]+'"]))
########################################################################
# Right Arrow to move to the second page tab.
@@ -56,7 +56,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog Page Setup Page'",
" VISIBLE: 'Page Setup Page', cursor=1",
- "SPEECH OUTPUT: 'tab list Page Setup page item 2 of [0-9]+'"]))
+ "SPEECH OUTPUT: 'tab list Page Setup page 2 of [0-9]+'"]))
########################################################################
# Left Arrow to move to the first page tab.
diff --git a/test/keystrokes/firefox/xul_role_radio_button.py b/test/keystrokes/firefox/xul_role_radio_button.py
index 4f2686a..325b4f3 100755
--- a/test/keystrokes/firefox/xul_role_radio_button.py
+++ b/test/keystrokes/firefox/xul_role_radio_button.py
@@ -43,7 +43,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range &=y All Pages RadioButton'",
" VISIBLE: '&=y All Pages RadioButton', cursor=1",
- "SPEECH OUTPUT: 'Range All Pages radio button selected item 1 of 3.'",
+ "SPEECH OUTPUT: 'Range All Pages radio button selected 1 of 3.'",
"SPEECH OUTPUT: 'Alt a'"]))
########################################################################
@@ -67,7 +67,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range &=y Pages: RadioButton'",
" VISIBLE: '&=y Pages: RadioButton', cursor=1",
- "SPEECH OUTPUT: 'Range Pages: radio button selected item 3 of 3.'",
+ "SPEECH OUTPUT: 'Range Pages: radio button selected 3 of 3.'",
"SPEECH OUTPUT: 'Alt e'"]))
########################################################################
diff --git a/test/keystrokes/firefox/xul_role_radio_menu_item.py b/test/keystrokes/firefox/xul_role_radio_menu_item.py
index 7848284..1d01cac 100755
--- a/test/keystrokes/firefox/xul_role_radio_menu_item.py
+++ b/test/keystrokes/firefox/xul_role_radio_menu_item.py
@@ -49,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu & y No Style RadioItem'",
" VISIBLE: '& y No Style RadioItem', cursor=1",
- "SPEECH OUTPUT: 'tool bar View menu Page Style menu No Style radio menu item not selected item 1 of 2'"]))
+ "SPEECH OUTPUT: 'tool bar View menu Page Style menu No Style radio menu item not selected 1 of 2'"]))
########################################################################
# Down Arrow to the "Basic Page Style" radio menu item.
@@ -72,7 +72,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
" VISIBLE: '&=y Basic Page Style RadioItem', cursor=1",
- "SPEECH OUTPUT: 'tool bar View menu Page Style menu Basic Page Style radio menu item selected item 2 of 2'"]))
+ "SPEECH OUTPUT: 'tool bar View menu Page Style menu Basic Page Style radio menu item selected 2 of 2'"]))
########################################################################
# Dismiss the "Page Style" menu by pressing Escape.
diff --git a/test/keystrokes/firefox/xul_role_tree.py b/test/keystrokes/firefox/xul_role_tree.py
index 8ed44f6..926624f 100644
--- a/test/keystrokes/firefox/xul_role_tree.py
+++ b/test/keystrokes/firefox/xul_role_tree.py
@@ -85,7 +85,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu collapsed ListItem TREE LEVEL 2'",
" VISIBLE: 'Bookmarks Menu collapsed ListIte', cursor=1",
- "SPEECH OUTPUT: 'list item Bookmarks Menu item 2 of 3 collapsed tree level 2'"]))
+ "SPEECH OUTPUT: 'list item Bookmarks Menu 2 of 3 collapsed tree level 2'"]))
########################################################################
# Press Right Arrow to expand this item.
@@ -108,7 +108,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu expanded ListItem TREE LEVEL 2'",
" VISIBLE: 'Bookmarks Menu expanded ListItem', cursor=1",
- "SPEECH OUTPUT: 'list item Bookmarks Menu item 2 of 3 expanded tree level 2'"]))
+ "SPEECH OUTPUT: 'list item Bookmarks Menu 2 of 3 expanded tree level 2'"]))
########################################################################
# Press Down Arrow to give focus to the next item, Recently Bookmarked.
@@ -131,7 +131,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Recently Bookmarked ListItem TREE LEVEL 3'",
" VISIBLE: 'Recently Bookmarked ListItem TRE', cursor=1",
- "SPEECH OUTPUT: 'list item Recently Bookmarked item 1 of 4 tree level 3'"]))
+ "SPEECH OUTPUT: 'list item Recently Bookmarked 1 of 4 tree level 3'"]))
########################################################################
# Press Up Arrow to work back to the Bookmarks Toolbar list item.
diff --git a/test/keystrokes/firefox/yahoo_tab_view.py b/test/keystrokes/firefox/yahoo_tab_view.py
index dec5be1..a6b3b22 100644
--- a/test/keystrokes/firefox/yahoo_tab_view.py
+++ b/test/keystrokes/firefox/yahoo_tab_view.py
@@ -84,7 +84,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: 'Opera Page Firefox Page Explorer Page Safari Page'",
" VISIBLE: 'Safari Page', cursor=1",
- "SPEECH OUTPUT: 'tab list Safari page item 4 of 4'"]))
+ "SPEECH OUTPUT: 'tab list Safari page 4 of 4'"]))
########################################################################
# Left Arrow back to the third tab
diff --git a/test/keystrokes/gtk-demo/role_accel_label.py b/test/keystrokes/gtk-demo/role_accel_label.py
index 9df4354..9e05342 100644
--- a/test/keystrokes/gtk-demo/role_accel_label.py
+++ b/test/keystrokes/gtk-demo/role_accel_label.py
@@ -50,7 +50,7 @@ sequence.append(utils.AssertPresentationAction(
"New menu item Where Am I",
["BRAILLE LINE: 'gtk-demo Application UI Manager Frame MenuBar New(Control n)'",
" VISIBLE: 'New(Control n)', cursor=1",
- "SPEECH OUTPUT: 'File menu New Control n item 1 of 5.",
+ "SPEECH OUTPUT: 'File menu New Control n 1 of 5.",
"SPEECH OUTPUT: 'n'"]))
########################################################################
diff --git a/test/keystrokes/gtk-demo/role_check_menu_item.py b/test/keystrokes/gtk-demo/role_check_menu_item.py
index 637f80f..bdcce4f 100644
--- a/test/keystrokes/gtk-demo/role_check_menu_item.py
+++ b/test/keystrokes/gtk-demo/role_check_menu_item.py
@@ -52,7 +52,7 @@ sequence.append(utils.AssertPresentationAction(
"Bold check item Where Am I",
["BRAILLE LINE: 'gtk-demo Application Application Window Frame MenuBar <x> Bold CheckItem(Control b)'",
" VISIBLE: '<x> Bold CheckItem(Control b)', cursor=1",
- "SPEECH OUTPUT: 'Preferences menu Bold check item checked Control b item 3 of 3.",
+ "SPEECH OUTPUT: 'Preferences menu Bold check item checked Control b 3 of 3.",
"SPEECH OUTPUT: 'b'"]))
########################################################################
diff --git a/test/keystrokes/gtk-demo/role_combo_box.py b/test/keystrokes/gtk-demo/role_combo_box.py
index f806bff..8561215 100644
--- a/test/keystrokes/gtk-demo/role_combo_box.py
+++ b/test/keystrokes/gtk-demo/role_combo_box.py
@@ -57,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
"Warning combo box item Where Am I",
["BRAILLE LINE: 'gtk-demo Application Combo boxes Frame Some stock icons Panel ComboWarning Warning'",
" VISIBLE: 'Warning', cursor=1",
- "SPEECH OUTPUT: 'Some stock icons panel Warning item 1 of 5'"]))
+ "SPEECH OUTPUT: 'Some stock icons panel Warning 1 of 5'"]))
########################################################################
# Now arrow down and select the "New" item.
@@ -88,7 +88,7 @@ sequence.append(utils.AssertPresentationAction(
"New combo box item Where Am I",
["BRAILLE LINE: 'gtk-demo Application Combo boxes Frame Some stock icons Panel ComboWarning New'",
" VISIBLE: 'New', cursor=1",
- "SPEECH OUTPUT: 'Some stock icons panel New item 3 of 5'"]))
+ "SPEECH OUTPUT: 'Some stock icons panel New 3 of 5'"]))
########################################################################
# Select the "New" entry and tab to the editable text combo box. Skip
diff --git a/test/keystrokes/gtk-demo/role_combo_box2.py b/test/keystrokes/gtk-demo/role_combo_box2.py
index c789627..1f24e2d 100644
--- a/test/keystrokes/gtk-demo/role_combo_box2.py
+++ b/test/keystrokes/gtk-demo/role_combo_box2.py
@@ -52,7 +52,7 @@ sequence.append(utils.AssertPresentationAction(
"All sheets combo box item Where Am I",
["BRAILLE LINE: 'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: All sheets Combo'",
" VISIBLE: 'Only print: All sheets Combo', cursor=13",
- "SPEECH OUTPUT: 'Only print: combo box All sheets item 1 of 3.'",
+ "SPEECH OUTPUT: 'Only print: combo box All sheets 1 of 3.'",
"SPEECH OUTPUT: 'Alt o'"]))
########################################################################
@@ -81,7 +81,7 @@ sequence.append(utils.AssertPresentationAction(
"Even sheets combo box item Where Am I",
["BRAILLE LINE: 'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: Even sheets Combo'",
" VISIBLE: 'Only print: Even sheets Combo', cursor=13",
- "SPEECH OUTPUT: 'Only print: combo box Even sheets item 2 of 3.'",
+ "SPEECH OUTPUT: 'Only print: combo box Even sheets 2 of 3.'",
"SPEECH OUTPUT: 'Alt o'"]))
########################################################################
diff --git a/test/keystrokes/gtk-demo/role_icon.py b/test/keystrokes/gtk-demo/role_icon.py
index 0e95ddf..6b2a18e 100644
--- a/test/keystrokes/gtk-demo/role_icon.py
+++ b/test/keystrokes/gtk-demo/role_icon.py
@@ -64,7 +64,7 @@ sequence.append(utils.AssertPresentationAction(
"Layered pane Where Am I",
["BRAILLE LINE: 'gtk-demo Application GtkIconView demo Frame ScrollPane LayeredPane'",
" VISIBLE: 'LayeredPane', cursor=1",
- "SPEECH OUTPUT: 'layered pane 0 of [0-9]+ items selected on item 0 of [0-9]+'"]))
+ "SPEECH OUTPUT: 'layered pane 0 of [0-9]+ items selected on 0 of [0-9]+'"]))
########################################################################
# Down into the icon list, finally making something be selected in the
@@ -89,7 +89,7 @@ sequence.append(utils.AssertPresentationAction(
"bin icon Where Am I",
["BRAILLE LINE: 'gtk-demo Application GtkIconView demo Frame ScrollPane LayeredPane bin Icon'",
" VISIBLE: 'bin Icon', cursor=1",
- "SPEECH OUTPUT: 'Icon panel bin [0-9] of [0-9]+ items selected on item 1 of [0-9]+'"]))
+ "SPEECH OUTPUT: 'Icon panel bin [0-9] of [0-9]+ items selected on 1 of [0-9]+'"]))
########################################################################
# Arrow right and wait for the next icon to be selected.
@@ -125,7 +125,7 @@ sequence.append(utils.AssertPresentationAction(
"icon selection Where Am I",
["BRAILLE LINE: 'gtk-demo Application GtkIconView demo Frame ScrollPane LayeredPane bin Icon'",
" VISIBLE: 'bin Icon', cursor=1",
- "SPEECH OUTPUT: 'Icon panel bin [0-9] of [0-9]+ items selected on item 1 of [0-9]+'"]))
+ "SPEECH OUTPUT: 'Icon panel bin [0-9] of [0-9]+ items selected on 1 of [0-9]+'"]))
########################################################################
# Close the GtkIconView demo window
diff --git a/test/keystrokes/gtk-demo/role_menu.py b/test/keystrokes/gtk-demo/role_menu.py
index cdf357f..8e41117 100644
--- a/test/keystrokes/gtk-demo/role_menu.py
+++ b/test/keystrokes/gtk-demo/role_menu.py
@@ -48,7 +48,7 @@ sequence.append(utils.AssertPresentationAction(
"File menu Where Am I",
["BRAILLE LINE: 'gtk-demo Application Application Window Frame File Menu'",
" VISIBLE: 'File Menu', cursor=1",
- "SPEECH OUTPUT: 'menu bar File menu item 1 of 3.",
+ "SPEECH OUTPUT: 'menu bar File menu 1 of 3.",
"SPEECH OUTPUT: 'f'"]))
########################################################################
@@ -74,7 +74,7 @@ sequence.append(utils.AssertPresentationAction(
"Preferences menu Where Am I",
["BRAILLE LINE: 'gtk-demo Application Application Window Frame Preferences Menu'",
" VISIBLE: 'Preferences Menu', cursor=1",
- "SPEECH OUTPUT: 'menu bar Preferences menu item 2 of 3.",
+ "SPEECH OUTPUT: 'menu bar Preferences menu 2 of 3.",
"SPEECH OUTPUT: 'p'"]))
########################################################################
@@ -100,7 +100,7 @@ sequence.append(utils.AssertPresentationAction(
"Color menu Where Am I",
["BRAILLE LINE: 'gtk-demo Application Application Window Frame MenuBar Color Menu'",
" VISIBLE: 'Color Menu', cursor=1",
- "SPEECH OUTPUT: 'Preferences menu Color menu item 1 of 3.",
+ "SPEECH OUTPUT: 'Preferences menu Color menu 1 of 3.",
"SPEECH OUTPUT: 'c'"]))
########################################################################
@@ -126,7 +126,7 @@ sequence.append(utils.AssertPresentationAction(
"Shape menu Where Am I",
["BRAILLE LINE: 'gtk-demo Application Application Window Frame MenuBar Shape Menu'",
" VISIBLE: 'Shape Menu', cursor=1",
- "SPEECH OUTPUT: 'Preferences menu Shape menu item 2 of 3.",
+ "SPEECH OUTPUT: 'Preferences menu Shape menu 2 of 3.",
"SPEECH OUTPUT: 's'"]))
########################################################################
diff --git a/test/keystrokes/gtk-demo/role_page_tab.py b/test/keystrokes/gtk-demo/role_page_tab.py
index 09b1489..d6f958f 100644
--- a/test/keystrokes/gtk-demo/role_page_tab.py
+++ b/test/keystrokes/gtk-demo/role_page_tab.py
@@ -56,7 +56,7 @@ sequence.append(utils.AssertPresentationAction(
"General page tab Where Am I",
["BRAILLE LINE: 'gtk-demo Application Print Dialog General Page'",
" VISIBLE: 'General Page', cursor=1",
- "SPEECH OUTPUT: 'tab list General page item 1 of 2'"]))
+ "SPEECH OUTPUT: 'tab list General page 1 of 2'"]))
########################################################################
# Arrow Right to the "Page Setup" tab.
@@ -80,7 +80,7 @@ sequence.append(utils.AssertPresentationAction(
"Page Setup page tab Where Am I",
["BRAILLE LINE: 'gtk-demo Application Print Dialog Page Setup Page'",
" VISIBLE: 'Page Setup Page', cursor=1",
- "SPEECH OUTPUT: 'tab list Page Setup page item 2 of 2'"]))
+ "SPEECH OUTPUT: 'tab list Page Setup page 2 of 2'"]))
########################################################################
# Close the demo
diff --git a/test/keystrokes/gtk-demo/role_radio_button.py b/test/keystrokes/gtk-demo/role_radio_button.py
index 5fadb14..104926f 100644
--- a/test/keystrokes/gtk-demo/role_radio_button.py
+++ b/test/keystrokes/gtk-demo/role_radio_button.py
@@ -47,7 +47,7 @@ sequence.append(utils.AssertPresentationAction(
"All Pages radio button Where Am I",
["BRAILLE LINE: 'gtk-demo Application Print Dialog TabList General Page Range &=y All Pages RadioButton'",
" VISIBLE: '&=y All Pages RadioButton', cursor=1",
- "SPEECH OUTPUT: 'Range All Pages radio button selected item 1 of 3.'",
+ "SPEECH OUTPUT: 'Range All Pages radio button selected 1 of 3.'",
"SPEECH OUTPUT: 'Alt a'"]))
########################################################################
@@ -81,7 +81,7 @@ sequence.append(utils.AssertPresentationAction(
"Range radio button Where Am I",
["BRAILLE LINE: 'gtk-demo Application Print Dialog TabList General Page Range &=y Pages: RadioButton'",
" VISIBLE: '&=y Pages: RadioButton', cursor=1",
- "SPEECH OUTPUT: 'Range Pages: radio button selected item 3 of 3.'",
+ "SPEECH OUTPUT: 'Range Pages: radio button selected 3 of 3.'",
"SPEECH OUTPUT: 'Alt e'"]))
########################################################################
diff --git a/test/keystrokes/gtk-demo/role_radio_menu_item.py b/test/keystrokes/gtk-demo/role_radio_menu_item.py
index 629a97e..4741b64 100644
--- a/test/keystrokes/gtk-demo/role_radio_menu_item.py
+++ b/test/keystrokes/gtk-demo/role_radio_menu_item.py
@@ -56,7 +56,7 @@ sequence.append(utils.AssertPresentationAction(
"Red button Where Am I",
["BRAILLE LINE: 'gtk-demo Application Application Window Frame MenuBar Preferences Menu <x> Red CheckItem(Control r)'",
" VISIBLE: '<x> Red CheckItem(Control r)', cursor=1",
- "SPEECH OUTPUT: 'Preferences menu Color menu Red check item checked Control r item 1 of 3.",
+ "SPEECH OUTPUT: 'Preferences menu Color menu Red check item checked Control r 1 of 3.",
"SPEECH OUTPUT: 'r'"]))
########################################################################
@@ -88,7 +88,7 @@ sequence.append(utils.AssertPresentationAction(
"Green button Where Am I",
["BRAILLE LINE: 'gtk-demo Application Application Window Frame MenuBar Preferences Menu < > Green CheckItem(Control g)'",
" VISIBLE: '< > Green CheckItem(Control g)', cursor=1",
- "SPEECH OUTPUT: 'Preferences menu Color menu Green check item not checked Control g item 2 of 3.",
+ "SPEECH OUTPUT: 'Preferences menu Color menu Green check item not checked Control g 2 of 3.",
"SPEECH OUTPUT: 'g'"]))
########################################################################
diff --git a/test/keystrokes/java/role_accel_label.py b/test/keystrokes/java/role_accel_label.py
index 36396e1..818448e 100644
--- a/test/keystrokes/java/role_accel_label.py
+++ b/test/keystrokes/java/role_accel_label.py
@@ -38,7 +38,7 @@ sequence.append(WaitForFocus("About", acc_role=pyatspi.ROLE_MENU_ITEM))
# SPEECH OUTPUT: ' popup menu'
# SPEECH OUTPUT: 'About'
# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'item 1 of 5'
+# SPEECH OUTPUT: '1 of 5'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
diff --git a/test/keystrokes/java/role_page_tab.py b/test/keystrokes/java/role_page_tab.py
index 87f9e47..fde882d 100644
--- a/test/keystrokes/java/role_page_tab.py
+++ b/test/keystrokes/java/role_page_tab.py
@@ -115,7 +115,7 @@ sequence.append(WaitForFocus("<html><font color=blue><bold><center>Bouncing Babi
#
# SPEECH OUTPUT: 'tab list'
# SPEECH OUTPUT: '<html><font color=blue><bold><center>Bouncing Babies!</center></bold></font></html> page'
-# SPEECH OUTPUT: 'item 4 of 4'
+# SPEECH OUTPUT: '4 of 4'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
@@ -129,7 +129,7 @@ sequence.append(WaitForFocus("Hania", acc_role=pyatspi.ROLE_PAGE_TAB))
#
# SPEECH OUTPUT: 'tab list'
# SPEECH OUTPUT: 'Hania page'
-# SPEECH OUTPUT: 'item 3 of 4'
+# SPEECH OUTPUT: '3 of 4'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
@@ -143,7 +143,7 @@ sequence.append(WaitForFocus("Ewan", acc_role=pyatspi.ROLE_PAGE_TAB))
#
# SPEECH OUTPUT: 'tab list'
# SPEECH OUTPUT: 'Ewan page'
-# SPEECH OUTPUT: 'item 2 of 4'
+# SPEECH OUTPUT: '2 of 4'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
@@ -157,7 +157,7 @@ sequence.append(WaitForFocus("Laine", acc_role=pyatspi.ROLE_PAGE_TAB))
#
# SPEECH OUTPUT: 'tab list'
# SPEECH OUTPUT: 'Laine page'
-# SPEECH OUTPUT: 'item 1 of 4'
+# SPEECH OUTPUT: '1 of 4'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
diff --git a/test/keystrokes/java/role_radio_button.py b/test/keystrokes/java/role_radio_button.py
index 47a640c..8ff6a9c 100644
--- a/test/keystrokes/java/role_radio_button.py
+++ b/test/keystrokes/java/role_radio_button.py
@@ -148,13 +148,13 @@ sequence.append(KeyComboAction("Tab"))
sequence.append(WaitForFocus("Radio One ", acc_role=pyatspi.ROLE_RADIO_BUTTON))
########################################################################
-# TODO: "item 3 of 3"?
+# TODO: "3 of 3"?
# Do a basic "Where Am I" via KP_Enter. The following should be
# presented in speech:
# SPEECH OUTPUT: 'Image Radio Buttons'
# SPEECH OUTPUT: 'Radio One radio button'
# SPEECH OUTPUT: 'not selected'
-# SPEECH OUTPUT: 'item 3 of 3'
+# SPEECH OUTPUT: '3 of 3'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
@@ -172,13 +172,13 @@ sequence.append(WaitAction("object:property-change:accessible-value", None,
None, pyatspi.ROLE_RADIO_BUTTON, 5000))
########################################################################
-# TODO: "item 3 of 3"?
+# TODO: "3 of 3"?
# Do a basic "Where Am I" via KP_Enter. The following should be
# presented in speech:
# SPEECH OUTPUT: 'Image Radio Buttons'
# SPEECH OUTPUT: 'Radio One radio button'
# SPEECH OUTPUT: 'selected'
-# SPEECH OUTPUT: 'item 3 of 3'
+# SPEECH OUTPUT: '3 of 3'
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
@@ -201,7 +201,7 @@ sequence.append(WaitForFocus("Radio Two", acc_role=pyatspi.ROLE_RADIO_BUTTON))
# SPEECH OUTPUT: 'Image Radio Buttons'
# SPEECH OUTPUT: 'Radio Two radio button'
# SPEECH OUTPUT: 'not selected'
-# SPEECH OUTPUT: 'item 2 of 3'
+# SPEECH OUTPUT: '2 of 3'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
@@ -224,7 +224,7 @@ sequence.append(WaitAction("object:property-change:accessible-value", None,
# SPEECH OUTPUT: 'Image Radio Buttons'
# SPEECH OUTPUT: 'Radio Two radio button'
# SPEECH OUTPUT: 'selected'
-# SPEECH OUTPUT: 'item 2 of 3'
+# SPEECH OUTPUT: '2 of 3'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
diff --git a/test/keystrokes/java/role_radio_menu_item.py b/test/keystrokes/java/role_radio_menu_item.py
index 2599015..82c10de 100644
--- a/test/keystrokes/java/role_radio_menu_item.py
+++ b/test/keystrokes/java/role_radio_menu_item.py
@@ -39,7 +39,7 @@ sequence.append(WaitForFocus("Ocean", acc_role=pyatspi.ROLE_RADIO_MENU_ITEM))
# SPEECH OUTPUT: 'radio menu item'
# SPEECH OUTPUT: 'selected'
# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'item 3 of 9'
+# SPEECH OUTPUT: '3 of 9'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
@@ -62,7 +62,7 @@ sequence.append(WaitForFocus("Steel", acc_role=pyatspi.ROLE_RADIO_MENU_ITEM))
# SPEECH OUTPUT: 'radio menu item'
# SPEECH OUTPUT: 'not selected'
# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'item 4 of 9'
+# SPEECH OUTPUT: '4 of 9'
# SPEECH OUTPUT: ''
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
