X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1c5637e71a4565181064cc0e00dac36fb113bf08..5be5939082cfcef843e668bc1cbfb67f5451ef55:/lib/python/Screens/ParentalControlSetup.py

diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py
index cde1f7c2..6ae12cae 100644
--- a/lib/python/Screens/ParentalControlSetup.py
+++ b/lib/python/Screens/ParentalControlSetup.py
@@ -1,17 +1,15 @@
 from Screen import Screen
-from Components.ConfigList import ConfigList, ConfigListScreen
+from Components.ConfigList import ConfigListScreen
 from Components.ActionMap import NumberActionMap
 from Components.config import config, getConfigListEntry, ConfigNothing, NoSave, ConfigPIN
-from Components.ServiceList import ServiceList
 from Components.ParentalControlList import ParentalControlEntryComponent, ParentalControlList 
 from Components.ParentalControl import parentalControl
 from Screens.ChoiceBox import ChoiceBox
 from Screens.MessageBox import MessageBox
-from Screens.InputBox import InputBox, Input, PinInput
+from Screens.InputBox import PinInput
 from Screens.ChannelSelection import service_types_tv
 from Tools.BoundFunction import boundFunction
-from ServiceReference import ServiceReference
-from enigma import eServiceCenter, eServiceReference, eTimer
+from enigma import eServiceCenter, eTimer, eServiceReference
 from operator import itemgetter
 
 class ProtectedScreen:
@@ -51,7 +49,7 @@ class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen):
 		}, -2)
 
 	def isProtected(self):
-		return config.ParentalControl.setuppinactive.value
+		return config.ParentalControl.setuppinactive.value and config.ParentalControl.configured.value
 	
 	def createSetup(self):
 		self.editListEntry = None
@@ -150,7 +148,7 @@ class ParentalControlEditor(Screen):
 		self.currentLetter = chr(SPECIAL_CHAR)
 		self.readServiceList()
 		self.chooseLetterTimer = eTimer()
-		self.chooseLetterTimer.timeout.get().append(self.chooseLetter)
+		self.chooseLetterTimer.callback.append(self.chooseLetter)
 		self.onLayoutFinish.append(self.LayoutFinished)
 
 		self["actions"] = NumberActionMap(["DirectionActions", "ColorActions", "OkCancelActions", "NumberActions"],
@@ -192,10 +190,7 @@ class ParentalControlEditor(Screen):
 		if list is not None:
 			services = list.getContent("CN", True) #(servicecomparestring, name)
 			for s in services:
-				if ord(s[1][0])==0xc2 and ord(s[1][1])==0x86: # ignore shortname brackets
-					key = s[1].lower()[2]
-				else:
-					key = s[1].lower()[0]
+				key = s[1].lower()[0]
 				if key < 'a' or key > 'z':
 					key = chr(SPECIAL_CHAR)
 				#key = str(key)
@@ -235,6 +230,8 @@ class ParentalControlChangePin(Screen, ConfigListScreen, ProtectedScreen):
 		self.list = []
 		self.pin1 = ConfigPIN(default = 1111, censor = "*")
 		self.pin2 = ConfigPIN(default = 1112, censor = "*")
+		self.pin1.addEndNotifier(boundFunction(self.valueChanged, 1))
+		self.pin2.addEndNotifier(boundFunction(self.valueChanged, 2))
 		self.list.append(getConfigListEntry(_("New pin"), NoSave(self.pin1)))
 		self.list.append(getConfigListEntry(_("Reenter new pin"), NoSave(self.pin2)))
 		ConfigListScreen.__init__(self, self.list)
@@ -248,6 +245,12 @@ class ParentalControlChangePin(Screen, ConfigListScreen, ProtectedScreen):
 			"cancel": self.cancel,
 		}, -1)
 
+	def valueChanged(self, pin, value):
+		if pin == 1:
+			self["config"].setCurrentIndex(1)
+		elif pin == 2:
+			self.keyOK()
+
 	def getPinText(self):
 		return _("Please enter the old pin code")