git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
text edit patch #5 by Anders Holst
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index cfcb52840e4e4a558cb2a12089f63e95ed42610b..4c4f117bad39c213775077ac8d6c58a7863277fd 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-1,16
+1,22
@@
-from Components.HTMLSkin import *
-from Components.GUISkin import *
-from Components.Sources.Source import Source
+from Tools.Profile import profile, profile_final
-import sys
+profile("LOAD:GUISkin")
+from Components.GUISkin import GUISkin
+profile("LOAD:Source")
+from Components.Sources.Source import Source
+profile("LOAD:GUIComponent")
+from Components.GUIComponent import GUIComponent
-class Screen(dict,
HTMLSkin,
GUISkin):
+class Screen(dict, GUISkin):
ALLOW_SUSPEND = False
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 = [ ]
@@
-45,7
+51,7
@@
class Screen(dict, HTMLSkin, GUISkin):
tmp = self.close_on_next_exec
self.close_on_next_exec = None
self.execing = True
tmp = self.close_on_next_exec
self.close_on_next_exec = None
self.execing = True
- self.close(tmp)
+ self.close(
*
tmp)
else:
single = self.onFirstExecBegin
self.onFirstExecBegin = []
else:
single = self.onFirstExecBegin
self.onFirstExecBegin = []
@@
-141,3
+147,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