[orca] Provide more meaningful information for egg-list-boxes

[Joanmarie Diggs <joanied src gnome org>]

commit ba9a2d5202a38970ca076b3e30ec2b6f12046c4e
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Feb 4 17:22:05 2013 -0500

    Provide more meaningful information for egg-list-boxes

 src/orca/braille_generator.py |    5 +++++
 src/orca/script_utilities.py  |    5 +++++
 src/orca/speech_generator.py  |    5 +++++
 3 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/src/orca/braille_generator.py b/src/orca/braille_generator.py
index aec557f..7eb0339 100644
--- a/src/orca/braille_generator.py
+++ b/src/orca/braille_generator.py
@@ -129,6 +129,11 @@ class BrailleGenerator(generator.Generator):
         verbosityLevel = _settingsManager.getSetting('brailleVerbosityLevel')
 
         doNotPresent = [pyatspi.ROLE_UNKNOWN]
+
+        # egg-list-box, e.g. privacy panel in gnome-control-center
+        if obj.parent and obj.parent.getRole() == pyatspi.ROLE_LIST_BOX:
+            doNotPresent.append(pyatspi.ROLE_FILLER)
+
         if verbosityLevel == settings.VERBOSITY_LEVEL_BRIEF:
             doNotPresent.extend([pyatspi.ROLE_ICON, pyatspi.ROLE_CANVAS])
 
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 7fba7dd..f6f9349 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -606,6 +606,11 @@ class Utilities:
             except (LookupError, RuntimeError):
                 pass
 
+        # egg-list-box, e.g. privacy panel in gnome-control-center
+        if not displayedText and role == pyatspi.ROLE_FILLER:
+            labels = self.unrelatedLabels(obj)
+            displayedText = " ".join(map(self.displayedText, labels))
+
         # [[[WDW - HACK because push buttons can have labels as their
         # children.  An example of this is the Font: button on the General
         # tab in the Editing Profile dialog in gnome-terminal.
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index d9ff094..31498cb 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -260,6 +260,11 @@ class SpeechGenerator(generator.Generator):
         role = args.get('role', obj.getRole())
 
         doNotPresent = [pyatspi.ROLE_UNKNOWN]
+
+        # egg-list-box, e.g. privacy panel in gnome-control-center
+        if obj.parent and obj.parent.getRole() == pyatspi.ROLE_LIST_BOX:
+            doNotPresent.append(pyatspi.ROLE_FILLER)
+
         if _settingsManager.getSetting('speechVerbosityLevel') \
                 == settings.VERBOSITY_LEVEL_BRIEF:
             doNotPresent.extend([pyatspi.ROLE_ICON, pyatspi.ROLE_CANVAS])