X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5db2dc5c63948651b3e4b337d7057cd940ccc644..eca33f89346b4ad0e7bbaef7438e8a87daa963a9:/lib/python/Components/ParentalControlList.py?ds=sidebyside

diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py
index 9ec469ae..797ea391 100644
--- a/lib/python/Components/ParentalControlList.py
+++ b/lib/python/Components/ParentalControlList.py
@@ -1,45 +1,44 @@
-from HTMLComponent import HTMLComponent
-from GUIComponent import GUIComponent
-
 from MenuList import MenuList
-from Components.ParentalControl import parentalControl
+from Components.ParentalControl import parentalControl, IMG_WHITESERVICE, IMG_WHITEBOUQUET, IMG_BLACKSERVICE, IMG_BLACKBOUQUET
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 
-from enigma import LoadPixmap, eListbox, eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
+from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
+from Tools.LoadPixmap import LoadPixmap
+
+#Now there is a list of pictures instead of one...
+entryPicture = {}
 
-lockPicture = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "lock-fs8.png"))
+entryPicture[IMG_BLACKSERVICE] = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/lock.png"))
+entryPicture[IMG_BLACKBOUQUET] = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/lockBouquet.png"))
+entryPicture[IMG_WHITESERVICE] = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/unlock.png"))
+entryPicture[IMG_WHITEBOUQUET] = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/unlockBouquet.png"))
 
-def ParentalControlEntryComponent(service, name, locked = True):
-	res = [ (service, name, locked) ]
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 5, 300, 50, 0, RT_HALIGN_LEFT, name))
-	if locked:
-		res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 32, 32, lockPicture))
+def ParentalControlEntryComponent(service, name, protectionType):
+	locked = protectionType[0]
+	sImage = protectionType[1]
+	res = [
+		(service, name, locked),
+		(eListboxPythonMultiContent.TYPE_TEXT, 80, 5, 300, 50, 0, RT_HALIGN_LEFT, name)
+	]
+	#Changed logic: The image is defined by sImage, not by locked anymore
+	if sImage != "":
+		res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 32, 32, entryPicture[sImage]))
 	return res
 
-class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
-	def __init__(self, list):
-		GUIComponent.__init__(self)
-		self.l = eListboxPythonMultiContent()
-		self.list = list
-		self.l.setList(list)
+class ParentalControlList(MenuList):
+	def __init__(self, list, enableWrapAround = False):
+		MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
 		self.l.setFont(0, gFont("Regular", 20))
 		self.l.setItemHeight(32)
 
-	GUI_WIDGET = eListbox
-	
-	def setList(self, list):
-		self.list = list
-		self.l.setList(list)
-		
-	def postWidgetCreate(self, instance):
-		instance.setContent(self.l)
-
 	def toggleSelectedLock(self):
 		print "self.l.getCurrentSelection():", self.l.getCurrentSelection()
 		print "self.l.getCurrentSelectionIndex():", self.l.getCurrentSelectionIndex()
-		self.list[self.l.getCurrentSelectionIndex()] = ParentalControlEntryComponent(self.l.getCurrentSelection()[0][0], self.l.getCurrentSelection()[0][1], not self.l.getCurrentSelection()[0][2]);
-		if self.l.getCurrentSelection()[0][2]:
-			parentalControl.protectService(self.l.getCurrentSelection()[0][0])
+		curSel = self.l.getCurrentSelection()
+		if curSel[0][2]:
+			parentalControl.unProtectService(self.l.getCurrentSelection()[0][0])
 		else:
-			parentalControl.unProtectService(self.l.getCurrentSelection()[0][0])	
+			parentalControl.protectService(self.l.getCurrentSelection()[0][0])	
+		#Instead of just negating the locked- flag, now I call the getProtectionType every time...
+		self.list[self.l.getCurrentSelectionIndex()] = ParentalControlEntryComponent(curSel[0][0], curSel[0][1], parentalControl.getProtectionType(curSel[0][0]))
 		self.l.setList(self.list)