prevent endless loop

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

diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py
index 0be9385e9268e93d4edb69539bd601ccbd0b86a5..9711da2dc5680670ed0a422ec923d00554b28f76 100644 (file)
--- a/lib/python/Screens/ChoiceBox.py
+++ b/lib/python/Screens/ChoiceBox.py
@@ -10,13 +10,13 @@ from Components.ChoiceList import ChoiceEntryComponent, ChoiceList
 import os
 
 class ChoiceBox(Screen):
-       def __init__(self, session, title = "", list = [], keys = None):
+       def __init__(self, session, title = "", list = [], keys = None, selection = 0):
                Screen.__init__(self, session)
 
                self["text"] = Label(title)
                self.list = []
                if keys is None:
-                       self.keys = [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" ] + (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
                        
@@ -24,13 +24,13 @@ class ChoiceBox(Screen):
                pos = 0
                for x in list:
                        strpos = str(self.keys[pos])
-                       self.list.append(ChoiceEntryComponent(strpos, x))
+                       self.list.append(ChoiceEntryComponent(key = strpos, text = x))
                        if self.keys[pos] != "":
                                self.keymap[self.keys[pos]] = list[pos]
                        pos += 1
-               self["list"] = ChoiceList(self.list)
+               self["list"] = ChoiceList(list = self.list, selection = selection)
                                
-               self["actions"] = NumberActionMap(["WizardActions", "InputActions"], 
+               self["actions"] = NumberActionMap(["WizardActions", "InputActions", "ColorActions", "DirectionActions"], 
                {
                        "ok": self.go,
                        "back": self.cancel,
@@ -43,7 +43,13 @@ class ChoiceBox(Screen):
                        "7": self.keyNumberGlobal,
                        "8": self.keyNumberGlobal,
                        "9": self.keyNumberGlobal,
-                       "0": self.keyNumberGlobal
+                       "0": self.keyNumberGlobal,
+                       "red": self.keyRed,
+                       "green": self.keyGreen,
+                       "yellow": self.keyYellow,
+                       "blue": self.keyBlue,
+                       "up": self.up,
+                       "down": self.down
                }, -1)
                
        def keyLeft(self):
@@ -52,6 +58,19 @@ class ChoiceBox(Screen):
        def keyRight(self):
                pass
        
+       def up(self):
+               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] != "--" 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)):
@@ -60,6 +79,22 @@ class ChoiceBox(Screen):
        def go(self):
                self.close(self["list"].l.getCurrentSelection()[0])
                #self.close(self["input"].getText())
-               
+
+       def keyRed(self):
+               if self.keymap.has_key("red"):
+                       self.close(self.keymap["red"])
+
+       def keyGreen(self):
+               if self.keymap.has_key("green"):
+                       self.close(self.keymap["green"])
+       
+       def keyYellow(self):
+               if self.keymap.has_key("yellow"):
+                       self.close(self.keymap["yellow"])
+                       
+       def keyBlue(self):
+               if self.keymap.has_key("blue"):
+                       self.close(self.keymap["blue"])
+                       
        def cancel(self):
                self.close(None)
\ No newline at end of file