orca r3740 - in trunk: . src/orca/scripts test/keystrokes/oocalc

[richb svn gnome org]

Author: richb
Date: Thu Mar 20 20:39:56 2008
New Revision: 3740
URL: http://svn.gnome.org/viewvc/orca?rev=3740&view=rev

Log:
        * test/keystrokes/oocalc/bug_364407.py:
          src/orca/scripts/StarOffice.py:
          Fix for bug #523018 - Orca does not speak the role for edits 
          in the find and replace dialog in openoffice. Really a new fix
          for bug #364407 which broke again with the recent pyatspi migration.


Modified:
   trunk/ChangeLog
   trunk/src/orca/scripts/StarOffice.py
   trunk/test/keystrokes/oocalc/bug_364407.py

Modified: trunk/src/orca/scripts/StarOffice.py
==============================================================================
--- trunk/src/orca/scripts/StarOffice.py	(original)
+++ trunk/src/orca/scripts/StarOffice.py	Thu Mar 20 20:39:56 2008
@@ -2123,7 +2123,8 @@
         # locusOfFocusChanged method, which in turn will result in our
         # _getSpeechForComboBox() method being called.
         #
-        rolesList = [pyatspi.ROLE_COMBO_BOX, \
+        rolesList = [pyatspi.ROLE_LIST, \
+                     pyatspi.ROLE_COMBO_BOX, \
                      pyatspi.ROLE_TOOL_BAR, \
                      pyatspi.ROLE_PANEL, \
                      pyatspi.ROLE_ROOT_PANE, \
@@ -2134,11 +2135,15 @@
             and (not event.source.name or len(event.source.name) == 0):
             debug.println(self.debugLevel, "StarOffice.locusOfFocusChanged - " \
                           + "Calc: name box.")
+
+            self.updateBraille(newLocusOfFocus)
+
             # Translators: this is our made up name for the nameless field
             # in StarOffice/OpenOffice calc that allows you to type in a
             # cell coordinate (e.g., A4) and then move to it.
             #
-            event.source.name = _("Move to cell")
+            speech.speak(_("Move to cell"))
+            return
 
         # 6) Calc: spreadsheet cell.
         #
@@ -2270,14 +2275,15 @@
 
 
     def onFocus(self, event):
-        """Called whenever an object gets focus. Overridden in this script
-        so that we can adjust the "focus:" events for the Calc Name combo
-        box to reduce its verbosity (see bug #364407).
+        """Called whenever an object gets focus.
 
         Arguments:
         - event: the Event
         """
 
+        # If this is a "focus:" event for the Calc Name combo box, catch 
+        # it here to reduce verbosity (see bug #364407).
+        #
         rolesList = [pyatspi.ROLE_LIST, \
                      pyatspi.ROLE_COMBO_BOX, \
                      pyatspi.ROLE_TOOL_BAR, \
@@ -2288,7 +2294,7 @@
         if self.isDesiredFocusedItem(event.source, rolesList):
             debug.println(self.debugLevel, "StarOffice.onFocus - " \
                           + "Calc: Name combo box.")
-            orca.setLocusOfFocus(None, event.source.parent, False)
+            orca.setLocusOfFocus(event, event.source, True)
             return
 
         # If we are FOCUSED on a paragraph inside a table cell (in Writer),

Modified: trunk/test/keystrokes/oocalc/bug_364407.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_364407.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_364407.py	Thu Mar 20 20:39:56 2008
@@ -60,7 +60,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_LIST))
 sequence.append(utils.AssertPresentationAction(
     "Type Control-Shift-t to give focus to the spreadsheet cell locator",
-    ["BUG: not brailling/speaking anything"]))
+    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ToolBar List'",
+     "     VISIBLE:  'List', cursor=1",
+     "SPEECH OUTPUT: 'Move to cell'"]))
 
 ######################################################################
 # 4. Type right arrow twice and backspace twice to remove the current 
@@ -94,8 +96,11 @@
      "     VISIBLE:  'c3 $l', cursor=3",
      "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ToolBar c3 $l'",
      "     VISIBLE:  'c3 $l', cursor=1",
+     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
+     "     VISIBLE:  'Cell A1 ', cursor=1",
      "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell C3 '",
      "     VISIBLE:  'Cell C3 ', cursor=1",
+     "SPEECH OUTPUT: ' A1'",
      "SPEECH OUTPUT: ' C3'"]))
 
 ######################################################################