X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4568716f1e86aca58df71f1b66bc0d1ad623c202..ff90cba66b3ebe6adf9b436fa8ae9ac440a0c70c:/lib/python/Components/config.py diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 7e797861..1486420c 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -1,3 +1,6 @@ +from time import * +from Tools.NumericalTextInput import * + class configFile: def __init__(self): self.changed = 0 @@ -80,6 +83,38 @@ class configSelection: self.checkValues() return ("text", self.parent.vals[self.parent.value]) +class configDateTime: + def __init__(self, parent): + self.parent = parent + + def checkValues(self): + pass +# if self.parent.value < 0: + #self.parent.value = 0 + + #if(self.parent.value >= (len(self.parent.vals) - 1)): + #self.parent.value = len(self.parent.vals) - 1 + + def cancel(self): + self.parent.reload() + + def save(self): + self.parent.save() + + def handleKey(self, key): + if key == config.key["prevElement"]: + self.parent.value = self.parent.value - self.parent.vals[1] + if key == config.key["nextElement"]: + self.parent.value = self.parent.value + self.parent.vals[1] + + self.checkValues() + + self.parent.change() + + def __call__(self, selected): #needed by configlist + self.checkValues() + return ("text", strftime(self.parent.vals[0], localtime(self.parent.value))) + class configSatlist: def __init__(self, parent): self.parent = parent @@ -120,6 +155,9 @@ class configSequenceArg: # configsequencearg.get ("MAC") if (type == "MAC"): return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "") + # configsequencearg.get ("CLOCK") + if (type == "CLOCK"): + return ((":"), [(0,23),(0,59)], "") # configsequencearg.get("INTEGER", (min, max)) => x with min <= x <= max if (type == "INTEGER"): return ((":"), [args], "") @@ -228,6 +266,61 @@ class configSequence: # (this code is heavily ink optimized!) return ("mtext"[1-selected:], value, [mPos]) +class configText: + # used as first parameter + # is the text of a fixed size or is the user able to extend the length of the text + extendableSize = 1 + fixedSize = 2 + + def __init__(self, parent): + self.parent = parent + self.markedPos = 0 + self.mode = self.parent.vals[0] + self.textInput = NumericalTextInput(self.nextEntry) + + def checkValues(self): + if (self.markedPos < 0): + self.markedPos = 0 + if (self.markedPos >= len(self.parent.value)): + self.markedPos = len(self.parent.value) - 1 + + def cancel(self): + self.parent.reload() + + def save(self): + self.parent.save() + + def nextEntry(self): + print "Next entry" + self.handleKey(config.key["nextElement"]) + + def handleKey(self, key): + #this will no change anything on the value itself + #so we can handle it here in gui element + if key == config.key["prevElement"]: + self.textInput.nextKey() + self.markedPos -= 1 + + if key == config.key["nextElement"]: + self.textInput.nextKey() + self.markedPos += 1 + if (self.mode == self.extendableSize): + if (self.markedPos >= len(self.parent.value)): + self.parent.value = self.parent.value.ljust(len(self.parent.value) + 1) + + + if key >= config.key["0"] and key <= config.key["9"]: + number = 9 - config.key["9"] + key + + self.parent.value = self.parent.value[0:self.markedPos] + str(self.textInput.getKey(number)) + self.parent.value[self.markedPos + 1:] + + self.checkValues() + + self.parent.change() + + def __call__(self, selected): #needed by configlist + return ("mtext"[1-selected:], str(self.parent.value), [self.markedPos]) + class configValue: def __init__(self, obj): self.obj = obj @@ -305,9 +398,13 @@ class configElement: def datafromFile(self, control, data): if control == ConfigSlider: - return int(data); + return int(data) elif control == configSelection: - return int(data); + return int(data) + elif control == configDateTime: + return int(data) + elif control == configText: + return str(data) elif control == configSequence: list = [ ] part = data.split(self.vals[0]) @@ -321,9 +418,14 @@ class configElement: def datatoFile(self, control, data): if control == ConfigSlider: - return str(data); + return str(data) elif control == configSelection: - return str(data); + return str(data) + elif control == configDateTime: + return str(data) + elif control == configText: + return str(data.strip()) + elif control == configSequence: value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data) # just in case you don't understand the above, here an equivalent: @@ -389,5 +491,3 @@ def getConfigListEntry(description, element): b = element item = b.controlType(b) return ((description, item)) - - \ No newline at end of file