X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FChoiceList.py;h=af93399f30b53fb594a0b86299b85fe54c7bf737;hb=ddbde4a649523ecd1adcd3958c996986ca0f3a0a;hp=33868d610ade518f12703f2e01152589f90e16d7;hpb=a7ed9db9532b7ac58dc3b923c0e3f9ee1789ddeb;p=vuplus_dvbapp diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py index 33868d6..af93399 100755 --- a/lib/python/Components/ChoiceList.py +++ b/lib/python/Components/ChoiceList.py @@ -2,25 +2,30 @@ from MenuList import MenuList 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 = ["--"]): 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, 45, 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_CURRENT_SKIN, "skin_default/buttons/key_" + key + ".png")) if png is not None: - res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 5, 0, 35, 25, 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): 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) + 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 def postWidgetCreate(self, instance):