X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=mytest.py;h=014f94c9a1d40692aba7daf606e1370a8e1bd16d;hp=e8e0c74c8649c1e845697778b45408c98b83e828;hb=1076e4717bcf0eb93d803f73b2b75a8ae192b143;hpb=361de59820cf1bde180548782a647a5137b2a21c diff --git a/mytest.py b/mytest.py index e8e0c74..014f94c 100644 --- a/mytest.py +++ b/mytest.py @@ -1,13 +1,15 @@ +import eConsoleImpl import eBaseImpl import enigma enigma.eTimer = eBaseImpl.eTimer enigma.eSocketNotifier = eBaseImpl.eSocketNotifier +enigma.eConsoleAppContainer = eConsoleImpl.eConsoleAppContainer from Tools.Profile import profile, profile_final profile("PYTHON_START") -from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \ +from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, \ getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent from tools import * @@ -36,17 +38,18 @@ profile("LOAD:Navigation") from Navigation import Navigation profile("LOAD:skin") -from skin import readSkin, applyAllAttributes +from skin import readSkin profile("LOAD:Tools") from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE -from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger +from Components.config import config, configfile, ConfigText, ConfigYesNo InitFallbackFiles() profile("ReloadProfiles") eDVBDB.getInstance().reloadBouquets() config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi") +config.misc.isNextRecordTimerAfterEventActionAuto = ConfigYesNo(default=False) profile("Twisted") try: @@ -59,7 +62,7 @@ try: from twisted.internet import reactor def runReactor(): - reactor.run() + reactor.run(installSignalHandlers=False) except ImportError: print "twisted not available" def runReactor(): @@ -72,9 +75,11 @@ from Components.PluginComponent import plugins profile("LOAD:Wizard") from Screens.Wizard import wizardManager +from Screens.DefaultWizard import * from Screens.ImageWizard import * from Screens.StartWizard import * from Screens.TutorialWizard import * +import Screens.Rc from Tools.BoundFunction import boundFunction from Plugins.Plugin import PluginDescriptor @@ -313,87 +318,10 @@ class Session: if self.summary is not None: self.summary.show() -from Screens.Volume import Volume -from Screens.Mute import Mute -from GlobalActions import globalActionMap - -profile("VolumeControl") -#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 = ConfigInteger(default = 100, limits = (0, 100)) - - self.volumeDialog = session.instantiateDialog(Volume) - self.muteDialog = session.instantiateDialog(Mute) - - self.hideVolTimer = eTimer() - self.hideVolTimer.callback.append(self.volHide) - - vol = config.audio.volume.value - self.volumeDialog.setValue(vol) - self.volctrl = eDVBVolumecontrol.getInstance() - self.volctrl.setVolume(vol, vol) - - def volSave(self): - if self.volctrl.isMuted(): - config.audio.volume.value = 0 - else: - config.audio.volume.value = self.volctrl.getVolume() - config.audio.volume.save() - - def volUp(self): - self.setVolume(+1) - - def volDown(self): - self.setVolume(-1) - - def setVolume(self, direction): - oldvol = self.volctrl.getVolume() - if direction > 0: - self.volctrl.volumeUp() - else: - self.volctrl.volumeDown() - is_muted = self.volctrl.isMuted() - vol = self.volctrl.getVolume() - self.volumeDialog.show() - if is_muted: - self.volMute() # unmute - elif not vol: - self.volMute(False, True) # mute but dont show mute symbol - if self.volctrl.isMuted(): - self.volumeDialog.setValue(0) - else: - self.volumeDialog.setValue(self.volctrl.getVolume()) - self.volSave() - self.hideVolTimer.start(3000, True) - - def volHide(self): - self.volumeDialog.hide() - - def volMute(self, showMuteSymbol=True, force=False): - vol = self.volctrl.getVolume() - if vol or force: - self.volctrl.volumeToggleMute() - if self.volctrl.isMuted(): - if showMuteSymbol: - self.muteDialog.show() - self.volumeDialog.setValue(0) - else: - self.muteDialog.hide() - self.volumeDialog.setValue(vol) - profile("Standby,PowerKey") import Screens.Standby from Screens.Menu import MainMenu, mdom -import xml.dom.minidom +from GlobalActions import globalActionMap class PowerKey: """ PowerKey stuff - handles the powerkey press and powerkey release actions""" @@ -421,21 +349,16 @@ class PowerKey: self.shutdown() elif action == "show_menu": print "Show shutdown Menu" - menu = mdom.childNodes[0] - for x in menu.childNodes: - if x.nodeType != xml.dom.minidom.Element.nodeType: - continue - elif x.tagName == 'menu': - for y in x.childNodes: - if y.nodeType != xml.dom.minidom.Element.nodeType: - continue - elif y.tagName == 'id': - id = y.getAttribute("val") - if id and id == "shutdown": - self.session.infobar = self - menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x, x.childNodes) - menu_screen.setTitle(_("Standby / Restart")) - return + root = mdom.getroot() + for x in root.findall("menu"): + y = x.find("id") + if y is not None: + id = y.get("val") + if id and id == "shutdown": + self.session.infobar = self + menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x) + menu_screen.setTitle(_("Standby / Restart")) + return def powerdown(self): self.standbyblocked = 0 @@ -479,12 +402,16 @@ profile("Load:CI") from enigma import eDVBCIInterfaces from Screens.Ci import CiHandler +profile("Load:VolumeControl") +from Components.VolumeControl import VolumeControl + def runScreenTest(): profile("readPluginList") plugins.readPluginList(resolveFilename(SCOPE_PLUGINS)) profile("Init:Session") - session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation()) + nav = Navigation(config.misc.isNextRecordTimerAfterEventActionAuto.value) + session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = nav) CiHandler.setSession(session) @@ -533,33 +460,39 @@ def runScreenTest(): profile("RunReactor") profile_final() runReactor() - profile("configfile.save") - configfile.save() profile("wakeup") from time import time - from Tools.DreamboxHardware import setFPWakeuptime + from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime #get currentTime nowTime = time() wakeupList = [ - x for x in - [session.nav.RecordTimer.getNextRecordingTime(), - session.nav.RecordTimer.getNextZapTime(), - plugins.getNextWakeupTime()] - if x != -1 + x for x in ((session.nav.RecordTimer.getNextRecordingTime(), 0, session.nav.RecordTimer.isNextRecordAfterEventActionAuto()), + (session.nav.RecordTimer.getNextZapTime(), 1), + (plugins.getNextWakeupTime(), 2)) + if x[0] != -1 ] wakeupList.sort() + recordTimerWakeupAuto = False if len(wakeupList): startTime = wakeupList.pop(0) - if (startTime - nowTime < 330): # no time to switch box back on - setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds + if (startTime[0] - nowTime) < 330: # no time to switch box back on + wptime = nowTime + 30 # so switch back on in 30 seconds else: - setFPWakeuptime(startTime - 300) + wptime = startTime[0] - 300 + setFPWakeuptime(wptime) + recordTimerWakeupAuto = startTime[1] == 0 and startTime[2] + config.misc.isNextRecordTimerAfterEventActionAuto.value = recordTimerWakeupAuto + config.misc.isNextRecordTimerAfterEventActionAuto.save() + profile("stopService") session.nav.stopService() profile("nav shutdown") session.nav.shutdown() + profile("configfile.save") + configfile.save() + return 0 profile("Init:skin")