diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2008-01-24 21:47:38 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2008-01-24 21:47:38 +0000 |
| commit | d3f23bc82dcf800c265938a6bc7d07f5c61e924a (patch) | |
| tree | 8997725a46fe157100289b5f9cea5b0de2358c80 /lib/python/Screens/Wizard.py | |
| parent | dcc4a84bbe28965292b92a0242d9c68e6e0dbba8 (diff) | |
| download | enigma2-d3f23bc82dcf800c265938a6bc7d07f5c61e924a.tar.gz enigma2-d3f23bc82dcf800c265938a6bc7d07f5c61e924a.zip | |
- add selectNext/selectPrevious to sources.List
- fix wizard up/down for configList
Diffstat (limited to 'lib/python/Screens/Wizard.py')
| -rw-r--r-- | lib/python/Screens/Wizard.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index 8b90e4c7..2f76e3b1 100644 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -183,8 +183,8 @@ class Wizard(Screen, HelpableScreen): "back": self.back, "left": self.left, "right": self.right, - #"up": self.up, - #"down": self.down, + "up": self.up, + "down": self.down, "1": self.keyNumberGlobal, "2": self.keyNumberGlobal, "3": self.keyNumberGlobal, @@ -287,7 +287,7 @@ class Wizard(Screen, HelpableScreen): if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None): self["config"].instance.moveSelection(self["config"].instance.moveUp) elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0): - self["list"].instance.moveSelection(self["list"].instance.moveUp) + self["list"].selectPrevious() if self.wizard[self.currStep].has_key("onselect"): self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1] exec("self." + self.wizard[self.currStep]["onselect"] + "()") @@ -299,10 +299,7 @@ class Wizard(Screen, HelpableScreen): self["config"].instance.moveSelection(self["config"].instance.moveDown) elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0): #self["list"].instance.moveSelection(self["list"].instance.moveDown) - if self["list"].index + 1 >= self["list"].count(): - self["list"].index = 0 - else: - self["list"].index += 1 + self["list"].selectNext() if self.wizard[self.currStep].has_key("onselect"): print "current:", self["list"].current #self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1] @@ -400,6 +397,8 @@ class Wizard(Screen, HelpableScreen): self.wizard[self.currStep]["evaluatedlist"] = self.list self["list"].list = self.list self["list"].index = 0 + else: + self["list"].hide() if self.showConfig: self["config"].instance.setZPosition(1) @@ -419,6 +418,8 @@ class Wizard(Screen, HelpableScreen): self.configInstance["config"] = self["config"] else: self["config"].l.setList([]) + else: + self["config"].hide() else: # condition false self.currStep += 1 self.updateValues() |