X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dd6b0a6724db3e2533c5858beb49523f713fe8a7..c2a4869e307a91ba25ff5c827505f884764d7b6c:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 19fdefee..4d5af5cc 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,12 +1,13 @@
 from time import *
 from Tools.NumericalTextInput import *
+from Tools.Directories import *
 
 class configFile:
 	def __init__(self):
 		self.changed = 0
 		self.configElements = { }
 		try:
-			self.file = open("config")
+			self.file = open(resolveFilename(SCOPE_CONFIG, "config"))
 		except IOError:
 			print "cannot open config file"
 			return 
@@ -38,15 +39,12 @@ class configFile:
 		if self.changed == 0:		#no changes, so no write to disk needed
 			return
 			
-		fileHandle = open("config", "w")
+		fileHandle = open(resolveFilename(SCOPE_CONFIG, "config"), "w")
 		
 		keys = self.configElements.keys()
 		keys.sort()
 		for x in keys:
 			wstr = x + "=" + self.configElements[x] + "\n"
-			
-			if wstr[len(wstr) - 1] != '\n':
-				wstr = wstr + "\n"
 
 			fileHandle.write(wstr)
 
@@ -58,10 +56,9 @@ class configSelection:
 		
 	def checkValues(self):
 		if self.parent.value < 0:
-			self.parent.value = 0	
-
-		if(self.parent.value >= (len(self.parent.vals) - 1)):
-			self.parent.value = len(self.parent.vals) - 1
+			self.parent.value = len(self.parent.vals) - 1	
+		elif(self.parent.value > (len(self.parent.vals) - 1)):
+			self.parent.value = 0
 
 	def cancel(self):
 		self.parent.reload()
@@ -81,7 +78,7 @@ class configSelection:
 
 	def __call__(self, selected):			#needed by configlist
 		self.checkValues()
-		return ("text", self.parent.vals[self.parent.value])
+		return ("text", _(self.parent.vals[self.parent.value]))
 
 class configDateTime:
 	def __init__(self, parent):
@@ -264,8 +261,11 @@ class configSequence:
 			num += 1
 			# only mark cursor when we are selected
 			# (this code is heavily ink optimized!)
-		return ("mtext"[1-selected:], value, [mPos])
-
+		if (self.parent.enabled == True):
+			return ("mtext"[1-selected:], value, [mPos])
+		else:
+			return ("text", value)
+		
 class configText:
 	# used as first parameter
 	# is the text of a fixed size or is the user able to extend the length of the text
@@ -297,6 +297,8 @@ class configText:
 	def handleKey(self, key):
 		#this will no change anything on the value itself
 		#so we can handle it here in gui element
+		if key == config.key["delete"]:
+			self.parent.value = self.parent.value[0:self.markedPos] + self.parent.value[self.markedPos + 1:]
 		if key == config.key["prevElement"]:
 			self.textInput.nextKey()
 			self.markedPos -= 1
@@ -333,6 +335,7 @@ class Config:
 		self.key = { "choseElement": 0,
 					 "prevElement": 1,
 					 "nextElement": 2,
+					 "delete": 3,
 					 "0": 10,
 					 "1": 11,
 					 "2": 12,
@@ -345,6 +348,7 @@ class Config:
 					 "9": 19 }
 		
 config = Config();
+
 configfile = configFile()
 
 class ConfigSlider:
@@ -501,3 +505,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()