activate language when used in standalone screen

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

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 13e31d671113c77bfb587c7dd018c19c469a1b55..08e0baa90b0f011bfc6eff75c4cb668705328ed4 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -15,26 +15,41 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.onExecBegin = [ ]
                self.onShown = [ ]
                
                self.onExecBegin = [ ]
                self.onShown = [ ]
                

+               self.execing = False
+               

                # in order to support screens *without* a help,
                # we need the list in every screen. how ironic.
                self.helpList = [ ]
                
        def execBegin(self):
                # in order to support screens *without* a help,
                # we need the list in every screen. how ironic.
                self.helpList = [ ]
                
        def execBegin(self):

+               self.active_components = [ ]

                for x in self.onExecBegin:
                        x()
                for x in self.onExecBegin:
                        x()

+                       if self.session.currentDialog != self:
+                               return
+

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

+

                for (name, val) in self.items():
                        val.execBegin()
                for (name, val) in self.items():
                        val.execBegin()

+                       if self.session.currentDialog != self:
+                               return
+                       self.active_components.append(val)

 
 

+               self.execing = True
+       

                for x in self.onShown:
                        x()
        
        def execEnd(self):
                for x in self.onShown:
                        x()
        
        def execEnd(self):

-               for (name, val) in self.items():
+#              for (name, val) in self.items():
+               for val in self.active_components:

                        val.execEnd()
                        val.execEnd()

+               del self.active_components

 #              assert self.session != None, "execEnd on non-execing screen!"
 #              self.session = None
 #              assert self.session != None, "execEnd on non-execing screen!"
 #              self.session = None

+               self.execing = False

        
        # never call this directly - it will be called from the session!
        def doClose(self):
        
        # never call this directly - it will be called from the session!
        def doClose(self):