X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/255acaf49e248672e154f03ee833b72c253b241d..73b5c76cb020ac7baa2536e14997618b0e17eef5:/lib/python/Components/config.py diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py old mode 100644 new mode 100755 index 02d17055..cfa4318c --- 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. @@ -32,6 +34,7 @@ class ConfigElement(object): self.save_disabled = False self.notifiers = [] self.enabled = True + self.callNotifiersOnSaveAndCancel = False # you need to override this to do input validation def setValue(self, value): @@ -49,10 +52,11 @@ class ConfigElement(object): # you can overide this for fancy default handling def load(self): - if self.saved_value is None: + sv = self.saved_value + if sv is None: self.value = self.default else: - self.value = self.fromstring(self.saved_value) + self.value = self.fromstring(sv) def tostring(self, value): return str(value) @@ -63,14 +67,19 @@ class ConfigElement(object): self.saved_value = None else: self.saved_value = self.tostring(self.value) + if self.callNotifiersOnSaveAndCancel: + self.changed() def cancel(self): self.load() + if self.callNotifiersOnSaveAndCancel: + self.changed() def isChanged(self): - if self.saved_value is None and self.value == self.default: + sv = self.saved_value + if sv is None and self.value == self.default: return False - return self.tostring(self.value) != self.saved_value + return self.tostring(self.value) != sv def changed(self): for x in self.notifiers: @@ -97,14 +106,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 +141,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 +175,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,6 +216,15 @@ 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): descr = self.description[self.value] @@ -233,6 +266,10 @@ 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): descr = self.descriptions[self.value] @@ -294,8 +331,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)) @@ -328,6 +367,8 @@ class ConfigSequence(ConfigElement): self.default = default self.value = copy.copy(default) + + self.endNotifier = [] def validate(self): max_pos = 0 @@ -335,15 +376,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: @@ -357,6 +400,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: @@ -367,7 +413,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]))) @@ -385,8 +452,6 @@ class ConfigSequence(ConfigElement): else: blocknumber += 1 - number = getKeyNumber(key) - # length of numberblock number_len = len(str(self.limits[blocknumber][1])) @@ -440,11 +505,90 @@ 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): + def __init__(self, default, auto_jump = False): ConfigSequence.__init__(self, seperator = ".", limits = [(0,255),(0,255),(0,255),(0,255)], default = default) + self.block_len = [] + for x in self.limits: + self.block_len.append(len(str(x[1]))) + self.marked_block = 0 + self.overwrite = True + self.auto_jump = auto_jump + + def handleKey(self, key): + + if key == KEY_LEFT: + if self.marked_block > 0: + self.marked_block -= 1 + self.overwrite = True + + if key == KEY_RIGHT: + if self.marked_block < len(self.limits)-1: + self.marked_block += 1 + self.overwrite = True + + if key == KEY_HOME: + self.marked_block = 0 + self.overwrite = True + + if key == KEY_END: + self.marked_block = len(self.limits)-1 + self.overwrite = True + + 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) + oldvalue = self._value[self.marked_block] + + if self.overwrite: + self._value[self.marked_block] = number + self.overwrite = False + else: + oldvalue *= 10 + newvalue = oldvalue + number + if self.auto_jump and newvalue > self.limits[self.marked_block][1] and self.marked_block < len(self.limits)-1: + self.handleKey(KEY_RIGHT) + self.handleKey(key) + return + else: + self._value[self.marked_block] = newvalue + + if len(str(self._value[self.marked_block])) >= self.block_len[self.marked_block]: + self.handleKey(KEY_RIGHT) + + self.validate() + self.changed() + + def genText(self): + value = "" + block_strlen = [] + for i in self._value: + block_strlen.append(len(str(i))) + if len(value): + value += self.seperator + value += str(i) + leftPos = sum(block_strlen[:(self.marked_block)])+self.marked_block + rightPos = sum(block_strlen[:(self.marked_block+1)])+self.marked_block + mBlock = range(leftPos, rightPos) + return (value, mBlock) + + def getMulti(self, selected): + (value, mBlock) = self.genText() + if self.enabled: + return ("mtext"[1-selected:], value, mBlock) + else: + return ("text", value) + + 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): @@ -460,8 +604,36 @@ class ConfigClock(ConfigSequence): t = time.localtime(default) ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = [t.tm_hour, t.tm_min]) + def increment(self): + # Check if Minutes maxed out + if self._value[1] == 59: + # Check if Hours not maxed out + if self._value[0] < 23: + # Increment Hour, reset Minutes to 0 + self._value[0] += 1 + self._value[1] = 0 + else: + # Increment Minutes + self._value[1] += 1 + # Trigger change + self.changed() + + def decrement(self): + # Check if Minutes is minimum + if self._value[1] == 0: + # Check if Hour is greater than 0 + if self._value[0] > 0: + # Decrement Hour, set Minutes to 59 + self._value[0] -= 1 + self._value[1] = 59 + else: + # Decrement Minutes + self._value[1] -= 1 + # Trigger change + self.changed() + 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 @@ -502,77 +674,183 @@ 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.marked_pos >= len(self.text): - self.marked_pos = len(self.text) - 1 + 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.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 - self.maybeExpand() 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() - def maybeExpand(self): - if not self.fixed_size: - if self.marked_pos >= len(self.text): - self.text = self.text.ljust(len(self.text) + 1) - def nextFunc(self): self.marked_pos += 1 - self.maybeExpand() self.validateMarker() self.changed() def getValue(self): return self.text.encode("utf-8") - + def setValue(self, val): try: self.text = val.decode("utf-8") except UnicodeDecodeError: - self.text = val + self.text = val.decode("utf-8", "ignore") print "Broken UTF8!" value = property(getValue, setValue) _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 '
\n' @@ -580,6 +858,99 @@ class ConfigText(ConfigElement, NumericalTextInput): def unsafeAssign(self, value): self.value = str(value) +class ConfigPassword(ConfigText): + def __init__(self, default = "", fixed_size = False, visible_width = False, censor = "*"): + ConfigText.__init__(self, default = default, fixed_size = fixed_size, visible_width = visible_width) + self.censor_char = censor + self.hidden = True + + def getMulti(self, selected): + mtext, text, mark = ConfigText.getMulti(self, selected) + if self.hidden: + text = len(text) * self.censor_char + return (mtext, text, mark) + + def onSelect(self, session): + ConfigText.onSelect(self, session) + self.hidden = False + + def onDeselect(self, session): + ConfigText.onDeselect(self, session) + self.hidden = True + +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 + +class ConfigSearchText(ConfigText): + def __init__(self, default = "", fixed_size = False, visible_width = False): + ConfigText.__init__(self, default = default, fixed_size = fixed_size, visible_width = visible_width) + NumericalTextInput.__init__(self, nextFunc = self.nextFunc, handleTimeout = False, search = True) + +class ConfigDirectory(ConfigText): + def __init__(self, default="", visible_width=60): + ConfigText.__init__(self, default, fixed_size = True, visible_width = visible_width) + def handleKey(self, key): + pass + def getValue(self): + if self.text == "": + return None + else: + return ConfigText.getValue(self) + def setValue(self, val): + if val == None: + val = "" + ConfigText.setValue(self, val) + def getMulti(self, selected): + if self.text == "": + return ("mtext"[1-selected:], _("List of Storage Devices"), range(0)) + else: + return ConfigText.getMulti(self, selected) + # a slider. class ConfigSlider(ConfigElement): def __init__(self, default = 0, increment = 1, limits = (0, 100)): @@ -601,11 +972,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) @@ -622,7 +995,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 == "": @@ -631,6 +1004,240 @@ 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): + sv = self.saved_value + if sv is None: + tmp = self.default + else: + tmp = self.fromstring(sv) + 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): + sv = self.saved_value + if val is None and self.locations == []: + return False + return self.tostring([x[0] for x in self.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]): + 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): @@ -690,7 +1297,7 @@ class ConfigSubList(list, object): self[int(key)].saved_value = val saved_value = property(getSavedValue, setSavedValue) - + def append(self, item): i = str(len(self)) list.append(self, item) @@ -725,8 +1332,9 @@ class ConfigSubDict(dict, object): def getSavedValue(self): res = {} for (key, val) in self.items(): - if val.saved_value is not None: - res[str(key)] = val.saved_value + sv = val.saved_value + if sv is not None: + res[str(key)] = sv return res def setSavedValue(self, values): @@ -780,21 +1388,21 @@ class ConfigSubsection(object): def getSavedValue(self): res = self.content.stored_values for (key, val) in self.content.items.items(): - if val.saved_value is not None: - res[key] = val.saved_value + sv = val.saved_value + if sv is not None: + res[key] = sv elif key in res: del res[key] - return res def setSavedValue(self, values): 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) @@ -917,6 +1525,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 #