Changeset 85

Timestamp:

12/12/07 17:55:19

Author:

slee

Message:

more painfully one fixes

Files:

• action_groups/trunk/AccDecorator.py (modified) (1 diff)
• action_groups/trunk/ActionTree.py (modified) (9 diffs)

action_groups/trunk/AccDecorator.py

@@ -111 +111 @@
-      pass
-    
+  def clearSelection(self):
+    selection = self
+    try:
+      si = selection.querySelection()
+    except NotImplementedError:
+      return
+    si.clearSelection()
+    
-  def toggleSectable(self):
-    selection = self._acc.parent

action_groups/trunk/ActionTree.py

@@ -8 +8 @@
-from AccDecorator import AccDecorator
-from MessageTransport import Message
+from KeyGenerator import sendKeyCombination
-
-_ = lambda x: x
@@ -34 +35 @@
-
-    self.app = None
-_menu = Non
+h = Fals
-    #self.set_property('fixed-height-mode', True) # speed display
-
@@ -108 +109 @@
-    if event.source.getApplication() <> self.app:
-      return
+
+    source_acc = AccDecorator(event.source)
-    
-    class PrintMessage(Message):
@@ -122 +125 @@
-
-    if event.type == 'focus:' and \
-event.source.getRole() == pyatspi.ROLE_MENU
+source_acc.hasRoleIn(pyatspi.ROLE_MENU)
-      PrintMessage(s).send()
-      HideMenuMessage(True).send()
@@ -136 +139 @@
-      model = self.get_model()
-      top = parent_acc_with_role(event.source, pyatspi.ROLE_DIALOG, pyatspi.ROLE_FRAME)
-
+#
-      try:
-        root = model.getRootAcc()
@@ -180 +183 @@
-  def _onHideMenu(self, all=False):
-    print 'HideMenu'
+    if self.h:
+      self.h = False
+      return
-    model, iter, acc = self._getSelection()
-    if None in (acc, iter):
@@ -200 +206 @@
-    if menu_iter is not None:
-      self.get_selection().select_iter(menu_iter)
+      #self.h = True
+      #acc2=self.get_acc_from_path(model.get_path(menu_iter))
+      #print 'zzz '+str(acc2)
+      #acc2.toggleSectable()
+      
-
-  def do_action(self):
@@ -213 +224 @@
-        raise
-      
+    elif acc.isSelectable():
+      if acc.hasRoleIn(pyatspi.ROLE_MENU_ITEM):
+        if not self.row_expanded(path):
+          if acc.hasToolkitIn('Gecko'):
+            #sendKeyCombination('space', '')
+            acc.generateClick()
+          else:
+            acc.doAction()
+        elif self.row_expanded(path):
+          print '!!!Esc'
+          sendKeyCombination('Escape', '')         
+      else:
+        if not acc.hasRoleIn(pyatspi.ROLE_MENU):
+          acc.toggleSectable()  # causes too many problems
+        if acc.hasRoleIn(pyatspi.ROLE_MENU, pyatspi.ROLE_CHECK_MENU_ITEM):
+          acc.doAction()
+             
-    # TODO: use template DP for toolkit and application
-    elif acc.isActionable():
-
-
-
-
-
-
-
-
-
-
+
+
-
-      if acc.isHyperlink():
@@ -238 +258 @@
-        return
-          
-
-
-
-
-
-
+
-      if self.row_expanded(path):
-
-
-
-
-
-
+
-      elif model.iter_has_child(iter):
-        self.expand_row(path, False)