X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c9d04cb33fb06dfa075b431e36e7ea938a5f963..8bd6103bc110547cf683f931a1d9d7d14156bf98:/mytest.py?ds=sidebyside diff --git a/mytest.py b/mytest.py index 54f0f862..9e997189 100644 --- a/mytest.py +++ b/mytest.py @@ -1,40 +1,35 @@ from enigma import * +from tools import * + +import traceback +import Screens.InfoBar import sys import time -from screens import * -from skin import applyGUIskin +import ServiceReference + +from Navigation import Navigation -# 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 skin import readSkin, applyAllAttributes -# we thus have one (static) hierarchy of screens (classes, not instances) -# and one with the instanciated components itself (both global and dynamic) +had = dict() def dump(dir, p = ""): if isinstance(dir, dict): for (entry, val) in dir.items(): - dump(val, p + "/" + entry) - print p + ":" + str(dir.__class__) - -# defined components -components = {} - -# do global -screens["global"](components) - -# test our screens -components["$001"] = screens["testDialog"]() - -print "*** classes:" -dump(screens) - -print "*** instances:" -dump(components) + dump(val, p + "(dict)/" + entry) + if hasattr(dir, "__dict__"): + for name, value in dir.__dict__.items(): + if not had.has_key(str(value)): + had[str(value)] = 1 + dump(value, p + "/" + str(name)) + else: + print p + "/" + str(name) + ":" + str(dir.__class__) + "(cycle)" + else: + print p + ":" + str(dir) + +# + ":" + str(dir.__class__) # display @@ -51,74 +46,177 @@ 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): self.desktop = None self.delayTimer = eTimer() self.delayTimer.timeout.get().append(self.processDelay) + + self.currentDialog = None + + self.dialogStack = [ ] def processDelay(self): - components[self.screenname].close() - if self.currentWindow != None: - self.currentWindow.hide() + self.execEnd() - del components[self.screenname] - del self.currentWindow + callback = self.currentDialog.callback + retval = self.currentDialog.returnValue - - def open(self, screenname, screen): - components[screenname] = screen - self.screenname = screenname - screen.session = self + if self.currentDialog.isTmp: + self.currentDialog.doClose() - if self.desktop != None: - self.currentWindow = wnd = eWindow(self.desktop) - wnd.setTitle("Screen from python!") - wnd.move(ePoint(300, 100)) - wnd.resize(eSize(300, 300)) - - gui = GUIOutputDevice() - gui.parent = wnd - gui.create(components["$002"]) - - applyGUIskin(components["$002"], None, "clockDialog") - - wnd.show() + del self.currentDialog.instance +# dump(self.currentDialog) + del self.currentDialog else: - self.currentWindow = None + del self.currentDialog.callback + + self.popCurrent() + if callback is not None: + callback(*retval) - def close(self): + def execBegin(self): + self.currentDialog.execBegin() + self.currentDialog.instance.show() + + def execEnd(self): + 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) + + def instantiateDialog(self, 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() + print '-'*60 + + # 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) + applyAllAttributes(dlg.instance, self.desktop, dlg.skinAttributes) + gui = GUIOutputDevice() + gui.parent = dlg.instance + gui.create(dlg, self.desktop) + + return dlg + + def pushCurrent(self): + if self.currentDialog: + self.dialogStack.append(self.currentDialog) + self.execEnd() + + def popCurrent(self): + if len(self.dialogStack): + self.currentDialog = self.dialogStack.pop() + self.execBegin() + + 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): + self.open(screen, *arguments) + self.currentDialog.callback = callback + + def open(self, screen, *arguments): + self.pushCurrent() + self.currentDialog = self.instantiateDialog(screen, *arguments) + self.currentDialog.isTmp = True + self.currentDialog.callback = None + self.execBegin() + + def keyEvent(self, code): + print "code " + str(code) + + def close(self, *retval): + self.currentDialog.returnValue = retval self.delayTimer.start(0, 1) + def runScreenTest(): session = Session() session.desktop = getDesktop() -# components["$002"] = screens["clockDisplay"](components["clock"]) - - session.open("$002", screens["clockDisplay"](components["clock"])) - + session.nav = Navigation() - def blub(): -# x = components["$002"] - components["$002"].data["okbutton"]["instance"].push() -# dump(components) -# print "session, close screen " + str(sys.getrefcount(x)) -# session.close() - - tmr = eTimer() - tmr.timeout.get().append(blub) - tmr.start(4000, 1) + session.open(Screens.InfoBar.InfoBar) + + CONNECT(keyPressedSignal(), session.keyEvent) runMainloop() + session.nav.shutdown() + return 0 +import keymapparser +keymapparser.readKeymap() +import skin +skin.loadSkin(getDesktop()) + +import Components.InputDevice +Components.InputDevice.InitInputDevices() + +import Components.AVSwitch +Components.AVSwitch.InitAVSwitch() + +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 -runScreenTest() +try: + runScreenTest() +except: + print 'EXCEPTION IN PYTHON STARTUP CODE:' + print '-'*60 + traceback.print_exc(file=sys.stdout) + quitMainloop() + print '-'*60 # 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) +# +