[orca] More tweaking of what we speak when presenting ancestors

[Joanmarie Diggs <joanied src gnome org>]

commit 1fb14f23fe608b280d1813778ded1c9ee2304b7b
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Jan 17 06:13:43 2014 -0500

    More tweaking of what we speak when presenting ancestors

 src/orca/formatting.py       |    7 +++++--
 src/orca/speech_generator.py |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index c18d071..837bbfc 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -132,7 +132,7 @@ formatting = {
             'basicWhereAmI': 'label + roleName + value + percentage + ' + MNEMONIC + ' + accelerator + 
required'
             },
         pyatspi.ROLE_COMBO_BOX: {
-            'focused': 'name + positionInList',
+            'focused': 'name + roleName + positionInList',
             'unfocused': 'label + name + roleName + positionInList + ' + MNEMONIC + ' + accelerator',
             'basicWhereAmI': 'label + roleName + name + positionInList + ' + MNEMONIC + ' + accelerator'
             },
@@ -193,7 +193,7 @@ formatting = {
             'basicWhereAmI': 'label + roleName + name + positionInList + expandableState + (nodeLevel or 
nestingLevel)'
             },
         pyatspi.ROLE_MENU: {
-            'focused': '[]',
+            'focused': 'labelAndName + roleName',
             'unfocused': 'labelAndName + allTextSelection + roleName + availability + ' + MNEMONIC + ' + 
accelerator + positionInList',
             'basicWhereAmI': '(ancestors or parentRoleName) + labelAndName + roleName +  positionInList + ' 
+ MNEMONIC
             },
@@ -210,6 +210,9 @@ formatting = {
             'unfocused': 'labelAndName + roleName + positionInList + ' + MNEMONIC + ' + accelerator',
             'basicWhereAmI': 'parentRoleName + labelAndName + roleName + positionInList + ' + MNEMONIC + ' + 
accelerator'
             },
+        pyatspi.ROLE_PANEL: {
+            'focused': 'labelAndName + roleName',
+            },
         pyatspi.ROLE_PARAGRAPH: {
             'focused': 'labelOrName + readOnly + textRole + currentLineText + allTextSelection',
             'unfocused': 'labelOrName + readOnly + textRole + currentLineText + allTextSelection + ' + 
MNEMONIC,
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 871a241..81fe299 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -1496,7 +1496,7 @@ class SpeechGenerator(generator.Generator):
                     break
                 if parentRole not in skipRoles \
                    and not self._script.utilities.isLayoutOnly(parent):
-                    result.append(self.generate(parent))
+                    result.append(self.generate(parent, formatType='focused'))
                 parent = parent.parent
         result.reverse()
         return result