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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 9c2c3f43..dfd5d597 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,3 +1,5 @@
+from time import *
+
 class configFile:
 	def __init__(self):
 		self.changed = 0
@@ -80,6 +82,38 @@ class configSelection:
 		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 +150,20 @@ class configSequenceArg:
 	def get(self, type, args = ()):
 		# configsequencearg.get ("IP")
 		if (type == "IP"):
-			return (("."), [(1,255),(1,255),(1,255),(1,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("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,12 +173,23 @@ 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
 		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:
@@ -204,7 +253,10 @@ 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!)
@@ -290,6 +342,8 @@ class configElement:
 			return int(data);
 		elif control == configSelection:
 			return int(data);
+		elif control == configDateTime:
+			return int(data);
 		elif control == configSequence:
 			list = [ ]
 			part = data.split(self.vals[0])
@@ -306,6 +360,8 @@ class configElement:
 			return str(data);
 		elif control == configSelection:
 			return str(data);
+		elif control == configDateTime:
+			return str(data);
 		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:
@@ -327,7 +383,7 @@ class configElement:
 			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)
@@ -370,4 +426,6 @@ 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))
+
+	
\ No newline at end of file