small fix

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

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 43931576dcee0e331afc3cd30c5b7a01ad223854..bd458273439af6c868c01823ae12d456fe7ae7ba 100644 (file)
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -3,6 +3,7 @@ from Screen import Screen
 import string
 
 from Screens.HelpMenu import HelpableScreen
+from Components.config import config
 from Components.Label import Label
 from Components.Slider import Slider
 from Components.ActionMap import HelpableActionMap, NumberActionMap
@@ -31,7 +32,11 @@ class Wizard(Screen, HelpableScreen):
                                        id = str(attrs.get('id'))
                                else:
                                        id = ""
-                               self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": ""}
+                               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"):
@@ -68,10 +73,13 @@ class Wizard(Screen, HelpableScreen):
                                        self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"] + ch
                        elif self.currContent == "condition":
                                 self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"] + ch
+
        def __init__(self, session, showSteps = True, showStepSlider = True, showList = True, showConfig = True):
                Screen.__init__(self, session)
                HelpableScreen.__init__(self)
 
+               self.stepHistory = []
+
                self.wizard = {}
                parser = make_parser()
                print "Reading " + self.xmlfile
@@ -103,6 +111,8 @@ class Wizard(Screen, HelpableScreen):
                        self["list"] = MenuList(self.list)
 
                self.onShown.append(self.updateValues)
+
+               self.configInstance = None
                
                self["actions"] = NumberActionMap(["WizardActions", "NumberActions"],
                {
@@ -125,7 +135,9 @@ 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()
@@ -140,31 +152,50 @@ class Wizard(Screen, HelpableScreen):
                                return count
                        count += 1
                return 0
-               
-       def ok(self):
-               print "OK"
-               if self.showConfig:
-                       if (self.wizard[self.currStep]["config"]["screen"] != None):
-                               try: # don't die, if no run() is available
-                                       self.configInstance.run()
-                               except:
-                                       print "Failed to run configInstance"
-               
+
+       def finished(self, *args, **kwargs):
+               print "finished"
+               currStep = self.currStep
+
+               if self.updateValues not in self.onShown:
+                       self.onShown.append(self.updateValues)
+
                if self.showList:
-                       if (len(self.wizard[self.currStep]["list"]) > 0):
-                               nextStep = self.wizard[self.currStep]["list"][self["list"].l.getCurrentSelectionIndex()][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()
+                       self.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()
-                       
+
                print "Now: " + str(self.currStep)
 
+
+       def ok(self):
+               print "OK"
+               currStep = self.currStep
+               
+               if self.showConfig:
+                       if (self.wizard[currStep]["config"]["screen"] != None):
+                               # TODO: don't die, if no run() is available
+                               # there was a try/except here, but i can't see a reason
+                               # for this. If there is one, please do a more specific check
+                               # and/or a comment in which situation there is no run()
+                               if callable(getattr(self.configInstance, "runAsync", None)):
+                                       self.onShown.remove(self.updateValues)
+                                       self.configInstance.runAsync(self.finished)
+                                       return
+                               else:
+                                       self.configInstance.run()
+               self.finished()
+
        def keyNumberGlobal(self, number):
                if (self.wizard[self.currStep]["config"]["screen"] != None):
                        self.configInstance.keyNumberGlobal(number)
@@ -201,6 +232,13 @@ class Wizard(Screen, HelpableScreen):
        def updateValues(self):
                print "Updating values in step " + str(self.currStep)
                
+               self.stepHistory.append(self.currStep)
+               
+               if self.configInstance is not None:
+                       del self.configInstance["config"]
+                       self.configInstance.doClose()
+                       self.configInstance = None
+               
                self.condition = True
                exec (self.wizard[self.currStep]["condition"])
                if self.condition:
@@ -222,6 +260,7 @@ class Wizard(Screen, HelpableScreen):
                                        for x in self.wizard[self.currStep]["list"]:
                                                self.list.append((_(x[0]), None))
                                self["list"].l.setList(self.list)
+                               self["list"].moveToIndex(0)
        
                        if self.showConfig:
                                self["config"].instance.setZPosition(1)
@@ -237,6 +276,7 @@ class Wizard(Screen, HelpableScreen):
                                                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"].destroy()
                                                self.configInstance["config"] = self["config"]
                                else:
                                        self["config"].l.setList([])