X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5bc8209d19e1d41f289cfe198e4e3a839adf894b..b98a20dfd20ccd6c84526aa6716b3af730af7b6f:/lib/python/Screens/Wizard.py diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index 1b133152..a399c96a 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 from Components.Label import Label from Components.Slider import Slider from Components.ActionMap import NumberActionMap @@ -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 @@ -103,12 +104,19 @@ class Wizard(Screen, HelpableScreen): 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": + 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')) + 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"): if attrs.has_key('pos') and str(attrs.get('pos')) == "after": self.codeafter = True @@ -162,7 +170,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() @@ -187,7 +195,9 @@ class Wizard(Screen, HelpableScreen): self.lcdCallbacks = [] - self["actions"] = NumberActionMap(["WizardActions", "NumberActions"], + self.disableKeys = False + + self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions"], { "ok": self.ok, "back": self.back, @@ -195,6 +205,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, @@ -206,17 +220,40 @@ 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): + if self.disableKeys: + return + 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 @@ -238,7 +275,11 @@ 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): print "current:", self["list"].current @@ -265,6 +306,8 @@ class Wizard(Screen, HelpableScreen): def ok(self): print "OK" + if self.disableKeys: + return currStep = self.currStep if self.showConfig: @@ -289,30 +332,34 @@ 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): + 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"): print "current:", self["list"].current - self.selection = self["list"].current[1] + 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" 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) @@ -321,7 +368,7 @@ 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["list"].current[-1] #self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1] exec("self." + self.wizard[self.currStep]["onselect"] + "()") print "down" @@ -333,7 +380,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"] + "()") @@ -356,6 +403,13 @@ class Wizard(Screen, HelpableScreen): def updateValues(self): print "Updating values in step " + str(self.currStep) + # calling a step which doesn't exist can only happen if the condition in the last step is not fulfilled + # if a non-existing step is called, end the wizard + if self.currStep > len(self.wizard): + self.markDone() + self.close() + return + self.timeoutTimer.stop() if self.configInstance is not None: @@ -366,7 +420,8 @@ class Wizard(Screen, HelpableScreen): self.condition = True exec (self.wizard[self.currStep]["condition"]) if self.condition: - self.stepHistory.append(self.currStep) + 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: @@ -420,8 +475,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"]) @@ -438,7 +498,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()