orca r3664 - in trunk: . src/orca test/keystrokes/gtk-demo

[richb svn gnome org]

Author: richb
Date: Fri Feb 29 20:49:00 2008
New Revision: 3664
URL: http://svn.gnome.org/viewvc/orca?rev=3664&view=rev

Log:
        * src/orca/where_am_I.py:
          test/keystrokes/gtk-demo/role_split_pane.py:
          Fix for bug #519563 â gtk-demo/role_split_pane.py regression
          test #3 produces the wrong results.


Modified:
   trunk/ChangeLog
   trunk/src/orca/where_am_I.py
   trunk/test/keystrokes/gtk-demo/role_split_pane.py

Modified: trunk/src/orca/where_am_I.py
==============================================================================
--- trunk/src/orca/where_am_I.py	(original)
+++ trunk/src/orca/where_am_I.py	Fri Feb 29 20:49:00 2008
@@ -139,6 +139,9 @@
         elif role == pyatspi.ROLE_TOGGLE_BUTTON:
             self._speakToggleButton(obj, basicOnly)
 
+        elif role == pyatspi.ROLE_SPLIT_PANE:
+            self._speakSplitPane(obj, basicOnly)
+
         else:
             self._speakGenericObject(obj, basicOnly)
 
@@ -821,6 +824,25 @@
 
         speech.speakUtterances(utterances)
       
+    def _speakSplitPane(self, obj, basicOnly):
+        """Speak split pane information:
+           1. Name/Label
+           2. Role
+           3. Value
+        """
+
+        utterances = []
+        text = self.getObjLabelAndName(obj)
+        utterances.append(text)
+
+        text = rolenames.getSpeechForRoleName(obj)
+        utterances.append(text)
+
+        valueString = self._script.getTextForValue(obj)
+        utterances.append(valueString)
+
+        speech.speakUtterances(utterances)
+
     def __extractSize(self, uri):
         """Get the http header for a given uri and try to extract the size
         (Content-length).

Modified: trunk/test/keystrokes/gtk-demo/role_split_pane.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_split_pane.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_split_pane.py	Fri Feb 29 20:49:00 2008
@@ -65,8 +65,8 @@
     ["BRAILLE LINE:  'gtk-demo Application Panes Frame 61 SplitPane'",
      "     VISIBLE:  '61 SplitPane', cursor=1",
      "SPEECH OUTPUT: ''",
-     "BUG? - no value spoken?",
-     "SPEECH OUTPUT: 'split pane'"]))
+     "SPEECH OUTPUT: 'split pane'",
+     "SPEECH OUTPUT: '61'"]))
 
 ########################################################################
 # Put things back the way they were