X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FConfigList.py;h=2de075c62f07044cda85e6ea2869658505b6cca9;hb=92456d9542585d58e011fa4f0b501de3ef9c1819;hp=883a1ea4c7959ed06f1cf7b744fcfc0a5bb4b195;hpb=2bf059008f0ac3872f4150e0ccd0d3d34376300d;p=vuplus_dvbapp

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index 883a1ea..2de075c 100644
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -1,6 +1,6 @@
 from HTMLComponent import *
 from GUIComponent import *
-from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT
+from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT, ConfigElement
 from Components.ActionMap import NumberActionMap
 from enigma import eListbox, eListboxPythonConfigContent, eTimer
 
@@ -9,15 +9,19 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 		GUIComponent.__init__(self)
 		self.l = eListboxPythonConfigContent()
 		self.l.setSeperation(100)
+		self.timer = eTimer()
 		self.list = list
 		self.onSelectionChanged = [ ]
 		self.current = None
 		self.help_window = None
 		self.setHelpWindowSession(session)
-		
-		self.timer = eTimer()
+
+	def execBegin(self):
 		self.timer.timeout.get().append(self.timeout)
-	
+
+	def execEnd(self):
+		self.timer.timeout.get().remove(self.timeout)
+
 	def setHelpWindowSession(self, session):
 		assert self.help_window is None, "you can't move a help window to another session"
 		self.session = session
@@ -29,13 +33,13 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 
 	def handleKey(self, key):
 		selection = self.getCurrent()
-		if selection[1].enabled:
+		if selection and selection[1].enabled:
 			selection[1].handleKey(key)
 			self.invalidateCurrent()
 			if self.help_window:
 				self.help_window.update(selection[1])
-		if key not in [KEY_TIMEOUT, KEY_LEFT, KEY_RIGHT, KEY_DELETE, KEY_OK]:
-			self.timer.start(1000, 1)
+			if key not in [KEY_TIMEOUT, KEY_LEFT, KEY_RIGHT, KEY_DELETE, KEY_OK]:
+				self.timer.start(1000, 1)
 
 	def getCurrent(self):
 		return self.l.getCurrentSelection()
@@ -70,10 +74,15 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 	def preWidgetRemove(self, instance):
 		instance.selectionChanged.get().remove(self.selectionChanged)
 	
-	def setList(self, list):
-		self.__list = list
+	def setList(self, l):
+		self.timer.stop()
+		self.__list = l
 		self.l.setList(self.__list)
 
+		if l is not None:
+			for x in l:
+				assert isinstance(x[1], ConfigElement), "entry in ConfigList " + str(x[1]) + " must be a ConfigElement"
+
 	def getList(self):
 		return self.__list
 
@@ -83,7 +92,7 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 		self.handleKey(KEY_TIMEOUT)
 
 class ConfigListScreen:
-	def __init__(self, list, session = None):
+	def __init__(self, list, session = None, on_change = None):
 		self["config_actions"] = NumberActionMap(["SetupActions", "TextInputActions"],
 		{
 			"ok": self.keyOK,
@@ -100,21 +109,30 @@ class ConfigListScreen:
 			"8": self.keyNumberGlobal,
 			"9": self.keyNumberGlobal,
 			"0": self.keyNumberGlobal
-		}, 5)
-
+		}, -1) # to prevent left/right overriding the listbox
+		
 		self["config"] = ConfigList(list, session = session)
+		if on_change is not None:
+			self.__changed = on_change
+		else:
+			self.__changed = lambda: None
 
 	def keyOK(self):
 		self["config"].handleKey(KEY_OK)
 
 	def keyLeft(self):
 		self["config"].handleKey(KEY_LEFT)
+		self.__changed()
 
 	def keyRight(self):
 		self["config"].handleKey(KEY_RIGHT)
+		self.__changed()
 
 	def keyDelete(self):
 		self["config"].handleKey(KEY_DELETE)
+		self.__changed()
 
 	def keyNumberGlobal(self, number):
 		self["config"].handleKey(KEY_0 + number)
+		self.__changed()
+