X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5e54297861cae8b00c8ff52865bcd1333ada61a2..e4632437dcaf95c92abd3b1fed122a61c97e3a5b:/lib/python/Screens/Wizard.py diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index 58697fe8..23d6253a 100644 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -3,7 +3,7 @@ from Screen import Screen import string from Screens.HelpMenu import HelpableScreen -from Components.config import config +from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_DELETE, KEY_BACKSPACE from Components.Label import Label from Components.Slider import Slider from Components.ActionMap import NumberActionMap @@ -45,7 +45,7 @@ class WizardSummary(Screen): def setText(self, text): self["text"].setText(text) -class Wizard(Screen, HelpableScreen): +class Wizard(Screen): def createSummary(self): print "WizardCreateSummary" return WizardSummary @@ -55,12 +55,10 @@ class Wizard(Screen, HelpableScreen): self.isPointsElement, self.isReboundsElement = 0, 0 self.wizard = wizard self.currContent = "" - self.lastStep = 0 - - - + self.lastStep = 0 + def startElement(self, name, attrs): - print "startElement", name + #print "startElement", name self.currContent = name if (name == "step"): self.lastStep += 1 @@ -68,7 +66,7 @@ class Wizard(Screen, HelpableScreen): id = str(attrs.get('id')) else: id = "" - print "id:", id + #print "id:", id if attrs.has_key('nextstep'): nextstep = str(attrs.get('nextstep')) else: @@ -86,7 +84,7 @@ class Wizard(Screen, HelpableScreen): timeoutstep = str(attrs.get('timeoutstep')) else: timeoutstep = '' - self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "timeout": timeout, "timeoutaction": timeoutaction, "timeoutstep": timeoutstep, "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": "", "nextstep": nextstep} + self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "timeout": timeout, "timeoutaction": timeoutaction, "timeoutstep": timeoutstep, "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": "", "code_async": "", "codeafter_async": "", "nextstep": nextstep} elif (name == "text"): self.wizard[self.lastStep]["text"] = string.replace(str(attrs.get('value')), "\\n", "\n") elif (name == "displaytext"): @@ -97,62 +95,89 @@ class Wizard(Screen, HelpableScreen): self.wizard[self.lastStep]["dynamiclist"] = attrs.get("source") #self.wizard[self.lastStep]["list"].append(("Hallo", "test")) if (attrs.has_key("evaluation")): - print "evaluation" + #print "evaluation" self.wizard[self.lastStep]["listevaluation"] = attrs.get("evaluation") if (attrs.has_key("onselect")): self.wizard[self.lastStep]["onselect"] = attrs.get("onselect") elif (name == "listentry"): self.wizard[self.lastStep]["list"].append((str(attrs.get('caption')), str(attrs.get('step')))) elif (name == "config"): - exec "from Screens." + str(attrs.get('module')) + " import *" - self.wizard[self.lastStep]["config"]["screen"] = eval(str(attrs.get('screen'))) - if (attrs.has_key('args')): - print "has args" - self.wizard[self.lastStep]["config"]["args"] = str(attrs.get('args')) - self.wizard[self.lastStep]["config"]["type"] = str(attrs.get('type')) + type = str(attrs.get('type')) + self.wizard[self.lastStep]["config"]["type"] = type + if type == "ConfigList" or type == "standalone": + try: + exec "from Screens." + str(attrs.get('module')) + " import *" + except: + exec "from " + str(attrs.get('module')) + " import *" + + self.wizard[self.lastStep]["config"]["screen"] = eval(str(attrs.get('screen'))) + if (attrs.has_key('args')): + #print "has args" + self.wizard[self.lastStep]["config"]["args"] = str(attrs.get('args')) + elif type == "dynamic": + self.wizard[self.lastStep]["config"]["source"] = str(attrs.get('source')) + if (attrs.has_key('evaluation')): + self.wizard[self.lastStep]["config"]["evaluation"] = str(attrs.get('evaluation')) elif (name == "code"): + self.async_code = attrs.has_key('async') and str(attrs.get('async')) == "yes" if attrs.has_key('pos') and str(attrs.get('pos')) == "after": self.codeafter = True else: self.codeafter = False elif (name == "condition"): pass + def endElement(self, name): self.currContent = "" if name == 'code': - if self.codeafter: - self.wizard[self.lastStep]["codeafter"] = self.wizard[self.lastStep]["codeafter"].strip() + if self.async_code: + if self.codeafter: + self.wizard[self.lastStep]["codeafter_async"] = self.wizard[self.lastStep]["codeafter_async"].strip() + else: + self.wizard[self.lastStep]["code_async"] = self.wizard[self.lastStep]["code_async"].strip() else: - self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"].strip() + if self.codeafter: + self.wizard[self.lastStep]["codeafter"] = self.wizard[self.lastStep]["codeafter"].strip() + else: + self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"].strip() elif name == 'condition': self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"].strip() elif name == 'step': - print "Step number", self.lastStep, ":", self.wizard[self.lastStep] + #print "Step number", self.lastStep, ":", self.wizard[self.lastStep] + pass def characters(self, ch): if self.currContent == "code": - if self.codeafter: - self.wizard[self.lastStep]["codeafter"] = self.wizard[self.lastStep]["codeafter"] + ch + if self.async_code: + if self.codeafter: + self.wizard[self.lastStep]["codeafter_async"] = self.wizard[self.lastStep]["codeafter_async"] + ch + else: + self.wizard[self.lastStep]["code_async"] = self.wizard[self.lastStep]["code_async"] + ch else: - self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"] + ch + if self.codeafter: + self.wizard[self.lastStep]["codeafter"] = self.wizard[self.lastStep]["codeafter"] + ch + else: + self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"] + ch elif self.currContent == "condition": self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"] + ch - + def __init__(self, session, showSteps = True, showStepSlider = True, showList = True, showConfig = True): Screen.__init__(self, session) - HelpableScreen.__init__(self) self.stepHistory = [] self.wizard = {} parser = make_parser() - print "Reading " + self.xmlfile + if not isinstance(self.xmlfile, list): + self.xmlfile = [self.xmlfile] + print "Reading ", self.xmlfile wizardHandler = self.parseWizard(self.wizard) parser.setContentHandler(wizardHandler) - if self.xmlfile[0] != '/': - parser.parse('/usr/share/enigma2/' + self.xmlfile) - else: - parser.parse(self.xmlfile) + for xmlfile in self.xmlfile: + if xmlfile[0] != '/': + parser.parse('/usr/share/enigma2/' + xmlfile) + else: + parser.parse(xmlfile) self.showSteps = showSteps self.showStepSlider = showStepSlider @@ -160,7 +185,7 @@ class Wizard(Screen, HelpableScreen): self.showConfig = showConfig self.numSteps = len(self.wizard) - self.currStep = 1 + self.currStep = self.getStepWithID("start") + 1 self.timeoutTimer = eTimer() self.timeoutTimer.callback.append(self.timeoutCounterFired) @@ -168,7 +193,7 @@ class Wizard(Screen, HelpableScreen): self["text"] = Label() if showConfig: - self["config"] = ConfigList([]) + self["config"] = ConfigList([], session = session) if self.showSteps: self["step"] = Label() @@ -188,7 +213,9 @@ class Wizard(Screen, HelpableScreen): self.lcdCallbacks = [] - self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions"], + self.disableKeys = False + + self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions", "SetupActions"], { "ok": self.ok, "back": self.back, @@ -200,6 +227,8 @@ class Wizard(Screen, HelpableScreen): "green": self.green, "yellow": self.yellow, "blue":self.blue, + "deleteBackward": self.deleteBackward, + "deleteForward": self.deleteForward, "1": self.keyNumberGlobal, "2": self.keyNumberGlobal, "3": self.keyNumberGlobal, @@ -228,10 +257,28 @@ class Wizard(Screen, HelpableScreen): print "blue" pass + def deleteForward(self): + self.resetCounter() + if (self.wizard[self.currStep]["config"]["screen"] != None): + self.configInstance.keyDelete() + elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"): + self["config"].handleKey(KEY_DELETE) + print "deleteForward" + + def deleteBackward(self): + self.resetCounter() + if (self.wizard[self.currStep]["config"]["screen"] != None): + self.configInstance.keyBackspace() + elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"): + self["config"].handleKey(KEY_BACKSPACE) + print "deleteBackward" + def setLCDTextCallback(self, callback): self.lcdCallbacks.append(callback) def back(self): + if self.disableKeys: + return print "getting back..." print "stepHistory:", self.stepHistory if len(self.stepHistory) > 1: @@ -250,7 +297,7 @@ class Wizard(Screen, HelpableScreen): def getStepWithID(self, id): print "getStepWithID:", id count = 0 - for x in self.wizard: + for x in self.wizard.keys(): if self.wizard[x]["id"] == id: print "result:", count return count @@ -264,6 +311,10 @@ class Wizard(Screen, HelpableScreen): if self.updateValues not in self.onShown: self.onShown.append(self.updateValues) + + if self.showConfig: + if self.wizard[currStep]["config"]["type"] == "dynamic": + eval("self." + self.wizard[currStep]["config"]["evaluation"])() if self.showList: if (len(self.wizard[currStep]["evaluatedlist"]) > 0): @@ -274,23 +325,29 @@ class Wizard(Screen, HelpableScreen): else: self.currStep = self.getStepWithID(nextStep) - if (currStep == self.numSteps): # wizard finished + print_now = True + if ((currStep == self.numSteps and self.wizard[currStep]["nextstep"] is None) or self.wizard[currStep]["id"] == "end"): # wizard finished + print "wizard finished" self.markDone() self.close() else: + self.codeafter = True self.runCode(self.wizard[currStep]["codeafter"]) - if self.wizard[currStep]["nextstep"] is not None: - self.currStep = self.getStepWithID(self.wizard[currStep]["nextstep"]) - if gotoStep is not None: - self.currStep = self.getStepWithID(gotoStep) - self.currStep += 1 - self.updateValues() - - print "Now: " + str(self.currStep) + self.prevStep = currStep + self.gotoStep = gotoStep + if not self.runCode(self.wizard[currStep]["codeafter_async"]): + self.afterAsyncCode() + else: + if self.updateValues in self.onShown: + self.onShown.remove(self.updateValues) + if print_now: + print "Now: " + str(self.currStep) def ok(self): print "OK" + if self.disableKeys: + return currStep = self.currStep if self.showConfig: @@ -300,7 +357,8 @@ class Wizard(Screen, HelpableScreen): # for this. If there is one, please do a more specific check # and/or a comment in which situation there is no run() if callable(getattr(self.configInstance, "runAsync", None)): - self.onShown.remove(self.updateValues) + if self.updateValues in self.onShown: + self.onShown.remove(self.updateValues) self.configInstance.runAsync(self.finished) return else: @@ -315,18 +373,22 @@ class Wizard(Screen, HelpableScreen): self.resetCounter() if (self.wizard[self.currStep]["config"]["screen"] != None): self.configInstance.keyLeft() + elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"): + self["config"].handleKey(KEY_LEFT) print "left" def right(self): self.resetCounter() if (self.wizard[self.currStep]["config"]["screen"] != None): self.configInstance.keyRight() + elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"): + self["config"].handleKey(KEY_RIGHT) print "right" def up(self): self.resetCounter() - if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None): - self["config"].instance.moveSelection(self["config"].instance.moveUp) + if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None or self.wizard[self.currStep]["config"]["type"] == "dynamic"): + self["config"].instance.moveSelection(self["config"].instance.moveUp) elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0): self["list"].selectPrevious() if self.wizard[self.currStep].has_key("onselect"): @@ -338,7 +400,7 @@ class Wizard(Screen, HelpableScreen): def down(self): self.resetCounter() - if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None): + if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None or self.wizard[self.currStep]["config"]["type"] == "dynamic"): self["config"].instance.moveSelection(self["config"].instance.moveDown) elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0): #self["list"].instance.moveSelection(self["list"].instance.moveDown) @@ -356,7 +418,7 @@ class Wizard(Screen, HelpableScreen): self.resetCounter() if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None): - self["config"].instance.moveSelection(self["config"].instance.moveUp) + self["config"].instance.moveSelection(self["config"].instance.moveUp) elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0): if self.wizard[self.currStep].has_key("onselect"): self.selection = self["list"].current[-1] @@ -370,9 +432,14 @@ class Wizard(Screen, HelpableScreen): if code != "": print "code", code exec(code) + return True + return False + + def getTranslation(self, text): + return _(text) def updateText(self, firstset = False): - text = _(self.wizard[self.currStep]["text"]) + text = self.getTranslation(self.wizard[self.currStep]["text"]) if text.find("[timeout]") != -1: text = text.replace("[timeout]", str(self.timeoutCounter)) self["text"].setText(text) @@ -392,19 +459,24 @@ class Wizard(Screen, HelpableScreen): self.timeoutTimer.stop() if self.configInstance is not None: + # remove callbacks + self.configInstance["config"].onSelectionChanged = [] del self.configInstance["config"] self.configInstance.doClose() self.configInstance = None - + self.condition = True exec (self.wizard[self.currStep]["condition"]) - if self.condition: + if not self.condition: + self.currStep += 1 + self.updateValues() + else: if len(self.stepHistory) == 0 or self.stepHistory[-1] != self.currStep: self.stepHistory.append(self.currStep) print "wizard step:", self.wizard[self.currStep] if self.showSteps: - self["step"].setText(_("Step ") + str(self.currStep) + "/" + str(self.numSteps)) + self["step"].setText(self.getTranslation("Step ") + str(self.currStep) + "/" + str(self.numSteps)) if self.showStepSlider: self["stepslider"].setValue(self.currStep) @@ -412,7 +484,7 @@ class Wizard(Screen, HelpableScreen): self.resetCounter() self.timeoutTimer.start(1000) - print "wizard text", _(self.wizard[self.currStep]["text"]) + print "wizard text", self.getTranslation(self.wizard[self.currStep]["text"]) self.updateText(firstset = True) if self.wizard[self.currStep].has_key("displaytext"): displaytext = self.wizard[self.currStep]["displaytext"] @@ -420,8 +492,27 @@ class Wizard(Screen, HelpableScreen): for x in self.lcdCallbacks: x(displaytext) + self.codeafter=False self.runCode(self.wizard[self.currStep]["code"]) - + if self.runCode(self.wizard[self.currStep]["code_async"]): + if self.updateValues in self.onShown: + self.onShown.remove(self.updateValues) + else: + self.afterAsyncCode() + + def afterAsyncCode(self): + if not self.updateValues in self.onShown: + self.onShown.append(self.updateValues) + + if self.codeafter: + if self.wizard[self.prevStep]["nextstep"] is not None: + self.currStep = self.getStepWithID(self.wizard[self.prevStep]["nextstep"]) + if self.gotoStep is not None: + self.currStep = self.getStepWithID(self.gotoStep) + self.currStep += 1 + self.updateValues() + print "Now: " + str(self.currStep) + else: if self.showList: print "showing list,", self.currStep for renderer in self.renderer: @@ -432,7 +523,7 @@ class Wizard(Screen, HelpableScreen): print "setZPosition" rootrenderer.instance.setZPosition(1) renderer = renderer.source - + #self["list"].instance.setZPosition(1) self.list = [] if (self.wizard[self.currStep].has_key("dynamiclist")): @@ -446,7 +537,7 @@ class Wizard(Screen, HelpableScreen): if (len(self.wizard[self.currStep]["list"]) > 0): #self["list"].instance.setZPosition(2) for x in self.wizard[self.currStep]["list"]: - self.list.append((_(x[0]), x[1])) + self.list.append((self.getTranslation(x[0]), x[1])) self.wizard[self.currStep]["evaluatedlist"] = self.list self["list"].list = self.list self["list"].index = 0 @@ -454,8 +545,13 @@ class Wizard(Screen, HelpableScreen): self["list"].hide() if self.showConfig: + print "showing config" self["config"].instance.setZPosition(1) - if (self.wizard[self.currStep]["config"]["screen"] != None): + if self.wizard[self.currStep]["config"]["type"] == "dynamic": + print "config type is dynamic" + self["config"].instance.setZPosition(2) + self["config"].l.setList(eval("self." + self.wizard[self.currStep]["config"]["source"])()) + elif (self.wizard[self.currStep]["config"]["screen"] != None): if self.wizard[self.currStep]["config"]["type"] == "standalone": print "Type is standalone" self.session.openWithCallback(self.ok, self.wizard[self.currStep]["config"]["screen"]) @@ -467,17 +563,18 @@ class Wizard(Screen, HelpableScreen): else: self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]["screen"], eval(self.wizard[self.currStep]["config"]["args"])) self["config"].l.setList(self.configInstance["config"].list) + callbacks = self.configInstance["config"].onSelectionChanged self.configInstance["config"].destroy() + print "clearConfigList", self.configInstance["config"], self["config"] self.configInstance["config"] = self["config"] + self.configInstance["config"].onSelectionChanged = callbacks + print "clearConfigList", self.configInstance["config"], self["config"] else: self["config"].l.setList([]) else: if self.has_key("config"): self["config"].hide() - else: # condition false - self.currStep += 1 - self.updateValues() - + def timeoutCounterFired(self): self.timeoutCounter -= 1 print "timeoutCounter:", self.timeoutCounter