Changeset 124

Timestamp:

01/17/08 14:58:23

Author:

slee

Message:

GAIL fixes

Files:

• inapp/trunk/ChangeLog (modified) (1 diff)
• inapp/trunk/src/jambu/AccDecorator.py (modified) (1 diff)
• inapp/trunk/src/jambu/ActionTree.py (modified) (5 diffs)

inapp/trunk/ChangeLog

@@ -1 @@
-
+-3
-
+        * gail fixes
-  * improved highlight
-

inapp/trunk/src/jambu/AccDecorator.py

@@ -38 +38 @@
-    return getattr(self._acc, attrib)
-
+  def __eq__(self, other):
+    #do default comparison
+    if other is None:
+      return False
+    assert isinstance(other, self.__class__)
+    return self._acc == other._acc
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+  
-  # now the 'real' functions
-  def hasStates(self, *states):

inapp/trunk/src/jambu/ActionTree.py

@@ -82 +82 @@
-
-  def get_acc_from_iter(self, iter):
+    if iter is None:
+      return None
-    return self.get_acc_from_path(self.get_model().get_path(iter))
-                           
@@ -179 +181 @@
-
-    if event.type == 'focus:' and \
-
+
+
-#        not (source_acc.hasRoleIn(pyatspi.ROLE_MENU, pyatspi.ROLE_MENU_ITEM,
-#                                    pyatspi.ROLE_RADIO_MENU_ITEM, pyatspi.ROLE_CHECK_MENU_ITEM)):
@@ -196 +199 @@
-      except LookupError:
-        root = None
+      if top is None or top <> root:
-      # for some reason they are not always the same accessible 
-      # even though we expect them to be compared by hash
-      # perhaps state changes as default hash is probably on memory image
-
-
+#
+#
-        WindowActivateMessage(top).send()
-        
@@ -351 +355 @@
-      print 'gk: click'
-      self.generateClick(acc)
-
+
-    elif acc.isSelectable():
-      # moz location auto compelete - no parent
-      print 'sel'
+      is_gecko = acc.hasToolkitIn('Gecko')
-      if acc.hasRoleIn(pyatspi.ROLE_MENU_ITEM):
-        if not self.row_expanded(path):
@@ -360 +365 @@
-        elif self.row_expanded(path):
-          print '!!! Escape'
-
-
+
+
+
-          acc.doAction()
-
+
+
-          acc.toggleSectable()
-          acc.doAction()
-
-
-
+
+
+
+
-      else:
-        acc.toggleSectable()