X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c980cfb00b3ee0679b8ea5fe4d45e1680a014681..cbc5ef9c7959c734926472f0978a9f43ffa7381c:/lib/python/Components/ConfigList.py

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index 1341ac50..c93b10f7 100644
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -1,17 +1,27 @@
 from HTMLComponent import *
 from GUIComponent import *
-from config import *
-
-from enigma import eListbox, eListboxPythonConfigContent
+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
 
 class ConfigList(HTMLComponent, GUIComponent, object):
-	def __init__(self, list):
+	def __init__(self, list, session = None):
 		GUIComponent.__init__(self)
 		self.l = eListboxPythonConfigContent()
 		self.l.setSeperation(100)
 		self.list = list
 		self.onSelectionChanged = [ ]
+		self.current = None
+		self.help_window = None
+		self.setHelpWindowSession(session)
+		
+		self.timer = eTimer()
+		self.timer.timeout.get().append(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
+
 	def toggle(self):
 		selection = self.getCurrent()
 		selection[1].toggle()
@@ -19,9 +29,13 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 
 	def handleKey(self, key):
 		selection = self.getCurrent()
-		if selection[1].parent.enabled:
+		if 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)
 
 	def getCurrent(self):
 		return self.l.getCurrentSelection()
@@ -30,15 +44,22 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 		self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
 		
 	def invalidate(self, entry):
-		i = 0
-		for x in self.__list:
-			if (entry.getConfigPath() == x[1].parent.getConfigPath()):
-				self.l.invalidateEntry(i)
-			i += 1
+		self.l.invalidateEntry(self.__list.index(entry))
 
 	GUI_WIDGET = eListbox
 	
 	def selectionChanged(self):
+		n = self.getCurrent()
+		
+		if self.help_window:
+			self.session.deleteDialog(self.help_window)
+		
+		nh = n and n[1].helpWindow()
+		if nh is not None and self.session is not None:
+			self.help_window = self.session.instantiateDialog(*nh)
+			self.help_window.show()
+
+		self.current = n
 		for x in self.onSelectionChanged:
 			x()
 
@@ -49,11 +70,55 @@ 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.__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
 
 	list = property(getList, setList)
+
+	def timeout(self):
+		self.handleKey(KEY_TIMEOUT)
+
+class ConfigListScreen:
+	def __init__(self, list, session = None):
+		self["config_actions"] = NumberActionMap(["SetupActions", "TextInputActions"],
+		{
+			"ok": self.keyOK,
+			"left": self.keyLeft,
+			"right": self.keyRight,
+			"delete": self.keyDelete,
+			"1": self.keyNumberGlobal,
+			"2": self.keyNumberGlobal,
+			"3": self.keyNumberGlobal,
+			"4": self.keyNumberGlobal,
+			"5": self.keyNumberGlobal,
+			"6": self.keyNumberGlobal,
+			"7": self.keyNumberGlobal,
+			"8": self.keyNumberGlobal,
+			"9": self.keyNumberGlobal,
+			"0": self.keyNumberGlobal
+		}, -1) # to prevent left/right overriding the listbox
+		
+		self["config"] = ConfigList(list, session = session)
+
+	def keyOK(self):
+		self["config"].handleKey(KEY_OK)
+
+	def keyLeft(self):
+		self["config"].handleKey(KEY_LEFT)
+
+	def keyRight(self):
+		self["config"].handleKey(KEY_RIGHT)
+
+	def keyDelete(self):
+		self["config"].handleKey(KEY_DELETE)
+
+	def keyNumberGlobal(self, number):
+		self["config"].handleKey(KEY_0 + number)