git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
activate language when used in standalone screen
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index b1e5a51e2da5f4d7e61c7569f0c4f0aa8b8ae7b3..08e0baa90b0f011bfc6eff75c4cb668705328ed4 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-12,22
+12,44
@@
class Screen(dict, HTMLSkin, GUISkin):
GUISkin.__init__(self)
self.onClose = [ ]
GUISkin.__init__(self)
self.onClose = [ ]
+ self.onExecBegin = [ ]
+ self.onShown = [ ]
+
+ self.execing = False
# in order to support screens *without* a help,
# we need the list in every screen. how ironic.
self.helpList = [ ]
def execBegin(self):
# in order to support screens *without* a help,
# we need the list in every screen. how ironic.
self.helpList = [ ]
def execBegin(self):
+ self.active_components = [ ]
+ for x in self.onExecBegin:
+ x()
+ if self.session.currentDialog != self:
+ return
+
# assert self.session == None, "a screen can only exec one per time"
# self.session = session
# assert self.session == None, "a screen can only exec one per time"
# self.session = session
+
for (name, val) in self.items():
val.execBegin()
for (name, val) in self.items():
val.execBegin()
+ if self.session.currentDialog != self:
+ return
+ self.active_components.append(val)
+
+ self.execing = True
+
+ for x in self.onShown:
+ x()
def execEnd(self):
def execEnd(self):
- for (name, val) in self.items():
+# for (name, val) in self.items():
+ for val in self.active_components:
val.execEnd()
val.execEnd()
+ del self.active_components
# assert self.session != None, "execEnd on non-execing screen!"
# self.session = None
# assert self.session != None, "execEnd on non-execing screen!"
# self.session = None
+ self.execing = False
# 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):