going back in the wizard should work better now

[enigma2.git] / lib / python / Screens / Wizard.py

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index e894278dbac4209368a732d07d47fafe116a9868..ca5181921494af5afb46a9aa0c3e4a25d49cc422 100644 (file)
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -20,13 +20,22 @@ class Wizard(Screen, HelpableScreen):
                        self.isPointsElement, self.isReboundsElement = 0, 0
                        self.wizard = wizard
                        self.currContent = ""
+                       self.lastStep = 0
                
                def startElement(self, name, attrs):
-                       print name
+                       print "startElement", name
                        self.currContent = name
                        if (name == "step"):
-                               self.lastStep = int(attrs.get('number'))
-                               self.wizard[self.lastStep] = {"condition": "", "text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": ""}
+                               self.lastStep += 1
+                               if attrs.has_key('id'):
+                                       id = str(attrs.get('id'))
+                               else:
+                                       id = ""
+                               if attrs.has_key('nextstep'):
+                                       nextstep = str(attrs.get('nextstep'))
+                               else:
+                                       nextstep = None
+                               self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "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 == "listentry"):
@@ -67,6 +76,8 @@ class Wizard(Screen, HelpableScreen):
                Screen.__init__(self, session)
                HelpableScreen.__init__(self)
 
+               self.stepHistory = []
+
                self.wizard = {}
                parser = make_parser()
                print "Reading " + self.xmlfile
@@ -120,38 +131,46 @@ class Wizard(Screen, HelpableScreen):
                }, -1)
 
        def back(self):
-               self.currStep -= 1
+               if len(self.stepHistory) > 1:
+                       self.currStep = self.stepHistory[-2]
+                       self.stepHistory = self.stepHistory[:-2]
                if self.currStep < 1:
                        self.currStep = 1
                self.updateValues()
                
        def markDone(self):
                pass
+       
+       def getStepWithID(self, id):
+               count = 0
+               for x in self.wizard:
+                       if self.wizard[x]["id"] == id:
+                               return count
+                       count += 1
+               return 0
                
        def ok(self):
                print "OK"
+               currStep = self.currStep
                if self.showConfig:
-                       if (self.wizard[self.currStep]["config"]["screen"] != None):
+                       if (self.wizard[currStep]["config"]["screen"] != None):
                                try: # don't die, if no run() is available
                                        self.configInstance.run()
                                except:
                                        print "Failed to run configInstance"
                
                if self.showList:
-                       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 (len(self.wizard[currStep]["list"]) > 0):
+                               nextStep = self.wizard[currStep]["list"][self["list"].l.getCurrentSelectionIndex()][1]
+                               self.currStep = self.getStepWithID(nextStep)
 
-               if (self.currStep == self.numSteps): # wizard finished
+               if (currStep == self.numSteps): # wizard finished
                        self.markDone()
                        self.session.close()
                else:
-                       self.runCode(self.wizard[self.currStep]["codeafter"])
+                       self.runCode(self.wizard[currStep]["codeafter"])
+                       if self.wizard[currStep]["nextstep"] is not None:
+                               self.currStep = self.getStepWithID(self.wizard[currStep]["nextstep"])
                        self.currStep += 1
                        self.updateValues()
                        
@@ -187,12 +206,14 @@ class Wizard(Screen, HelpableScreen):
                
        def runCode(self, code):
                if code != "":
-                       print code
+                       print "code", code
                        exec(code)
                
        def updateValues(self):
                print "Updating values in step " + str(self.currStep)
                
+               self.stepHistory.append(self.currStep)
+               
                self.condition = True
                exec (self.wizard[self.currStep]["condition"])
                if self.condition:
@@ -201,7 +222,7 @@ class Wizard(Screen, HelpableScreen):
                        if self.showStepSlider:
                                self["stepslider"].setValue(self.currStep)
                
-                       print _(self.wizard[self.currStep]["text"])
+                       print "wizard text", _(self.wizard[self.currStep]["text"])
                        self["text"].setText(_(self.wizard[self.currStep]["text"]))
        
                        self.runCode(self.wizard[self.currStep]["code"])
@@ -223,7 +244,7 @@ class Wizard(Screen, HelpableScreen):
                                                self.session.openWithCallback(self.ok, self.wizard[self.currStep]["config"]["screen"])
                                        else:
                                                self["config"].instance.setZPosition(2)
-                                               print self.wizard[self.currStep]["config"]["screen"]
+                                               print "wizard screen", 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: