X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/71f4df6d025fa09d937dd5e259992cf04b4a04f8..dd935678caed30ac21aa74826d8fbfca5f31a81c:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 7bd8175a..cb9fdc2b 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -37,7 +37,9 @@ class configFile:
 			
 		fileHandle = open("config", "w")
 		
-		for x in self.configElements:
+		keys = self.configElements.keys()
+		keys.sort()
+		for x in keys:
 			wstr = x + "=" + self.configElements[x]
 			
 			if wstr[len(wstr) - 1] != '\n':
@@ -77,16 +79,85 @@ class configSelection:
 	def __call__(self, selected):			#needed by configlist
 		self.checkValues()
 		return ("text", self.parent.vals[self.parent.value])
+
+class configSatlist:
+	def __init__(self, parent):
+		self.parent = parent
+
+	def checkValues(self):
+		if self.parent.value < 0:
+			self.parent.value = 0	
+
+		if(self.parent.value >= (len(self.parent.vals) - 1)):
+			self.parent.value = len(self.parent.vals) - 1
+			
+	def cancel(self):
+		self.parent.reload()
+
+	def save(self):
+		self.parent.save()
+
+	def handleKey(self, key):
+		if key == config.key["prevElement"]:
+			self.parent.value = self.parent.value - 1
+		if key == config.key["nextElement"]:
+			self.parent.value = self.parent.value + 1
+		
+		self.checkValues()			
+
+		self.parent.change()	
+
+	def __call__(self, selected):			#needed by configlist
+		self.checkValues()
+		#fixme
+		return ("text", str(self.parent.vals[self.parent.value][0]))
+
+class configSequenceArg:
+	def get(self, type, args = ()):
+		# configsequencearg.get ("IP")
+		if (type == "IP"):
+			return (("."), [(1,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)], "")
+		# configsequencearg.get("INTEGER", (min, max)) => x with min <= x <= max
+		if (type == "INTEGER"):
+			return ((":"), [args], "")
+		# configsequencearg.get("PINCODE", (number, "*")) => pin with number = length of pincode and "*" as numbers shown as stars
+		# configsequencearg.get("PINCODE", (number, "")) => pin with number = length of pincode and numbers shown
+		if (type == "PINCODE"):
+			return ((":"), [(0, (10**args[0])-1)], args[1])
+		# configsequencearg.get("FLOAT", [(min,max),(min1,max1)]) => x.y with min <= x <= max and min1 <= y <= max1
+		if (type == "FLOAT"):
+			return (("."), args, "")
+
+configsequencearg = configSequenceArg()
 		
 class configSequence:
 	def __init__(self, parent):
 		self.parent = parent
 		self.markedPos = 0
-		
+		self.seperator = self.parent.vals[0]
+		self.valueBounds = self.parent.vals[1]
+		self.censorChar = self.parent.vals[2]
+
 	def checkValues(self):
-		maxPos = len(self.parent.value) * self.parent.vals[1] 
-		print maxPos
-			
+		maxPos = 0
+		num = 0
+		for i in self.parent.value:
+			maxPos += len(str(self.valueBounds[num][1]))
+			while (self.valueBounds[num][0] > self.parent.value[num]):
+				self.parent.value[num] += 1
+
+			while (self.valueBounds[num][1] < self.parent.value[num]):
+				self.parent.value[num] -= 1
+				
+#			if (self.valueBounds[num][0] <= i <= self.valueBounds[num][1]):
+				#pass
+			#else:
+				#self.parent.value[num] = self.valueBounds[num][0]
+			num += 1
+		
 		if self.markedPos >= maxPos:
 			self.markedPos = maxPos - 1
 		if self.markedPos < 0:
@@ -109,7 +180,7 @@ class configSequence:
 		if key >= config.key["0"] and key <= config.key["9"]:
 			number = 9 - config.key["9"] + key
 			# length of numberblock
-			numberLen = len(str(self.parent.vals[1][1]))
+			numberLen = len(str(self.valueBounds[0][1]))
 			# position in the block
 			posinblock = self.markedPos % numberLen
 			# blocknumber
@@ -136,19 +207,23 @@ class configSequence:
 		value = ""
 		mPos = self.markedPos
 		print "Positon: " + str(mPos)
+		num = 0;
 		for i in self.parent.value:
 			if len(value):	#fixme no heading separator possible
-				value += self.parent.vals[0]
+				value += self.seperator
 				if mPos >= len(value) - 1:
 					mPos += 1
 				
-			#diff = 	self.parent.vals[1] - len(str(i))
+			#diff = 	self.valueBounds - len(str(i))
 			#if diff > 0:
 				## if this helps?!
 				#value += " " * diff
-			print (("%0" + str(len(str(self.parent.vals[1][1]))) + "d") % i)
-			value += ("%0" + str(len(str(self.parent.vals[1][1]))) + "d") % i
-
+			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:
+				value += (self.censorChar * len(str(self.valueBounds[num][1])))
+			num += 1
 			# only mark cursor when we are selected
 			# (this code is heavily ink optimized!)
 		return ("mtext"[1-selected:], value, [mPos])
@@ -214,6 +289,20 @@ class ConfigSubsection:
 		pass
 
 class configElement:
+
+	def getIndexbyEntry(self, data):
+		cnt = 0;
+		tcnt = -1; #for defaultval
+		for x in self.vals:
+			if int(x[1]) == int(data):
+					return cnt
+			if int(x[1]) == int(self.defaultValue):
+					tcnt = cnt
+			cnt += 1
+		if tcnt != -1:
+			return tcnt			
+		return 0	#prevent bigger then array
+
 	def datafromFile(self, control, data):
 		if control == ConfigSlider:
 			return int(data);
@@ -225,6 +314,8 @@ class configElement:
 			for x in part:
 				list.append(int(x))
 			return list
+		elif control == configSatlist:
+			return self.getIndexbyEntry(data)
 		else: 
 			return ""	
 
@@ -242,6 +333,8 @@ class configElement:
 #					value += self.vals[0]
 #				value += str(i)
 			return value
+		elif control == configSatlist:
+			return str(self.vals[self.value][1]);
 		else: 
 			return ""	
 
@@ -252,11 +345,19 @@ class configElement:
 			value = ""
 
 		if value == "":
-			print "value not found - using default"
-			self.value = self.defaultValue
+			#print "value not found - using default"
+
+			if self.controlType == configSatlist:
+				self.value = self.getIndexbyEntry(self.defaultValue)
+			else:	
+				self.value = self.defaultValue
+
 			self.save()		#add missing value to dict
 		else:
 			self.value = value
+			
+		#is this right? activate settings after load/cancel and use default	
+		self.change()
 
 	def __init__(self, configPath, control, defaultValue, vals):
 		self.configPath = configPath
@@ -276,3 +377,15 @@ class configElement:
 		self.loadData()
 	def save(self):
 		configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
+
+class configElement_nonSave(configElement):
+	def __init__(self, configPath, control, defaultValue, vals):
+		configElement.__init__(self, configPath, control, defaultValue, vals)
+
+	def save(self):
+		pass
+		
+def getConfigListEntry(description, element):
+	b = element
+	item = b.controlType(b)
+	return ((description, item))
\ No newline at end of file