Changeset 111

Timestamp:

01/05/08 16:11:39

Author:

slee

Message:

minimize rather than hide and FF fix

Files:

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

inapp/trunk/src/jambu/ActionBrowser.py

@@ -65 +65 @@
-    self._buildUI()
-    self.bl = None
-
-
+
+
+
-    self.is_scanning = False
-    if getattr(self, '_scan', True):

inapp/trunk/src/jambu/ActionModel.py

@@ -37 +37 @@
-      if child.is_interactive or child.is_group:
-        items.append(AccFactory(child))
-
-
+#
+#
-      elif child.hasStates(pyatspi.STATE_SHOWING):
-        self._findInterestingChildren(child, items)
@@ -146 +146 @@
-  def popToPath(self, path):
-    for i in xrange(1, len(path)):
-
-
-
+
+
+
+
+
+
-  def makeExpandable(self, iter):
-    # add dummy child is expandable

inapp/trunk/src/jambu/ActionTree.py

@@ -142 +142 @@
-  def _onChildAddTimeout(self):
-    self.adding_children = False
+    self._onChildChanged()
-    return False
-    
@@ -160 +161 @@
-    class WindowActivateMessage(MyMessage):
-      handler = self._onWindowActivate
-    class ChildChangedMessage(MyMessage):
-      handler = self._onChildChanged
-    
-    s = formatEvent(event)
@@ -167 +166 @@
-
-    if event.type == 'focus:' and \
-
-
+
+
+
-      PrintMessage(s).send()
-      HideMenuMessage(True).send()
@@ -200 +200 @@
-#      ShowMenuMessage(event).send()
-
-
-
-
-
-
-
-
+
+
+
+
+
-      if not self.adding_children:
-        # hack to ignore bunch of adds
-        self.adding_children = True
-        PrintMessage(s).send()
-        ChildChangedMessage(None).send()
-        self.id = gobject.timeout_add(500, self._onChildAddTimeout)
+      return 
-
-    elif event.type in ('object:visible-data-changed'):
@@ -222 +219 @@
-        
-    elif event.source.getRole() == pyatspi.ROLE_MENU:
-
+
+
+
-        PrintMessage(s).send()
-        selected = bool(event.detail1)
-
+
+
+
+
+
+
-          ShowMenuMessage(event).send()
-        else:
-          HideMenuMessage().send()
-      elif event.type == 'object:state-changed:visible' \
-          and event.detail1 == 1 \
-          and (event.source.parent.getRole() == pyatspi.ROLE_COMBO_BOX or \
-               event.source.parent.getRole() == pyatspi.ROLE_PUSH_BUTTON):
-        PrintMessage(s).send()
-        ShowMenuMessage(event).send()
-      elif event.type == 'object:state-changed:visible' \
-          and event.detail1 == 0:
-        PrintMessage(s).send()
-        HideMenuMessage().send()
-
-    elif event.source.getRole() == pyatspi.ROLE_WINDOW:
@@ -255 +249 @@
-    self.next()
-
-, path
+
-    #a child of a acc in the model has changed
-    print 'ChildChange'
@@ -271 +265 @@
-    if acc.hasRoleIn(pyatspi.ROLE_PUSH_BUTTON, pyatspi.ROLE_MENU, pyatspi.ROLE_COMBO_BOX):
-      model.makeExpandable(iter)
-
-
+, pyatspi.ROLE_IMAGE
+ parent == AUTCOMPLETE?
-      model.popLevel(iter, event.source)
-    else:
@@ -292 +286 @@
-                                                   pyatspi.ROLE_MENU, 
-                                                   pyatspi.ROLE_COMBO_BOX, 
-
+
+
-      if next_menu_iter is None:
-        break