diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-03 17:40:59 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-03 17:40:59 +0100 |
| commit | f7af4f251d28b270925a98c7f258659a0b3b0c3b (patch) | |
| tree | f36aa08d965e5698d973971f1c3ee9e8cc80f6f7 | |
| parent | be47592d17cbd1e0d64a2c61c2b6f73614f5b448 (diff) | |
| parent | 1a7cc7d5f04ae8bcf6ae879f1cfc11c9072a95d7 (diff) | |
| download | enigma2-f7af4f251d28b270925a98c7f258659a0b3b0c3b.tar.gz enigma2-f7af4f251d28b270925a98c7f258659a0b3b0c3b.zip | |
Merge branch 'bug_607_parental_control_fix' into 3.0
| -rw-r--r-- | lib/python/Components/ParentalControlList.py | 5 | ||||
| -rw-r--r-- | lib/python/Screens/ParentalControlSetup.py | 6 |
2 files changed, 8 insertions, 3 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) diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py index f174b583..284294fc 100644 --- a/lib/python/Screens/ParentalControlSetup.py +++ b/lib/python/Screens/ParentalControlSetup.py @@ -3,7 +3,7 @@ from Components.ConfigList import ConfigListScreen from Components.ActionMap import NumberActionMap from Components.config import config, getConfigListEntry, ConfigNothing, NoSave, ConfigPIN from Components.ParentalControlList import ParentalControlEntryComponent, ParentalControlList -from Components.ParentalControl import parentalControl + from Components.Sources.StaticText import StaticText from Screens.ChoiceBox import ChoiceBox from Screens.MessageBox import MessageBox @@ -119,6 +119,7 @@ class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen): elif self["config"].l.getCurrentSelection() == self.changeSetupPin: self.session.open(ParentalControlChangePin, config.ParentalControl.setuppin, _("setup PIN")) elif self["config"].l.getCurrentSelection() == self.reloadLists: + from Components.ParentalControl import parentalControl parentalControl.open() else: ConfigListScreen.keyRight(self) @@ -255,6 +256,7 @@ class ParentalControlEditor(Screen): self.session.openWithCallback(self.letterChosen, ChoiceBox, title=_("Show services beginning with"), list=mylist, keys = [], selection = sel) def letterChosen(self, result): + from Components.ParentalControl import parentalControl if result is not None: print "result:", result self.currentLetter = result[1] @@ -284,6 +286,7 @@ class ParentalControlBouquetEditor(Screen): }, -1) def cancel(self): + from Components.ParentalControl import parentalControl parentalControl.save() self.close() @@ -300,6 +303,7 @@ class ParentalControlBouquetEditor(Screen): self.bouquetlist = list.getContent("CN", True) def selectBouquet(self): + from Components.ParentalControl import parentalControl self.list = [ParentalControlEntryComponent(x[0], x[1], parentalControl.getProtectionType(x[0])) for x in self.bouquetlist] self.bouquetslist.setList(self.list) |