X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bbb82688540582d2049b584e5263cbc0423fb551..4c1d3d2f5cf39f72bf85041a6ba6665350ea742e:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index a1f3d2c3..471b59ec 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1034,13 +1034,13 @@ class ConfigSelectionNumber(ConfigSelection):
 			step += stepwidth
 		
 		ConfigSelection.__init__(self, choices, default)
-		
+
 	def getValue(self):
-		return int(self.text)
+		return int(ConfigSelection.getValue(self))
 
 	def setValue(self, val):
-		self.text = str(val)
-		
+		ConfigSelection.setValue(self, str(val))
+
 	def handleKey(self, key):
 		if not self.wraparound:
 			if key == KEY_RIGHT:
@@ -1050,8 +1050,6 @@ class ConfigSelectionNumber(ConfigSelection):
 				if self.choices.index(self.value) == 0:
 					return
 		ConfigSelection.handleKey(self, key)
-				
-				
 
 class ConfigNumber(ConfigText):
 	def __init__(self, default = 0):
@@ -1140,6 +1138,9 @@ class ConfigDirectory(ConfigText):
 		else:
 			return ConfigText.getMulti(self, selected)
 
+	def onSelect(self, session):
+		self.allmarked = (self.value != "")
+
 # a slider.
 class ConfigSlider(ConfigElement):
 	def __init__(self, default = 0, increment = 1, limits = (0, 100)):
@@ -1184,25 +1185,12 @@ class ConfigSatlist(ConfigSelection):
 	def __init__(self, list, default = None):
 		if default is not None:
 			default = str(default)
-		list.sort(key = lambda x: int(x[0]))
-		self._satList = list
-		choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]
-		
-		ConfigSelection.__init__(self, choices = choices, default = default)
+		ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], 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)