X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FConfigList.py;h=fd638d7940b65bf56819abc5f90316886cb8a6b8;hp=418a1b67e0a6981c40189d4f830c945a5417ca11;hb=4911a0121954f6b6657ba28fab8d9dd9031d9a59;hpb=614c8a7a33de31665c7b7c0bc8cbcaa8ed353e91 diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py index 418a1b6..fd638d7 100755 --- a/lib/python/Components/ConfigList.py +++ b/lib/python/Components/ConfigList.py @@ -4,12 +4,14 @@ from config import KEY_LEFT, KEY_RIGHT, KEY_HOME, KEY_END, KEY_0, KEY_DELETE, KE from Components.ActionMap import NumberActionMap, ActionMap from enigma import eListbox, eListboxPythonConfigContent, eRCInput, eTimer from Screens.MessageBox import MessageBox +import skin class ConfigList(HTMLComponent, GUIComponent, object): def __init__(self, list, session = None): GUIComponent.__init__(self) self.l = eListboxPythonConfigContent() - self.l.setSeperation(200) + seperation, = skin.parameters.get("ConfigListSeperator", (200, )) + self.l.setSeperation(seperation) self.timer = eTimer() self.list = list self.onSelectionChanged = [ ] @@ -61,12 +63,13 @@ class ConfigList(HTMLComponent, GUIComponent, object): GUI_WIDGET = eListbox def selectionChanged(self): - if self.current: + if isinstance(self.current,tuple) and len(self.current) == 2: self.current[1].onDeselect(self.session) self.current = self.getCurrent() - if self.current: + if isinstance(self.current,tuple) and len(self.current) == 2: self.current[1].onSelect(self.session) - + else: + return for x in self.onSelectionChanged: x() @@ -75,11 +78,11 @@ class ConfigList(HTMLComponent, GUIComponent, object): instance.setContent(self.l) def preWidgetRemove(self, instance): - if self.current: + if isinstance(self.current,tuple) and len(self.current) == 2: self.current[1].onDeselect(self.session) instance.selectionChanged.get().remove(self.selectionChanged) instance.setContent(None) - + def setList(self, l): self.timer.stop() self.__list = l @@ -87,7 +90,7 @@ class ConfigList(HTMLComponent, GUIComponent, object): if l is not None: for x in l: - assert isinstance(x[1], ConfigElement), "entry in ConfigList " + str(x[1]) + " must be a ConfigElement" + assert len(x) < 2 or isinstance(x[1], ConfigElement), "entry in ConfigList " + str(x[1]) + " must be a ConfigElement" def getList(self): return self.__list