Changeset 108

Timestamp:

01/04/08 18:15:41

Author:

slee

Message:

more firefox fixes

Files:

• inapp/trunk/src/jambu/AccDecorator.py (modified) (1 diff)
• inapp/trunk/src/jambu/ActionModel.py (modified) (2 diffs)
• inapp/trunk/src/jambu/ActionTree.py (modified) (7 diffs)

inapp/trunk/src/jambu/AccDecorator.py

@@ -205 +205 @@
-  def isScrollableList(self):
-    return self.isScrollableSelection() and self.hasRoleIn(pyatspi.ROLE_TABLE)
+
+  def getAttributes(self):
+    d = {}
+    try:
+      attribs = self._acc.getAttributes()
+    except:
+      pass
+    else:
+      for attr in attribs:
+        name, value = attr.split(':', 1)
+        d[name] = value
+    return d
+
+  def hasAttribute(self, name, value):
+    d = self.getAttributes()
+    try:
+      val = d[name]
+    except KeyError:
+      val = None
+    return value == val

inapp/trunk/src/jambu/ActionModel.py

@@ -126 +126 @@
-    self.popLevel(iter)
-    
-
+, parent_acc=None
-    t = time()
-    if iter is None:
@@ -132 +132 @@
-      path = ()
-    else:
-self[iter][self.COL_ACC]
+(parent_acc if parent_acc is not None else self[iter][self.COL_ACC])
-      path = self.get_path(iter)
-
-    ag = ActionGroup(parent_acc)
-    for child, i in zip(ag, xrange(len(ag))):

inapp/trunk/src/jambu/ActionTree.py

@@ -164 +164 @@
-    
-    s = formatEvent(event)
-
+#
-
-    if event.type == 'focus:' and \
@@ -195 +195 @@
-         (root is None or not(top.getRole() == root.getRole() and top.name == root.name)):
-        WindowActivateMessage(top).send()
+        
+#    elif event.type == 'object:state-changed:showing' and bool(event.detail1):
+#      PrintMessage(s).send()
+#      ShowMenuMessage(event).send()
-
-    elif event.type == 'object:children-changed:remove':
@@ -226 +230 @@
-      elif event.type == 'object:state-changed:visible' \
-          and event.detail1 == 1 \
-
+
+
-        PrintMessage(s).send()
-        ShowMenuMessage(event).send()
@@ -263 +268 @@
-    model, iter, acc = self._getSelection()
-    if acc is None: return False
-
+PUSH_BUTTON, pyatspi.ROLE_
-      model.makeExpandable(iter)
+    if acc.hasRoleIn(pyatspi.ROLE_PUSH_BUTTON):
+        #and acc.hasAttribute('haspopup', 'true'):
+      model.popLevel(iter, event.source)
+    else:
-      model.popLevel(iter)
-  
-  
-  
-  
-  
+
+
+
+
+
-      
-  def _onHideMenu(self, all=False):
@@ -279 +288 @@
-    menu_iter = None
-    while True:
-
+
+
+
+
-      if next_menu_iter is None:
-        break
@@ -302 +314 @@
-    if acc is None: return
-    path = model.get_path(iter)
-
+#
- 
-    print acc
-    
-    if acc.isEditable():
-      try:
@@ -335 +345 @@
-      print 'click'
-      acc.generateClick()
-           
+
-    # TODO: use template DP for toolkit and application
-
-
-
+
+
+
+
+
+
+
-
-      if acc.isHyperlink():