updated swedish language

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 77e925b6a5d2ec48f6d2ff0853d88f6beba56892..8b3ad4972106bdf59533785680b5e3d21ccb7803 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -4,6 +4,12 @@ from tools import *
 
 from Components.Language import language
 
+def setEPGLanguage():
+       print "language set to", language.getLanguage()
+       eServiceEvent.setEPGLanguage(language.getLanguage())
+       
+language.addCallback(setEPGLanguage)
+
 import traceback
 import Screens.InfoBar
 from Screens.SimpleSummary import SimpleSummary
@@ -39,6 +45,7 @@ except ImportError:
 from Components.PluginComponent import plugins
 
 from Screens.Wizard import wizardManager
+from Screens.ImageWizard import *
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 from Tools.BoundFunction import boundFunction
@@ -80,6 +87,31 @@ class GUIOutputDevice(OutputDevice):
        def create(self, comp, desktop):
                comp.createGUIScreen(self.parent, desktop)
 
+# Session.open:
+# * push current active dialog ('current_dialog') onto stack
+# * call execEnd for this dialog
+#   * clear in_exec flag
+#   * hide screen
+# * instantiate new dialog into 'current_dialog'
+#   * create screens, components
+#   * read, apply skin
+#   * create GUI for screen
+# * call execBegin for new dialog
+#   * set in_exec
+#   * show gui screen
+#   * call components' / screen's onExecBegin
+# ... screen is active, until it calls 'close'...
+# Session.close:
+# * assert in_exec
+# * save return value
+# * start deferred close handler ('onClose')
+# * execEnd
+#   * clear in_exec
+#   * hide screen
+# .. a moment later:
+# Session.doClose:
+# * destroy screen
+
 class Session:
        def __init__(self, desktop = None, summary_desktop = None, navigation = None):
                self.desktop = desktop
@@ -93,10 +125,13 @@ class Session:
                self.dialog_stack = [ ]
                self.summary_stack = [ ]
                self.summary = None
+               
+               self.in_exec = False
+               
+               for p in plugins.getPlugins(PluginDescriptor.WHERE_SESSIONSTART):
+                       p(reason=0, session=self)
        
        def processDelay(self):
-               self.execEnd()
-               
                callback = self.current_dialog.callback
 
                retval = self.current_dialog.returnValue
@@ -113,6 +148,8 @@ class Session:
                        callback(*retval)
 
        def execBegin(self):
+               assert not self.in_exec 
+               self.in_exec = True
                c = self.current_dialog
                
                self.pushSummary()
@@ -129,6 +166,9 @@ class Session:
                        c.show()
                
        def execEnd(self):
+               assert self.in_exec
+               self.in_exec = False
+
                self.current_dialog.execEnd()
                self.current_dialog.hide()
                self.current_dialog.removeSummary(self.summary)
@@ -189,7 +229,7 @@ class Session:
                return dlg
         
        def pushCurrent(self):
-               if self.current_dialog:
+               if self.current_dialog is not None:
                        self.dialog_stack.append(self.current_dialog)
                        self.execEnd()
        
@@ -210,8 +250,13 @@ class Session:
        def openWithCallback(self, callback, screen, *arguments, **kwargs):
                dlg = self.open(screen, *arguments, **kwargs)
                dlg.callback = callback
+               return dlg
 
        def open(self, screen, *arguments, **kwargs):
+               if len(self.dialog_stack) and not self.in_exec:
+                       raise "modal open are allowed only from a screen which is modal!"
+                       # ...unless it's the very first screen.
+               
                self.pushCurrent()
                dlg = self.current_dialog = self.instantiateDialog(screen, *arguments, **kwargs)
                dlg.isTmp = True
@@ -222,9 +267,23 @@ class Session:
        def keyEvent(self, code):
                print "code " + str(code)
 
-       def close(self, *retval):
+       def close(self, screen, *retval):
+               if not self.in_exec:
+                       print "close after exec!"
+                       return
+               
+               # be sure that the close is for the right dialog!
+               # if it's not, you probably closed after another dialog
+               # was opened. this can happen if you open a dialog
+               # onExecBegin, and forget to do this only once.
+               # after close of the top dialog, the underlying will
+               # gain focus again (for a short time), thus triggering
+               # the onExec, which opens the dialog again, closing the loop.
+               assert screen == self.current_dialog
+               
                self.current_dialog.returnValue = retval
                self.delay_timer.start(0, 1)
+               self.execEnd()
 
        def pushSummary(self):
                if self.summary is not None:
@@ -301,10 +360,51 @@ class VolumeControl:
                else:
                        self.muteDialog.hide()
 
-def runScreenTest():
-       session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
+from Screens.Standby import Standby
+
+class PowerKey:
+       """ PowerKey stuff - handles the powerkey press and powerkey release actions"""
+       
+       def __init__(self, session):
+               self.session = session
+               self.powerKeyTimer = eTimer()
+               self.powerKeyTimer.timeout.get().append(self.powertimer)
+               globalActionMap.actions["powerdown"]=self.powerdown
+               globalActionMap.actions["powerup"]=self.powerup
+               self.standbyblocked = 0
+#              self["PowerKeyActions"] = HelpableActionMap(self, "PowerKeyActions",
+                       #{
+                               #"powerdown": self.powerdown,
+                               #"powerup": self.powerup,
+                               #"discreteStandby": (self.standby, "Go standby"),
+                               #"discretePowerOff": (self.quit, "Go to deep standby"),
+                       #})
+
+       def powertimer(self):   
+               print "PowerOff - Now!"
+               self.quit()
+       
+       def powerdown(self):
+               self.standbyblocked = 0
+               self.powerKeyTimer.start(3000, True)
 
+       def powerup(self):
+               self.powerKeyTimer.stop()
+               if self.standbyblocked == 0:
+                       self.standbyblocked = 1
+                       self.standby()
+
+       def standby(self):
+               self.session.open(Standby, self)
+
+       def quit(self):
+               # halt
+               quitMainloop(1)
+
+def runScreenTest():
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
+
+       session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
        
        screensToRun = [ ]
        
@@ -332,6 +432,7 @@ def runScreenTest():
        CONNECT(keyPressedSignal(), session.keyEvent)
        
        vol = VolumeControl(session)
+       power = PowerKey(session)
        
        runReactor()
        
@@ -353,7 +454,7 @@ def runScreenTest():
 import keymapparser
 keymapparser.readKeymap()
 import skin
-skin.loadSkin(getDesktop(0))
+skin.loadSkinData(getDesktop(0))
 
 import Components.InputDevice
 Components.InputDevice.InitInputDevices()