speedup show satellite-/ providerlist

[vuplus_dvbapp] / lib / python / Screens / ChoiceBox.py

diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py
index 522ee3c..d1bac9f 100644 (file)
--- a/lib/python/Screens/ChoiceBox.py
+++ b/lib/python/Screens/ChoiceBox.py
@@ -16,17 +16,17 @@ class ChoiceBox(Screen):
                self["text"] = Label(title)
                self.list = []
                if keys is None:
-                       self.keys = [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "red", "green", "yellow", "blue" ] + (len(list) - 10) * [""]
+                       self.__keys = [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "red", "green", "yellow", "blue" ] + (len(list) - 10) * [""]
                else:
-                       self.keys = keys
+                       self.__keys = keys + (len(list) - len(keys)) * [""]
                        
                self.keymap = {}
                pos = 0
                for x in list:
-                       strpos = str(self.keys[pos])
+                       strpos = str(self.__keys[pos])
                        self.list.append(ChoiceEntryComponent(key = strpos, text = x))
-                       if self.keys[pos] != "":
-                               self.keymap[self.keys[pos]] = list[pos]
+                       if self.__keys[pos] != "":
+                               self.keymap[self.__keys[pos]] = list[pos]
                        pos += 1
                self["list"] = ChoiceList(list = self.list, selection = selection)
                                
@@ -59,24 +59,30 @@ class ChoiceBox(Screen):
                pass
        
        def up(self):
-               while 1:
-                       self["list"].instance.moveSelection(self["list"].instance.moveUp)
-                       if self["list"].l.getCurrentSelection()[0][0] != "--":
-                               break
+               if len(self["list"].list) > 0:
+                       while 1:
+                               self["list"].instance.moveSelection(self["list"].instance.moveUp)
+                               if self["list"].l.getCurrentSelection()[0][0] != "--" or self["list"].l.getCurrentSelectionIndex() == 0:
+                                       break
                
        def down(self):
-               while 1:
-                       self["list"].instance.moveSelection(self["list"].instance.moveDown)
-                       if self["list"].l.getCurrentSelection()[0][0] != "--":
-                               break   
+               if len(self["list"].list) > 0:
+                       while 1:
+                               self["list"].instance.moveSelection(self["list"].instance.moveDown)
+                               if self["list"].l.getCurrentSelection()[0][0] != "--" or self["list"].l.getCurrentSelectionIndex() == len(self["list"].list) - 1:
+                                       break
+
+
        def keyNumberGlobal(self, number):
                print "pressed", number
                if self.keymap.has_key(str(number)):
                        self.close(self.keymap[str(number)])
                
        def go(self):
-               self.close(self["list"].l.getCurrentSelection()[0])
-               #self.close(self["input"].getText())
+               if len(self["list"].list) > 0:
+                       self.close(self["list"].l.getCurrentSelection()[0])
+               else:
+                       self.close(None)
 
        def keyRed(self):
                if self.keymap.has_key("red"):
@@ -95,4 +101,4 @@ class ChoiceBox(Screen):
                        self.close(self.keymap["blue"])
                        
        def cancel(self):
-               self.close(None)
\ No newline at end of file
+               self.close(None)