git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add possibility to set a callable check function
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index 46b94fd4f0074e893bee14200a4e2110179c5412..ed61d9d68bce68e615d4181bc2564a7cfaa156d9 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-1,8
+1,7
@@
-from Components.HTMLSkin import
*
-from Components.GUISkin import
*
+from Components.HTMLSkin import
HTMLSkin
+from Components.GUISkin import
GUISkin
from Components.Sources.Source import Source
from Components.Sources.Source import Source
-
-import sys
+from Components.GUIComponent import GUIComponent
class Screen(dict, HTMLSkin, GUISkin):
class Screen(dict, HTMLSkin, GUISkin):
@@
-22,7
+21,10
@@
class Screen(dict, HTMLSkin, GUISkin):
self.onHide = [ ]
self.execing = False
self.onHide = [ ]
self.execing = False
- self.shown = False
+
+ self.shown = True
+ # already shown is false until the screen is really shown (after creation)
+ self.already_shown = False
self.renderer = [ ]
self.renderer = [ ]
@@
-114,9
+116,10
@@
class Screen(dict, HTMLSkin, GUISkin):
self.instance.setFocus(o.instance)
def show(self):
self.instance.setFocus(o.instance)
def show(self):
- if
self.shown
or not self.instance:
+ if
(self.shown and self.already_shown)
or not self.instance:
return
self.shown = True
return
self.shown = True
+ self.already_shown = True
self.instance.show()
for x in self.onShow:
x()
self.instance.show()
for x in self.onShow:
x()