X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/22091210a13049f7a5a0da83cc6213c371bc287c..efc5aca651306518e6f21a6bd7cbfa1928821b60:/lib/python/Screens/Wizard.py diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index 4fa0b303..206a87ce 100644 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -19,7 +19,7 @@ from xml.sax.handler import ContentHandler class WizardSummary(Screen): skin = """ - + @@ -46,6 +46,9 @@ class WizardSummary(Screen): self["text"].setText(text) class Wizard(Screen, HelpableScreen): + def createSummary(self): + print "WizardCreateSummary" + return WizardSummary class parseWizard(ContentHandler): def __init__(self, wizard): @@ -54,9 +57,7 @@ class Wizard(Screen, HelpableScreen): self.currContent = "" self.lastStep = 0 - def createSummary(self): - print "WizardCreateSummary" - return WizardSummary + def startElement(self, name, attrs): print "startElement", name @@ -67,6 +68,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 +81,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 +126,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": @@ -152,7 +163,7 @@ class Wizard(Screen, HelpableScreen): self.currStep = 1 self.timeoutTimer = eTimer() - self.timeoutTimer.timeout.get().append(self.timeoutCounterFired) + self.timeoutTimer.callback.append(self.timeoutCounterFired) self["text"] = Label() @@ -177,7 +188,7 @@ class Wizard(Screen, HelpableScreen): self.lcdCallbacks = [] - self["actions"] = NumberActionMap(["WizardActions", "NumberActions"], + self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions"], { "ok": self.ok, "back": self.back, @@ -185,6 +196,10 @@ class Wizard(Screen, HelpableScreen): "right": self.right, "up": self.up, "down": self.down, + "red": self.red, + "green": self.green, + "yellow": self.yellow, + "blue":self.blue, "1": self.keyNumberGlobal, "2": self.keyNumberGlobal, "3": self.keyNumberGlobal, @@ -196,30 +211,54 @@ class Wizard(Screen, HelpableScreen): "9": self.keyNumberGlobal, "0": self.keyNumberGlobal }, -1) + + def red(self): + print "red" + pass + def green(self): + print "green" + pass + + def yellow(self): + print "yellow" + pass + + def blue(self): + print "blue" + pass + def setLCDTextCallback(self, callback): self.lcdCallbacks.append(callback) def back(self): + print "getting back..." + print "stepHistory:", self.stepHistory if len(self.stepHistory) > 1: self.currStep = self.stepHistory[-2] self.stepHistory = self.stepHistory[:-2] if self.currStep < 1: self.currStep = 1 + print "currStep:", self.currStep + print "new stepHistory:", self.stepHistory self.updateValues() + print "after updateValues stepHistory:", self.stepHistory def markDone(self): 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 +281,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() @@ -289,7 +330,9 @@ class Wizard(Screen, HelpableScreen): elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0): self["list"].selectPrevious() if self.wizard[self.currStep].has_key("onselect"): - self.selection = self["list"].current[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" @@ -304,6 +347,9 @@ class Wizard(Screen, HelpableScreen): 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): @@ -313,7 +359,7 @@ class Wizard(Screen, HelpableScreen): 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] + self.selection = self["list"].current[-1] print "self.selection:", self.selection exec("self." + self.wizard[self.currStep]["onselect"] + "()") @@ -338,8 +384,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() @@ -348,6 +392,8 @@ class Wizard(Screen, HelpableScreen): self.condition = True exec (self.wizard[self.currStep]["condition"]) if self.condition: + 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: @@ -419,7 +465,8 @@ class Wizard(Screen, HelpableScreen): else: self["config"].l.setList([]) else: - self["config"].hide() + if self.has_key("config"): + self["config"].hide() else: # condition false self.currStep += 1 self.updateValues() @@ -431,20 +478,23 @@ 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: def __init__(self): self.wizards = [] - def registerWizard(self, wizard, precondition): - self.wizards.append((wizard, precondition)) + def registerWizard(self, wizard, precondition, priority = 0): + self.wizards.append((wizard, precondition, priority)) def getWizards(self): list = [] for x in self.wizards: if x[1] == 1: # precondition - list.append(x[0]) + list.append((x[2], x[0])) return list wizardManager = WizardManager()