From: Stefan Pluecken Date: Sat, 15 Oct 2005 15:50:43 +0000 (+0000) Subject: - add pissibility to mask pins X-Git-Tag: 2.6.0~5462 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/8b2ce4053356148321c32551dd86234073f0c192 - add pissibility to mask pins - using PINCODE instead of INTEGER in ci.py --- diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index ba540db2..cb9fdc2b 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -116,16 +116,20 @@ class configSequenceArg: def get(self, type, args = ()): # configsequencearg.get ("IP") if (type == "IP"): - return (("."), [(1,255),(0,255),(0,255),(0,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)]) + return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "") # configsequencearg.get("INTEGER", (min, max)) => x with min <= x <= max if (type == "INTEGER"): - return ((":"), [args]) + return ((":"), [args], "") + # configsequencearg.get("PINCODE", (number, "*")) => pin with number = length of pincode and "*" as numbers shown as stars + # configsequencearg.get("PINCODE", (number, "")) => pin with number = length of pincode and numbers shown + if (type == "PINCODE"): + return ((":"), [(0, (10**args[0])-1)], args[1]) # configsequencearg.get("FLOAT", [(min,max),(min1,max1)]) => x.y with min <= x <= max and min1 <= y <= max1 if (type == "FLOAT"): - return (("."), args) + return (("."), args, "") configsequencearg = configSequenceArg() @@ -135,6 +139,7 @@ class configSequence: self.markedPos = 0 self.seperator = self.parent.vals[0] self.valueBounds = self.parent.vals[1] + self.censorChar = self.parent.vals[2] def checkValues(self): maxPos = 0 @@ -214,7 +219,10 @@ class configSequence: ## if this helps?! #value += " " * diff print (("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i) - value += ("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i + if (self.censorChar == ""): + value += ("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i + else: + value += (self.censorChar * len(str(self.valueBounds[num][1]))) num += 1 # only mark cursor when we are selected # (this code is heavily ink optimized!) diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py index 24e20bb1..8443079e 100644 --- a/lib/python/Screens/Ci.py +++ b/lib/python/Screens/Ci.py @@ -57,7 +57,10 @@ class CiMmi(Screen): if entry[0] == "TEXT": #handle every item (text / pin only?) list.append( (entry[1], index) ) if entry[0] == "PIN": - x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("INTEGER", (0, ((10**entry[1])-1)))) + # masked pins: + x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "-"))) + # unmasked pins: + # x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], ""))) list.append( getConfigListEntry(entry[2],x) ) def okbuttonClick(self):