X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2Fconfig.py;h=08dd3745e8e97f0dbbf983400c0e3ee5b344fd03;hp=e249caf4d3e80029a09d19c6f77066147c7a03f4;hb=739c64ceb1cad3f9fcf1e85be88bf3faad13c534;hpb=0fa0646e9d874dc905a26551557902b2fc12d79e

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index e249caf..08dd374 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)
@@ -178,7 +179,7 @@ class choicesList(object): # XXX: we might want a better name for this
 
 	def __list__(self):
 		if self.type == choicesList.LIST_TYPE_LIST:
-			ret = [not isinstance(x, tuple) and x or x[0] for x in self.choices]
+			ret = [not isinstance(x, tuple) and x or len(x) > 0 and x[0] or len(x) == 0 and x for x in self.choices]
 		else:
 			ret = self.choices.keys()
 		return ret or [""]
@@ -1017,6 +1018,40 @@ class ConfigPassword(ConfigText):
 		ConfigText.onDeselect(self, session)
 		self.hidden = True
 
+# lets the user select between [min, min+stepwidth, min+(stepwidth*2)..., maxval] with maxval <= max depending
+# on the stepwidth
+# min, max, stepwidth, default are int values
+# wraparound: pressing RIGHT key at max value brings you to min value and vice versa if set to True
+class ConfigSelectionNumber(ConfigSelection):
+	def __init__(self, min, max, stepwidth, default = None, wraparound = False):
+		self.wraparound = wraparound
+		if default is None:
+			default = min
+		default = str(default)
+		choices = []
+		step = min
+		while step <= max:
+			choices.append(str(step))
+			step += stepwidth
+		
+		ConfigSelection.__init__(self, choices, default)
+
+	def getValue(self):
+		return int(ConfigSelection.getValue(self))
+
+	def setValue(self, val):
+		ConfigSelection.setValue(self, str(val))
+
+	def handleKey(self, key):
+		if not self.wraparound:
+			if key == KEY_RIGHT:
+				if len(self.choices) == (self.choices.index(self.value) + 1):
+					return
+			if key == KEY_LEFT:
+				if self.choices.index(self.value) == 0:
+					return
+		ConfigSelection.handleKey(self, key)
+
 class ConfigNumber(ConfigText):
 	def __init__(self, default = 0):
 		ConfigText.__init__(self, str(default), fixed_size = False)
@@ -1104,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)):
@@ -1249,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):
@@ -1286,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
@@ -1305,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
 
@@ -1328,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):