X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2Fconfig.py;h=861e70bf61945545ba40cc730733a08269ea9991;hp=4da004e1bfa37c0862014ec66a3e65fde1bbe224;hb=e66f4bdb5fd20a77e5db713d732275aa32b22af5;hpb=1c9b6ea7f091be3c8be45dc21317af0adcc92c10
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 4da004e..861e70b 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,4 +1,5 @@
import time
+from enigma import getPrevAsciiCode
from Tools.NumericalTextInput import NumericalTextInput
from Tools.Directories import resolveFilename, SCOPE_CONFIG
import copy
@@ -26,6 +27,7 @@ import copy
#
class ConfigElement(object):
def __init__(self):
+
object.__init__(self)
self.saved_value = None
self.save_disabled = False
@@ -66,28 +68,52 @@ class ConfigElement(object):
def cancel(self):
self.load()
+ def isChanged(self):
+ if self.saved_value is None and self.value == self.default:
+ return False
+ return self.tostring(self.value) != self.saved_value
+
def changed(self):
for x in self.notifiers:
x(self)
- def addNotifier(self, notifier):
+ def addNotifier(self, notifier, initial_call = True):
assert callable(notifier), "notifiers must be callable"
self.notifiers.append(notifier)
+ # CHECKME:
+ # do we want to call the notifier
+ # - at all when adding it? (yes, though optional)
+ # - when the default is active? (yes)
+ # - when no value *yet* has been set,
+ # because no config has ever been read (currently yes)
+ # (though that's not so easy to detect.
+ # the entry could just be new.)
+ if initial_call:
+ notifier(self)
+
def disableSave(self):
self.save_disabled = True
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
@@ -125,7 +151,10 @@ class ConfigSelection(ConfigElement):
else:
assert False, "ConfigSelection choices must be dict or list!"
- assert len(self.choices), "you can't have an empty configselection"
+ #assert len(self.choices), "you can't have an empty configselection"
+ if len(self.choices) == 0:
+ self.choices = [""]
+ self.description[""] = ""
if default is None:
default = self.choices[0]
@@ -145,11 +174,18 @@ class ConfigSelection(ConfigElement):
self.changed()
def tostring(self, val):
- return (val, ','.join(self.choices))
+ return val
def getValue(self):
return self._value
+ def setCurrentText(self, text):
+ i = self.choices.index(self.value)
+ del self.description[self.choices[i]]
+ self.choices[i] = text
+ self.description[text] = text
+ self._value = text
+
value = property(getValue, setValue)
def getIndex(self):
@@ -165,12 +201,22 @@ 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_TIMEOUT:
- self.timeout()
- return
+ elif key == KEY_HOME:
+ self.value = self.choices[0]
+ elif key == KEY_END:
+ self.value = self.choices[nchoices - 1]
+
+ def getText(self):
+ 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):
@@ -200,11 +246,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):
+ 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:
@@ -252,8 +311,13 @@ 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))
def getMulti(self, selected):
return ("text", time.strftime(self.formatstring, time.localtime(self.value)))
@@ -283,6 +347,8 @@ class ConfigSequence(ConfigElement):
self.default = default
self.value = copy.copy(default)
+
+ self.endNotifier = []
def validate(self):
max_pos = 0
@@ -291,7 +357,7 @@ class ConfigSequence(ConfigElement):
max_pos += len(str(self.limits[num][1]))
while self._value[num] < self.limits[num][0]:
- self.value[num] += 1
+ self._value[num] += 1
while self._value[num] > self.limits[num][1]:
self._value[num] -= 1
@@ -299,6 +365,8 @@ class ConfigSequence(ConfigElement):
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:
@@ -312,6 +380,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:
@@ -322,7 +393,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])))
@@ -340,8 +432,6 @@ class ConfigSequence(ConfigElement):
else:
blocknumber += 1
- number = getKeyNumber(key)
-
# length of numberblock
number_len = len(str(self.limits[blocknumber][1]))
@@ -357,8 +447,8 @@ class ConfigSequence(ConfigElement):
self.validate()
self.changed()
-
- def getMulti(self, selected):
+
+ def genText(self):
value = ""
mPos = self.marked_pos
num = 0;
@@ -371,9 +461,16 @@ class ConfigSequence(ConfigElement):
if self.censor_char == "":
value += ("%0" + str(len(str(self.limits[num][1]))) + "d") % i
else:
- value += (self.censorChar * len(str(self.limits[num][1])))
+ value += (self.censor_char * len(str(self.limits[num][1])))
num += 1
-
+ return (value, mPos)
+
+ def getText(self):
+ (value, mPos) = self.genText()
+ return value
+
+ def getMulti(self, selected):
+ (value, mPos) = self.genText()
# only mark cursor when we are selected
# (this code is heavily ink optimized!)
if self.enabled:
@@ -388,11 +485,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):
@@ -404,10 +505,12 @@ class ConfigPosition(ConfigSequence):
class ConfigClock(ConfigSequence):
def __init__(self, default):
- ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = default)
+ import time
+ t = time.localtime(default)
+ ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = [t.tm_hour, t.tm_min])
class ConfigInteger(ConfigSequence):
- def __init__(self, default, limits):
+ def __init__(self, default, limits = (0, 10000000000)):
ConfigSequence.__init__(self, seperator = ":", limits = [limits], default = default)
# you need to override this to do input validation
@@ -426,9 +529,16 @@ class ConfigInteger(ConfigSequence):
def tostring(self, value):
return str(value)
-class ConfigPIN(ConfigSequence):
+class ConfigPIN(ConfigInteger):
def __init__(self, default, len = 4, censor = ""):
- ConfigSequence.__init__(self, seperator = ":", limits = [(0, (10**len)-1)], censor_char = censor, default = [default])
+ assert isinstance(default, int), "ConfigPIN default must be an integer"
+ if default == -1:
+ default = "aaaa"
+ ConfigSequence.__init__(self, seperator = ":", limits = [(0, (10**len)-1)], censor_char = censor, default = default)
+ self.len = len
+
+ def getLength(self):
+ return self.len
class ConfigFloat(ConfigSequence):
def __init__(self, default, limits):
@@ -441,43 +551,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 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 nextEntry(self):
- # self.vals[1](self.getConfigPath())
+ 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] + str(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()
@@ -499,12 +698,36 @@ class ConfigText(ConfigElement, NumericalTextInput):
value = property(getValue, setValue)
_value = property(getValue, setValue)
+ def getText(self):
+ return self.value
+
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.value+" ", 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'
@@ -533,12 +756,19 @@ 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)
+
def getMulti(self, selected):
self.checkValues()
return ("slider", self.value, self.max)
@@ -551,17 +781,17 @@ class ConfigSatlist(ConfigSelection):
def __init__(self, list, default = None):
if default is not None:
default = str(default)
- if list == [ ]:
- list = [0, "N/A"]
- 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 == "":
+ return None
return int(self.value)
orbital_position = property(getOrbitalPosition)
# nothing.
-class ConfigDummy(ConfigSelection):
+class ConfigNothing(ConfigSelection):
def __init__(self):
ConfigSelection.__init__(self, choices = [""])
@@ -621,12 +851,18 @@ class ConfigSubList(list, object):
saved_value = property(getSavedValue, setSavedValue)
def append(self, item):
- list.append(self, item)
i = str(len(self))
+ list.append(self, item)
if i in self.stored_values:
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
@@ -666,6 +902,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.
#
@@ -687,6 +926,7 @@ class ConfigSubsection(object):
def __setattr__(self, name, value):
if name == "saved_value":
return self.setSavedValue(value)
+ assert isinstance(value, ConfigSubsection) or isinstance(value, ConfigElement) or isinstance(value, ConfigSubList) or isinstance(value, ConfigSubDict), "ConfigSubsections can only store ConfigSubsections, ConfigSubLists, ConfigSubDicts or ConfigElements"
self.content.items[name] = value
if name in self.content.stored_values:
#print "ok, now we have a new item,", name, "and have the following value for it:", self.content.stored_values[name]
@@ -701,6 +941,9 @@ class ConfigSubsection(object):
for (key, val) in self.content.items.items():
if val.saved_value is not None:
res[key] = val.saved_value
+ elif key in res:
+ del res[key]
+
return res
def setSavedValue(self, values):
@@ -722,6 +965,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.
#
@@ -771,7 +1017,8 @@ class Config(ConfigSubsection):
# we inherit from ConfigSubsection, so ...
#object.__setattr__(self, "saved_value", tree["config"])
- self.setSavedValue(tree["config"])
+ if "config" in tree:
+ self.setSavedValue(tree["config"])
def saveToFile(self, filename):
f = open(filename, "w")
@@ -787,7 +1034,7 @@ config = Config()
config.misc = ConfigSubsection()
class ConfigFile:
- CONFIG_FILE = resolveFilename(SCOPE_CONFIG, "config2")
+ CONFIG_FILE = resolveFilename(SCOPE_CONFIG, "settings")
def load(self):
try:
@@ -796,11 +1043,26 @@ class ConfigFile:
print "unable to load config (%s), assuming defaults..." % str(e)
def save(self):
- config.save()
+# config.save()
config.saveToFile(self.CONFIG_FILE)
+ def __resolveValue(self, pickles, cmap):
+ if cmap.has_key(pickles[0]):
+ if len(pickles) > 1:
+ return self.__resolveValue(pickles[1:], cmap[pickles[0]].dict())
+ else:
+ return str(cmap[pickles[0]].value)
+ return None
+
def getResolvedKey(self, key):
- return None # FIXME
+ names = key.split('.')
+ if len(names) > 1:
+ if names[0] == "config":
+ ret=self.__resolveValue(names[1:], config.content.items)
+ if ret and len(ret):
+ return ret
+ print "getResolvedKey", key, "failed !! (Typo??)"
+ return ""
def NoSave(element):
element.disableSave()
@@ -810,8 +1072,9 @@ configfile = ConfigFile()
configfile.load()
-def getConfigListEntry(desc, config):
- return (desc, config)
+def getConfigListEntry(*args):
+ assert len(args) > 1, "getConfigListEntry needs a minimum of two arguments (descr, configElement)"
+ return args
#def _(x):
# return x