orca r3784 - in trunk: . src/orca src/orca/scripts
- From: richb svn gnome org
- To: svn-commits-list gnome org
- Subject: orca r3784 - in trunk: . src/orca src/orca/scripts
- Date: Tue, 1 Apr 2008 02:24:55 +0100 (BST)
Author: richb
Date: Tue Apr 1 02:24:54 2008
New Revision: 3784
URL: http://svn.gnome.org/viewvc/orca?rev=3784&view=rev
Log:
* src/orca/scripts/Evolution.py:
src/orca/flat_review.py:
src/orca/speechgenerator.py:
src/orca/Gecko.py:
src/orca/where_am_I.py:
src/orca/braillegenerator.py:
Fix for bug #519936 - In Evolution Orca does not read the
messages list properly when in "read table row" mode.
Modified:
trunk/ChangeLog
trunk/src/orca/Gecko.py
trunk/src/orca/braillegenerator.py
trunk/src/orca/default.py
trunk/src/orca/flat_review.py
trunk/src/orca/scripts/Evolution.py
trunk/src/orca/speechgenerator.py
trunk/src/orca/where_am_I.py
Modified: trunk/src/orca/Gecko.py
==============================================================================
--- trunk/src/orca/Gecko.py (original)
+++ trunk/src/orca/Gecko.py Tue Apr 1 02:24:54 2008
@@ -8911,7 +8911,9 @@
comboBox.queryComponent().grabFocus()
for i in range(0, action.nActions):
name = action.getName(i)
- if name == "open":
+ # Translators: this is the action name for the 'open' action.
+ #
+ if name in ["open", _("open")]:
action.doAction(i)
break
Modified: trunk/src/orca/braillegenerator.py
==============================================================================
--- trunk/src/orca/braillegenerator.py (original)
+++ trunk/src/orca/braillegenerator.py Tue Apr 1 02:24:54 2008
@@ -1165,7 +1165,11 @@
continue
else:
for j in range(0, action.nActions):
- if action.getName(j) == "toggle":
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(j) in ["toggle", _("toggle")]:
hasToggle[i] = True
break
@@ -1201,7 +1205,12 @@
debug.println(debug.LEVEL_FINEST,
"braillegenerator._getBrailleRegionsForTableCell " \
+ "looking at action %d" % i)
- if action.getName(i) == "toggle":
+
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(i) in ["toggle", _("toggle")]:
regions = self._getBrailleRegionsForCheckBox(obj)
# If this table cell doesn't have any label associated
Modified: trunk/src/orca/default.py
==============================================================================
--- trunk/src/orca/default.py (original)
+++ trunk/src/orca/default.py Tue Apr 1 02:24:54 2008
@@ -2791,15 +2791,24 @@
parentRole = newLocusOfFocus.parent.getRole()
state = newLocusOfFocus.getState()
- if objRole == pyatspi.ROLE_ICON and \
- parentRole == pyatspi.ROLE_LAYERED_PANE:
- checkIfSelected = True
-
if objRole == pyatspi.ROLE_TABLE_CELL and \
(parentRole == pyatspi.ROLE_TREE_TABLE or \
parentRole == pyatspi.ROLE_TABLE):
checkIfSelected = True
+ # If we met the last set of conditions, but we got here by
+ # moving left or right on the same row, then don't announce the
+ # selection state to the user. See bug #523235 for more details.
+ #
+ if checkIfSelected == True and \
+ (orca_state.lastNonModifierKeyEvent.event_string == "Left" or \
+ orca_state.lastNonModifierKeyEvent.event_string == "Right"):
+ checkIfSelected = False
+
+ if objRole == pyatspi.ROLE_ICON and \
+ parentRole == pyatspi.ROLE_LAYERED_PANE:
+ checkIfSelected = True
+
if checkIfSelected and not state.contains(pyatspi.STATE_SELECTED):
# Translators: this is in reference to a table cell being
# selected or not.
Modified: trunk/src/orca/flat_review.py
==============================================================================
--- trunk/src/orca/flat_review.py (original)
+++ trunk/src/orca/flat_review.py Tue Apr 1 02:24:54 2008
@@ -1052,7 +1052,11 @@
if action:
hasToggle = False
for i in range(0, action.nActions):
- if action.getName(i) == "toggle":
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(i) in ["toggle", _("toggle")]:
hasToggle = True
break
if hasToggle:
Modified: trunk/src/orca/scripts/Evolution.py
==============================================================================
--- trunk/src/orca/scripts/Evolution.py (original)
+++ trunk/src/orca/scripts/Evolution.py Tue Apr 1 02:24:54 2008
@@ -66,7 +66,11 @@
if action:
for i in range(0, action.nActions):
- if action.getName(i) == "toggle":
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(i) in ["toggle", _("toggle")]:
if not obj.getState().contains(pyatspi.STATE_CHECKED):
notChecked = True
break
@@ -1040,7 +1044,11 @@
if action:
for j in range(0, action.nActions):
- if action.getName(j) == "toggle":
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(j) in ["toggle", _("toggle")]:
checkbox = True
checked = cell.getState().contains( \
pyatspi.STATE_CHECKED)
Modified: trunk/src/orca/speechgenerator.py
==============================================================================
--- trunk/src/orca/speechgenerator.py (original)
+++ trunk/src/orca/speechgenerator.py Tue Apr 1 02:24:54 2008
@@ -1307,7 +1307,11 @@
continue
else:
for j in range(0, action.nActions):
- if action.getName(j) == "toggle":
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(j) in ["toggle", _("toggle")]:
hasToggle[i] = True
break
@@ -1342,7 +1346,12 @@
debug.println(debug.LEVEL_FINEST,
"speechgenerator.__getTableCellUtterances " \
+ "looking at action %d" % i)
- if action.getName(i) == "toggle":
+
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(i) in ["toggle", _("toggle")]:
utterances = self._getSpeechForCheckBox(obj,
already_focused)
break
@@ -1468,7 +1477,12 @@
action = None
if action and (label == None or len(label) == 0):
for j in range(0, action.nActions):
- if action.getName(j) == "toggle":
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(j) in ["toggle", \
+ _("toggle")]:
accHeader = \
parent_table.getColumnHeader(i)
utterances.append(accHeader.name)
Modified: trunk/src/orca/where_am_I.py
==============================================================================
--- trunk/src/orca/where_am_I.py (original)
+++ trunk/src/orca/where_am_I.py Tue Apr 1 02:24:54 2008
@@ -1216,7 +1216,11 @@
pass
else:
for i in range(0, action.nActions):
- if action.getName(i) == "toggle":
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(i) in ["toggle", _("toggle")]:
isToggle = True
break
@@ -1243,7 +1247,11 @@
pass
else:
for i in range(0, action.nActions):
- if action.getName(i) == "toggle":
+ # Translators: this is the action name for
+ # the 'toggle' action. It must be the same
+ # string used in the *.po file for gail.
+ #
+ if action.getName(i) in ["toggle", _("toggle")]:
isToggle = True
break
if not isToggle:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
