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 concept of 'related screen', which can be used to get shared sources (like clock...
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index 53492918b4bf240a74a114f493953a1feec124f8..4e3b117e94cf050c0dd3285b72d00405ebc5441d 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-1,37
+1,46
@@
-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_scren = 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)
GUISkin.__init__(self)
-
+
self.onClose = [ ]
self.onFirstExecBegin = [ ]
self.onExecBegin = [ ]
self.onShown = [ ]
self.onClose = [ ]
self.onFirstExecBegin = [ ]
self.onExecBegin = [ ]
self.onShown = [ ]
-
+
self.onShow = [ ]
self.onHide = [ ]
self.onShow = [ ]
self.onHide = [ ]
-
+
self.execing = False
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 = [ ]
-
+
# in order to support screens *without* a help,
# we need the list in every screen. how ironic.
self.helpList = [ ]
# in order to support screens *without* a help,
# we need the list in every screen. how ironic.
self.helpList = [ ]
-
+
self.close_on_next_exec = None
self.close_on_next_exec = None
+ # stand alone screens (for example web screens)
+ # don't care about having or not having focus.
+ self.stand_alone = False
+
def execBegin(self):
self.active_components = [ ]
if self.close_on_next_exec is not None:
def execBegin(self):
self.active_components = [ ]
if self.close_on_next_exec is not None:
@@
-44,7
+53,7
@@
class Screen(dict, HTMLSkin, GUISkin):
self.onFirstExecBegin = []
for x in self.onExecBegin + single:
x()
self.onFirstExecBegin = []
for x in self.onExecBegin + single:
x()
- if self.session.current_dialog != self:
+ if
not self.stand_alone and
self.session.current_dialog != self:
return
# assert self.session == None, "a screen can only exec once per time"
return
# assert self.session == None, "a screen can only exec once per time"
@@
-52,7
+61,7
@@
class Screen(dict, HTMLSkin, GUISkin):
for val in self.values() + self.renderer:
val.execBegin()
for val in self.values() + self.renderer:
val.execBegin()
- if self.session.current_dialog != self:
+ if
not self.stand_alone and
self.session.current_dialog != self:
return
self.active_components.append(val)
return
self.active_components.append(val)
@@
-110,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
:
+ 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()
@@
-121,7
+131,7
@@
class Screen(dict, HTMLSkin, GUISkin):
val.onShow()
def hide(self):
val.onShow()
def hide(self):
- if not self.shown:
+ if not self.shown
or not self.instance
:
return
self.shown = False
self.instance.hide()
return
self.shown = False
self.instance.hide()
@@
-133,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