dont re-ask parental pin on change subservices

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

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 14faba244cbc557a0ce1edaa32eff099fd5fc782..c4fcb10a4156669d47a1f8a2df7bb1991e1371f2 100644 (file)
--- 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 = """
        <screen position="0,0" size="132,64">
-               <widget name="text" position="6,4" size="120,42" font="Regular;14" />
+               <widget name="text" position="6,4" size="120,42" font="Regular;14" transparent="1" />
                <widget source="parent.list" render="Label" position="6,25" size="120,21" font="Regular;16">
                        <convert type="StringListSelection" />
                </widget>
@@ -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
@@ -162,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()
 
@@ -187,7 +188,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 +198,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 +213,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
@@ -265,6 +295,8 @@ class Wizard(Screen, HelpableScreen):
 
        def ok(self):
                print "OK"
+               if self.disableKeys:
+                       return
                currStep = self.currStep
                
                if self.showConfig:
@@ -305,7 +337,7 @@ class Wizard(Screen, HelpableScreen):
                        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"
@@ -321,7 +353,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 +365,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 +388,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 +405,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:
@@ -438,7 +478,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()
@@ -459,14 +500,14 @@ 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()