diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2008-01-25 01:52:12 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2008-01-25 01:52:12 +0000 |
| commit | cc530513af228bdb48473a62f91315a43bb9de76 (patch) | |
| tree | ea0c75204ee80cf76ecdd21bd2120269fd17c558 /lib/python | |
| parent | b9168c16363e8c6da6ce43988e08448031b5c60a (diff) | |
| download | enigma2-cc530513af228bdb48473a62f91315a43bb9de76.tar.gz enigma2-cc530513af228bdb48473a62f91315a43bb9de76.zip | |
fix wizard step history (exit key should work now as expected)
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Screens/Wizard.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index 8c49a89c..8782a664 100644 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -212,11 +212,14 @@ class Wizard(Screen, HelpableScreen): pass def getStepWithID(self, id): + print "getStepWithID:", id count = 0 for x in self.wizard: if self.wizard[x]["id"] == id: + print "result:", count return count count += 1 + print "result: nothing" return 0 def finished(self, *args, **kwargs): @@ -343,8 +346,6 @@ class Wizard(Screen, HelpableScreen): print "Updating values in step " + str(self.currStep) self.timeoutTimer.stop() - self.stepHistory.append(self.currStep) - if self.configInstance is not None: del self.configInstance["config"] self.configInstance.doClose() @@ -353,6 +354,7 @@ class Wizard(Screen, HelpableScreen): self.condition = True exec (self.wizard[self.currStep]["condition"]) if self.condition: + self.stepHistory.append(self.currStep) print "wizard step:", self.wizard[self.currStep] if self.showSteps: @@ -436,6 +438,9 @@ class Wizard(Screen, HelpableScreen): if self.wizard[self.currStep]["timeoutaction"] == "selectnext": print "selection next item" self.down() + else: + if self.wizard[self.currStep]["timeoutaction"] == "nextstep": + self.finished() self.updateText() class WizardManager: |