X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4220c7211df32b7c5baff6f48b375b79dcf9c328..60ee8597f658a0061d9326bd8d5dde2e2f73a670:/mytest.py diff --git a/mytest.py b/mytest.py index bfc015c3..42f1e009 100644 --- a/mytest.py +++ b/mytest.py @@ -1,23 +1,44 @@ from enigma import * from tools import * -import Screens.InfoBar +from Components.Language import language -import RecordTimer +import traceback +import Screens.InfoBar import sys import time -from skin import applyGUIskin +import ServiceReference + +from Navigation import Navigation + +from skin import readSkin, applyAllAttributes -# A screen is a function which instanciates all components of a screen into a temporary component. -# Thus, the global stuff is a screen, too. -# In a screen, components can either be instanciated from the class-tree, cloned (copied) or -# "linked" from the instance tree. -# A screen itself lives as the container of the components, so a screen is a component, too. +from Components.config import configfile +from Tools.Directories import InitFallbackFiles +InitFallbackFiles() +eDVBDB.getInstance().reloadBouquets() -# we thus have one (static) hierarchy of screens (classes, not instances) -# and one with the instanciated components itself (both global and dynamic) +try: + from twisted.internet import e2reactor + e2reactor.install() + + from twisted.internet import reactor + + def runReactor(): + reactor.run() +except: + 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.StartWizard import * +from Screens.TutorialWizard import * +from Tools.BoundFunction import boundFunction had = dict() @@ -52,8 +73,8 @@ html = HTMLOutputDevice() class GUIOutputDevice(OutputDevice): parent = None - def create(self, comp): - comp.createGUIScreen(self.parent) + def create(self, comp, desktop): + comp.createGUIScreen(self.parent, desktop) class Session: def __init__(self): @@ -68,39 +89,76 @@ class Session: def processDelay(self): self.execEnd() + callback = self.currentDialog.callback + + retval = self.currentDialog.returnValue + if self.currentDialog.isTmp: self.currentDialog.doClose() - - print sys.getrefcount(self.currentDialog) - del self.currentDialog.instance - dump(self.currentDialog) +# dump(self.currentDialog) del self.currentDialog + else: + del self.currentDialog.callback self.popCurrent() - + if callback is not None: + callback(*retval) + def execBegin(self): - self.currentDialog.execBegin() - self.currentDialog.instance.show() + c = self.currentDialog + c.execBegin() + + # when execBegin opened a new dialog, don't bother showing the old one. + if c == self.currentDialog: + c.instance.show() def execEnd(self): - self.currentDialog.execEnd() - self.currentDialog.instance.hide() + self.currentDialog.execEnd() + self.currentDialog.instance.hide() def create(self, screen, arguments): # creates an instance of 'screen' (which is a class) - return screen(self, *arguments) + try: + return screen(self, *arguments) + except: + errstr = "Screen %s(%s): %s" % (str(screen), str(arguments), sys.exc_info()[0]) + print errstr + traceback.print_exc(file=sys.stdout) + quitMainloop(5) + def instantiateDialog(self, screen, *arguments): - dlg = self.create(screen, arguments) + # create dialog + + try: + dlg = self.create(screen, arguments) + except: + print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:' + print '-'*60 + traceback.print_exc(file=sys.stdout) + quitMainloop(5) + print '-'*60 + + if dlg is None: + return + + # read skin data + readSkin(dlg, None, dlg.skinName, self.desktop) + + # create GUI view of this dialog assert self.desktop != None - dlg.instance = eWindow(self.desktop) + + z = 0 + 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) gui = GUIOutputDevice() gui.parent = dlg.instance - gui.create(dlg) - - applyGUIskin(dlg, None, dlg.skinName, self.desktop) - + gui.create(dlg, self.desktop) + return dlg def pushCurrent(self): @@ -112,130 +170,105 @@ class Session: if len(self.dialogStack): self.currentDialog = self.dialogStack.pop() self.execBegin() - + else: + self.currentDialog = None + def execDialog(self, dialog): self.pushCurrent() self.currentDialog = dialog self.currentDialog.isTmp = False + self.currentDialog.callback = None # would cause re-entrancy problems. self.execBegin() + def openWithCallback(self, callback, screen, *arguments): + dlg = self.open(screen, *arguments) + dlg.callback = callback + def open(self, screen, *arguments): self.pushCurrent() - self.currentDialog = self.instantiateDialog(screen, *arguments) - self.currentDialog.isTmp = True + dlg = self.currentDialog = self.instantiateDialog(screen, *arguments) + dlg.isTmp = True + dlg.callback = None self.execBegin() + return dlg def keyEvent(self, code): -# print "code " + str(code) - if code == 32: - self.currentDialog["okbutton"].instance.push() - - if code == 33: - self.currentDialog["channelSwitcher"].instance.push() - - if code >= 0x30 and code <= 0x39: - try: - self.currentDialog["menu"].instance.moveSelection(code - 0x31) - except: - self.currentDialog["list"].instance.moveSelection(code - 0x31) + print "code " + str(code) - def close(self): + def close(self, *retval): + self.currentDialog.returnValue = retval self.delayTimer.start(0, 1) -# TODO: remove pNavgation, eNavigation and rewrite this stuff in python. -class Navigation: - def __init__(self): - self.pnav = pNavigation() - self.pnav.m_event.get().append(self.callEvent) - self.event = [ ] - self.currentlyPlayingService = None - - self.RecordTimer = RecordTimer.RecordTimer() - - def callEvent(self, i): - for x in self.event: - x(i) - - def playService(self, ref): - self.currentlyPlayingServiceReference = None - if not self.pnav.playService(ref): - self.currentlyPlayingServiceReference = ref - return 0 - return 1 - - def getCurrentlyPlayingServiceReference(self): - return self.currentlyPlayingServiceReference - - def recordService(self, ref): - service = iRecordableServicePtr() - print "recording service: %s" % (str(ref)) - if self.pnav.recordService(ref, service): - print "record returned non-zero" - return None - else: - print "ok, recordService didn't fail" - return service - - def enqueueService(self, ref): - return self.pnav.enqueueService(ref) - - def getCurrentService(self): - service = iPlayableServicePtr() - if self.pnav.getCurrentService(service): - return None - return service - - def getPlaylist(self): - playlist = ePlaylistPtr() - if self.pnav.getPlaylist(playlist): - return None - return playlist - - def pause(self, p): - return self.pnav.pause(p) - - def recordWithTimer(self, begin, end, ref, epg): - entry = RecordTimer.RecordTimerEntry(begin, end, self, ref, epg) - self.RecordTimer.record(entry) - return entry - def runScreenTest(): session = Session() session.desktop = getDesktop() session.nav = Navigation() - session.open(Screens.InfoBar.InfoBar) + screensToRun = wizardManager.getWizards() + screensToRun.append(Screens.InfoBar.InfoBar) + + def runNextScreen(session, screensToRun, *result): + if result: + quitMainloop(result) + + screen = screensToRun[0] + + if len(screensToRun): + session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen) + else: + session.open(screen) + + runNextScreen(session, screensToRun) CONNECT(keyPressedSignal(), session.keyEvent) - runMainloop() + runReactor() + + configfile.save() + + session.nav.shutdown() return 0 import keymapparser keymapparser.readKeymap() import skin -skin.loadSkin() +skin.loadSkin(getDesktop()) -# first, setup a screen -runScreenTest() - -# now, run the mainloop - -#pt = eDebugClassPtr() -#eDebugClass.getDebug(pt, 12) -#p = pt.__deref__() -#print pt.x -#print p.x -#print "removing ptr..." -#pt = 0 -#print "now" -#print "p is " + str(p) -#print p.x -#p = 0 -# -#bla = eDebugClass() -#bla = eDebugClass(2) -# +import Components.InputDevice +Components.InputDevice.InitInputDevices() + +import Components.AVSwitch +Components.AVSwitch.InitAVSwitch() + +import Components.RecordingConfig +Components.RecordingConfig.InitRecordingConfig() +import Components.UsageConfig +Components.UsageConfig.InitUsageConfig() + +import Components.Network +Components.Network.InitNetwork() + +import Components.Lcd +Components.Lcd.InitLcd() + +import Components.SetupDevices +Components.SetupDevices.InitSetupDevices() + +import Components.RFmod +Components.RFmod.InitRFmod() + +import Components.NimManager + +# first, setup a screen +try: + runScreenTest() + plugins.getPluginList(runAutoendPlugins=True) +except: + print 'EXCEPTION IN PYTHON STARTUP CODE:' + print '-'*60 + traceback.print_exc(file=sys.stdout) + quitMainloop(5) + print '-'*60