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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index bd5656c9..7f8f5072 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -89,9 +89,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()
 
@@ -249,6 +246,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);
@@ -260,6 +271,8 @@ class configElement:
 			for x in part:
 				list.append(int(x))
 			return list
+		elif control == configSatlist:
+			return self.getIndexbyEntry(data)
 		else: 
 			return ""	
 
@@ -277,6 +290,8 @@ class configElement:
 #					value += self.vals[0]
 #				value += str(i)
 			return value
+		elif control == configSatlist:
+			return str(self.vals[self.value][1]);
 		else: 
 			return ""	
 
@@ -288,10 +303,18 @@ class configElement:
 
 		if value == "":
 			print "value not found - using default"
-			self.value = self.defaultValue
+
+			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