X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0a6ec816cccbc85a2d2f2a0856f99aabdb43f73b..150c14f36b9773f65070208986a607d3782f66b2:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index a2dfb8db..6897aa88 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -48,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):
@@ -78,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
@@ -148,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)], "")
@@ -165,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()
 		
@@ -417,7 +436,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:
@@ -437,6 +466,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)