improve parental control retry count

[enigma2.git] / lib / python / Screens / ParentalControlSetup.py

diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py
index 780114b8827dc8be3034f1b56e287cdfb47f9505..d49119531edab5e38c709270ec210f4f5ce6e045 100644 (file)
--- a/lib/python/Screens/ParentalControlSetup.py
+++ b/lib/python/Screens/ParentalControlSetup.py
@@ -19,7 +19,10 @@ import operator
 class ProtectedScreen:
        def __init__(self):
                if self.isProtected():
-                       self.onFirstExecBegin.append(boundFunction(self.session.openWithCallback, self.pinEntered, PinInput, pinList = [self.protectedWithPin()], title = self.getPinText(), windowTitle = _("Change pin code")))
+                       self.onFirstExecBegin.append(boundFunction(self.session.openWithCallback, self.pinEntered, PinInput, pinList = [self.protectedWithPin()], triesEntry = self.getTriesEntry(), title = self.getPinText(), windowTitle = _("Change pin code")))
+
+       def getTriesEntry(self):
+               return config.ParentalControl.retries.setuppin
 
        def getPinText(self):
                return _("Please enter the correct pin code")
@@ -31,10 +34,9 @@ class ProtectedScreen:
                return config.ParentalControl.setuppin.value
 
        def pinEntered(self, result):
-               if result[0] is None:
+               if result is None:
                        self.close()
-               if not result[0]:
-                       print result, "-", self.protectedWithPin()
+               elif not result:
                        self.session.openWithCallback(self.close, MessageBox, _("The pin code you entered is wrong."), MessageBox.TYPE_ERROR)
 
 class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen):
@@ -117,8 +119,8 @@ class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen):
        def keyNumberGlobal(self, number):
                pass
 
+SPECIAL_CHAR = 96
 class ParentalControlEditor(Screen):
-       SPECIAL_CHAR = 96
        def __init__(self, session):
                Screen.__init__(self, session)
                self.list = []