X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/64fdc7815a0b07777d9c9706f02317d325f8f773..562f08b0d0d53a3b79516dff47a7eea7ba971d17:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 40a460c2..5a4ed12e 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -257,23 +257,17 @@ 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
-
 		#FIXME: dont call when press left/right
 		self.parent.change()	
 
 	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):
@@ -466,6 +458,8 @@ 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:
@@ -485,7 +479,6 @@ class configElement:
 			return str(data.strip())
 
 		elif control == configSequence:
-			print data
 			try:
 				value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
 			except:	
@@ -525,13 +518,14 @@ class configElement:
 		#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):
@@ -546,7 +540,8 @@ class configElement:
 	def reload(self):
 		self.loadData()
 	def save(self):
-		configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
+		if self.defaultValue != self.value or self.saveDefaults == True:
+			configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
 
 class configElement_nonSave(configElement):
 	def __init__(self, configPath, control, defaultValue, vals):