X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fe3e42f417c8c735bdfd6f57799a2247477a0fda..c7239788f111d2a6a8ca3bb8b95b72579095bad4:/mytest.py diff --git a/mytest.py b/mytest.py index caad5206..86549f77 100644 --- a/mytest.py +++ b/mytest.py @@ -19,15 +19,20 @@ import time import ServiceReference +from Components.ParentalControl import InitParentalControl +InitParentalControl() + 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 config, ConfigText, configfile, ConfigSubsection, ConfigInteger InitFallbackFiles() eDVBDB.getInstance().reloadBouquets() +config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi") + try: import e2reactor e2reactor.install() @@ -87,6 +92,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 @@ -101,12 +131,12 @@ class Session: 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 @@ -122,27 +152,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) @@ -157,6 +196,10 @@ class Session: def instantiateDialog(self, screen, *arguments, **kwargs): return self.doInstantiateDialog(screen, arguments, kwargs, self.desktop) + def deleteDialog(self, screen): + screen.hide() + screen.doClose() + def instantiateSummaryDialog(self, screen, *arguments, **kwargs): return self.doInstantiateDialog(screen, arguments, kwargs, self.summary_desktop) @@ -199,14 +242,14 @@ 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() + 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 @@ -220,8 +263,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 @@ -229,12 +277,23 @@ class Session: self.execBegin() return dlg - 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: @@ -252,7 +311,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: @@ -265,7 +323,7 @@ class VolumeControl: globalActionMap.actions["volumeMute"]=self.volMute config.audio = ConfigSubsection() - config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100))) + config.audio.volume = ConfigInteger(default = 100, limits = (0, 100)) self.volumeDialog = session.instantiateDialog(Volume) self.muteDialog = session.instantiateDialog(Mute) @@ -273,7 +331,8 @@ class VolumeControl: self.hideVolTimer = eTimer() self.hideVolTimer.timeout.get().append(self.volHide) - vol = config.audio.volume.value[0] + vol = config.audio.volume.value + print "volume is", vol self.volumeDialog.setValue(vol) eDVBVolumecontrol.getInstance().setVolume(vol, vol) @@ -322,7 +381,7 @@ class PowerKey: 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, @@ -346,7 +405,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 @@ -366,6 +426,8 @@ def runScreenTest(): screensToRun.append(Screens.InfoBar.InfoBar) + ePythonConfigQuery.setQueryFunc(configfile.getResolvedKey) + def runNextScreen(session, screensToRun, *result): if result: quitMainloop(*result) @@ -380,8 +442,6 @@ def runScreenTest(): runNextScreen(session, screensToRun) - CONNECT(keyPressedSignal(), session.keyEvent) - vol = VolumeControl(session) power = PowerKey(session) @@ -398,6 +458,7 @@ def runScreenTest(): else: setFPWakeuptime(nextRecordingTime - (300)) + session.nav.stopService() session.nav.shutdown() return 0 @@ -433,11 +494,17 @@ Components.RFmod.InitRFmod() import Components.NimManager +import Screens.Ci +Screens.Ci.InitCiConfig() + # first, setup a screen try: runScreenTest() plugins.shutdown() + + from Components.ParentalControl import parentalControl + parentalControl.save() except: print 'EXCEPTION IN PYTHON STARTUP CODE:' print '-'*60