Changeset 69

Timestamp:

11/16/07 12:53:05

Author:

slee

Message:

pop menus

Files:

• action_groups/trunk/action_tree.py (modified) (12 diffs)

action_groups/trunk/action_tree.py

@@ -42 +42 @@
-    top_hbox.pack_start(scrolled_window)
-
-Generate'
+_Generate', use_underline=True
-    generate_button.connect('clicked', self._onGenerate)
-    bottom_hbox.pack_start(generate_button, False)
-
-xamine'
+_xamine', use_underline=True
-    examine_button.connect('clicked', self._onExamine)
-    bottom_hbox.pack_start(examine_button, False)
-
-Scan'
+_Scan', use_underline=True
-    scan_button.connect('clicked', self._onScan)
-    bottom_hbox.pack_start(scan_button, False)
-
-
+
+
-    action_button.connect('clicked', self._onAction)
-    bottom_hbox.pack_start(action_button, False)
@@ -73 +74 @@
-      gobject.timeout_add(1000, self._onScanStep)
-    self.is_scanning = not self.is_scanning
-Scan' if self.is_scanning else 'Start 
+_Scan' if self.is_scanning else 'Start _
-    button.set_label(label)
-    
@@ -192 +193 @@
-class ActionGroup(object):
-  def __init__(self, root_acc):
-
+ is not None
-    #REVIEW test if is a valid action group and throw if not ?
-    self.parent_acc = root_acc
@@ -200 +201 @@
-  def _populateChildren(self, parent_acc):
-    for child_acc in parent_acc:
+      if child_acc is None: continue
-      child = AccDecorator(child_acc)
-      child.is_group = self.isActionGroup(child)
@@ -294 +296 @@
-      self.remove(first_iter)
-
-
+, all=False
-    self.append(iter, ['', '', None, True, False])
-    child_iter = self.iter_children(iter)
-    iter_valid = bool(child_iter)
-not self[child_iter][self.COL_DUMMY]
+(all or not self[child_iter][self.COL_DUMMY])
-      iter_valid = self.remove(child_iter)
-    self[iter][self.COL_FILLED] = False
@@ -328 +330 @@
-  def _onExpanded(self, treeview, iter, path):
-    # don't repopulate if it has been filled before
- #   print 'expanding %s' % path
-    if self.get_model()[iter][ProgressiveTreeModel.COL_FILLED]:
-      return
@@ -338 +339 @@
-  def _getSelection(self, selection=None):
-    selection = selection or self.get_selection()
+#    if selection is None:
+#      return (self.get_model(), None, None)
-    model, iter = selection.get_selected()
-    if iter:
@@ -346 +349 @@
-  
-  def get_selected_acc(self, selection=None):
-
+selection
-    return acc
-  
-  def get_acc_from_path(self, path):
-
+
+
+
-
-  def set_top_acc(self, acc):
@@ -356 +361 @@
-    model.popLevel(None) # top
-    self.set_model(model)
-
+
+
+
+
+
-  def select(self, iter):
-    selection = self.get_selection()
@@ -364 +373 @@
-    selection = self.get_selection()
-    model, iter = selection.get_selected()
-not iter
+iter is None
-      nextiter = model.get_iter_root()
-next_children
+row_expanded(model.get_path(iter))
-      nextiter = model.iter_children(iter)
-      self.next_children = False;
-    else:
-      nextiter = model.iter_next(iter)
-ot nextiter
+extiter is None
-        nextiter = model.iter_parent(iter)
-ot nextiter
+extiter is None
-          nextiter = model.get_iter_root()
-        else:
@@ -379 +387 @@
-    self.select(nextiter)
-     
+  def _onAccEventState(self, event):
+    '''
+    Callback for accessible state changes. Repopulates the states model.
+    
+    @param event: Event that triggered this callback.
+    @type event: Accessibility.Event
+    '''
+    if not self.get_model():
+      return
+    if event.source.getApplication() <> self.get_acc_from_path(0).getApplication():
+      return
+    model, iter, acc = self._getSelection()
+    if acc is None: 
+      return
+    print event.type, event.detail1, event.detail2, event.source, acc,  event.source.parent
+    if acc.getRole() == pyatspi.ROLE_MENU :
+      print 'menu'
+      if event.source.parent == acc._acc :
+        print 'parent'
+        if event.type in ('object:state-changed:showing'):
+          showing = event.detail1
+          path = model.get_path(iter)
+          if showing == 1 \
+             and not model.iter_has_child(iter):
+            model.makeExpandable(iter)
+            model.popLevel(iter)
+            self.expand_row(path, False)
+          elif showing == 0 \
+               and self.row_expanded(path):
+              self.collapse_row(path)
+              model.dePopLevel(iter, all=True)
+    
-  def do_action(self):
-    model, iter, acc = self._getSelection()
-not acc
+acc is None
-    path = model.get_path(iter)
-    print 'path', path
-    is_interactive = acc.isInteractive()
-    if is_interactive:
@@ -389 +428 @@
-        action_if = acc.queryAction()
-        action_if.doAction(0)
-        # assume menu for now
-        if self.row_expanded(path):
-          self.collapse_row(path)
-        else:
-          model.makeExpandable(iter)
-          model.popLevel(model.get_iter(path))
-          self.expand_row(path, False)
-      except:
-        pass