X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2b8587722d707e88dbc8d381a74c12c380c6db04..d04d03175ca6e6df022b09b0b8e068355626b5dd:/lib/python/Components/config.py diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 93479b66..ba540db2 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -116,7 +116,7 @@ class configSequenceArg: def get(self, type, args = ()): # configsequencearg.get ("IP") if (type == "IP"): - return (("."), [(1,255),(1,255),(1,255),(1,255)]) + return (("."), [(1,255),(0,255),(0,255),(0,255)]) # configsequencearg.get ("MAC") if (type == "MAC"): return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)]) @@ -137,8 +137,22 @@ class configSequence: self.valueBounds = self.parent.vals[1] def checkValues(self): - maxPos = len(self.parent.value) * len(self.valueBounds) + len(self.parent.value) - + maxPos = 0 + num = 0 + for i in self.parent.value: + maxPos += len(str(self.valueBounds[num][1])) + while (self.valueBounds[num][0] > self.parent.value[num]): + self.parent.value[num] += 1 + + while (self.valueBounds[num][1] < self.parent.value[num]): + self.parent.value[num] -= 1 + +# if (self.valueBounds[num][0] <= i <= self.valueBounds[num][1]): + #pass + #else: + #self.parent.value[num] = self.valueBounds[num][0] + num += 1 + if self.markedPos >= maxPos: self.markedPos = maxPos - 1 if self.markedPos < 0: @@ -188,6 +202,7 @@ class configSequence: value = "" mPos = self.markedPos print "Positon: " + str(mPos) + num = 0; for i in self.parent.value: if len(value): #fixme no heading separator possible value += self.seperator @@ -198,9 +213,9 @@ class configSequence: #if diff > 0: ## if this helps?! #value += " " * diff - print (("%0" + str(len(str(self.valueBounds[0][1]))) + "d") % i) - value += ("%0" + str(len(str(self.valueBounds[0][1]))) + "d") % i - + print (("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i) + value += ("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i + num += 1 # only mark cursor when we are selected # (this code is heavily ink optimized!) return ("mtext"[1-selected:], value, [mPos]) @@ -322,7 +337,7 @@ class configElement: value = "" if value == "": - print "value not found - using default" + #print "value not found - using default" if self.controlType == configSatlist: self.value = self.getIndexbyEntry(self.defaultValue)