X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fdac98ca30eff200afaa92b7cd0464186fa8db88..30d9fe14f438ff0d1543f474eadc87e3626215b1:/mytest.py diff --git a/mytest.py b/mytest.py index 70c45a01..5f574ad8 100644 --- a/mytest.py +++ b/mytest.py @@ -4,8 +4,15 @@ 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 import sys import time @@ -36,9 +43,9 @@ except ImportError: # initialize autorun plugins and plugin menu entries from Components.PluginComponent import plugins -plugins.readPluginList(resolveFilename(SCOPE_PLUGINS)) from Screens.Wizard import wizardManager +from Screens.ImageWizard import * from Screens.StartWizard import * from Screens.TutorialWizard import * from Tools.BoundFunction import boundFunction @@ -80,45 +87,92 @@ 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): - self.desktop = None - self.delayTimer = eTimer() - self.delayTimer.timeout.get().append(self.processDelay) + def __init__(self, desktop = None, summary_desktop = None, navigation = None): + self.desktop = desktop + self.summary_desktop = summary_desktop + self.nav = navigation + self.delay_timer = eTimer() + self.delay_timer.timeout.get().append(self.processDelay) + + self.current_dialog = None + + self.dialog_stack = [ ] + self.summary_stack = [ ] + self.summary = None - self.currentDialog = None + self.in_exec = False - self.dialogStack = [ ] + for p in plugins.getPlugins(PluginDescriptor.WHERE_SESSIONSTART): + p(reason=0, session=self) def processDelay(self): - self.execEnd() - - callback = self.currentDialog.callback + callback = self.current_dialog.callback - retval = self.currentDialog.returnValue + retval = self.current_dialog.returnValue - if self.currentDialog.isTmp: - self.currentDialog.doClose() -# dump(self.currentDialog) - del self.currentDialog + if self.current_dialog.isTmp: + self.current_dialog.doClose() +# dump(self.current_dialog) + del self.current_dialog else: - del self.currentDialog.callback + del self.current_dialog.callback self.popCurrent() if callback is not None: callback(*retval) def execBegin(self): - c = self.currentDialog + 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() + + c.addSummary(self.summary) c.execBegin() # when execBegin opened a new dialog, don't bother showing the old one. - if c == self.currentDialog: + if c == self.current_dialog: c.show() def execEnd(self): - self.currentDialog.execEnd() - self.currentDialog.hide() + assert self.in_exec + self.in_exec = False + + self.current_dialog.execEnd() + self.current_dialog.hide() + self.current_dialog.removeSummary(self.summary) + self.popSummary() def create(self, screen, arguments, **kwargs): # creates an instance of 'screen' (which is a class) @@ -129,9 +183,14 @@ class Session: print errstr traceback.print_exc(file=sys.stdout) quitMainloop(5) - def instantiateDialog(self, screen, *arguments, **kwargs): + return self.doInstantiateDialog(screen, arguments, kwargs, self.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 try: @@ -147,50 +206,59 @@ class Session: return # read skin data - readSkin(dlg, None, dlg.skinName, self.desktop) + readSkin(dlg, None, dlg.skinName, desktop) # create GUI view of this dialog - assert self.desktop != None + assert desktop is not None z = 0 + title = "" for (key, value) in dlg.skinAttributes: if key == "zPosition": z = int(value) - - dlg.instance = eWindow(self.desktop, z) - applyAllAttributes(dlg.instance, self.desktop, dlg.skinAttributes) + 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, self.desktop) + gui.create(dlg, desktop) return dlg def pushCurrent(self): - if self.currentDialog: - self.dialogStack.append(self.currentDialog) + if self.current_dialog is not None: + self.dialog_stack.append(self.current_dialog) self.execEnd() def popCurrent(self): - if len(self.dialogStack): - self.currentDialog = self.dialogStack.pop() + if len(self.dialog_stack): + self.current_dialog = self.dialog_stack.pop() self.execBegin() else: - self.currentDialog = None + self.current_dialog = None def execDialog(self, dialog): self.pushCurrent() - self.currentDialog = dialog - self.currentDialog.isTmp = False - self.currentDialog.callback = None # would cause re-entrancy problems. + self.current_dialog = dialog + self.current_dialog.isTmp = False + self.current_dialog.callback = None # would cause re-entrancy problems. self.execBegin() 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.currentDialog = self.instantiateDialog(screen, *arguments, **kwargs) + dlg = self.current_dialog = self.instantiateDialog(screen, *arguments, **kwargs) dlg.isTmp = True dlg.callback = None self.execBegin() @@ -199,9 +267,36 @@ class Session: def keyEvent(self, code): print "code " + str(code) - def close(self, *retval): - self.currentDialog.returnValue = retval - self.delayTimer.start(0, 1) + 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: + self.summary.hide() + self.summary_stack.append(self.summary) + self.summary = None + + def popSummary(self): + if self.summary is not None: + self.summary.doClose() + self.summary = self.summary_stack.pop() + if self.summary is not None: + self.summary.show() from Screens.Volume import Volume from Screens.Mute import Mute @@ -265,11 +360,51 @@ class VolumeControl: else: self.muteDialog.hide() -def runScreenTest(): - session = Session() - session.desktop = getDesktop() +from Screens.Standby import Standby + +class PowerKey: + """ PowerKey stuff - handles the powerkey press and powerkey release actions""" - session.nav = Navigation() + 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 = [ ] @@ -280,6 +415,8 @@ def runScreenTest(): screensToRun.append(Screens.InfoBar.InfoBar) + ePythonConfigQuery.setQueryFunc(configfile.getResolvedKey) + def runNextScreen(session, screensToRun, *result): if result: quitMainloop(*result) @@ -297,6 +434,7 @@ def runScreenTest(): CONNECT(keyPressedSignal(), session.keyEvent) vol = VolumeControl(session) + power = PowerKey(session) runReactor() @@ -318,7 +456,7 @@ def runScreenTest(): import keymapparser keymapparser.readKeymap() import skin -skin.loadSkin(getDesktop()) +skin.loadSkinData(getDesktop(0)) import Components.InputDevice Components.InputDevice.InitInputDevices()