X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ceec7e17eeaecf4290e17f19bf37f299dae0f754..29dda647f09e42ac3a621bbb537558c2d1bbc7b4:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 51e753ca..212c92ee 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -257,15 +257,10 @@ class configSequence:
 			olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
 			newvalue = oldvalue - olddec + (10 ** (numberLen - posinblock - 1) * number)
 			
-			print "You actually pressed a number (" + str(number) + ") which will be added at block number " + str(blocknumber) + " on position " + str(posinblock)
-			print "Old value: " + str(oldvalue) + " olddec: " + str(olddec) + " newvalue: " + str(newvalue)
 			self.parent.value[blocknumber] = newvalue
 			self.markedPos += 1
 		
-		self.checkValues()			
-		
-		print "markPos:",
-		print self.markedPos
+		self.checkValues()
 
 		#FIXME: dont call when press left/right
 		self.parent.change()	
@@ -273,7 +268,6 @@ class configSequence:
 	def __call__(self, selected):			#needed by configlist
 		value = ""
 		mPos = self.markedPos
-		print "Positon: " + str(mPos)
 		num = 0;
 		for i in self.parent.value:
 			if len(value):	#fixme no heading separator possible
@@ -285,7 +279,6 @@ class configSequence:
 			#if diff > 0:
 				## if this helps?!
 				#value += " " * diff
-			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:
@@ -323,7 +316,6 @@ class configText:
 		self.parent.save()
 		
 	def nextEntry(self):
-		print self.parent
 		self.parent.vals[1](self.parent.getConfigPath())
 
 	def handleKey(self, key):
@@ -485,18 +477,20 @@ class configElement:
 			return str(data)
 		elif control == configText:
 			return str(data.strip())
-
 		elif control == configSequence:
+#			print self.vals
+#			print self.value
 			try:
-				value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+				value = ""
+				count = 0
+				for i in data:
+					if value !="":
+						value += self.vals[0]
+					value += (("%0" + str(len(str(self.vals[1][count][1]))) + "d") % i)
+					count += 1
+					#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:
-#				if value !="":
-#					value += self.vals[0]
-#				value += str(i)
 			return value
 		elif control == configSatlist:
 			return str(self.vals[self.value][1]);
@@ -512,27 +506,29 @@ class configElement:
 
 		if value == "":
 			#print "value not found - using default"
-
 			if self.controlType == configSatlist:
 				self.value = self.getIndexbyEntry(self.defaultValue)
-			else:	
+			elif self.controlType == configSequence:
+				self.value = self.defaultValue[:]
+			else:
 				self.value = self.defaultValue
 
 			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	
 		self.change()
 
-	def __init__(self, configPath, control, defaultValue, vals):
+	def __init__(self, configPath, control, defaultValue, vals, saveDefaults = True):
 		self.configPath = configPath
 		self.defaultValue = defaultValue
 		self.controlType = control
 		self.vals = vals
 		self.notifierList = [ ]
 		self.enabled = True
+		self.saveDefaults = saveDefaults
 		self.loadData()		
 		
 	def getConfigPath(self):
@@ -541,13 +537,20 @@ class configElement:
 	def addNotifier(self, notifier):
 		self.notifierList.append(notifier);
 		notifier(self);
+
 	def change(self):
 		for notifier in self.notifierList:
 			notifier(self)
+
 	def reload(self):
 		self.loadData()
+
 	def save(self):
-		if self.defaultValue != self.value:
+		if self.controlType == configSatlist:
+			defaultValue = self.getIndexbyEntry(self.defaultValue)
+		else:
+			defaultValue = self.defaultValue
+		if (defaultValue != self.value) or (self.saveDefaults == True):
 			configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
 
 class configElement_nonSave(configElement):
@@ -556,13 +559,12 @@ class configElement_nonSave(configElement):
 
 	def save(self):
 		pass
-		
+
 def getConfigListEntry(description, element):
 	b = element
 	item = b.controlType(b)
 	return ((description, item))
 
-
 def configElementBoolean(name, default, texts=(_("Enable"), _("Disable"))):
 	return configElement(name, configSelection, default, texts)