git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove no more needed c++ single epg list content class
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index a8d0b0481f9efedad6432b1852f2da15a6e925a3..e6abdef95a06f21153786b70ce53781d89dd2aac 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-29,15
+29,15
@@
class Screen(dict, HTMLSkin, GUISkin):
self.active_components = [ ]
for x in self.onExecBegin:
x()
self.active_components = [ ]
for x in self.onExecBegin:
x()
- if self.session.current
D
ialog != self:
+ if self.session.current
_d
ialog != self:
return
return
-# assert self.session == None, "a screen can only exec one per time"
+# assert self.session == None, "a screen can only exec on
c
e per time"
# self.session = session
for (name, val) in self.items():
val.execBegin()
# self.session = session
for (name, val) in self.items():
val.execBegin()
- if self.session.current
D
ialog != self:
+ if self.session.current
_d
ialog != self:
return
self.active_components.append(val)
return
self.active_components.append(val)
@@
-57,6
+57,7
@@
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):
+ self.hide()
for x in self.onClose:
x()
for x in self.onClose:
x()
@@
-66,13
+67,14
@@
class Screen(dict, HTMLSkin, GUISkin):
del self.session
for (name, val) in self.items():
del self.session
for (name, val) in self.items():
+ val.destroy()
del self[name]
# really delete all elements now
self.__dict__.clear()
def close(self, *retval):
del self[name]
# really delete all elements now
self.__dict__.clear()
def close(self, *retval):
- self.session.close(*retval)
+ self.session.close(
self,
*retval)
def setFocus(self, o):
self.instance.setFocus(o.instance)
def setFocus(self, o):
self.instance.setFocus(o.instance)
@@
-84,6
+86,9
@@
class Screen(dict, HTMLSkin, GUISkin):
self.instance.show()
for x in self.onShow:
x()
self.instance.show()
for x in self.onShow:
x()
+ for (name, val) in self.items():
+ if isinstance(val, GUIComponent):
+ val.onShow()
def hide(self):
if not self.shown:
def hide(self):
if not self.shown:
@@
-92,3
+97,6
@@
class Screen(dict, HTMLSkin, GUISkin):
self.instance.hide()
for x in self.onHide:
x()
self.instance.hide()
for x in self.onHide:
x()
+ for (name, val) in self.items():
+ if isinstance(val, GUIComponent):
+ val.onHide()