X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1036de712ab59acf11d5012d182cea8734b8412b..0bbd93ba1e8f12d5cf1756e6a80e7513af51fe79:/lib/python/Screens/Wizard.py diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index 8922380d..7687f44d 100644 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -3,12 +3,11 @@ from Screen import Screen from Screens.HelpMenu import HelpableScreen from Components.Label import Label from Components.Slider import Slider -from Components.ActionMap import HelpableActionMap +from Components.ActionMap import HelpableActionMap, NumberActionMap from Components.config import config, configElementBoolean from Components.Pixmap import * from Components.MenuList import MenuList from Components.ConfigList import ConfigList -from Screens.ScanSetup import ScanSimple from xml.sax import make_parser from xml.sax.handler import ContentHandler @@ -20,13 +19,13 @@ class WelcomeWizard(Screen, HelpableScreen): skin = """ - - + + - - - + + + """ class parseWizard(ContentHandler): @@ -36,18 +35,21 @@ class WelcomeWizard(Screen, HelpableScreen): self.currContent = "" def startElement(self, name, attrs): + print name self.currContent = name if (name == "step"): self.lastStep = int(attrs.get('number')) - self.wizard[self.lastStep] = {"text": "", "list": [], "config": None, "code": ""} + self.wizard[self.lastStep] = {"text": "", "list": [], "config": {"screen": None, "args": None }, "code": ""} elif (name == "text"): self.wizard[self.lastStep]["text"] = str(attrs.get('value')) elif (name == "listentry"): - self.wizard[self.lastStep]["list"].append(str(attrs.get('caption'))) + 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"] = eval(str(attrs.get('screen'))) - + 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')) def endElement(self, name): self.currContent = "" if name == 'code': @@ -64,77 +66,135 @@ class WelcomeWizard(Screen, HelpableScreen): HelpableScreen.__init__(self) self.wizard = {} - print self.wizard parser = make_parser() print "Reading startwizard.xml" wizardHandler = self.parseWizard(self.wizard) parser.setContentHandler(wizardHandler) parser.parse('/usr/share/enigma2/startwizard.xml') - print self.wizard - - self.numSteps = 4 + self.numSteps = len(self.wizard) self.currStep = 1 self["text"] = Label() self["rc"] = MovingPixmap() self["arrowdown"] = MovingPixmap() - self["arrowdown"].moveTo(557, 232, 10) self["arrowup"] = MovingPixmap() - self["rc"].moveTo(500, 50, 10) + self["config"] = ConfigList([]) - - self.onShown.append(self["arrowdown"].startMoving) - self.onShown.append(self["rc"].startMoving) self["step"] = Label() self["stepslider"] = Slider(1, self.numSteps) - #self.scanSetupDialog = self.session.instantiateDialog(ScanSimple) - self.list = [] - #list.append(("Use wizard to set up basic features", None)) - #list.append(("Exit wizard", None)) self["list"] = MenuList(self.list) - self.updateValues() + self.onShown.append(self.updateValues) + + self["actions"] = NumberActionMap(["WizardActions", "NumberActions"], + { + "ok": self.ok, + #"cancel": self.keyCancel, + "left": self.left, + "right": self.right, + "up": self.up, + "down": self.down, + "1": self.keyNumberGlobal, + "2": self.keyNumberGlobal, + "3": self.keyNumberGlobal, + "4": self.keyNumberGlobal, + "5": self.keyNumberGlobal, + "6": self.keyNumberGlobal, + "7": self.keyNumberGlobal, + "8": self.keyNumberGlobal, + "9": self.keyNumberGlobal, + "0": self.keyNumberGlobal + }, -1) + + #self["actions"] = HelpableActionMap(self, "OkCancelActions", + #{ + #"ok": (self.ok, _("Close this Screen...")), + #}) + + def ok(self): + if (self.wizard[self.currStep]["config"]["screen"] != None): + self.configInstance.run() - self["actions"] = HelpableActionMap(self, "OkCancelActions", - { - "ok": (self.ok, _("Close this Screen...")), - }) + if (len(self.wizard[self.currStep]["list"]) > 0): + nextStep = self.wizard[self.currStep]["list"][self["list"].l.getCurrentSelectionIndex()][1] + if nextStep == "end": + self.currStep = self.numSteps + elif nextStep == "next": + pass + else: + self.currStep = int(nextStep) - 1 + + if (self.currStep == self.numSteps): # wizard finished + config.misc.firstrun.value = 0; + config.misc.firstrun.save() + self.session.close() + else: + self.currStep += 1 + self.updateValues() + def keyNumberGlobal(self, number): + if (self.wizard[self.currStep]["config"]["screen"] != None): + self.configInstance.keyNumberGlobal(number) + + def left(self): + if (self.wizard[self.currStep]["config"]["screen"] != None): + self.configInstance.keyLeft() + print "left" + + def right(self): + if (self.wizard[self.currStep]["config"]["screen"] != None): + self.configInstance.keyRight() + print "right" + + def up(self): + if (self.wizard[self.currStep]["config"]["screen"] != None): + self["config"].instance.moveSelection(self["config"].instance.moveUp) + elif (len(self.wizard[self.currStep]["list"]) > 0): + self["list"].instance.moveSelection(self["config"].instance.moveUp) + print "up" + + def down(self): + if (self.wizard[self.currStep]["config"]["screen"] != None): + self["config"].instance.moveSelection(self["config"].instance.moveDown) + elif (len(self.wizard[self.currStep]["list"]) > 0): + self["list"].instance.moveSelection(self["config"].instance.moveDown) + print "down" + def updateValues(self): self["step"].setText(_("Step ") + str(self.currStep) + "/" + str(self.numSteps)) self["stepslider"].setValue(self.currStep) self["text"].setText(self.wizard[self.currStep]["text"]) + self["list"].instance.setZPosition(1) self.list = [] 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, None)) + self.list.append((x[0], None)) self["list"].l.setList(self.list) - - if (self.wizard[self.currStep]["config"] != None): - self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]) + + self["config"].instance.setZPosition(1) + if (self.wizard[self.currStep]["config"]["screen"] != None): + self["config"].instance.setZPosition(2) + print self.wizard[self.currStep]["config"]["screen"] + if self.wizard[self.currStep]["config"]["args"] == None: + self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]["screen"]) + 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) + self.configInstance["config"] = self["config"] else: self["config"].l.setList([]) if self.wizard[self.currStep]["code"] != "": print self.wizard[self.currStep]["code"] exec(self.wizard[self.currStep]["code"]) - - def ok(self): - if (self.currStep == self.numSteps): # wizard finished - config.misc.firstrun.value = 0; - config.misc.firstrun.save() - self.session.close() - else: - self.currStep += 1 - self.updateValues() def listActiveWizards(): wizards = [ ]