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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index bd5656c9..c433f01b 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,3 +1,6 @@
+from time import *
+from Tools.NumericalTextInput import *
+
 class configFile:
 	def __init__(self):
 		self.changed = 0
@@ -37,7 +40,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':
@@ -72,12 +77,44 @@ class configSelection:
 		
 		self.checkValues()			
 
-		self.parent.change()	
+		self.parent.change()
 
 	def __call__(self, selected):			#needed by configlist
 		self.checkValues()
 		return ("text", self.parent.vals[self.parent.value])
 
+class configDateTime:
+	def __init__(self, parent):
+		self.parent = parent
+		
+	def checkValues(self):
+		pass
+#		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 - self.parent.vals[1]
+		if key == config.key["nextElement"]:
+			self.parent.value = self.parent.value + self.parent.vals[1]
+		
+		self.checkValues()
+
+		self.parent.change()	
+
+	def __call__(self, selected):			#needed by configlist
+		self.checkValues()
+		return ("text", strftime(self.parent.vals[0], localtime(self.parent.value)))
+	
 class configSatlist:
 	def __init__(self, parent):
 		self.parent = parent
@@ -89,9 +126,6 @@ class configSatlist:
 		if(self.parent.value >= (len(self.parent.vals) - 1)):
 			self.parent.value = len(self.parent.vals) - 1
 			
-		print "value" + str(self.parent.value)
-		print "name " + self.parent.vals[self.parent.value][0]
-
 	def cancel(self):
 		self.parent.reload()
 
@@ -112,16 +146,56 @@ class configSatlist:
 		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 ("CLOCK")
+		if (type == "CLOCK"):
+			return ((":"), [(0,23),(0,59)], "")
+		# 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:
@@ -144,7 +218,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
@@ -171,23 +245,82 @@ 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])
 
+class configText:
+	# 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):
+		self.parent = parent
+		self.markedPos = 0
+		self.mode = self.parent.vals[0]
+		self.textInput = NumericalTextInput(self.nextEntry)
+
+	def checkValues(self):
+		if (self.markedPos < 0):
+			self.markedPos = 0
+		if (self.markedPos >= len(self.parent.value)):
+			self.markedPos = len(self.parent.value) - 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["prevElement"]:
+			self.textInput.nextKey()
+			self.markedPos -= 1
+
+		if key == config.key["nextElement"]:
+			self.textInput.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"]:
+			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()	
+
+	def __call__(self, selected):			#needed by configlist
+		return ("mtext"[1-selected:], str(self.parent.value), [self.markedPos])
+		
 class configValue:
 	def __init__(self, obj):
 		self.obj = obj
@@ -249,25 +382,50 @@ 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);
+			return int(data)
 		elif control == configSelection:
-			return int(data);
+			return int(data)
+		elif control == configDateTime:
+			return int(data)
+		elif control == configText:
+			return str(data)
 		elif control == configSequence:
 			list = [ ]
 			part = data.split(self.vals[0])
 			for x in part:
 				list.append(int(x))
 			return list
+		elif control == configSatlist:
+			return self.getIndexbyEntry(data)
 		else: 
 			return ""	
 
 	def datatoFile(self, control, data):
 		if control == ConfigSlider:
-			return str(data);
+			return str(data)
 		elif control == configSelection:
-			return str(data);
+			return str(data)
+		elif control == configDateTime:
+			return str(data)
+		elif control == configText:
+			return str(data.strip())
+
 		elif control == configSequence:
 			value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
 #			just in case you don't understand the above, here an equivalent:
@@ -277,6 +435,8 @@ class configElement:
 #					value += self.vals[0]
 #				value += str(i)
 			return value
+		elif control == configSatlist:
+			return str(self.vals[self.value][1]);
 		else: 
 			return ""	
 
@@ -287,11 +447,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
@@ -301,6 +469,10 @@ class configElement:
 		self.notifierList = [ ]
 		self.enabled = True
 		self.loadData()		
+		
+	def getConfigPath(self):
+		return self.configPath
+	
 	def addNotifier(self, notifier):
 		self.notifierList.append(notifier);
 		notifier(self);
@@ -311,3 +483,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))