orca r3571 - in trunk: . src/orca

[eitani svn gnome org]

Author: eitani
Date: Tue Feb 12 23:27:57 2008
New Revision: 3571
URL: http://svn.gnome.org/viewvc/orca?rev=3571&view=rev

Log:
* src/orca/braille.py: Make ReviewComponent expand on cursor.
* src/orca/flat_review.py: Don't expand the entire reviewed component.
* src/orca/orca_gui_prefs.py: Fixed a typo where we were using the wrong variable.


Modified:
   trunk/ChangeLog
   trunk/src/orca/braille.py
   trunk/src/orca/flat_review.py
   trunk/src/orca/orca_gui_prefs.py

Modified: trunk/src/orca/braille.py
==============================================================================
--- trunk/src/orca/braille.py	(original)
+++ trunk/src/orca/braille.py	Tue Feb 12 23:27:57 2008
@@ -689,7 +689,8 @@
         - zone: the flat review Zone associated with this component
         """
 
-        Component.__init__(self, accessible, string, cursorOffset)
+        Component.__init__(self, accessible, string,
+                           cursorOffset, expandOnCursor=True)
         self.zone = zone
 
 class ReviewText(Region):

Modified: trunk/src/orca/flat_review.py
==============================================================================
--- trunk/src/orca/flat_review.py	(original)
+++ trunk/src/orca/flat_review.py	Tue Feb 12 23:27:57 2008
@@ -1655,8 +1655,6 @@
                             len(zone.words[wordIndex].string.decode("UTF-8"))
                 regionWithFocus.cursorOffset += self.charIndex
                 regionWithFocus.repositionCursor()
-                if isinstance(regionWithFocus, braille.ReviewComponent):
-                    regionWithFocus.expandRegion()
                 break
 
         return [regions, regionWithFocus]

Modified: trunk/src/orca/orca_gui_prefs.py
==============================================================================
--- trunk/src/orca/orca_gui_prefs.py	(original)
+++ trunk/src/orca/orca_gui_prefs.py	Tue Feb 12 23:27:57 2008
@@ -1484,13 +1484,13 @@
                 for name, fname in tableDict.items():
                     it = tablesModel.append([name, fname])
                     if os.path.join(louis.TABLES_DIR, fname) == selectedTable:
-                        selectedTable = it
+                        selectedTableIter = it
                 cell = gtk.CellRendererText()
                 tablesCombo.pack_start(cell, True)
                 tablesCombo.add_attribute(cell, 'text', 0)
                 tablesCombo.set_model(tablesModel)
-                if selectedTable:
-                    tablesCombo.set_active_iter(selectedTable)
+                if selectedTableIter:
+                    tablesCombo.set_active_iter(selectedTableIter)
                 else:
                     tablesCombo.set_active(0)
             else: