X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0e9ffe6bc88f7cec210e0416f36062eb0c7a3502..a996da519c52c9e468b30da93d8439ad49c875d5:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 9c7dcb29..2056192f 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -25,7 +25,7 @@ class configFile:
 	def addElement(self, line):
 		x = line.find("=")
 		if x > -1:
-			self.configElements[line[:x]] = line[x + 1:]
+			self.configElements[line[:x]] = line[x + 1:-1]
 	
 	def getKey(self, key):
 		return self.configElements[key]
@@ -43,10 +43,7 @@ class configFile:
 		keys = self.configElements.keys()
 		keys.sort()
 		for x in keys:
-			wstr = x + "=" + self.configElements[x]
-			
-			if wstr[len(wstr) - 1] != '\n':
-				wstr = wstr + "\n"
+			wstr = x + "=" + self.configElements[x] + "\n"
 
 			fileHandle.write(wstr)
 
@@ -291,8 +288,8 @@ class configText:
 		self.parent.save()
 		
 	def nextEntry(self):
-		print "Next entry"
-		self.handleKey(config.key["nextElement"])
+		print self.parent
+		self.parent.vals[1](self.parent.getConfigPath())
 
 	def handleKey(self, key):
 		#this will no change anything on the value itself
@@ -345,6 +342,7 @@ class Config:
 					 "9": 19 }
 		
 config = Config();
+
 configfile = configFile()
 
 class ConfigSlider:
@@ -427,7 +425,11 @@ class configElement:
 			return str(data.strip())
 
 		elif control == configSequence:
-			value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+			print data
+			try:
+				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:
@@ -441,6 +443,7 @@ class configElement:
 			return ""	
 
 	def loadData(self):
+		#print "load:" + self.configPath
 		try:
 			value = self.datafromFile(self.controlType, configfile.getKey(self.configPath))
 		except:		
@@ -456,6 +459,7 @@ class configElement:
 
 			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	
@@ -469,6 +473,10 @@ class configElement:
 		self.notifierList = [ ]
 		self.enabled = True
 		self.loadData()		
+		
+	def getConfigPath(self):
+		return self.configPath
+	
 	def addNotifier(self, notifier):
 		self.notifierList.append(notifier);
 		notifier(self);
@@ -491,3 +499,9 @@ 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)
+
+config.misc = ConfigSubsection()