Changeset 112

Timestamp:

01/07/08 16:27:00

Author:

slee

Message:

more firefox fixes

Files:

• inapp/trunk/README (modified) (2 diffs)
• inapp/trunk/src/jambu/ActionTree.py (modified) (8 diffs)

inapp/trunk/README

@@ -29 +29 @@
-  --showtree    show the GTKTreeView of accesible objects and other UI
-
-
+
+
-
-Gestures
@@ -38 +39 @@
-Auto scan may be started/stopped with the 'Start Scan' button.
-
-
+
+
-
-Known Bugs

inapp/trunk/src/jambu/ActionTree.py

@@ -13 +13 @@
-
-__metaclass__ = type
+
+def parent_acc_with_role(acc, *roles):
+  while acc is not None:
+    if acc.getRole() in roles:
+      return acc
+    acc = acc.parent
+  return None
-
-class ActionTree(gtk.TreeView):
@@ -161 +168 @@
-    class WindowActivateMessage(MyMessage):
-      handler = self._onWindowActivate
+    class ChildChangedMessage(MyMessage):
+      handler = self._onChildChanged
-    
-    s = formatEvent(event)
@@ -174 +183 @@
-    elif event.type in ('window:activate', 'window:restore'):
-      PrintMessage(s).send()
-      def parent_acc_with_role(acc, *roles):
-        while acc is not None:
-          if acc.getRole() in roles:
-            return acc
-          acc = acc.parent
-        return None
-      top = parent_acc_with_role(event.source, pyatspi.ROLE_DIALOG, 
-                                        pyatspi.ROLE_ALERT, 
@@ -215 +218 @@
-      model = self.get_model()
-      if source_acc.hasToolkitIn('Gecko') or model.isAncestor(self.current_acc, source_acc._acc):
-None
+
-      # with minefield we get changes on a FRAME that is not in the heirarchy
-        
@@ -311 +314 @@
-    path = model.get_path(iter)
-    #acc.grabFocus()
-
+
+
-    if acc.isEditable():
-      try:
@@ -317 +321 @@
-      except:
-        raise
+
+    elif acc.hasToolkitIn('Gecko') \
+        and acc.getRole() == pyatspi.ROLE_LIST and acc.parent.getRole() == pyatspi.ROLE_MENU and acc.is_group:
+      # assume is location list
+      print 'gk: loc group'
+      self._do_actionGroup(iter)
+
+    elif acc.hasToolkitIn('Gecko') \
+        and (acc.getRole() == pyatspi.ROLE_LIST_ITEM \
+        and acc.parent.getRole() == pyatspi.ROLE_LIST and acc.parent.parent.getRole() == pyatspi.ROLE_MENU):
+      # assume is location list
+      print 'gk: loc action'
+      acc.doAction()
-      
+    elif acc.hasToolkitIn('Gecko') \
+        and (acc.getRole() == pyatspi.ROLE_PUSH_BUTTON \
+        and acc.parent.getRole() == pyatspi.ROLE_PAGE_TAB_LIST):
+      # assume is location list
+      print 'gk: pt button action'
+      acc.generateClick()
+
+    elif acc.hasToolkitIn('Gecko') and \
+         acc.hasRoleIn(pyatspi.ROLE_MENU, pyatspi.ROLE_MENU_ITEM):
+      print 'gk: click'
+      acc.generateClick()
+    
-    elif acc.isSelectable():
+      # moz location auto compelete - no parent
-      print 'sel'
-      if acc.hasRoleIn(pyatspi.ROLE_MENU_ITEM):
@@ -326 +356 @@
-          print '!!! Escape'
-          sendKeyCombination('Escape', '')         
-
+ or acc.is_interactive
-          acc.doAction()
-      elif acc.hasRoleIn(pyatspi.ROLE_CHECK_MENU_ITEM, pyatspi.ROLE_RADIO_MENU_ITEM):
@@ -337 +367 @@
-        acc.toggleSectable()
-
-    elif acc.hasToolkitIn('Gecko') and \
-         acc.hasRoleIn(pyatspi.ROLE_MENU, pyatspi.ROLE_MENU_ITEM):
-      print 'click'
-      acc.generateClick()
-    
-    # TODO: use template DP for toolkit and application
-    elif acc.isActionable() and not acc.hasRoleIn(pyatspi.ROLE_AUTOCOMPLETE):