git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- improved parser
[enigma2.git]
/
components.py
diff --git
a/components.py
b/components.py
index a5df8ffef7f10460a5704f3bad750016f637c234..abf25f208988a2f24d067bdc53112152c705d5ff 100644
(file)
--- a/
components.py
+++ b/
components.py
@@
-277,7
+277,7
@@
class ServiceList(HTMLComponent, GUIComponent):
def __init__(self):
GUIComponent.__init__(self)
self.l = eListboxServiceContent()
def __init__(self):
GUIComponent.__init__(self)
self.l = eListboxServiceContent()
-
+
def getCurrent(self):
r = eServiceReference()
self.l.getCurrent(r)
def getCurrent(self):
r = eServiceReference()
self.l.getCurrent(r)
@@
-292,6
+292,19
@@
class ServiceList(HTMLComponent, GUIComponent):
def setRoot(self, root):
self.l.setRoot(root)
def setRoot(self, root):
self.l.setRoot(root)
+
+ # mark stuff
+ def clearMarked(self):
+ self.l.clearMarked()
+
+ def isMarked(self, ref):
+ return self.l.isMarked(ref)
+
+ def addMarked(self, ref):
+ self.l.addMarked(ref)
+
+ def removeMarked(self, ref):
+ self.l.removeMarked(ref)
class ServiceScan:
class ServiceScan:
@@
-338,20
+351,23
@@
class ServiceScan:
return self.state == self.Done
class ActionMap:
return self.state == self.Done
class ActionMap:
- def __init__(self, context, actions = { }, prio=0):
+ def __init__(self, context
s = [ ]
, actions = { }, prio=0):
self.actions = actions
self.actions = actions
- self.context
= context
+ self.context
s = contexts
self.prio = prio
self.p = eActionMapPtr()
eActionMap.getInstance(self.p)
def execBegin(self):
self.prio = prio
self.p = eActionMapPtr()
eActionMap.getInstance(self.p)
def execBegin(self):
- self.p.bindAction(self.context, self.prio, self.action)
+ for ctx in self.contexts:
+ self.p.bindAction(ctx, self.prio, self.action)
def execEnd(self):
def execEnd(self):
- self.p.unbindAction(self.context, self.action)
+ for ctx in self.contexts:
+ self.p.unbindAction(ctx, self.action)
def action(self, context, action):
def action(self, context, action):
+ print " ".join(("action -> ", context, action))
try:
self.actions[action]()
except KeyError:
try:
self.actions[action]()
except KeyError: