From 1a356266af95c3dcf2d85baee824a1bae55c5de2 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 15 Feb 2008 15:02:44 +0000 Subject: fix and simplify ChoiceList more flexible MenuList --- lib/python/Components/ChoiceList.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lib/python/Components/ChoiceList.py') diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py index 07bb56d0..af9f950e 100644 --- a/lib/python/Components/ChoiceList.py +++ b/lib/python/Components/ChoiceList.py @@ -1,5 +1,3 @@ -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 @@ -18,18 +16,13 @@ def ChoiceEntryComponent(key, text): 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) + MenuList.postWidgetCreate(self, instance) self.moveToIndex(self.selection) -- cgit v1.2.3