X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1423570251c2b91902c5503417dca37a7e2903dc..323ac4a566f7c1ea9006eaf58eae915fac00071b:/mytest.py diff --git a/mytest.py b/mytest.py index 13eb4a7e..680f198d 100644 --- a/mytest.py +++ b/mytest.py @@ -1,3 +1,4 @@ +from Tools import RedirectOutput from enigma import * from tools import * @@ -5,6 +6,7 @@ from Components.Language import language import traceback import Screens.InfoBar +from Screens.SimpleSummary import SimpleSummary import sys import time @@ -16,29 +18,32 @@ from Navigation import Navigation from skin import readSkin, applyAllAttributes from Components.config import configfile -from Tools.Directories import InitFallbackFiles +from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS InitFallbackFiles() eDVBDB.getInstance().reloadBouquets() try: - from twisted.internet import e2reactor + import e2reactor e2reactor.install() from twisted.internet import reactor def runReactor(): reactor.run() -except: +except ImportError: + print "twisted not available" def runReactor(): runMainloop() # initialize autorun plugins and plugin menu entries from Components.PluginComponent import plugins -plugins.getPluginList(runAutostartPlugins=True) + from Screens.Wizard import wizardManager +from Screens.ImageWizard import * from Screens.StartWizard import * from Screens.TutorialWizard import * from Tools.BoundFunction import boundFunction +from Plugins.Plugin import PluginDescriptor had = dict() @@ -77,61 +82,80 @@ class GUIOutputDevice(OutputDevice): comp.createGUIScreen(self.parent, desktop) 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.currentDialog = None + self.current_dialog = None - self.dialogStack = [ ] + self.dialog_stack = [ ] + self.summary_stack = [ ] + self.summary = None 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 + 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: - c.instance.show() + if c == self.current_dialog: + c.show() def execEnd(self): - self.currentDialog.execEnd() - self.currentDialog.instance.hide() + self.current_dialog.execEnd() + self.current_dialog.hide() + self.current_dialog.removeSummary(self.summary) + self.popSummary() - def create(self, screen, arguments): + def create(self, screen, arguments, **kwargs): # creates an instance of 'screen' (which is a class) try: - return screen(self, *arguments) + return screen(self, *arguments, **kwargs) except: - errstr = "Screen %s(%s): %s" % (str(screen), str(arguments), sys.exc_info()[0]) + errstr = "Screen %s(%s, %s): %s" % (str(screen), str(arguments), str(kwargs), sys.exc_info()[0]) print errstr traceback.print_exc(file=sys.stdout) quitMainloop(5) - - def instantiateDialog(self, screen, *arguments): + 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: - dlg = self.create(screen, arguments) + dlg = self.create(screen, arguments, **kwargs) except: print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:' print '-'*60 @@ -143,50 +167,54 @@ 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: + 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): - dlg = self.open(screen, *arguments) + def openWithCallback(self, callback, screen, *arguments, **kwargs): + dlg = self.open(screen, *arguments, **kwargs) dlg.callback = callback - def open(self, screen, *arguments): + def open(self, screen, *arguments, **kwargs): self.pushCurrent() - dlg = self.currentDialog = self.instantiateDialog(screen, *arguments) + dlg = self.current_dialog = self.instantiateDialog(screen, *arguments, **kwargs) dlg.isTmp = True dlg.callback = None self.execBegin() @@ -196,22 +224,103 @@ class Session: print "code " + str(code) def close(self, *retval): - self.currentDialog.returnValue = retval - self.delayTimer.start(0, 1) + self.current_dialog.returnValue = retval + self.delay_timer.start(0, 1) + + 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 +from GlobalActions import globalActionMap +from Components.config import ConfigSubsection, configSequence, configElement, configsequencearg + +#TODO .. move this to a own .py file +class VolumeControl: + """Volume control, handles volUp, volDown, volMute actions and display + a corresponding dialog""" + def __init__(self, session): + global globalActionMap + globalActionMap.actions["volumeUp"]=self.volUp + globalActionMap.actions["volumeDown"]=self.volDown + globalActionMap.actions["volumeMute"]=self.volMute + + config.audio = ConfigSubsection() + config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100))) + + self.volumeDialog = session.instantiateDialog(Volume) + self.muteDialog = session.instantiateDialog(Mute) + + self.hideVolTimer = eTimer() + self.hideVolTimer.timeout.get().append(self.volHide) + + vol = config.audio.volume.value[0] + self.volumeDialog.setValue(vol) + eDVBVolumecontrol.getInstance().setVolume(vol, vol) + + def volSave(self): + config.audio.volume.value = eDVBVolumecontrol.getInstance().getVolume() + config.audio.volume.save() + + def volUp(self): + if (eDVBVolumecontrol.getInstance().isMuted()): + self.volMute() + eDVBVolumecontrol.getInstance().volumeUp() + self.volumeDialog.show() + self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + self.volSave() + self.hideVolTimer.start(3000, True) + + def volDown(self): + if (eDVBVolumecontrol.getInstance().isMuted()): + self.volMute() + eDVBVolumecontrol.getInstance().volumeDown() + self.volumeDialog.show() + self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + self.volSave() + self.hideVolTimer.start(3000, True) + + def volHide(self): + self.volumeDialog.hide() + + def volMute(self): + eDVBVolumecontrol.getInstance().volumeToggleMute() + self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + + if (eDVBVolumecontrol.getInstance().isMuted()): + self.muteDialog.show() + else: + self.muteDialog.hide() def runScreenTest(): - session = Session() - session.desktop = getDesktop() + session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation()) + + plugins.readPluginList(resolveFilename(SCOPE_PLUGINS)) - session.nav = Navigation() + screensToRun = [ ] - screensToRun = wizardManager.getWizards() - screensToRun.append(Screens.InfoBar.InfoBar) + for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD): + screensToRun.append(p.__call__) + screensToRun += wizardManager.getWizards() + + screensToRun.append(Screens.InfoBar.InfoBar) + def runNextScreen(session, screensToRun, *result): if result: - quitMainloop(result) - + quitMainloop(*result) + return + screen = screensToRun[0] if len(screensToRun): @@ -220,13 +329,24 @@ def runScreenTest(): session.open(screen) runNextScreen(session, screensToRun) - + CONNECT(keyPressedSignal(), session.keyEvent) + vol = VolumeControl(session) + runReactor() configfile.save() + from Tools.DreamboxHardware import setFPWakeuptime + from time import time + nextRecordingTime = session.nav.RecordTimer.getNextRecordingTime() + if nextRecordingTime != -1: + if (nextRecordingTime - time() < 330): # no time to switch box back on + setFPWakeuptime(time() + 30) # so switch back on in 30 seconds + else: + setFPWakeuptime(nextRecordingTime - (300)) + session.nav.shutdown() return 0 @@ -234,7 +354,7 @@ def runScreenTest(): import keymapparser keymapparser.readKeymap() import skin -skin.loadSkin(getDesktop()) +skin.loadSkin(getDesktop(0)) import Components.InputDevice Components.InputDevice.InitInputDevices() @@ -265,7 +385,8 @@ import Components.NimManager # first, setup a screen try: runScreenTest() - plugins.getPluginList(runAutoendPlugins=True) + + plugins.shutdown() except: print 'EXCEPTION IN PYTHON STARTUP CODE:' print '-'*60