X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FChoiceList.py;h=af93399f30b53fb594a0b86299b85fe54c7bf737;hb=ddbde4a649523ecd1adcd3958c996986ca0f3a0a;hp=07bb56d085dd53aa5f3bbcb4005f0530aa91d5e2;hpb=5db2dc5c63948651b3e4b337d7057cd940ccc644;p=vuplus_dvbapp

diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py
old mode 100644
new mode 100755
index 07bb56d..af93399
--- a/lib/python/Components/ChoiceList.py
+++ b/lib/python/Components/ChoiceList.py
@@ -1,35 +1,33 @@
-from HTMLComponent import HTMLComponent
-from GUIComponent import GUIComponent
 from MenuList import MenuList
-from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
-from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, eListbox, gFont
+from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename
+from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, gFont
 from Tools.LoadPixmap import LoadPixmap
+import skin
 
-def ChoiceEntryComponent(key, text):
+def ChoiceEntryComponent(key = "", text = ["--"]):
 	res = [ text ]
 	if text[0] == "--":
-		res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 00, 800, 25, 0, RT_HALIGN_LEFT, "-"*200))
+		x, y, w, h = skin.parameters.get("ChoicelistDash",(0, 0, 800, 25))
+		res.append((eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, RT_HALIGN_LEFT, "-"*200))
 	else:
-		res.append((eListboxPythonMultiContent.TYPE_TEXT, 32, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
+		x, y, w, h = skin.parameters.get("ChoicelistName",(45, 0, 800, 25))
+		res.append((eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, RT_HALIGN_LEFT, text[0]))
 	
-		png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "key_" + key + "-fs8.png"))
+		png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/buttons/key_" + key + ".png"))
 		if png is not None:
-			res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 30, 20, png))
+			x, y, w, h = skin.parameters.get("ChoicelistIcon",(5, 0, 35, 25))
+			res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, x, y, w, h, 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)
-		self.l.setFont(0, gFont("Regular", 20))
-		self.l.setItemHeight(25)
+class ChoiceList(MenuList):
+	def __init__(self, list, selection = 0, enableWrapAround=False):
+		MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
+		font = skin.fonts.get("ChoiceList", ("Regular", 20, 25))
+		self.l.setFont(0, gFont(font[0], font[1]))
+		self.l.setItemHeight(font[2])
 		self.selection = selection
 
-	GUI_WIDGET = eListbox
-		
 	def postWidgetCreate(self, instance):
-		instance.setContent(self.l)
+		MenuList.postWidgetCreate(self, instance)
 		self.moveToIndex(self.selection)