fix typo

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 5f574ad80e3d27da01470cfc715bcb371ba18f05..8ea13e0a5e59468b7f3dea678d243a04851bcc3c 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -23,11 +23,13 @@ from Navigation import Navigation
 
 from skin import readSkin, applyAllAttributes
 
-from Components.config import configfile
-from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS
+from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
+from Components.config import configfile, configElement, configText, ConfigSubsection, config, configSequence, configsequencearg
 InitFallbackFiles()
 eDVBDB.getInstance().reloadBouquets()
 
+config.misc.radiopic = configElement("config.misc.radiopic", configText, resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi", 0)
+
 try:
        import e2reactor
        e2reactor.install()
@@ -147,32 +149,36 @@ class Session:
                if callback is not None:
                        callback(*retval)
 
-       def execBegin(self):
+       def execBegin(self, first=True):
                assert not self.in_exec 
                self.in_exec = True
                c = self.current_dialog
                
-               self.pushSummary()
-
-               summary = c.createSummary() or SimpleSummary
-               self.summary = self.instantiateSummaryDialog(summary, c)
-               self.summary.show()
+               # when this is an execbegin after a execend of a "higher" dialog,
+               # popSummary already did the right thing.
+               if first:
+                       self.pushSummary()
+                       summary = c.createSummary() or SimpleSummary
+                       self.summary = self.instantiateSummaryDialog(summary, c)
+                       self.summary.show()
+                       c.addSummary(self.summary)
 
-               c.addSummary(self.summary)
                c.execBegin()
 
                # when execBegin opened a new dialog, don't bother showing the old one.
                if c == self.current_dialog:
                        c.show()
                
-       def execEnd(self):
+       def execEnd(self, last=True):
                assert self.in_exec
                self.in_exec = False
 
                self.current_dialog.execEnd()
                self.current_dialog.hide()
-               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)
@@ -231,12 +237,12 @@ class Session:
        def pushCurrent(self):
                if self.current_dialog is not None:
                        self.dialog_stack.append(self.current_dialog)
-                       self.execEnd()
+                       self.execEnd(last=False)
        
        def popCurrent(self):
                if len(self.dialog_stack):
                        self.current_dialog = self.dialog_stack.pop()
-                       self.execBegin()
+                       self.execBegin(first=False)
                else:
                        self.current_dialog = None
 
@@ -264,9 +270,6 @@ class Session:
                self.execBegin()
                return dlg
 
-       def keyEvent(self, code):
-               print "code " + str(code)
-
        def close(self, screen, *retval):
                if not self.in_exec:
                        print "close after exec!"
@@ -301,7 +304,6 @@ class Session:
 from Screens.Volume import Volume
 from Screens.Mute import Mute
 from GlobalActions import globalActionMap
-from Components.config import ConfigSubsection, configSequence, configElement, configsequencearg
 
 #TODO .. move this to a own .py file
 class VolumeControl:
@@ -395,7 +397,8 @@ class PowerKey:
                        self.standby()
 
        def standby(self):
-               self.session.open(Standby, self)
+               if self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+                       self.session.open(Standby, self)
 
        def quit(self):
                # halt
@@ -431,8 +434,6 @@ def runScreenTest():
        
        runNextScreen(session, screensToRun)
        
-       CONNECT(keyPressedSignal(), session.keyEvent)
-       
        vol = VolumeControl(session)
        power = PowerKey(session)
        
@@ -484,6 +485,9 @@ Components.RFmod.InitRFmod()
 
 import Components.NimManager
 
+import Screens.Ci
+Screens.Ci.InitCiConfig()
+
 # first, setup a screen
 try:
        runScreenTest()