X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/98efaa152afc767093651fc0a2316d90a19f757a..2c8c2343f6fe05e59a8633b24d565e0fff5c6a3d:/lib/python/Components/config.py diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 5a4ed12e..1645784b 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -260,8 +260,8 @@ class configSequence: self.parent.value[blocknumber] = newvalue self.markedPos += 1 - self.checkValues() - + self.checkValues() + #FIXME: dont call when press left/right self.parent.change() @@ -479,16 +479,20 @@ class configElement: return str(data.strip()) elif control == configSequence: + print self.vals + print self.value try: - value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data) + value = "" + count = 0 + for i in data: + if value !="": + value += self.vals[0] + value += (("%0" + str(len(str(self.vals[1][count][1]))) + "d") % i) + count += 1 + #value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data) except: value = str(data) -# just in case you don't understand the above, here an equivalent: -# value = "" -# for i in data: -# if value !="": -# value += self.vals[0] -# value += str(i) + return value elif control == configSatlist: return str(self.vals[self.value][1]); @@ -504,10 +508,11 @@ class configElement: if value == "": #print "value not found - using default" - if self.controlType == configSatlist: self.value = self.getIndexbyEntry(self.defaultValue) - else: + elif self.controlType == configSequence: + self.value = self.defaultValue[:] + else: self.value = self.defaultValue self.save() #add missing value to dict @@ -540,7 +545,7 @@ class configElement: def reload(self): self.loadData() def save(self): - if self.defaultValue != self.value or self.saveDefaults == True: + if (self.defaultValue != self.value) or (self.saveDefaults == True): configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value)) class configElement_nonSave(configElement):