whitespace fixup
[enigma2.git] / mytest.py
index 452dd3d70abc66cb0a6318ce7c998eed71331648..66d9eb3918988f138f3b737cbbe78bc216bba403 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -8,7 +8,7 @@ from Components.Language import language
 def setEPGLanguage():
        print "language set to", language.getLanguage()
        eServiceEvent.setEPGLanguage(language.getLanguage())
 def setEPGLanguage():
        print "language set to", language.getLanguage()
        eServiceEvent.setEPGLanguage(language.getLanguage())
-       
+
 language.addCallback(setEPGLanguage)
 
 from traceback import print_exc
 language.addCallback(setEPGLanguage)
 
 from traceback import print_exc
@@ -36,12 +36,12 @@ config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"r
 try:
        import e2reactor
        e2reactor.install()
 try:
        import e2reactor
        e2reactor.install()
-       
+
        import twisted.python.runtime
        twisted.python.runtime.platform.supportsThreads = lambda: False
        import twisted.python.runtime
        twisted.python.runtime.platform.supportsThreads = lambda: False
-       
+
        from twisted.internet import reactor
        from twisted.internet import reactor
-       
+
        def runReactor():
                reactor.run()
 except ImportError:
        def runReactor():
                reactor.run()
 except ImportError:
@@ -127,18 +127,18 @@ class Session:
                self.nav = navigation
                self.delay_timer = eTimer()
                self.delay_timer.timeout.get().append(self.processDelay)
                self.nav = navigation
                self.delay_timer = eTimer()
                self.delay_timer.timeout.get().append(self.processDelay)
-               
+
                self.current_dialog = None
                self.current_dialog = None
-               
+
                self.dialog_stack = [ ]
                self.summary_stack = [ ]
                self.summary = None
                self.dialog_stack = [ ]
                self.summary_stack = [ ]
                self.summary = None
-               
+
                self.in_exec = False
                self.in_exec = False
-               
+
                for p in plugins.getPlugins(PluginDescriptor.WHERE_SESSIONSTART):
                        p(reason=0, session=self)
                for p in plugins.getPlugins(PluginDescriptor.WHERE_SESSIONSTART):
                        p(reason=0, session=self)
-       
+
        def processDelay(self):
                callback = self.current_dialog.callback
 
        def processDelay(self):
                callback = self.current_dialog.callback
 
@@ -150,7 +150,7 @@ class Session:
                        del self.current_dialog
                else:
                        del self.current_dialog.callback
                        del self.current_dialog
                else:
                        del self.current_dialog.callback
-               
+
                self.popCurrent()
                if callback is not None:
                        callback(*retval)
                self.popCurrent()
                if callback is not None:
                        callback(*retval)
@@ -173,11 +173,7 @@ class Session:
 
                # when execBegin opened a new dialog, don't bother showing the old one.
                if c == self.current_dialog and do_show:
 
                # when execBegin opened a new dialog, don't bother showing the old one.
                if c == self.current_dialog and do_show:
-                       # this is the first show() for each screen.
-                       # screen.shown is already true, because that resembles the state 
-                       # ("not-yet-shown-but-will-be-shown") best, so c.show() would just do nothing.
-                       # show(force=True) will show in any case.
-                       c.show(force = True)
+                       c.show()
 
        def execEnd(self, last=True):
                assert self.in_exec
 
        def execEnd(self, last=True):
                assert self.in_exec
@@ -185,11 +181,11 @@ class Session:
 
                self.current_dialog.execEnd()
                self.current_dialog.hide()
 
                self.current_dialog.execEnd()
                self.current_dialog.hide()
-               
+
                if last:
                        self.current_dialog.removeSummary(self.summary)
                        self.popSummary()
                if last:
                        self.current_dialog.removeSummary(self.summary)
                        self.popSummary()
-       
+
        def create(self, screen, arguments, **kwargs):
                # creates an instance of 'screen' (which is a class)
                try:
        def create(self, screen, arguments, **kwargs):
                # creates an instance of 'screen' (which is a class)
                try:
@@ -199,20 +195,20 @@ class Session:
                        print errstr
                        print_exc(file=stdout)
                        quitMainloop(5)
                        print errstr
                        print_exc(file=stdout)
                        quitMainloop(5)
-       
+
        def instantiateDialog(self, screen, *arguments, **kwargs):
                return self.doInstantiateDialog(screen, arguments, kwargs, self.desktop)
        def instantiateDialog(self, screen, *arguments, **kwargs):
                return self.doInstantiateDialog(screen, arguments, kwargs, self.desktop)
-       
+
        def deleteDialog(self, screen):
                screen.hide()
                screen.doClose()
        def deleteDialog(self, screen):
                screen.hide()
                screen.doClose()
-       
+
        def instantiateSummaryDialog(self, screen, *arguments, **kwargs):
                return self.doInstantiateDialog(screen, arguments, kwargs, self.summary_desktop)
        def instantiateSummaryDialog(self, screen, *arguments, **kwargs):
                return self.doInstantiateDialog(screen, arguments, kwargs, self.summary_desktop)
-       
+
        def doInstantiateDialog(self, screen, arguments, kwargs, desktop):
                # create dialog
        def doInstantiateDialog(self, screen, arguments, kwargs, desktop):
                # create dialog
-               
+
                try:
                        dlg = self.create(screen, arguments, **kwargs)
                except:
                try:
                        dlg = self.create(screen, arguments, **kwargs)
                except:
@@ -221,7 +217,7 @@ class Session:
                        print_exc(file=stdout)
                        quitMainloop(5)
                        print '-'*60
                        print_exc(file=stdout)
                        quitMainloop(5)
                        print '-'*60
-               
+
                if dlg is None:
                        return
 
                if dlg is None:
                        return
 
@@ -230,7 +226,7 @@ class Session:
 
                # create GUI view of this dialog
                assert desktop is not None
 
                # create GUI view of this dialog
                assert desktop is not None
-               
+
                z = 0
                title = ""
                for (key, value) in dlg.skinAttributes:
                z = 0
                title = ""
                for (key, value) in dlg.skinAttributes:
@@ -238,16 +234,16 @@ class Session:
                                z = int(value)
                        elif key == "title":
                                title = value
                                z = int(value)
                        elif key == "title":
                                title = value
-               
+
                dlg.instance = eWindow(desktop, z)
                dlg.title = title
                applyAllAttributes(dlg.instance, desktop, dlg.skinAttributes)
                gui = GUIOutputDevice()
                gui.parent = dlg.instance
                gui.create(dlg, desktop)
                dlg.instance = eWindow(desktop, z)
                dlg.title = title
                applyAllAttributes(dlg.instance, desktop, dlg.skinAttributes)
                gui = GUIOutputDevice()
                gui.parent = dlg.instance
                gui.create(dlg, desktop)
-               
+
                return dlg
                return dlg
-        
+
        def pushCurrent(self):
                if self.current_dialog is not None:
                        self.dialog_stack.append((self.current_dialog, self.current_dialog.shown))
        def pushCurrent(self):
                if self.current_dialog is not None:
                        self.dialog_stack.append((self.current_dialog, self.current_dialog.shown))
@@ -276,7 +272,7 @@ class Session:
                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.
                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
                self.pushCurrent()
                dlg = self.current_dialog = self.instantiateDialog(screen, *arguments, **kwargs)
                dlg.isTmp = True
@@ -288,7 +284,7 @@ class Session:
                if not self.in_exec:
                        print "close after exec!"
                        return
                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
                # 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
@@ -297,7 +293,7 @@ class Session:
                # gain focus again (for a short time), thus triggering
                # the onExec, which opens the dialog again, closing the loop.
                assert screen == self.current_dialog
                # 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()
                self.current_dialog.returnValue = retval
                self.delay_timer.start(0, 1)
                self.execEnd()
@@ -395,7 +391,7 @@ import Screens.Standby
 
 class PowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""
 
 class PowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""
-       
+
        def __init__(self, session):
                self.session = session
                self.powerKeyTimer = eTimer()
        def __init__(self, session):
                self.session = session
                self.powerKeyTimer = eTimer()
@@ -411,11 +407,11 @@ class PowerKey:
                                #"discretePowerOff": (self.quit, "Go to deep standby"),
                        #})
 
                                #"discretePowerOff": (self.quit, "Go to deep standby"),
                        #})
 
-       def powertimer(self):   
+       def powertimer(self):
                print "PowerOff - Now!"
                if not Screens.Standby.inTryQuitMainloop:
                        self.session.open(Screens.Standby.TryQuitMainloop, 1)
                print "PowerOff - Now!"
                if not Screens.Standby.inTryQuitMainloop:
                        self.session.open(Screens.Standby.TryQuitMainloop, 1)
-       
+
        def powerdown(self):
                self.standbyblocked = 0
                self.powerKeyTimer.start(3000, True)
        def powerdown(self):
                self.standbyblocked = 0
                self.powerKeyTimer.start(3000, True)
@@ -461,14 +457,14 @@ def runScreenTest():
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
        session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
        session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
-       
+
        screensToRun = [ ]
        screensToRun = [ ]
-       
+
        for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
                screensToRun.append(p.__call__)
        for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
                screensToRun.append(p.__call__)
-       
+
        screensToRun += wizardManager.getWizards()
        screensToRun += wizardManager.getWizards()
-       
+
        screensToRun.append(Screens.InfoBar.InfoBar)
 
        ePythonConfigQuery.setQueryFunc(configfile.getResolvedKey)
        screensToRun.append(Screens.InfoBar.InfoBar)
 
        ePythonConfigQuery.setQueryFunc(configfile.getResolvedKey)
@@ -483,16 +479,16 @@ def runScreenTest():
                if result:
                        quitMainloop(*result)
                        return
                if result:
                        quitMainloop(*result)
                        return
-       
+
                screen = screensToRun[0]
                screen = screensToRun[0]
-               
+
                if len(screensToRun):
                        session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
                else:
                        session.open(screen)
                if len(screensToRun):
                        session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
                else:
                        session.open(screen)
-       
+
        runNextScreen(session, screensToRun)
        runNextScreen(session, screensToRun)
-       
+
        vol = VolumeControl(session)
        power = PowerKey(session)
 
        vol = VolumeControl(session)
        power = PowerKey(session)
 
@@ -500,7 +496,7 @@ def runScreenTest():
        session.scart = AutoScartControl(session)
 
        runReactor()
        session.scart = AutoScartControl(session)
 
        runReactor()
-       
+
        configfile.save()
 
        from time import time
        configfile.save()
 
        from time import time
@@ -522,7 +518,7 @@ def runScreenTest():
                        setFPWakeuptime(startTime - 300)
        session.nav.stopService()
        session.nav.shutdown()
                        setFPWakeuptime(startTime - 300)
        session.nav.stopService()
        session.nav.shutdown()
-       
+
        return 0
 
 import keymapparser
        return 0
 
 import keymapparser
@@ -564,7 +560,7 @@ try:
        runScreenTest()
 
        plugins.shutdown()
        runScreenTest()
 
        plugins.shutdown()
-       
+
        from Components.ParentalControl import parentalControl
        parentalControl.save()
 except:
        from Components.ParentalControl import parentalControl
        parentalControl.save()
 except: