X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/68c21083593b5b05681efaffbe6ec50aba385ddc..f7046d9cc476b4c04d144c2bc46696614b89ace1:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 25684fc1..2dc19bfd 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,5 +1,5 @@
 from time import *
-from Tools.NumericalTextInput import *
+from Tools.NumericalTextInput import NumericalTextInput
 from Tools.Directories import *
 
 class configFile:
@@ -27,13 +27,28 @@ class configFile:
 		x = line.find("=")
 		if x > -1:
 			self.configElements[line[:x]] = line[x + 1:-1]
-	
+
 	def getKey(self, key):
 		return self.configElements[key]
 
-	def setKey(self, key, value):
+	def setKey(self, key, value, isDefaultKey=False):
 		self.changed = 1
-		self.configElements[key] = value
+		if isDefaultKey and self.configElements.has_key(key):
+			del self.configElements[key]
+		else:
+			self.configElements[key] = value
+
+	def getResolvedKey(self, key):
+		str = self.configElements[key]
+		if len(str):
+			pos = str.find('*')
+			if pos != -1:
+				str = str[pos+1:]
+				pos = str.find('*')
+				if pos != -1:
+					return str[:pos]
+			return str
+		return None
 
 	def save(self):
 		if self.changed == 0:		#no changes, so no write to disk needed
@@ -89,10 +104,17 @@ class configSelection:
 
 	def __call__(self, selected):			#needed by configlist
 		self.checkValues()
-		if isinstance(self.parent.vals[self.parent.value], str):
-			returnValue = _(self.parent.vals[self.parent.value])
-		else:
-			returnValue = _(self.parent.vals[self.parent.value][1])
+
+		returnValue = _(self.parent.vals[self.parent.value])
+		if not isinstance(returnValue, str):
+			returnValue = returnValue[1]
+
+		# FIXME: it's not really nice to translate this here.
+		# however, configSelections are persistent.
+		
+		# WORKAROUND: don't translate ""
+		if returnValue:
+			returnValue = _(returnValue)
 		
 		return ("text", returnValue)
 		
@@ -166,6 +188,8 @@ class configSequenceArg:
 		if (type == "IP"):
 			return (("."), [(0,255),(0,255),(0,255),(0,255)], "")
 		# configsequencearg.get ("MAC")
+		if (type == "POSITION"):
+			return ((","), [(0,args[0]),(0,args[1]),(0,args[2]),(0,args[3])], "")
 		if (type == "MAC"):
 			return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
 		# configsequencearg.get ("CLOCK")
@@ -181,6 +205,9 @@ class configSequenceArg:
 		# configsequencearg.get("FLOAT", [(min,max),(min1,max1)]) => x.y with min <= x <= max and min1 <= y <= max1
 		if (type == "FLOAT"):
 			return (("."), args, "")
+		
+	def getFloat(self, element):
+		return float(("%d.%0" + str(len(str(element.vals[1][1][1]))) + "d") % (element.value[0], element.value[1]))
 
 configsequencearg = configSequenceArg()
 		
@@ -254,15 +281,10 @@ class configSequence:
 			olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
 			newvalue = oldvalue - olddec + (10 ** (numberLen - posinblock - 1) * number)
 			
-			print "You actually pressed a number (" + str(number) + ") which will be added at block number " + str(blocknumber) + " on position " + str(posinblock)
-			print "Old value: " + str(oldvalue) + " olddec: " + str(olddec) + " newvalue: " + str(newvalue)
 			self.parent.value[blocknumber] = newvalue
 			self.markedPos += 1
 		
-		self.checkValues()			
-		
-		print "markPos:",
-		print self.markedPos
+		self.checkValues()
 
 		#FIXME: dont call when press left/right
 		self.parent.change()	
@@ -270,7 +292,6 @@ class configSequence:
 	def __call__(self, selected):			#needed by configlist
 		value = ""
 		mPos = self.markedPos
-		print "Positon: " + str(mPos)
 		num = 0;
 		for i in self.parent.value:
 			if len(value):	#fixme no heading separator possible
@@ -282,7 +303,6 @@ class configSequence:
 			#if diff > 0:
 				## if this helps?!
 				#value += " " * diff
-			print (("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i)
 			if (self.censorChar == ""):
 				value += ("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i
 			else:
@@ -294,64 +314,84 @@ class configSequence:
 			return ("mtext"[1-selected:], value, [mPos])
 		else:
 			return ("text", value)
+
+class configNothing:
+	def __init__(self, parent):
+		self.parent = parent
+		self.markedPos = 0
+
+	def cancel(self):
+		self.parent.reload()
+
+	def save(self):
+		self.parent.save()
 		
-class configText:
+	def nextEntry(self):
+		self.parent.vals[1](self.parent.getConfigPath())
+
+	def handleKey(self, key):
+		pass
+
+	def __call__(self, selected):			#needed by configlist
+		return ("text", "")
+
+class configText(NumericalTextInput):
 	# used as first parameter
 	# is the text of a fixed size or is the user able to extend the length of the text
 	extendableSize = 1
 	fixedSize = 2
 
 	def __init__(self, parent):
+		NumericalTextInput.__init__(self, self.nextEntry)
 		self.parent = parent
 		self.markedPos = 0
 		self.mode = self.parent.vals[0]
-		self.textInput = NumericalTextInput(self.nextEntry)
+		try:
+			self.Text = self.parent.value.decode("utf-8")
+		except UnicodeDecodeError:
+			print "utf8 kaputt!"
 
 	def checkValues(self):
 		if (self.markedPos < 0):
 			self.markedPos = 0
-		if (self.markedPos >= len(self.parent.value)):
-			self.markedPos = len(self.parent.value) - 1
-			
+		if (self.markedPos >= len(self.Text)):
+			self.markedPos = len(self.Text) - 1
+
 	def cancel(self):
 		self.parent.reload()
 
 	def save(self):
 		self.parent.save()
-		
+
 	def nextEntry(self):
-		print self.parent
 		self.parent.vals[1](self.parent.getConfigPath())
 
 	def handleKey(self, key):
 		#this will no change anything on the value itself
 		#so we can handle it here in gui element
 		if key == config.key["delete"]:
-			self.parent.value = self.parent.value[0:self.markedPos] + self.parent.value[self.markedPos + 1:]
-		if key == config.key["prevElement"]:
-			self.textInput.nextKey()
+			self.Text = self.Text[0:self.markedPos] + self.Text[self.markedPos + 1:]
+			self.parent.value = self.Text.encode("utf-8")
+		elif key == config.key["prevElement"]:
+			self.nextKey()
 			self.markedPos -= 1
-
-		if key == config.key["nextElement"]:
-			self.textInput.nextKey()
+		elif key == config.key["nextElement"]:
+			self.nextKey()
 			self.markedPos += 1
 			if (self.mode == self.extendableSize):
-				if (self.markedPos >= len(self.parent.value)):
-					self.parent.value = self.parent.value.ljust(len(self.parent.value) + 1)
-			
-				
-		if key >= config.key["0"] and key <= config.key["9"]:
+				if (self.markedPos >= len(self.Text)):
+					self.Text = self.Text.ljust(len(self.Text) + 1)
+					self.parent.value = self.Text.encode("utf-8")
+		elif key >= config.key["0"] and key <= config.key["9"]:
 			number = 9 - config.key["9"] + key
-
-			self.parent.value = self.parent.value[0:self.markedPos] + str(self.textInput.getKey(number)) + self.parent.value[self.markedPos + 1:]
-		
-		self.checkValues()			
-		
-		self.parent.change()	
+			self.Text = self.Text[0:self.markedPos] + self.getKey(number) + self.Text[self.markedPos + 1:]
+			self.parent.value = self.Text.encode("utf-8")
+		self.checkValues()
+		self.parent.change()
 
 	def __call__(self, selected):			#needed by configlist
-		return ("mtext"[1-selected:], str(self.parent.value), [self.markedPos])
-		
+		return ("mtext"[1-selected:], self.parent.value, [self.markedPos])
+
 class configValue:
 	def __init__(self, obj):
 		self.obj = obj
@@ -380,7 +420,7 @@ config = Config();
 
 configfile = configFile()
 
-class ConfigSlider:
+class configSlider:
 	def __init__(self, parent):
 		self.parent = parent
 
@@ -394,21 +434,21 @@ class ConfigSlider:
 		if self.parent.value < 0:
 			self.parent.value = 0	
 
-		if self.parent.value > 10:
-			self.parent.value = 10	
+		if self.parent.value > self.parent.vals[1]:
+			self.parent.value = self.parent.vals[1]
 
 	def handleKey(self, key):
 		if key == config.key["prevElement"]:
-			self.parent.value = self.parent.value - 1
+			self.parent.value = self.parent.value - self.parent.vals[0]
 		if key == config.key["nextElement"]:
-			self.parent.value = self.parent.value + 1
+			self.parent.value = self.parent.value + self.parent.vals[0]
 					
 		self.checkValues()	
 		self.parent.change()	
 
 	def __call__(self, selected):			#needed by configlist
 		self.checkValues()
-		return ("slider", self.parent.value * 10)
+		return ("slider", self.parent.value, self.parent.vals[1])
 
 class ConfigSubsection:
 	def __init__(self):
@@ -430,7 +470,7 @@ class configElement:
 		return 0	#prevent bigger then array
 
 	def datafromFile(self, control, data):
-		if control == ConfigSlider:
+		if control == configSlider:
 			return int(data)
 		elif control == configSelection:
 			try:
@@ -460,9 +500,11 @@ class configElement:
 			return ""	
 
 	def datatoFile(self, control, data):
-		if control == ConfigSlider:
+		if control == configSlider:
 			return str(data)
 		elif control == configSelection:
+			if len(self.vals) < data + 1:
+				return "0"
 			if isinstance(self.vals[data], str):
 				return str(data)
 			else:
@@ -480,19 +522,20 @@ class configElement:
 			return str(data)
 		elif control == configText:
 			return str(data.strip())
-
 		elif control == configSequence:
-			print data
+#			print self.vals
+#			print self.value
 			try:
-				value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+				value = ""
+				count = 0
+				for i in data:
+					if value !="":
+						value += self.vals[0]
+					value += (("%0" + str(len(str(self.vals[1][count][1]))) + "d") % i)
+					count += 1
+					#value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
 			except:	
 				value = str(data)	
-#			just in case you don't understand the above, here an equivalent:
-#			value = ""
-#			for i in data:
-#				if value !="":
-#					value += self.vals[0]
-#				value += str(i)
 			return value
 		elif control == configSatlist:
 			return str(self.vals[self.value][1]);
@@ -508,27 +551,29 @@ class configElement:
 
 		if value == "":
 			#print "value not found - using default"
-
 			if self.controlType == configSatlist:
 				self.value = self.getIndexbyEntry(self.defaultValue)
-			else:	
+			elif self.controlType == configSequence:
+				self.value = self.defaultValue[:]
+			else:
 				self.value = self.defaultValue
 
 			self.save()		#add missing value to dict
 		else:
 			#print "set val:" + str(value)
 			self.value = value
-			
+
 		#is this right? activate settings after load/cancel and use default	
 		self.change()
 
-	def __init__(self, configPath, control, defaultValue, vals):
+	def __init__(self, configPath, control, defaultValue, vals, saveDefaults = True):
 		self.configPath = configPath
 		self.defaultValue = defaultValue
 		self.controlType = control
 		self.vals = vals
 		self.notifierList = [ ]
 		self.enabled = True
+		self.saveDefaults = saveDefaults
 		self.loadData()		
 		
 	def getConfigPath(self):
@@ -537,13 +582,28 @@ class configElement:
 	def addNotifier(self, notifier):
 		self.notifierList.append(notifier);
 		notifier(self);
+
 	def change(self):
 		for notifier in self.notifierList:
 			notifier(self)
+
 	def reload(self):
 		self.loadData()
+
 	def save(self):
-		configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
+		if self.controlType == configSatlist:
+			defaultValue = self.getIndexbyEntry(self.defaultValue)
+		else:
+			defaultValue = self.defaultValue
+		if self.value != defaultValue or self.saveDefaults:
+			configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value))
+		else:
+			try:
+				oldValue = configfile.getKey(self.configPath)
+			except:
+				oldValue = None
+			if oldValue is not None and oldValue != defaultValue:
+				configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value), True)
 
 class configElement_nonSave(configElement):
 	def __init__(self, configPath, control, defaultValue, vals):
@@ -551,14 +611,13 @@ class configElement_nonSave(configElement):
 
 	def save(self):
 		pass
-		
+
 def getConfigListEntry(description, element):
 	b = element
 	item = b.controlType(b)
 	return ((description, item))
 
-
-def configElementBoolean(name, default, texts=(_("Enable"), _("Disable"))):
+def configElementBoolean(name, default, texts=(_("Disable"), _("Enable"))):
 	return configElement(name, configSelection, default, texts)
 
 config.misc = ConfigSubsection()