X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2c8c2343f6fe05e59a8633b24d565e0fff5c6a3d..db2fb2d1b2d807cc389a429881886d4a40e763e1:/lib/python/Components/config.py diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 1645784b..fda44795 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -27,13 +27,28 @@ class configFile: x = line.find("=") if x > -1: self.configElements[line[:x]] = line[x + 1:-1] - + def getKey(self, key): return self.configElements[key] - def setKey(self, key, value): + def setKey(self, key, value, isDefaultKey=False): self.changed = 1 - self.configElements[key] = value + if isDefaultKey and self.configElements.has_key(key): + del self.configElements[key] + else: + self.configElements[key] = value + + def getResolvedKey(self, key): + str = self.configElements[key] + if len(str): + pos = str.find('*') + if pos != -1: + str = str[pos+1:] + pos = str.find('*') + if pos != -1: + return str[:pos] + return str + return None def save(self): if self.changed == 0: #no changes, so no write to disk needed @@ -89,10 +104,17 @@ class configSelection: def __call__(self, selected): #needed by configlist self.checkValues() - if isinstance(self.parent.vals[self.parent.value], str): - returnValue = _(self.parent.vals[self.parent.value]) - else: - returnValue = _(self.parent.vals[self.parent.value][1]) + + returnValue = _(self.parent.vals[self.parent.value]) + if not isinstance(returnValue, str): + returnValue = returnValue[1] + + # FIXME: it's not really nice to translate this here. + # however, configSelections are persistent. + + # WORKAROUND: don't translate "" + if returnValue: + returnValue = _(returnValue) return ("text", returnValue) @@ -166,6 +188,8 @@ class configSequenceArg: if (type == "IP"): return (("."), [(0,255),(0,255),(0,255),(0,255)], "") # configsequencearg.get ("MAC") + if (type == "POSITION"): + return ((","), [(0,args[0]),(0,args[1]),(0,args[2]),(0,args[3])], "") if (type == "MAC"): return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "") # configsequencearg.get ("CLOCK") @@ -290,7 +314,27 @@ class configSequence: return ("mtext"[1-selected:], value, [mPos]) else: return ("text", value) + +class configNothing: + def __init__(self, parent): + self.parent = parent + self.markedPos = 0 + + def cancel(self): + self.parent.reload() + + def save(self): + self.parent.save() + def nextEntry(self): + self.parent.vals[1](self.parent.getConfigPath()) + + def handleKey(self, key): + pass + + def __call__(self, selected): #needed by configlist + return ("text", "") + 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 @@ -375,7 +419,7 @@ config = Config(); configfile = configFile() -class ConfigSlider: +class configSlider: def __init__(self, parent): self.parent = parent @@ -389,21 +433,21 @@ class ConfigSlider: if self.parent.value < 0: self.parent.value = 0 - if self.parent.value > 10: - self.parent.value = 10 + if self.parent.value > self.parent.vals[1]: + self.parent.value = self.parent.vals[1] def handleKey(self, key): if key == config.key["prevElement"]: - self.parent.value = self.parent.value - 1 + self.parent.value = self.parent.value - self.parent.vals[0] if key == config.key["nextElement"]: - self.parent.value = self.parent.value + 1 + self.parent.value = self.parent.value + self.parent.vals[0] self.checkValues() self.parent.change() def __call__(self, selected): #needed by configlist self.checkValues() - return ("slider", self.parent.value * 10) + return ("slider", self.parent.value, self.parent.vals[1]) class ConfigSubsection: def __init__(self): @@ -425,7 +469,7 @@ class configElement: return 0 #prevent bigger then array def datafromFile(self, control, data): - if control == ConfigSlider: + if control == configSlider: return int(data) elif control == configSelection: try: @@ -455,7 +499,7 @@ class configElement: return "" def datatoFile(self, control, data): - if control == ConfigSlider: + if control == configSlider: return str(data) elif control == configSelection: if len(self.vals) < data + 1: @@ -477,10 +521,9 @@ class configElement: return str(data) elif control == configText: return str(data.strip()) - elif control == configSequence: - print self.vals - print self.value +# print self.vals +# print self.value try: value = "" count = 0 @@ -492,7 +535,6 @@ class configElement: #value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data) except: value = str(data) - return value elif control == configSatlist: return str(self.vals[self.value][1]); @@ -519,7 +561,7 @@ class configElement: else: #print "set val:" + str(value) self.value = value - + #is this right? activate settings after load/cancel and use default self.change() @@ -539,14 +581,28 @@ class configElement: def addNotifier(self, notifier): self.notifierList.append(notifier); notifier(self); + def change(self): for notifier in self.notifierList: notifier(self) + def reload(self): self.loadData() + def save(self): - if (self.defaultValue != self.value) or (self.saveDefaults == True): - configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value)) + if self.controlType == configSatlist: + defaultValue = self.getIndexbyEntry(self.defaultValue) + else: + defaultValue = self.defaultValue + if self.value != defaultValue or self.saveDefaults: + configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value)) + else: + try: + oldValue = configfile.getKey(self.configPath) + except: + oldValue = None + if oldValue is not None and oldValue != defaultValue: + configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value), True) class configElement_nonSave(configElement): def __init__(self, configPath, control, defaultValue, vals): @@ -554,13 +610,12 @@ class configElement_nonSave(configElement): def save(self): pass - + def getConfigListEntry(description, element): b = element item = b.controlType(b) return ((description, item)) - def configElementBoolean(name, default, texts=(_("Enable"), _("Disable"))): return configElement(name, configSelection, default, texts)