Revert "Revert "disable m2ts support for release 2.6""

[enigma2.git] / lib / python / Screens / Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index d4b3d729e32ac11ceb2de790d7d40a291c2429d1..f0bf773d6a28a76418984bbad84811eba4835766 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,56 +1,87 @@
-from Components.HTMLSkin import *
-from Components.GUISkin import *
+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):
-       """ bla """
+class Screen(dict, GUISkin):

 
 

-       def __init__(self, session):
+       False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3)
+       ALLOW_SUSPEND = False
+
+       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.onClose = [ ]

+               self.onFirstExecBegin = [ ]

                self.onExecBegin = [ ]
                self.onShown = [ ]
                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 = [ ]
+

                # 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
+
+               # 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 = [ ]
        def execBegin(self):
                self.active_components = [ ]

-               for x in self.onExecBegin:
-                       x()
-                       if self.session.current_dialog != self:
-                               return
+               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)
+               else:
+                       single = self.onFirstExecBegin
+                       self.onFirstExecBegin = []
+                       for x in self.onExecBegin + single:
+                               x()
+                               if not self.stand_alone and self.session.current_dialog != self:
+                                       return

 
 

-#              assert self.session == None, "a screen can only exec once per time"
-#              self.session = session
+#                      assert self.session == None, "a screen can only exec once per time"
+#                      self.session = session

 
 

-               for (name, val) in self.items():
-                       val.execBegin()
-                       if self.session.current_dialog != self:
-                               return
-                       self.active_components.append(val)
+                       for val in self.values() + self.renderer:
+                               val.execBegin()
+                               if not self.stand_alone and self.session.current_dialog != self:
+                                       return
+                               self.active_components.append(val)

 
 

-               self.execing = True
+                       self.execing = True

        
        

-               for x in self.onShown:
-                       x()
+                       for x in self.onShown:
+                               x()

        
        def execEnd(self):
        
        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


@@ -64,39 +95,65 @@ class Screen(dict, HTMLSkin, GUISkin):
                # fixup circular references
                del self.helpList
                GUISkin.close(self)
                # fixup circular references
                del self.helpList
                GUISkin.close(self)

-               
+
+               # first disconnect all render from their sources.
+               # we might split this out into a "unskin"-call,
+               # but currently we destroy the screen afterwards
+               # anyway.
+               for val in self.renderer:
+                       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]

-               
+
+               self.renderer = [ ]
+

                # really delete all elements now
                self.__dict__.clear()
        
        def close(self, *retval):
                # really delete all elements now
                self.__dict__.clear()
        
        def close(self, *retval):

-               self.session.close(*retval)
+               if not self.execing:
+                       self.close_on_next_exec = retval
+               else:
+                       self.session.close(self, *retval)

 
        def setFocus(self, o):
                self.instance.setFocus(o.instance)
 
        def show(self):
 
        def setFocus(self, o):
                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()

-               for (name, val) in self.items():
-                       if isinstance(val, GUIComponent):
+               for val in self.values() + self.renderer:
+                       if isinstance(val, GUIComponent) or isinstance(val, Source):

                                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()
                for x in self.onHide:
                        x()
                        return
                self.shown = False
                self.instance.hide()
                for x in self.onHide:
                        x()

-               for (name, val) in self.items():
-                       if isinstance(val, GUIComponent):
+               for val in self.values() + self.renderer:
+                       if isinstance(val, GUIComponent) or isinstance(val, Source):

                                val.onHide()
                                val.onHide()

+
+       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