X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aaeba87c8ee1b528dc9660dab9c6980155e878d4..91c9fe96447bd6fabe95374c05579c0ffc3f3202:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index d17f7711..471b59ec 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,6 +1,6 @@
 from enigma import getPrevAsciiCode
 from Tools.NumericalTextInput import NumericalTextInput
-from Tools.Directories import resolveFilename, SCOPE_CONFIG
+from Tools.Directories import resolveFilename, SCOPE_CONFIG, fileExists
 from Components.Harddisk import harddiskmanager
 from copy import copy as copy_copy
 from os import path as os_path
@@ -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,10 +1185,7 @@ class ConfigSatlist(ConfigSelection):
 	def __init__(self, list, default = None):
 		if default is not None:
 			default = str(default)
-		choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]
-		choices.sort(key = lambda x: int(x[0]))
-		
-		ConfigSelection.__init__(self, choices = choices, default = default)
+		ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], default = default)
 
 	def getOrbitalPosition(self):
 		if self.value == "":
@@ -1288,7 +1286,6 @@ class ConfigLocations(ConfigElement):
 		self.default = default
 		self.locations = []
 		self.mountpoints = []
-		harddiskmanager.on_partition_list_change.append(self.mountpointsChanged)
 		self.value = default[:]
 
 	def setValue(self, value):
@@ -1325,7 +1322,7 @@ class ConfigLocations(ConfigElement):
 		locations = [[x, None, False, False] for x in tmp]
 		self.refreshMountpoints()
 		for x in locations:
-			if os_path.exists(x[0]):
+			if fileExists(x[0]):
 				x[1] = self.getMountpoint(x[0])
 				x[2] = True
 		self.locations = locations
@@ -1344,20 +1341,11 @@ class ConfigLocations(ConfigElement):
 			return False
 		return self.tostring([x[0] for x in locations]) != sv
 
-	def mountpointsChanged(self, action, dev):
-		print "Mounts changed: ", action, dev
-		mp = dev.mountpoint+"/"
-		if action == "add":
-			self.addedMount(mp)
-		elif action == "remove":
-			self.removedMount(mp)
-		self.refreshMountpoints()
-
 	def addedMount(self, mp):
 		for x in self.locations:
 			if x[1] == mp:
 				x[2] = True
-			elif x[1] == None and os_path.exists(x[0]):
+			elif x[1] == None and fileExists(x[0]):
 				x[1] = self.getMountpoint(x[0])
 				x[2] = True
 
@@ -1367,7 +1355,7 @@ class ConfigLocations(ConfigElement):
 				x[2] = False
 
 	def refreshMountpoints(self):
-		self.mountpoints = [p.mountpoint + "/" for p in harddiskmanager.getMountedPartitions() if p.mountpoint != "/"]
+		self.mountpoints = [p.mountpoint for p in harddiskmanager.getMountedPartitions() if p.mountpoint != "/"]
 		self.mountpoints.sort(key = lambda x: -len(x))
 
 	def checkChangedMountpoints(self):