diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-03 17:40:54 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-03 17:40:54 +0100 |
| commit | 1f65ad77eb4ec34015b873d5327a6f91dadbdb70 (patch) | |
| tree | ab817f37f65e7766aea1c8f4b9b7a2bee0e24a1f /lib/python/Components | |
| parent | 00d4f213c39e0ddffa2d0353af8cf65e77f8f709 (diff) | |
| parent | 1a7cc7d5f04ae8bcf6ae879f1cfc11c9072a95d7 (diff) | |
| download | enigma2-1f65ad77eb4ec34015b873d5327a6f91dadbdb70.tar.gz enigma2-1f65ad77eb4ec34015b873d5327a6f91dadbdb70.zip | |
Merge branch 'bug_607_parental_control_fix' into experimental
Diffstat (limited to 'lib/python/Components')
| -rw-r--r-- | lib/python/Components/ParentalControlList.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py index 797ea391..0e65257d 100644 --- a/lib/python/Components/ParentalControlList.py +++ b/lib/python/Components/ParentalControlList.py @@ -1,5 +1,5 @@ from MenuList import MenuList -from Components.ParentalControl import parentalControl, IMG_WHITESERVICE, IMG_WHITEBOUQUET, IMG_BLACKSERVICE, IMG_BLACKBOUQUET +from Components.ParentalControl import IMG_WHITESERVICE, IMG_WHITEBOUQUET, IMG_BLACKSERVICE, IMG_BLACKBOUQUET from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT @@ -32,13 +32,14 @@ class ParentalControlList(MenuList): self.l.setItemHeight(32) def toggleSelectedLock(self): + from Components.ParentalControl import parentalControl print "self.l.getCurrentSelection():", self.l.getCurrentSelection() print "self.l.getCurrentSelectionIndex():", self.l.getCurrentSelectionIndex() curSel = self.l.getCurrentSelection() if curSel[0][2]: parentalControl.unProtectService(self.l.getCurrentSelection()[0][0]) else: - parentalControl.protectService(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) |