X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/76ab06c06bdf77f0b0cecd225367862ef0de0d2f..7416bb955a8eee1764a969116a54e3996fec429d:/lib/python/Components/config.py
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index f8ef0ec8..a70f0d47 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -2,8 +2,9 @@ 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.
@@ -98,8 +99,11 @@ 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
@@ -130,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 = {}
@@ -160,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:
@@ -202,6 +213,11 @@ class ConfigSelection(ConfigElement):
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]
@@ -353,11 +369,11 @@ 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
@@ -491,6 +507,20 @@ class ConfigIP(ConfigSequence):
def getHTML(self, id):
# we definitely don't want leading zeros
return '.'.join(["%d" % d for d in self.value])
+
+ def genText(self):
+ value = ""
+ mPos = self.marked_pos
+ num = 0;
+ for i in self._value:
+ if len(value):
+ value += self.seperator
+ if mPos >= len(value) - 1:
+ mPos += 1
+ value += (" " * (len(str(self.limits[num][1]))-len(str(i))))
+ value += str(i)
+ num += 1
+ return (value, mPos)
class ConfigMAC(ConfigSequence):
def __init__(self, default):
@@ -507,7 +537,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
@@ -558,7 +588,7 @@ class ConfigText(ConfigElement, NumericalTextInput):
self.visible_width = visible_width
self.offset = 0
self.overwrite = fixed_size
-
+ self.help_window = None
self.value = self.default = default
def validateMarker(self):
@@ -668,8 +698,12 @@ class ConfigText(ConfigElement, NumericalTextInput):
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()
@@ -692,7 +726,7 @@ class ConfigText(ConfigElement, NumericalTextInput):
_value = property(getValue, setValue)
def getText(self):
- return self.value
+ return self.text.encode("utf-8")
def getMulti(self, selected):
if self.visible_width:
@@ -706,11 +740,21 @@ class ConfigText(ConfigElement, NumericalTextInput):
mark = range(0, len(self.text))
else:
mark = [self.marked_pos]
- return ("mtext"[1-selected:], self.value+" ", mark)
+ return ("mtext"[1-selected:], self.text.encode("utf-8")+" ", mark)
- def helpWindow(self):
- from Screens.NumericalTextInputHelpDialog import NumericalTextInputHelpDialog
- return (NumericalTextInputHelpDialog,self)
+ 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 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'
@@ -718,6 +762,74 @@ 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
+
# a slider.
class ConfigSlider(ConfigElement):
def __init__(self, default = 0, increment = 1, limits = (0, 100)):
@@ -745,9 +857,7 @@ class ConfigSlider(ConfigElement):
self.value = self.max
else:
return
-
self.checkValues()
- self.changed()
def getText(self):
return "%d / %d" % (self.value, self.max)
@@ -773,6 +883,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):
@@ -933,10 +1275,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)
@@ -1059,6 +1401,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
#