X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/92456d9542585d58e011fa4f0b501de3ef9c1819..cd1ef2a9024596a6f5938b701e8a8ac623e40ee6:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 6c683bca..b91c449e 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,8 +1,10 @@
 import time
+from enigma import getPrevAsciiCode
 from Tools.NumericalTextInput import NumericalTextInput
 from Tools.Directories import resolveFilename, SCOPE_CONFIG
+from Components.Harddisk import harddiskmanager
 import copy
-
+import os
 
 # ConfigElement, the base class of all ConfigElements.
 
@@ -97,14 +99,22 @@ class ConfigElement(object):
 	def __call__(self, selected):
 		return self.getMulti(selected)
 
-	def helpWindow(self):
-		return None
+	def onSelect(self, session):
+		pass
+
+	def onDeselect(self, session):
+		pass
 
 KEY_LEFT = 0
 KEY_RIGHT = 1
 KEY_OK = 2
 KEY_DELETE = 3
-KEY_TIMEOUT = 4
+KEY_BACKSPACE = 4
+KEY_HOME = 5
+KEY_END = 6
+KEY_TOGGLEOW = 7
+KEY_ASCII = 8
+KEY_TIMEOUT = 9
 KEY_NUMBERS = range(12, 12+10)
 KEY_0 = 12
 KEY_9 = 12+9
@@ -124,6 +134,10 @@ def getKeyNumber(key):
 class ConfigSelection(ConfigElement):
 	def __init__(self, choices, default = None):
 		ConfigElement.__init__(self)
+		self._value = None
+		self.setChoices(choices, default)
+
+	def setChoices(self, choices, default = None):
 		self.choices = []
 		self.description = {}
 		
@@ -154,7 +168,10 @@ class ConfigSelection(ConfigElement):
 		for x in self.choices:
 			assert isinstance(x, str), "ConfigSelection choices must be strings"
 		
-		self.value = self.default = default
+		self.default = default
+
+		if self.value == None or not self.value in self.choices:
+			self.value = default
 
 	def setValue(self, value):
 		if value in self.choices:
@@ -192,12 +209,27 @@ class ConfigSelection(ConfigElement):
 			self.value = self.choices[(i + nchoices - 1) % nchoices]
 		elif key == KEY_RIGHT:
 			self.value = self.choices[(i + 1) % nchoices]
+		elif key == KEY_HOME:
+			self.value = self.choices[0]
+		elif key == KEY_END:
+			self.value = self.choices[nchoices - 1]
+			
+	def selectNext(self):
+		nchoices = len(self.choices)
+		i = self.choices.index(self.value)
+		self.value = self.choices[(i + 1) % nchoices]
 
 	def getText(self):
-		return _(self.description[self.value])
+		descr = self.description[self.value]
+		if len(descr):
+			return _(descr)
+		return descr
 
 	def getMulti(self, selected):
-		return ("text", _(self.description[self.value]))
+		descr = self.description[self.value]
+		if len(descr):
+			return ("text", _(descr))
+		return ("text", descr)
 
 	# HTML
 	def getHTML(self, id):
@@ -227,14 +259,24 @@ class ConfigBoolean(ConfigElement):
 	def handleKey(self, key):
 		if key in [KEY_LEFT, KEY_RIGHT]:
 			self.value = not self.value
+		elif key == KEY_HOME:
+			self.value = False
+		elif key == KEY_END:
+			self.value = True
 
 	def getText(self):
-		return _(self.descriptions[self.value])
+		descr = self.descriptions[self.value]
+		if len(descr):
+			return _(descr)
+		return descr
 
 	def getMulti(self, selected):
-		return ("text", _(self.descriptions[self.value]))
+		descr = self.descriptions[self.value]
+		if len(descr):
+			return ("text", _(descr))
+		return ("text", descr)
 
- 	def tostring(self, value):
+	def tostring(self, value):
 		if not value:
 			return "false"
 		else:
@@ -282,9 +324,10 @@ class ConfigDateTime(ConfigElement):
 	def handleKey(self, key):
 		if key == KEY_LEFT:
 			self.value = self.value - self.increment
-		if key == KEY_RIGHT:
+		elif key == KEY_RIGHT:
 			self.value = self.value + self.increment
-
+		elif key == KEY_HOME or key == KEY_END:
+			self.value = self.default
 
 	def getText(self):
 		return time.strftime(self.formatstring, time.localtime(self.value))
@@ -317,6 +360,8 @@ class ConfigSequence(ConfigElement):
 		
 		self.default = default
 		self.value = copy.copy(default)
+		
+		self.endNotifier = []
 
 	def validate(self):
 		max_pos = 0
@@ -324,15 +369,17 @@ class ConfigSequence(ConfigElement):
 		for i in self._value:
 			max_pos += len(str(self.limits[num][1]))
 
-			while self._value[num] < self.limits[num][0]:
-				self.value[num] += 1
+			if self._value[num] < self.limits[num][0]:
+				self._value[num] = self.limits[num][0]
 
-			while self._value[num] > self.limits[num][1]:
-				self._value[num] -= 1
+			if self._value[num] > self.limits[num][1]:
+				self._value[num] = self.limits[num][1]
 
 			num += 1
 
 		if self.marked_pos >= max_pos:
+			for x in self.endNotifier:
+				x(self)
 			self.marked_pos = max_pos - 1
 
 		if self.marked_pos < 0:
@@ -346,6 +393,9 @@ class ConfigSequence(ConfigElement):
 
 		if self.marked_pos >= total_len:
 			self.marked_pos = total_len - 1
+			
+	def addEndNotifier(self, notifier):
+		self.endNotifier.append(notifier)
 
 	def handleKey(self, key):
 		if key == KEY_LEFT:
@@ -356,7 +406,28 @@ class ConfigSequence(ConfigElement):
 			self.marked_pos += 1
 			self.validatePos()
 		
-		if key in KEY_NUMBERS:
+		if key == KEY_HOME:
+			self.marked_pos = 0
+			self.validatePos()
+
+		if key == KEY_END:
+			max_pos = 0
+			num = 0
+			for i in self._value:
+				max_pos += len(str(self.limits[num][1]))
+				num += 1
+			self.marked_pos = max_pos - 1
+			self.validatePos()
+		
+		if key in KEY_NUMBERS or key == KEY_ASCII:
+			if key == KEY_ASCII:
+				code = getPrevAsciiCode()
+				if code < 48 or code > 57:
+					return
+				number = code - 48
+			else:
+				number = getKeyNumber(key)
+			
 			block_len = []
 			for x in self.limits:
 				block_len.append(len(str(x[1])))
@@ -374,8 +445,6 @@ class ConfigSequence(ConfigElement):
 				else:
 					blocknumber += 1
 
-			number = getKeyNumber(key)
-			
 			# length of numberblock
 			number_len = len(str(self.limits[blocknumber][1]))
 
@@ -429,11 +498,15 @@ class ConfigSequence(ConfigElement):
 		return str(v)
 
 	def fromstring(self, value):
-		return [int(x) for x in self.saved_value.split(self.seperator)]
+		return [int(x) for x in value.split(self.seperator)]
 
 class ConfigIP(ConfigSequence):
 	def __init__(self, default):
 		ConfigSequence.__init__(self, seperator = ".", limits = [(0,255),(0,255),(0,255),(0,255)], default = default)
+	
+	def getHTML(self, id):
+		# we definitely don't want leading zeros
+		return '.'.join(["%d" % d for d in self.value])
 
 class ConfigMAC(ConfigSequence):
 	def __init__(self, default):
@@ -450,7 +523,7 @@ class ConfigClock(ConfigSequence):
 		ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = [t.tm_hour, t.tm_min])
 
 class ConfigInteger(ConfigSequence):
-	def __init__(self, default, limits = (0, 10000000000)):
+	def __init__(self, default, limits = (0, 9999999999)):
 		ConfigSequence.__init__(self, seperator = ":", limits = [limits], default = default)
 	
 	# you need to override this to do input validation
@@ -491,43 +564,132 @@ class ConfigFloat(ConfigSequence):
 
 # an editable text...
 class ConfigText(ConfigElement, NumericalTextInput):
-	def __init__(self, default = "", fixed_size = True):
+	def __init__(self, default = "", fixed_size = True, visible_width = False):
 		ConfigElement.__init__(self)
 		NumericalTextInput.__init__(self, nextFunc = self.nextFunc, handleTimeout = False)
 		
 		self.marked_pos = 0
+		self.allmarked = (default != "")
 		self.fixed_size = fixed_size
-
+		self.visible_width = visible_width
+		self.offset = 0
+		self.overwrite = fixed_size
+		self.help_window = None
 		self.value = self.default = default
 
 	def validateMarker(self):
+		if self.fixed_size:
+			if self.marked_pos > len(self.text)-1:
+				self.marked_pos = len(self.text)-1
+		else:
+			if self.marked_pos > len(self.text):
+				self.marked_pos = len(self.text)
 		if self.marked_pos < 0:
 			self.marked_pos = 0
-		if self.marked_pos >= len(self.text):
-			self.marked_pos = len(self.text) - 1
+		if self.visible_width:
+			if self.marked_pos < self.offset:
+				self.offset = self.marked_pos
+			if self.marked_pos >= self.offset + self.visible_width:
+				if self.marked_pos == len(self.text):
+					self.offset = self.marked_pos - self.visible_width
+				else:
+					self.offset = self.marked_pos - self.visible_width + 1
+			if self.offset > 0 and self.offset + self.visible_width > len(self.text):
+				self.offset = max(0, len(self.text) - self.visible_width)
+
+	def insertChar(self, ch, pos, owr):
+		if owr or self.overwrite:
+			self.text = self.text[0:pos] + ch + self.text[pos + 1:]
+		elif self.fixed_size:
+			self.text = self.text[0:pos] + ch + self.text[pos:-1]
+		else:
+			self.text = self.text[0:pos] + ch + self.text[pos:]
 
-	#def nextEntry(self):
-	#	self.vals[1](self.getConfigPath())
+	def deleteChar(self, pos):
+		if not self.fixed_size:
+			self.text = self.text[0:pos] + self.text[pos + 1:]
+		elif self.overwrite:
+			self.text = self.text[0:pos] + " " + self.text[pos + 1:]
+		else:
+			self.text = self.text[0:pos] + self.text[pos + 1:] + " "
+
+	def deleteAllChars(self):
+		if self.fixed_size:
+			self.text = " " * len(self.text)
+		else:
+			self.text = ""
+		self.marked_pos = 0
 
 	def handleKey(self, key):
 		# this will no change anything on the value itself
 		# so we can handle it here in gui element
 		if key == KEY_DELETE:
-			self.text = self.text[0:self.marked_pos] + self.text[self.marked_pos + 1:]
+			self.timeout()
+			if self.allmarked:
+				self.deleteAllChars()
+				self.allmarked = False
+			else:
+				self.deleteChar(self.marked_pos)
+				if self.fixed_size and self.overwrite:
+					self.marked_pos += 1
+		elif key == KEY_BACKSPACE:
+			self.timeout()
+			if self.allmarked:
+				self.deleteAllChars()
+				self.allmarked = False
+			elif self.marked_pos > 0:
+				self.deleteChar(self.marked_pos-1)
+				if not self.fixed_size and self.offset > 0:
+					self.offset -= 1
+				self.marked_pos -= 1
 		elif key == KEY_LEFT:
-			self.marked_pos -= 1
+			self.timeout()
+			if self.allmarked:
+				self.marked_pos = len(self.text)
+				self.allmarked = False
+			else:
+				self.marked_pos -= 1
 		elif key == KEY_RIGHT:
+			self.timeout()
+			if self.allmarked:
+				self.marked_pos = 0
+				self.allmarked = False
+			else:
+				self.marked_pos += 1
+		elif key == KEY_HOME:
+			self.timeout()
+			self.allmarked = False
+			self.marked_pos = 0
+		elif key == KEY_END:
+			self.timeout()
+			self.allmarked = False
+			self.marked_pos = len(self.text)
+		elif key == KEY_TOGGLEOW:
+			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
-			if not self.fixed_size:
-				if self.marked_pos >= len(self.text):
-					self.text = self.text.ljust(len(self.text) + 1)
 		elif key in KEY_NUMBERS:
-			number = self.getKey(getKeyNumber(key))
-			self.text = self.text[0:self.marked_pos] + unicode(number) + self.text[self.marked_pos + 1:]
+			owr = self.lastKey == getKeyNumber(key)
+			newChar = self.getKey(getKeyNumber(key))
+			if self.allmarked:
+				self.deleteAllChars()
+				self.allmarked = False
+			self.insertChar(newChar, self.marked_pos, owr)
 		elif key == KEY_TIMEOUT:
 			self.timeout()
+			if self.help_window:
+				self.help_window.update(self)
 			return
 
+		if self.help_window:
+			self.help_window.update(self)
 		self.validateMarker()
 		self.changed()
 
@@ -550,14 +712,35 @@ class ConfigText(ConfigElement, NumericalTextInput):
 	_value = property(getValue, setValue)
 
 	def getText(self):
-		return self.value
+		return self.text.encode("utf-8")
 
 	def getMulti(self, selected):
-		return ("mtext"[1-selected:], self.value, [self.marked_pos])
+		if self.visible_width:
+			if self.allmarked:
+				mark = range(0, min(self.visible_width, len(self.text)))
+			else:
+				mark = [self.marked_pos-self.offset]
+			return ("mtext"[1-selected:], self.text[self.offset:self.offset+self.visible_width].encode("utf-8")+" ", mark)
+		else:
+			if self.allmarked:
+				mark = range(0, len(self.text))
+			else:
+				mark = [self.marked_pos]
+			return ("mtext"[1-selected:], self.text.encode("utf-8")+" ", mark)
+
+	def onSelect(self, session):
+		self.allmarked = (self.value != "")
+		if session is not None:
+			from Screens.NumericalTextInputHelpDialog import NumericalTextInputHelpDialog
+			self.help_window = session.instantiateDialog(NumericalTextInputHelpDialog, self)
+			self.help_window.show()
 
-	def helpWindow(self):
-		from Screens.NumericalTextInputHelpDialog import NumericalTextInputHelpDialog
-		return (NumericalTextInputHelpDialog,self)
+	def onDeselect(self, session):
+		self.marked_pos = 0
+		self.offset = 0
+		if self.help_window:
+			session.deleteDialog(self.help_window)
+			self.help_window = None
 
 	def getHTML(self, id):
 		return '<input type="text" name="' + id + '" value="' + self.value + '" /><br>\n'
@@ -565,6 +748,54 @@ class ConfigText(ConfigElement, NumericalTextInput):
 	def unsafeAssign(self, value):
 		self.value = str(value)
 
+class ConfigNumber(ConfigText):
+	def __init__(self, default = 0):
+		ConfigText.__init__(self, str(default), fixed_size = False)
+
+	def getValue(self):
+		return int(self.text)
+		
+	def setValue(self, val):
+		self.text = str(val)
+
+	value = property(getValue, setValue)
+	_value = property(getValue, setValue)
+
+	def conform(self):
+		pos = len(self.text) - self.marked_pos
+		self.text = self.text.lstrip("0")
+		if self.text == "":
+			self.text = "0"
+		if pos > len(self.text):
+			self.marked_pos = 0
+		else:
+			self.marked_pos = len(self.text) - pos
+
+	def handleKey(self, key):
+		if key in KEY_NUMBERS or key == KEY_ASCII:
+			if key == KEY_ASCII:
+				ascii = getPrevAsciiCode()
+				if not (48 <= ascii <= 57):
+					return
+			else:
+				ascii = getKeyNumber(key) + 48
+  			newChar = unichr(ascii)
+			if self.allmarked:
+				self.deleteAllChars()
+				self.allmarked = False
+			self.insertChar(newChar, self.marked_pos, False)
+			self.marked_pos += 1
+		else:
+			ConfigText.handleKey(self, key)
+		self.conform()
+
+	def onSelect(self, session):
+		self.allmarked = (self.value != "")
+
+	def onDeselect(self, session):
+		self.marked_pos = 0
+		self.offset = 0
+
 # a slider.
 class ConfigSlider(ConfigElement):
 	def __init__(self, default = 0, increment = 1, limits = (0, 100)):
@@ -586,11 +817,13 @@ class ConfigSlider(ConfigElement):
 			self.value -= self.increment
 		elif key == KEY_RIGHT:
 			self.value += self.increment
+		elif key == KEY_HOME:
+			self.value = self.min
+		elif key == KEY_END:
+			self.value = self.max
 		else:
 			return
-
 		self.checkValues()
-		self.changed()
 
 	def getText(self):
 		return "%d / %d" % (self.value, self.max)
@@ -607,7 +840,7 @@ 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) in list], default = default)
+		ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], default = default)
 
 	def getOrbitalPosition(self):
 		if self.value == "":
@@ -616,6 +849,238 @@ class ConfigSatlist(ConfigSelection):
 	
 	orbital_position = property(getOrbitalPosition)
 
+class ConfigSet(ConfigElement):
+	def __init__(self, choices, default = []):
+		ConfigElement.__init__(self)
+		self.choices = []
+		self.description = {}
+		if isinstance(choices, list):
+			choices.sort()
+			for x in choices:
+				if isinstance(x, tuple):
+					self.choices.append(x[0])
+					self.description[x[0]] = str(x[1])
+				else:
+					self.choices.append(x)
+					self.description[x] = str(x)
+		else:
+			assert False, "ConfigSet choices must be a list!"
+		if len(self.choices) == 0:
+			self.choices = [""]
+			self.description[""] = ""
+		if default is None:
+			default = []
+		self.pos = -1
+		default.sort()
+		self.default = default
+		self.value = default+[]
+
+	def toggleChoice(self, choice):
+		if choice in self.value:
+			self.value.remove(choice)
+		else:
+			self.value.append(choice)
+			self.value.sort()
+
+	def handleKey(self, key):
+		if key in KEY_NUMBERS + [KEY_DELETE, KEY_BACKSPACE]:
+			if self.pos != -1:
+				self.toggleChoice(self.choices[self.pos])
+		elif key == KEY_LEFT:
+			self.pos -= 1
+			if self.pos < -1:
+			    self.pos = len(self.choices)-1
+		elif key == KEY_RIGHT:
+			self.pos += 1
+			if self.pos >= len(self.choices):
+			    self.pos = -1
+		elif key in [KEY_HOME, KEY_END]:
+			self.pos = -1
+
+	def genString(self, lst):
+		res = ""
+		for x in lst:
+			res += self.description[x]+" "
+		return res
+
+	def getText(self):
+		return self.genString(self.value)
+
+	def getMulti(self, selected):
+		if not selected or self.pos == -1:
+			return ("text", self.genString(self.value))
+		else:
+			tmp = self.value+[]
+			ch = self.choices[self.pos]
+			mem = ch in self.value
+			if not mem:
+				tmp.append(ch)
+				tmp.sort()
+			ind = tmp.index(ch)
+			val1 = self.genString(tmp[:ind])
+			val2 = " "+self.genString(tmp[ind+1:])
+			if mem:
+				chstr = " "+self.description[ch]+" "
+			else:
+				chstr = "("+self.description[ch]+")"
+			return ("mtext", val1+chstr+val2, range(len(val1),len(val1)+len(chstr)))
+
+	def onDeselect(self, session):
+		self.pos = -1
+		self.changed()
+		
+	def tostring(self, value):
+		return str(value)
+
+	def fromstring(self, val):
+		return eval(val)
+
+class ConfigLocations(ConfigElement):
+	def __init__(self, default = [], visible_width = False):
+		ConfigElement.__init__(self)
+		self.visible_width = visible_width
+		self.pos = -1
+		self.default = default
+		self.locations = []
+		self.mountpoints = []
+		harddiskmanager.on_partition_list_change.append(self.mountpointsChanged)
+
+	def setValue(self, value):
+		loc = [x[0] for x in self.locations if x[3]]
+		add = [x for x in value if not x in loc]
+		diff = add + [x for x in loc if not x in value]
+		self.locations = [x for x in self.locations if not x[0] in diff] + [[x, self.getMountpoint(x), True, True] for x in add]
+		self.locations.sort(key = lambda x: x[0])
+		self.changed()
+
+	def getValue(self):
+		self.checkChangedMountpoints()
+		for x in self.locations:
+			x[3] = x[2]
+		return [x[0] for x in self.locations if x[3]]
+	
+	value = property(getValue, setValue)
+
+	def tostring(self, value):
+		return str(value)
+
+	def fromstring(self, val):
+		return eval(val)
+
+	def load(self):
+		if self.saved_value is None:
+			tmp = self.default
+		else:
+			tmp = self.fromstring(self.saved_value)
+		self.locations = [[x, None, False, False] for x in tmp]
+		self.refreshMountpoints()
+		for x in self.locations:
+			if os.path.exists(x[0]):
+				x[1] = self.getMountpoint(x[0])
+				x[2] = True
+
+	def save(self):
+		if self.save_disabled or self.locations == []:
+			self.saved_value = None
+		else:
+			self.saved_value = self.tostring([x[0] for x in self.locations])
+
+	def isChanged(self):
+		if self.saved_value is None and self.locations == []:
+			return False
+		return self.tostring([x[0] for x in self.locations]) != self.saved_value
+
+	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]):
+				x[1] = self.getMountpoint(x[0])
+				x[2] = True
+
+	def removedMount(self, mp):
+		for x in self.locations:
+			if x[1] == mp:
+				x[2] = False
+		
+	def refreshMountpoints(self):
+		self.mountpoints = [p.mountpoint + "/" for p in harddiskmanager.getMountedPartitions() if p.mountpoint != "/"]
+		self.mountpoints.sort(key = lambda x: -len(x))
+
+	def checkChangedMountpoints(self):
+		oldmounts = self.mountpoints
+		self.refreshMountpoints()
+		if oldmounts == self.mountpoints:
+			return
+		for x in oldmounts:
+			if not x in self.mountpoints:
+				self.removedMount(x)
+		for x in self.mountpoints:
+			if not x in oldmounts:
+				self.addedMount(x)
+
+	def getMountpoint(self, file):
+		file = os.path.realpath(file)+"/"
+		for m in self.mountpoints:
+			if file.startswith(m):
+				return m
+		return None
+
+	def handleKey(self, key):
+		if key == KEY_LEFT:
+			self.pos -= 1
+			if self.pos < -1:
+			    self.pos = len(self.value)-1
+		elif key == KEY_RIGHT:
+			self.pos += 1
+			if self.pos >= len(self.value):
+			    self.pos = -1
+		elif key in [KEY_HOME, KEY_END]:
+			self.pos = -1
+
+	def getText(self):
+		return " ".join(self.value)
+
+	def getMulti(self, selected):
+		if not selected:
+			valstr = " ".join(self.value)
+			if self.visible_width and len(valstr) > self.visible_width:
+				return ("text", valstr[0:self.visible_width])
+			else:
+				return ("text", valstr)
+		else:
+			i = 0
+			valstr = ""
+			ind1 = 0
+			ind2 = 0
+			for val in self.value:
+				if i == self.pos:
+					ind1 = len(valstr)
+				valstr += str(val)+" "
+				if i == self.pos:
+					ind2 = len(valstr)
+				i += 1
+			if self.visible_width and len(valstr) > self.visible_width:
+				if ind1+1 < self.visible_width/2:
+					off = 0
+				else:
+					off = min(ind1+1-self.visible_width/2, len(valstr)-self.visible_width)
+				return ("mtext", valstr[off:off+self.visible_width], range(ind1-off,ind2-off))
+			else:
+				return ("mtext", valstr, range(ind1,ind2))
+
+	def onDeselect(self, session):
+		self.pos = -1
+		
 # nothing.
 class ConfigNothing(ConfigSelection):
 	def __init__(self):
@@ -683,6 +1148,12 @@ class ConfigSubList(list, object):
 			item.saved_value = self.stored_values[i]
 			item.load()
 
+	def dict(self):
+		res = dict()
+		for index in range(len(self)):
+			res[str(index)] = self[index]
+		return res
+
 # same as ConfigSubList, just as a dictionary.
 # care must be taken that the 'key' has a proper
 # str() method, because it will be used in the config
@@ -722,6 +1193,9 @@ class ConfigSubDict(dict, object):
 			item.saved_value = self.stored_values[str(key)]
 			item.load()
 
+	def dict(self):
+		return self
+
 # Like the classes above, just with a more "native"
 # syntax.
 #
@@ -767,10 +1241,10 @@ class ConfigSubsection(object):
 		values = dict(values)
 		
 		self.content.stored_values = values
-		
+
 		for (key, val) in self.content.items.items():
 			if key in values:
-				val.setSavedValue(values[key])
+				val.saved_value = values[key]
 
 	saved_value = property(getSavedValue, setSavedValue)
 
@@ -782,6 +1256,9 @@ class ConfigSubsection(object):
 		for x in self.content.items.values():
 			x.load()
 
+	def dict(self):
+		return self.content.items
+
 # the root config object, which also can "pickle" (=serialize)
 # down the whole config tree.
 #
@@ -863,7 +1340,7 @@ class ConfigFile:
 	def __resolveValue(self, pickles, cmap):
 		if cmap.has_key(pickles[0]):
 			if len(pickles) > 1:
-				return self.__resolveValue(pickles[1:], cmap[pickles[0]].content.items)
+				return self.__resolveValue(pickles[1:], cmap[pickles[0]].dict())
 			else:
 				return str(cmap[pickles[0]].value)
 		return None
@@ -890,6 +1367,10 @@ def getConfigListEntry(*args):
 	assert len(args) > 1, "getConfigListEntry needs a minimum of two arguments (descr, configElement)"
 	return args
 
+def updateConfigElement(element, newelement):
+	newelement.value = element.value
+	return newelement
+
 #def _(x):
 #	return x
 #