- add selectNext/selectPrevious to sources.List

- fix wizard up/down for configList

diff --git a/lib/python/Components/Sources/List.py b/lib/python/Components/Sources/List.py
index 71be0807f9ae0c0dfe3afb576c65a1b471d1cbb6..0480dd65a2ac030157db403f6d5aa8ef2748ecf2 100644 (file)
--- a/lib/python/Components/Sources/List.py
+++ b/lib/python/Components/Sources/List.py
@@ -16,6 +16,7 @@ to generate HTML."""
                self.item_height = item_height
                self.fonts = fonts
                self.disable_callbacks = False
+               self.enableWrapAround = enableWrapAround
 
        def setList(self, list):
                self.__list = list
@@ -57,6 +58,20 @@ to generate HTML."""
        setCurrentIndex = setIndex
 
        index = property(getIndex, setIndex)
+       
+       def selectNext(self):
+               if self.getIndex() + 1 >= self.count():
+                       if self.enableWrapAround:
+                               self.index = 0
+               else:
+                       self.index += 1
+
+       def selectPrevious(self):
+               if self.getIndex() - 1 < 0:
+                       if self.enableWrapAround:
+                               self.index = self.count() - 1
+               else:
+                       self.index -= 1
 
        def updateList(self, list):
                """Changes the list without changing the selection or emitting changed Events"""

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 8b90e4c74c16822d9bf2c772451ea9496d3022d2..2f76e3b10d016353d82eee7f371e375ec991a396 100644 (file)
--- 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()