git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed parameters for dvb-c
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index 1b42141a95e8b3108050a1e850a7652c49cce15a..b1e5a51e2da5f4d7e61c7569f0c4f0aa8b8ae7b3 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-11,6
+11,12
@@
class Screen(dict, HTMLSkin, GUISkin):
self.session = session
GUISkin.__init__(self)
self.session = session
GUISkin.__init__(self)
+ self.onClose = [ ]
+
+ # in order to support screens *without* a help,
+ # we need the list in every screen. how ironic.
+ self.helpList = [ ]
+
def execBegin(self):
# assert self.session == None, "a screen can only exec one per time"
# self.session = session
def execBegin(self):
# assert self.session == None, "a screen can only exec one per time"
# self.session = session
@@
-25,12
+31,19
@@
class Screen(dict, HTMLSkin, GUISkin):
# never call this directly - it will be called from the session!
def doClose(self):
# never call this directly - it will be called from the session!
def doClose(self):
+ for x in self.onClose:
+ x()
+
+ # fixup circular references
+ del self.helpList
GUISkin.close(self)
del self.session
for (name, val) in self.items():
del self[name]
GUISkin.close(self)
del self.session
for (name, val) in self.items():
del self[name]
- def close(self,
retval=None
):
- self.session.close()
+ def close(self,
*retval
):
+ self.session.close(
*retval
)
+ def setFocus(self, o):
+ self.instance.setFocus(o.instance)