X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2eb13f628b3d0780556b5898d8dbee838baf5e31..2a148e8428ff9c4029e8eb0a5adea5477e9ad3e6:/lib/python/Screens/Wizard.py diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index 8b90e4c7..14faba24 100644 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -67,6 +67,7 @@ class Wizard(Screen, HelpableScreen): id = str(attrs.get('id')) else: id = "" + print "id:", id if attrs.has_key('nextstep'): nextstep = str(attrs.get('nextstep')) else: @@ -79,16 +80,23 @@ class Wizard(Screen, HelpableScreen): timeoutaction = str(attrs.get('timeoutaction')) else: timeoutaction = 'nextpage' - self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "timeout": timeout, "timeoutaction": timeoutaction, "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": "", "nextstep": nextstep} + + if attrs.has_key('timeoutstep'): + 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} elif (name == "text"): self.wizard[self.lastStep]["text"] = string.replace(str(attrs.get('value')), "\\n", "\n") elif (name == "displaytext"): self.wizard[self.lastStep]["displaytext"] = string.replace(str(attrs.get('value')), "\\n", "\n") elif (name == "list"): if (attrs.has_key('type')): - self.wizard[self.lastStep]["dynamiclist"] = attrs.get("source") + if attrs["type"] == "dynamic": + self.wizard[self.lastStep]["dynamiclist"] = attrs.get("source") #self.wizard[self.lastStep]["list"].append(("Hallo", "test")) if (attrs.has_key("evaluation")): + print "evaluation" self.wizard[self.lastStep]["listevaluation"] = attrs.get("evaluation") if (attrs.has_key("onselect")): self.wizard[self.lastStep]["onselect"] = attrs.get("onselect") @@ -117,6 +125,8 @@ class Wizard(Screen, HelpableScreen): 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] def characters(self, ch): if self.currContent == "code": @@ -183,8 +193,8 @@ class Wizard(Screen, HelpableScreen): "back": self.back, "left": self.left, "right": self.right, - #"up": self.up, - #"down": self.down, + "up": self.up, + "down": self.down, "1": self.keyNumberGlobal, "2": self.keyNumberGlobal, "3": self.keyNumberGlobal, @@ -212,14 +222,17 @@ class Wizard(Screen, HelpableScreen): pass def getStepWithID(self, id): + print "getStepWithID:", id count = 0 for x in self.wizard: if self.wizard[x]["id"] == id: + print "result:", count return count count += 1 + print "result: nothing" return 0 - def finished(self, *args, **kwargs): + def finished(self, gotoStep = None, *args, **kwargs): print "finished" currStep = self.currStep @@ -242,6 +255,8 @@ class Wizard(Screen, HelpableScreen): 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() @@ -287,9 +302,11 @@ class Wizard(Screen, HelpableScreen): if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None): self["config"].instance.moveSelection(self["config"].instance.moveUp) elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0): - self["list"].instance.moveSelection(self["list"].instance.moveUp) + self["list"].selectPrevious() if self.wizard[self.currStep].has_key("onselect"): - self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1] + print "current:", self["list"].current + self.selection = self["list"].current[1] + #self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1] exec("self." + self.wizard[self.currStep]["onselect"] + "()") print "up" @@ -299,14 +316,14 @@ class Wizard(Screen, HelpableScreen): 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) - if self["list"].index + 1 >= self["list"].count(): - self["list"].index = 0 - else: - self["list"].index += 1 + self["list"].selectNext() if self.wizard[self.currStep].has_key("onselect"): print "current:", self["list"].current #self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1] #exec("self." + self.wizard[self.currStep]["onselect"] + "()") + self.selection = self["list"].current[1] + #self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1] + exec("self." + self.wizard[self.currStep]["onselect"] + "()") print "down" def selChanged(self): @@ -341,8 +358,6 @@ class Wizard(Screen, HelpableScreen): print "Updating values in step " + str(self.currStep) self.timeoutTimer.stop() - self.stepHistory.append(self.currStep) - if self.configInstance is not None: del self.configInstance["config"] self.configInstance.doClose() @@ -351,6 +366,7 @@ class Wizard(Screen, HelpableScreen): self.condition = True exec (self.wizard[self.currStep]["condition"]) if self.condition: + self.stepHistory.append(self.currStep) print "wizard step:", self.wizard[self.currStep] if self.showSteps: @@ -400,6 +416,8 @@ class Wizard(Screen, HelpableScreen): self.wizard[self.currStep]["evaluatedlist"] = self.list self["list"].list = self.list self["list"].index = 0 + else: + self["list"].hide() if self.showConfig: self["config"].instance.setZPosition(1) @@ -419,6 +437,8 @@ class Wizard(Screen, HelpableScreen): self.configInstance["config"] = self["config"] else: self["config"].l.setList([]) + else: + self["config"].hide() else: # condition false self.currStep += 1 self.updateValues() @@ -430,6 +450,9 @@ class Wizard(Screen, HelpableScreen): if self.wizard[self.currStep]["timeoutaction"] == "selectnext": print "selection next item" self.down() + else: + if self.wizard[self.currStep]["timeoutaction"] == "changestep": + self.finished(gotoStep = self.wizard[self.currStep]["timeoutstep"]) self.updateText() class WizardManager: