git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small radiomode fix
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index 46b94fd4f0074e893bee14200a4e2110179c5412..ba96ef503680f7f3fea174694da5dec02ac7d5f3 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-1,16
+1,18
@@
-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):
ALLOW_SUSPEND = False
class Screen(dict, HTMLSkin, GUISkin):
ALLOW_SUSPEND = False
- def __init__(self, session):
+ global_screen = None
+
+ def __init__(self, session, parent = None):
self.skinName = self.__class__.__name__
self.session = session
self.skinName = self.__class__.__name__
self.session = session
+ self.parent = parent
GUISkin.__init__(self)
self.onClose = [ ]
GUISkin.__init__(self)
self.onClose = [ ]
@@
-22,7
+24,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
+119,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()
@@
-137,3
+143,13
@@
class Screen(dict, HTMLSkin, GUISkin):
def __repr__(self):
return str(type(self))
def __repr__(self):
return str(type(self))
+
+ def getRelatedScreen(self, name):
+ if name == "session":
+ return self.session.screen
+ elif name == "parent":
+ return self.parent
+ elif name == "global":
+ return self.global_screen
+ else:
+ return None