fix off-by-one error on the progress and fix vars in ToolExistsPrecondition

[enigma2.git] / lib / python / Components / ActionMap.py

diff --git a/lib/python/Components/ActionMap.py b/lib/python/Components/ActionMap.py
index cd466c14f99037daf38e302539f137c8a70d2ff9..b65d6ebc218ec7f9ced446da62f5d3ed06973c8e 100644 (file)
--- a/lib/python/Components/ActionMap.py
+++ b/lib/python/Components/ActionMap.py
@@ -1,36 +1,94 @@
-from enigma import *
+from enigma import eActionMap
 
 class ActionMap:
        def __init__(self, contexts = [ ], actions = { }, prio=0):
                self.actions = actions
                self.contexts = contexts
                self.prio = prio
-               self.p = eActionMapPtr()
-               eActionMap.getInstance(self.p)
+               self.p = eActionMap.getInstance()
+               self.bound = False
+               self.exec_active = False
+               self.enabled = True
+
+       def setEnabled(self, enabled):
+               self.enabled = enabled
+               self.checkBind()
+
+       def doBind(self):
+               if not self.bound:
+                       for ctx in self.contexts:
+                               self.p.bindAction(ctx, self.prio, self.action)
+                       self.bound = True
+
+       def doUnbind(self):
+               if self.bound:
+                       for ctx in self.contexts:
+                               self.p.unbindAction(ctx, self.action)
+                       self.bound = False
+
+       def checkBind(self):
+               if self.exec_active and self.enabled:
+                       self.doBind()
+               else:
+                       self.doUnbind()
 
        def execBegin(self):
-               for ctx in self.contexts:
-                       self.p.bindAction(ctx, self.prio, self.action)
-       
+               self.exec_active = True
+               self.checkBind()
+
        def execEnd(self):
-               for ctx in self.contexts:
-                       self.p.unbindAction(ctx, self.action)
-       
+               self.exec_active = False
+               self.checkBind()
+
        def action(self, context, action):
                print " ".join(("action -> ", context, action))
                if self.actions.has_key(action):
-                       self.actions[action]()
+                       res = self.actions[action]()
+                       if res is not None:
+                               return res
                        return 1
                else:
                        print "unknown action %s/%s! typo in keymap?" % (context, action)
                        return 0
 
-                       
+       def destroy(self):
+               pass
+
 class NumberActionMap(ActionMap):
        def action(self, contexts, action):
                numbers = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
-               if (action in numbers):
-                       self.actions[action](int(action))
+               if (action in numbers and self.actions.has_key(action)):
+                       res = self.actions[action](int(action))
+                       if res is not None:
+                               return res
                        return 1
                else:
-                       return ActionMap.action(self, contexts, action)                 
\ No newline at end of file
+                       return ActionMap.action(self, contexts, action)
+
+class HelpableActionMap(ActionMap):
+       """An Actionmap which automatically puts the actions into the helpList.
+
+       Note that you can only use ONE context here!"""
+       
+       # sorry for this complicated code.
+       # it's not more than converting a "documented" actionmap 
+       # (where the values are possibly (function, help)-tuples)
+       # into a "classic" actionmap, where values are just functions.
+       # the classic actionmap is then passed to the ActionMap constructor,
+       # the collected helpstrings (with correct context, action) is
+       # added to the screen's "helpList", which will be picked up by
+       # the "HelpableScreen".
+       def __init__(self, parent, context, actions = { }, prio=0):
+               alist = [ ]
+               adict = { }
+               for (action, funchelp) in actions.iteritems():
+                       # check if this is a tuple
+                       if type(funchelp) is type(()):
+                               alist.append((action, funchelp[1]))
+                               adict[action] = funchelp[0]
+                       else:
+                               adict[action] = funchelp
+
+               ActionMap.__init__(self, [context], adict, prio)
+
+               parent.helpList.append((self, context, alist))