X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/84f04f5d7473fa875372c53af82b11791da572dc..a996da519c52c9e468b30da93d8439ad49c875d5:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 4585620b..2056192f 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
@@ -22,7 +25,7 @@ class configFile:
 	def addElement(self, line):
 		x = line.find("=")
 		if x > -1:
-			self.configElements[line[:x]] = line[x + 1:]
+			self.configElements[line[:x]] = line[x + 1:-1]
 	
 	def getKey(self, key):
 		return self.configElements[key]
@@ -40,10 +43,7 @@ class configFile:
 		keys = self.configElements.keys()
 		keys.sort()
 		for x in keys:
-			wstr = x + "=" + self.configElements[x]
-			
-			if wstr[len(wstr) - 1] != '\n':
-				wstr = wstr + "\n"
+			wstr = x + "=" + self.configElements[x] + "\n"
 
 			fileHandle.write(wstr)
 
@@ -74,12 +74,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
@@ -116,16 +148,23 @@ class configSequenceArg:
 	def get(self, type, args = ()):
 		# configsequencearg.get ("IP")
 		if (type == "IP"):
-			return (("."), [(1,255),(0,255),(0,255),(0,255)])
+			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)])
+			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])
+			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)
+			return (("."), args, "")
 
 configsequencearg = configSequenceArg()
 		
@@ -135,6 +174,7 @@ class configSequence:
 		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 = 0
@@ -214,12 +254,70 @@ class configSequence:
 				## if this helps?!
 				#value += " " * diff
 			print (("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i)
-			value += ("%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
@@ -244,6 +342,7 @@ class Config:
 					 "9": 19 }
 		
 config = Config();
+
 configfile = configFile()
 
 class ConfigSlider:
@@ -292,14 +391,18 @@ class configElement:
 					tcnt = cnt
 			cnt += 1
 		if tcnt != -1:
-			return tcnt			
+			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])
@@ -313,11 +416,20 @@ class configElement:
 
 	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)
+			print data
+			try:
+				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:
@@ -331,13 +443,14 @@ class configElement:
 			return ""	
 
 	def loadData(self):
+		#print "load:" + self.configPath
 		try:
 			value = self.datafromFile(self.controlType, configfile.getKey(self.configPath))
 		except:		
 			value = ""
 
 		if value == "":
-			print "value not found - using default"
+			#print "value not found - using default"
 
 			if self.controlType == configSatlist:
 				self.value = self.getIndexbyEntry(self.defaultValue)
@@ -346,6 +459,7 @@ class configElement:
 
 			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	
@@ -359,6 +473,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);
@@ -380,4 +498,10 @@ class configElement_nonSave(configElement):
 def getConfigListEntry(description, element):
 	b = element
 	item = b.controlType(b)
-	return ((description, item))
\ No newline at end of file
+	return ((description, item))
+
+
+def configElementBoolean(name, default, texts=(_("Enable"), _("Disable"))):
+	return configElement(name, configSelection, default, texts)
+
+config.misc = ConfigSubsection()