X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2Fconfig.py;h=d7506e31a275a0fb9a03a62b7cfabdd12b840df4;hp=1f8709b38cbe28741b7100781199997fca8b4663;hb=c95ebd0688c39d4fa6e22e85d84fe7d80e3da013;hpb=ffd8a32dea13249abcf4f53ae6c60025b2063899

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 1f8709b..d7506e3 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
@@ -29,6 +29,7 @@ from time import localtime, strftime
 class ConfigElement(object):
 	def __init__(self):
 		self.saved_value = None
+		self.save_forced = False
 		self.last_value = None
 		self.save_disabled = False
 		self.__notifiers = None
@@ -83,7 +84,7 @@ class ConfigElement(object):
 
 	# you need to override this if str(self.value) doesn't work
 	def save(self):
-		if self.save_disabled or self.value == self.default:
+		if self.save_disabled or (self.value == self.default and not self.save_forced):
 			self.saved_value = None
 		else:
 			self.saved_value = self.tostring(self.value)
@@ -1138,6 +1139,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)):
@@ -1283,7 +1287,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):
@@ -1320,7 +1323,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
@@ -1339,20 +1342,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
 
@@ -1362,7 +1356,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):