X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c0f63db1291342f40f066e169b97080f1453445e..80058dea34aae48ed729986a65112f0096f5b2d5:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 3b64763e..3c01794a 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -26,6 +26,7 @@ import copy
 #
 class ConfigElement(object):
 	def __init__(self):
+
 		object.__init__(self)
 		self.saved_value = None
 		self.save_disabled = False
@@ -66,23 +67,29 @@ class ConfigElement(object):
 	def cancel(self):
 		self.load()
 
+	def isChanged(self):
+		if self.saved_value is None and self.value == self.default:
+			return False
+		return self.tostring(self.value) != self.saved_value
+
 	def changed(self):
 		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
@@ -158,11 +165,18 @@ class ConfigSelection(ConfigElement):
 		self.changed()
 
 	def tostring(self, val):
-		return (val, ','.join(self.choices))
+		return val
 
 	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):
@@ -179,8 +193,17 @@ class ConfigSelection(ConfigElement):
 		elif key == KEY_RIGHT:
 			self.value = self.choices[(i + 1) % nchoices]
 
+	def getText(self):
+		descr = self.description[self.value]
+		if len(descr):
+			return _(descr)
+		return descr
+
 	def getMulti(self, selected):
-		return ("text", self.description[self.value])
+		descr = self.description[self.value]
+		if len(descr):
+			return ("text", _(descr))
+		return ("text", descr)
 
 	# HTML
 	def getHTML(self, id):
@@ -211,10 +234,19 @@ class ConfigBoolean(ConfigElement):
 		if key in [KEY_LEFT, KEY_RIGHT]:
 			self.value = not self.value
 
+	def getText(self):
+		descr = self.descriptions[self.value]
+		if len(descr):
+			return _(descr)
+		return descr
+
 	def getMulti(self, selected):
-		return ("text", _(self.descriptions[self.value]))
+		descr = self.descriptions[self.value]
+		if len(descr):
+			return ("text", _(descr))
+		return ("text", descr)
 
- 	def tostring(self, value):
+	def tostring(self, value):
 		if not value:
 			return "false"
 		else:
@@ -265,6 +297,9 @@ class ConfigDateTime(ConfigElement):
 		if key == KEY_RIGHT:
 			self.value = self.value + self.increment
 
+	def getText(self):
+		return time.strftime(self.formatstring, time.localtime(self.value))
+
 	def getMulti(self, selected):
 		return ("text", time.strftime(self.formatstring, time.localtime(self.value)))
 
@@ -367,8 +402,8 @@ class ConfigSequence(ConfigElement):
 		
 			self.validate()
 			self.changed()
-			
-	def getMulti(self, selected):
+	
+	def genText(self):
 		value = ""
 		mPos = self.marked_pos
 		num = 0;
@@ -381,9 +416,16 @@ class ConfigSequence(ConfigElement):
 			if self.censor_char == "":
 				value += ("%0" + str(len(str(self.limits[num][1]))) + "d") % i
 			else:
-				value += (self.censorChar * len(str(self.limits[num][1])))
+				value += (self.censor_char * len(str(self.limits[num][1])))
 			num += 1
-
+		return (value, mPos)
+		
+	def getText(self):
+		(value, mPos) = self.genText()
+		return value
+	
+	def getMulti(self, selected):
+		(value, mPos) = self.genText()
 			# only mark cursor when we are selected
 			# (this code is heavily ink optimized!)
 		if self.enabled:
@@ -414,10 +456,12 @@ 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):
+	def __init__(self, default, limits = (0, 10000000000)):
 		ConfigSequence.__init__(self, seperator = ":", limits = [limits], default = default)
 	
 	# you need to override this to do input validation
@@ -436,9 +480,16 @@ class ConfigInteger(ConfigSequence):
 	def tostring(self, value):
 		return str(value)
 
-class ConfigPIN(ConfigSequence):
+class ConfigPIN(ConfigInteger):
 	def __init__(self, default, len = 4, censor = ""):
-		ConfigSequence.__init__(self, seperator = ":", limits = [(0, (10**len)-1)], censor_char = censor, default = [default])
+		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
+
+	def getLength(self):
+		return self.len
 
 class ConfigFloat(ConfigSequence):
 	def __init__(self, default, limits):
@@ -483,7 +534,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
@@ -509,6 +560,9 @@ class ConfigText(ConfigElement, NumericalTextInput):
 	value = property(getValue, setValue)
 	_value = property(getValue, setValue)
 
+	def getText(self):
+		return self.value
+
 	def getMulti(self, selected):
 		return ("mtext"[1-selected:], self.value, [self.marked_pos])
 
@@ -549,6 +603,9 @@ class ConfigSlider(ConfigElement):
 		self.checkValues()
 		self.changed()
 
+	def getText(self):
+		return "%d / %d" % (self.value, self.max)
+
 	def getMulti(self, selected):
 		self.checkValues()
 		return ("slider", self.value, self.max)
@@ -571,7 +628,7 @@ class ConfigSatlist(ConfigSelection):
 	orbital_position = property(getOrbitalPosition)
 
 # nothing.
-class ConfigDummy(ConfigSelection):
+class ConfigNothing(ConfigSelection):
 	def __init__(self):
 		ConfigSelection.__init__(self, choices = [""])
 
@@ -631,8 +688,8 @@ class ConfigSubList(list, object):
 	saved_value = property(getSavedValue, setSavedValue)
 	
 	def append(self, item):
-		list.append(self, item)
 		i = str(len(self))
+		list.append(self, item)
 		if i in self.stored_values:
 			item.saved_value = self.stored_values[i]
 			item.load()
@@ -697,6 +754,7 @@ class ConfigSubsection(object):
 	def __setattr__(self, name, value):
 		if name == "saved_value":
 			return self.setSavedValue(value)
+		assert isinstance(value, ConfigSubsection) or isinstance(value, ConfigElement) or isinstance(value, ConfigSubList) or isinstance(value, ConfigSubDict), "ConfigSubsections can only store ConfigSubsections, ConfigSubLists, ConfigSubDicts or ConfigElements"
 		self.content.items[name] = value
 		if name in self.content.stored_values:
 			#print "ok, now we have a new item,", name, "and have the following value for it:", self.content.stored_values[name]
@@ -711,6 +769,9 @@ class ConfigSubsection(object):
 		for (key, val) in self.content.items.items():
 			if val.saved_value is not None:
 				res[key] = val.saved_value
+			elif key in res:
+				del res[key]
+				
 		return res
 
 	def setSavedValue(self, values):
@@ -781,7 +842,8 @@ class Config(ConfigSubsection):
 
 		# we inherit from ConfigSubsection, so ...
 		#object.__setattr__(self, "saved_value", tree["config"])
-		self.setSavedValue(tree["config"])
+		if "config" in tree:
+			self.setSavedValue(tree["config"])
 
 	def saveToFile(self, filename):
 		f = open(filename, "w")
@@ -797,7 +859,7 @@ config = Config()
 config.misc = ConfigSubsection()
 
 class ConfigFile:
-	CONFIG_FILE = resolveFilename(SCOPE_CONFIG, "config2")
+	CONFIG_FILE = resolveFilename(SCOPE_CONFIG, "settings")
 
 	def load(self):
 		try:
@@ -806,11 +868,26 @@ class ConfigFile:
 			print "unable to load config (%s), assuming defaults..." % str(e)
 	
 	def save(self):
-		config.save()
+#		config.save()
 		config.saveToFile(self.CONFIG_FILE)
 	
+	def __resolveValue(self, pickles, cmap):
+		if cmap.has_key(pickles[0]):
+			if len(pickles) > 1:
+				return self.__resolveValue(pickles[1:], cmap[pickles[0]].content.items)
+			else:
+				return str(cmap[pickles[0]].value)
+		return None
+	
 	def getResolvedKey(self, key):
-		return None # FIXME
+		names = key.split('.')
+		if len(names) > 1:
+			if names[0] == "config":
+				ret=self.__resolveValue(names[1:], config.content.items)
+				if ret and len(ret):
+					return ret
+		print "getResolvedKey", key, "failed !! (Typo??)"
+		return ""
 
 def NoSave(element):
 	element.disableSave()
@@ -820,8 +897,9 @@ configfile = ConfigFile()
 
 configfile.load()
 
-def getConfigListEntry(desc, config):
-	return (desc, config)
+def getConfigListEntry(*args):
+	assert len(args) > 1, "getConfigListEntry needs a minimum of two arguments (descr, configElement)"
+	return args
 
 #def _(x):
 #	return x