X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7e13c14fb5b2d6e36e62fdfcdc49c3e1fef0183f..0a7e2ed8d31048eee98bf2ffd794743d30d9b953:/lib/python/Screens/ChoiceBox.py

diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py
index 533e78d0..60aa5e10 100644
--- a/lib/python/Screens/ChoiceBox.py
+++ b/lib/python/Screens/ChoiceBox.py
@@ -5,20 +5,35 @@ from Components.ActionMap import NumberActionMap
 from Components.Label import Label
 from Components.MenuList import MenuList
 from Components.GUIComponent import *
+from Components.ChoiceList import ChoiceEntryComponent, ChoiceList
 
 import os
 
 class ChoiceBox(Screen):
-	def __init__(self, session, title = "", **kwargs):
+	def __init__(self, session, title = "", list = [], keys = None, selection = 0):
 		Screen.__init__(self, session)
 
 		self["text"] = Label(title)
-		self["list"] = MenuList(**kwargs)
+		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) * [""]
+		else:
+			self.keys = keys
+			
+		self.keymap = {}
+		pos = 0
+		for x in list:
+			strpos = str(self.keys[pos])
+			self.list.append(ChoiceEntryComponent(key = strpos, text = x))
+			if self.keys[pos] != "":
+				self.keymap[self.keys[pos]] = list[pos]
+			pos += 1
+		self["list"] = ChoiceList(list = self.list, selection = selection)
 				
-		self["actions"] = NumberActionMap(["WizardActions", "InputActions"], 
+		self["actions"] = NumberActionMap(["WizardActions", "InputActions", "ColorActions"], 
 		{
 			"ok": self.go,
-			"back": self.close,
+			"back": self.cancel,
 			"1": self.keyNumberGlobal,
 			"2": self.keyNumberGlobal,
 			"3": self.keyNumberGlobal,
@@ -28,7 +43,11 @@ 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
 		}, -1)
 		
 	def keyLeft(self):
@@ -39,11 +58,28 @@ class ChoiceBox(Screen):
 	
 	def keyNumberGlobal(self, number):
 		print "pressed", number
-		#self["input"].number(number)
+		if self.keymap.has_key(str(number)):
+			self.close(self.keymap[str(number)])
 		
 	def go(self):
-		self.close(self["list"].l.getCurrentSelection())
+		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