Changeset 94

Timestamp:

12/17/07 18:19:33

Author:

slee

Message:

fixes to page tabs

Files:

• action_groups/trunk/AccDecorator.py (modified) (2 diffs)
• action_groups/trunk/ActionBrowser.py (modified) (1 diff)
• action_groups/trunk/ActionModel.py (modified) (5 diffs)
• action_groups/trunk/ActionTree.py (modified) (8 diffs)

action_groups/trunk/AccDecorator.py

@@ -144 +144 @@
-    except NotImplementedError:
-      return
-0
+pyatspi.DESKTOP_COORDS
-    x = int(rect.x + rect.width / 2)
-    y = int(rect.y + rect.height / 2)
@@ -151 +151 @@
-    reg.generateMouseEvent(x, y, pyatspi.MOUSE_B1R)
-    reg.generateMouseEvent(x, y, pyatspi.MOUSE_B1C)
-
+
+
+
+
+
+
+
+
-  def doAction(self):
-    try:

action_groups/trunk/ActionBrowser.py

@@ -145 +145 @@
-    acc = self.groups_tree.get_selected_acc(selection)
-    if acc is not None:
-
-
-
-
-
-
-
+
+
+
+
+
-  def blink(self, extents):
-    if self.bl:

action_groups/trunk/ActionModel.py

@@ -18 +18 @@
-
-  def _populateChildren(self, parent_acc):
-
+
+
+
+
-    for child_acc in parent_acc:
-      if child_acc is None: continue
-      child = AccDecorator(child_acc)
-
+
+
-      child.is_interactive = self._isInteractive(child)
-      if child.is_interactive or child.is_group:
-self.
-#
-#
+
+
+
-      elif child.hasStates(pyatspi.STATE_SHOWING):
-populateChildren(child
+findInterestingChildren(child, items
-
-  def __len__(self):
@@ -45 +49 @@
-    return 'root: %s + items {%s}' % (self.parent_acc, 
-                                      ', '.join((str_item(item) for item in self.items)))
+
+  def _hasOneInteractiveChild(self, acc):
+    return acc.childCount == 1 and self._isInteractive(AccDecorator(acc[0]))  
-  
-  def _isActionGroup(self, acc):
@@ -53 +60 @@
-      # menus are handled as dynamic groups
-      return False
-if role in (pyatspi.ROLE_DOCUMENT_FRAME
+elif role in (pyatspi.ROLE_DOCUMENT_FRAME, pyatspi.ROLE_TOOL_BAR
-      return True
-
+el
-      app = acc.getApplication()
-      if app.childCount == 1:
-        # Top level frames of single framed apps can't be groups
-        return False
+    return self._hasInteractiveDecendants(acc)
+
+  def _hasInteractiveDecendants(self, acc):
+    role = acc.getRole()
-    n_interactive = 0
+    if role == pyatspi.ROLE_PAGE_TAB:
+      items=[]
+      self._findInterestingChildren(acc, items)
+      if len(items):
+        return True
-    for child in acc:
-      if child is None: continue
@@ -67 +83 @@
-        continue
-      if self._isInteractive(child) or \
-
+
+
-        n_interactive += 1
-      if n_interactive == 2:
-        return True
-n_interactive > 1 or role == pyatspi.ROLE_PAGE_TAB
+(n_interactive > 1)
-
-  def _isInteractive(self, acc):
-    if acc.hasRoleIn(pyatspi.ROLE_SEPARATOR) \
-acc.hasRoleIn(pyatspi.ROLE_MENU) and acc.parent.getRole() == pyatspi.ROLE_COMBO_BOX
+(acc.hasRoleIn(pyatspi.ROLE_MENU) and acc.parent.getRole() == pyatspi.ROLE_COMBO_BOX)
-       or not acc.hasStates(pyatspi.STATE_SHOWING, pyatspi.STATE_VISIBLE, pyatspi.STATE_SENSITIVE):
-      return False
@@ -183 +200 @@
-        ac = acc._acc
-      path = self.acc_cache[acc]
+      while path == None:
+        acc = acc.parent
+        path = self.acc_cache[acc]
-      return path
-    except KeyError:
-      return None
+    
+  def getScrollBarAcc(self, acc):
+    pacc = acc.parent
+    while pacc is not None:
+      if pacc.getRole() ==  pyatspi.ROLE_PANE:
+        return pacc
+      pacc=acc.parent
+      
+  def isAncestor(self, acc, accA):
+    while acc is not None:
+      acc = acc.parent
+      if acc == accA:
+        return True
+    return False
+  
+class scrollable():
+  def __init__(self, pane):
+    self._pane=pane
+    v_scrollbar = pane.self.childAtIndex(pane.childCount-1)
+    if v_scrollbar.getRole() <> pyatspi.ROLE_SCROLL_BAR:
+      raise Exception()
+    self.v_scrollbar = v_scrollbar.queryValue()
+  def scrollIntoView(y):
+    self.v_scrollbar.currentValue = y
+    
+#class List(Scrollable):
+#  def __init__(self, pane):

action_groups/trunk/ActionTree.py

@@ -84 +84 @@
-    selection = self.get_selection()
-    selection.select_iter(iter)
+    self.current_acc = self.get_acc_from_path(self.get_model().get_path(iter))
-
-  def next(self):
@@ -100 +101 @@
-          self.next_children = True;
-    self.select(nextiter)
-
+
+
+
+
+
+
+
+
+
+
+
-  def focus(self):
-    model, iter, acc = self._getSelection()
@@ -128 +139 @@
-    
-    s = formatEvent(event)
-MENU
+
-
-    if event.type == 'focus:' and \
@@ -146 +157 @@
-      top = parent_acc_with_role(event.source, pyatspi.ROLE_DIALOG, 
-                                        pyatspi.ROLE_ALERT, 
-
+, pyatspi.ROLE_WINDOW
-      try:
-        model = self.get_model()
@@ -163 +174 @@
-      model = self.get_model()
-      path = model.getAccPath(source_acc) 
-      if path is None:
-        path = model.getAccPath(source_acc.parent)
-      if path is not None:
-        ChildChangedMessage(path).send()
@@ -174 +183 @@
-        ChildChangedMessage(None).send()
-        self.id = gobject.timeout_add(500, self._onChildAddTimeout)
+
+    elif event.type in ('object:visible-data-changed'):
+      PrintMessage(s).send()
+      model = self.get_model()
+      if model.isAncestor(self.current_acc, source_acc._acc):
+        ChildChangedMessage(None).send()
-        
-    elif event.source.getRole() == pyatspi.ROLE_MENU:
@@ -280 +295 @@
-          acc.toggleSectable()
-          acc.doAction()
+      elif acc.hasRoleIn(pyatspi.ROLE_PAGE_TAB):
+        acc.toggleSectable()
+        self._do_actionGroup(iter) # race condition?
-      else:
-
+
+
-                     
-    # TODO: use template DP for toolkit and application
@@ -300 +319 @@
-          
-    elif acc.is_group:
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  def goToPath(self, path):
-    if len(path) > 1: