X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/daceed220bdfbb2bd48d08372dbb77d450a8be61..835d4ae513afbbb62c7739070ef3c23eade22e62:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 4df02d5d..baa6c35b 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -913,13 +913,14 @@ class ConfigText(ConfigElement, NumericalTextInput):
 			self.timeout()
 			self.overwrite = not self.overwrite
 		elif key == KEY_ASCII:
-  			self.timeout()
-  			newChar = unichr(getPrevAsciiCode())
-			if self.allmarked:
-				self.deleteAllChars()
-				self.allmarked = False
-			self.insertChar(newChar, self.marked_pos, False)
-			self.marked_pos += 1
+			self.timeout()
+			newChar = unichr(getPrevAsciiCode())
+			if not self.useableChars or newChar in self.useableChars:
+				if self.allmarked:
+					self.deleteAllChars()
+					self.allmarked = False
+				self.insertChar(newChar, self.marked_pos, False)
+				self.marked_pos += 1
 		elif key in KEY_NUMBERS:
 			owr = self.lastKey == getKeyNumber(key)
 			newChar = self.getKey(getKeyNumber(key))
@@ -1147,12 +1148,24 @@ class ConfigSatlist(ConfigSelection):
 	def __init__(self, list, default = None):
 		if default is not None:
 			default = str(default)
-		ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], default = default)
+		self._satList = list
+		choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]
+		
+		ConfigSelection.__init__(self, choices = choices, default = default)
 
+	# use this function to get the orbital position, don't rely on .index
 	def getOrbitalPosition(self):
 		if self.value == "":
 			return None
 		return int(self.value)
+	
+	def getSatList(self):
+		return self._satList
+	
+	def getSat(self):
+		return self.satList[self.index]
+	
+	satList = property(getSatList)
 
 	orbital_position = property(getOrbitalPosition)
 
@@ -1493,7 +1506,7 @@ class ConfigSubDict(dict, object):
 		self.stored_values = dict(values)
 		for (key, val) in self.items():
 			if str(key) in self.stored_values:
-				val = self.stored_values[str(key)]
+				val.saved_value = self.stored_values[str(key)]
 
 	saved_value = property(getSavedValue, setSavedValue)