git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs bug #587
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index 53492918b4bf240a74a114f493953a1feec124f8..f0bf773d6a28a76418984bbad84811eba4835766 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-1,50
+1,65
@@
-from Components.HTMLSkin import *
-from Components.GUISkin import *
-from Components.Sources.Source import Source
+from Tools.Profile import profile
-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):
+ False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3)
ALLOW_SUSPEND = False
ALLOW_SUSPEND = False
- def __init__(self, session):
+ global_screen = None
+
+ def __init__(self, session, parent = None):
+ dict.__init__(self)
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:
tmp = self.close_on_next_exec
self.close_on_next_exec = None
self.execing = True
def execBegin(self):
self.active_components = [ ]
if self.close_on_next_exec is not None:
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 = []
for x in self.onExecBegin + single:
x()
else:
single = self.onFirstExecBegin
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
+67,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)
@@
-62,10
+77,11
@@
class Screen(dict, HTMLSkin, GUISkin):
x()
def execEnd(self):
x()
def execEnd(self):
+ active_components = self.active_components
# for (name, val) in self.items():
# for (name, val) in self.items():
- for val in self.active_components:
+ self.active_components = None
+ for val in active_components:
val.execEnd()
val.execEnd()
- del self.active_components
# assert self.session != None, "execEnd on non-execing screen!"
# self.session = None
self.execing = False
# assert self.session != None, "execEnd on non-execing screen!"
# self.session = None
self.execing = False
@@
-85,18
+101,15
@@
class Screen(dict, HTMLSkin, GUISkin):
# but currently we destroy the screen afterwards
# anyway.
for val in self.renderer:
# but currently we destroy the screen afterwards
# anyway.
for val in self.renderer:
- val.disconnectAll() # disconnected converter/sources and probably destroy them
-
+ val.disconnectAll() # disconnected converter/sources and probably destroy them
. Sources will not be destroyed.
+
del self.session
for (name, val) in self.items():
val.destroy()
del self[name]
del self.session
for (name, val) in self.items():
val.destroy()
del self[name]
-
- for val in self.renderer:
- val.destroy()
-
+
self.renderer = [ ]
self.renderer = [ ]
-
+
# really delete all elements now
self.__dict__.clear()
# really delete all elements now
self.__dict__.clear()
@@
-110,9
+123,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
+135,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
+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