X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FConfigList.py;h=a54d27b1fbe750bf2721f5a2e1525decf45d3558;hb=76ab06c06bdf77f0b0cecd225367862ef0de0d2f;hp=4dd401f9475a0e0c5b3da27f6f82add44a5d330e;hpb=0e7f46d6379dbf08183caadfa33b8d0648418d9e;p=vuplus_dvbapp

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index 4dd401f..a54d27b 100644
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -1,8 +1,9 @@
-from HTMLComponent import *
-from GUIComponent import *
-from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT, ConfigElement
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
+from config import KEY_LEFT, KEY_RIGHT, KEY_HOME, KEY_END, KEY_0, KEY_DELETE, KEY_BACKSPACE, KEY_OK, KEY_TOGGLEOW, KEY_ASCII, KEY_TIMEOUT, KEY_NUMBERS, ConfigElement
 from Components.ActionMap import NumberActionMap
-from enigma import eListbox, eListboxPythonConfigContent, eTimer
+from enigma import eListbox, eListboxPythonConfigContent, eRCInput, eTimer
+from Screens.MessageBox import MessageBox
 
 class ConfigList(HTMLComponent, GUIComponent, object):
 	def __init__(self, list, session = None):
@@ -17,9 +18,13 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 		self.setHelpWindowSession(session)
 
 	def execBegin(self):
+		rcinput = eRCInput.getInstance()
+		rcinput.setKeyboardMode(rcinput.kmAscii)
 		self.timer.timeout.get().append(self.timeout)
 
 	def execEnd(self):
+		rcinput = eRCInput.getInstance()
+		rcinput.setKeyboardMode(rcinput.kmNone)
 		self.timer.timeout.get().remove(self.timeout)
 
 	def setHelpWindowSession(self, session):
@@ -38,12 +43,19 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 			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]:
+			if key in KEY_NUMBERS:
 				self.timer.start(1000, 1)
 
 	def getCurrent(self):
 		return self.l.getCurrentSelection()
 	
+	def getCurrentIndex(self):
+		return self.l.getCurrentSelectionIndex()
+	
+	def setCurrentIndex(self, index):
+		if self.instance is not None:
+			self.instance.moveSelectionTo(index)
+	
 	def invalidateCurrent(self):
 		self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
 
@@ -94,14 +106,29 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 	def timeout(self):
 		self.handleKey(KEY_TIMEOUT)
 
+	def isChanged(self):
+		is_changed = False
+		for x in self.list:
+			is_changed |= x[1].isChanged()
+
+		return is_changed
+
 class ConfigListScreen:
 	def __init__(self, list, session = None, on_change = None):
-		self["config_actions"] = NumberActionMap(["SetupActions", "TextInputActions"],
+		self["config_actions"] = NumberActionMap(["SetupActions", "InputAsciiActions", "KeyboardInputActions"],
 		{
+			"gotAsciiCode": self.keyGotAscii,
 			"ok": self.keyOK,
+			"accept": self.keyOK,
 			"left": self.keyLeft,
 			"right": self.keyRight,
-			"delete": self.keyDelete,
+			"moveLeft": self.keyLeft,
+			"moveRight": self.keyRight,
+			"moveHome": self.keyHome,
+			"moveEnd": self.keyEnd,
+			"deleteForward": self.keyDelete,
+			"deleteBackward": self.keyBackspace,
+			"toggleOverwrite": self.keyToggleOW,
 			"1": self.keyNumberGlobal,
 			"2": self.keyNumberGlobal,
 			"3": self.keyNumberGlobal,
@@ -131,11 +158,51 @@ class ConfigListScreen:
 		self["config"].handleKey(KEY_RIGHT)
 		self.__changed()
 
+	def keyHome(self):
+		self["config"].handleKey(KEY_HOME)
+		self.__changed()
+
+	def keyEnd(self):
+		self["config"].handleKey(KEY_END)
+		self.__changed()
+
 	def keyDelete(self):
 		self["config"].handleKey(KEY_DELETE)
 		self.__changed()
 
+	def keyBackspace(self):
+		self["config"].handleKey(KEY_BACKSPACE)
+		self.__changed()
+
+	def keyToggleOW(self):
+		self["config"].handleKey(KEY_TOGGLEOW)
+		self.__changed()
+
+	def keyGotAscii(self):
+		self["config"].handleKey(KEY_ASCII)
+		self.__changed()
+
 	def keyNumberGlobal(self, number):
 		self["config"].handleKey(KEY_0 + number)
 		self.__changed()
 
+	# keySave and keyCancel are just provided in case you need them.
+	# you have to call them by yourself.
+	def keySave(self):
+		for x in self["config"].list:
+			x[1].save()
+		self.close()
+	
+	def cancelConfirm(self, result):
+		if not result:
+			return
+
+		for x in self["config"].list:
+			x[1].cancel()
+		self.close()
+
+	def keyCancel(self):
+		if self["config"].isChanged():
+			self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"))
+		else:
+			self.close()