X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bce737aacfca6fc825d35e2e172c7e6bef6d85d3..ab9f30f89ade9a09d22e13e5be633f1db45c6a9a:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 3e035d1e..e9c8b1c1 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -71,19 +71,20 @@ class ConfigElement(object):
 		for x in self.notifiers:
 			x(self)
 			
-	def addNotifier(self, notifier):
+	def addNotifier(self, notifier, initial_call = True):
 		assert callable(notifier), "notifiers must be callable"
 		self.notifiers.append(notifier)
-		
+
 		# CHECKME:
 		# do we want to call the notifier
-		#  - at all when adding it? (yes)
+		#  - at all when adding it? (yes, though optional)
 		#  - when the default is active? (yes)
 		#  - when no value *yet* has been set,
 		#    because no config has ever been read (currently yes)
 		#    (though that's not so easy to detect.
 		#     the entry could just be new.)
-		notifier(self)
+		if initial_call:
+			notifier(self)
 
 	def disableSave(self):
 		self.save_disabled = True
@@ -164,6 +165,13 @@ class ConfigSelection(ConfigElement):
 	def getValue(self):
 		return self._value
 
+	def setCurrentText(self, text):
+		i = self.choices.index(self.value)
+		del self.description[self.choices[i]]
+		self.choices[i] = text
+		self.description[text] = text
+		self._value = text
+
 	value = property(getValue, setValue)
 	
 	def getIndex(self):
@@ -415,7 +423,9 @@ class ConfigPosition(ConfigSequence):
 
 class ConfigClock(ConfigSequence):
 	def __init__(self, default):
-		ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = default)
+		import time
+		t = time.localtime(default)
+		ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = [t.tm_hour, t.tm_min])
 
 class ConfigInteger(ConfigSequence):
 	def __init__(self, default, limits):
@@ -440,6 +450,8 @@ class ConfigInteger(ConfigSequence):
 class ConfigPIN(ConfigInteger):
 	def __init__(self, default, len = 4, censor = ""):
 		assert isinstance(default, int), "ConfigPIN default must be an integer"
+		if default == -1:
+			default = "aaaa"
 		ConfigSequence.__init__(self, seperator = ":", limits = [(0, (10**len)-1)], censor_char = censor, default = default)
 		self.len = len
 
@@ -489,7 +501,7 @@ class ConfigText(ConfigElement, NumericalTextInput):
 					self.text = self.text.ljust(len(self.text) + 1)
 		elif key in KEY_NUMBERS:
 			number = self.getKey(getKeyNumber(key))
-			self.text = self.text[0:self.marked_pos] + str(number) + self.text[self.marked_pos + 1:]
+			self.text = self.text[0:self.marked_pos] + unicode(number) + self.text[self.marked_pos + 1:]
 		elif key == KEY_TIMEOUT:
 			self.timeout()
 			return