X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/84e19567791d6117f4d5103b001d0b05cd231d38..019ba406ed5ba46782951d501ed2d4c0a96e6096:/lib/python/Components/ChoiceList.py

diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py
index ca58ecd6..fe505c2a 100644
--- a/lib/python/Components/ChoiceList.py
+++ b/lib/python/Components/ChoiceList.py
@@ -1,43 +1,28 @@
-from HTMLComponent import *
-from GUIComponent import *
-
 from MenuList import MenuList
-
-from Tools.Directories import *
-
-from enigma import *
-
-RT_HALIGN_LEFT = 0
-RT_HALIGN_RIGHT = 1
-RT_HALIGN_CENTER = 2
-RT_HALIGN_BLOCK = 4
-
-RT_VALIGN_TOP = 0
-RT_VALIGN_CENTER = 8
-RT_VALIGN_BOTTOM = 16
+from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
+from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, gFont
+from Tools.LoadPixmap import LoadPixmap
 
 def ChoiceEntryComponent(key, text):
 	res = [ text ]
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 32, 00, 800,25, 0, RT_HALIGN_LEFT, text[0]))
-
-	png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "key_" + key + "-fs8.png"))
-	if png is not None:
-		res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 30, 20, png))
+	if text[0] == "--":
+		res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 00, 800, 25, 0, RT_HALIGN_LEFT, "-"*200))
+	else:
+		res.append((eListboxPythonMultiContent.TYPE_TEXT, 45, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
+	
+		png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/buttons/key_" + key + ".png"))
+		if png is not None:
+			res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 5, 0, 35, 25, png))
 	
 	return res
 
-class ChoiceList(MenuList, HTMLComponent, GUIComponent):
-	def __init__(self, list, selection = 0):
-		GUIComponent.__init__(self)
-		self.l = eListboxPythonMultiContent()
-		self.list = list
-		self.l.setList(list)
+class ChoiceList(MenuList):
+	def __init__(self, list, selection = 0, enableWrapAround=False):
+		MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
 		self.l.setFont(0, gFont("Regular", 20))
+		self.l.setItemHeight(25)
 		self.selection = selection
 
-	GUI_WIDGET = eListbox
-		
 	def postWidgetCreate(self, instance):
-		instance.setContent(self.l)
-		instance.setItemHeight(25)
+		MenuList.postWidgetCreate(self, instance)
 		self.moveToIndex(self.selection)