X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/89a936e39a696d7d4928051b31871f483dd178d1..98efaa152afc767093651fc0a2316d90a19f757a:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 037b66b1..5a4ed12e 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,12 +1,13 @@
 from time import *
 from Tools.NumericalTextInput import *
+from Tools.Directories import *
 
 class configFile:
 	def __init__(self):
 		self.changed = 0
 		self.configElements = { }
 		try:
-			self.file = open("config")
+			self.file = open(resolveFilename(SCOPE_CONFIG, "config"))
 		except IOError:
 			print "cannot open config file"
 			return 
@@ -38,7 +39,7 @@ class configFile:
 		if self.changed == 0:		#no changes, so no write to disk needed
 			return
 			
-		fileHandle = open("config", "w")
+		fileHandle = open(resolveFilename(SCOPE_CONFIG, "config"), "w")
 		
 		keys = self.configElements.keys()
 		keys.sort()
@@ -47,7 +48,18 @@ class configFile:
 
 			fileHandle.write(wstr)
 
-		fileHandle.close()		
+		fileHandle.close()
+		
+def currentConfigSelectionElement(element):
+	return element.vals[element.value][0]
+
+def getConfigSelectionElement(element, value):
+	count = 0
+	for x in element.vals:
+		if x[0] == value:
+			return count
+		count += 1
+	return -1
 
 class configSelection:
 	def __init__(self, parent):
@@ -77,8 +89,13 @@ class configSelection:
 
 	def __call__(self, selected):			#needed by configlist
 		self.checkValues()
-		return ("text", _(self.parent.vals[self.parent.value]))
-
+		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])
+		
+		return ("text", returnValue)
+		
 class configDateTime:
 	def __init__(self, parent):
 		self.parent = parent
@@ -147,7 +164,7 @@ class configSequenceArg:
 	def get(self, type, args = ()):
 		# configsequencearg.get ("IP")
 		if (type == "IP"):
-			return (("."), [(1,255),(0,255),(0,255),(0,255)], "")
+			return (("."), [(0,255),(0,255),(0,255),(0,255)], "")
 		# configsequencearg.get ("MAC")
 		if (type == "MAC"):
 			return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
@@ -164,6 +181,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()
 		
@@ -212,35 +232,42 @@ class configSequence:
 			self.markedPos += 1
 		
 		if key >= config.key["0"] and key <= config.key["9"]:
+			self.blockLen = []
+			for x in self.valueBounds:
+				self.blockLen.append(len(str(x[1])))
+				
+			pos = 0
+			blocknumber = 0
+			self.blockLenTotal = [0,]
+			for x in self.blockLen:
+				pos += self.blockLen[blocknumber]
+				self.blockLenTotal.append(pos)
+				if (pos - 1 >= self.markedPos):
+					pass
+				else:
+					blocknumber += 1
+					
 			number = 9 - config.key["9"] + key
 			# length of numberblock
-			numberLen = len(str(self.valueBounds[0][1]))
+			numberLen = len(str(self.valueBounds[blocknumber][1]))
 			# position in the block
-			posinblock = self.markedPos % numberLen
-			# blocknumber
-			blocknumber = self.markedPos / numberLen
+			posinblock = self.markedPos - self.blockLenTotal[blocknumber]
 			
 			oldvalue = self.parent.value[blocknumber]
 			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
-
 		#FIXME: dont call when press left/right
 		self.parent.change()	
 
 	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
@@ -252,7 +279,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:
@@ -290,7 +316,6 @@ class configText:
 		self.parent.save()
 		
 	def nextEntry(self):
-		print self.parent
 		self.parent.vals[1](self.parent.getConfigPath())
 
 	def handleKey(self, key):
@@ -403,7 +428,17 @@ class configElement:
 		if control == ConfigSlider:
 			return int(data)
 		elif control == configSelection:
-			return int(data)
+			try:
+				return int(data)
+			except:
+				for x in data.split(":"):
+					if x[0] == "*":
+						count = 0
+						for y in self.vals:
+							if y[0] == x[1:-1]:
+								return count
+							count += 1
+				return self.defaultValue
 		elif control == configDateTime:
 			return int(data)
 		elif control == configText:
@@ -423,6 +458,20 @@ class configElement:
 		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:
+				confList = []
+				count = 0
+				for x in self.vals:
+					if count == data:
+						confList.append("*" + str(x[0] + "*"))
+					else:
+						confList.append(x[0])
+					count += 1
+				return ":".join(confList)
 			return str(data)
 		elif control == configDateTime:
 			return str(data)
@@ -430,7 +479,6 @@ class configElement:
 			return str(data.strip())
 
 		elif control == configSequence:
-			print data
 			try:
 				value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
 			except:	
@@ -470,13 +518,14 @@ class configElement:
 		#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):
@@ -491,7 +540,8 @@ class configElement:
 	def reload(self):
 		self.loadData()
 	def save(self):
-		configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
+		if self.defaultValue != self.value or self.saveDefaults == True:
+			configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
 
 class configElement_nonSave(configElement):
 	def __init__(self, configPath, control, defaultValue, vals):