diff options
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/NimManager.py | 11 | ||||
| -rw-r--r-- | lib/python/Screens/Satconfig.py | 1 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 11 |
3 files changed, 3 insertions, 20 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 92ef9dea..5f5ae7bf 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -641,8 +641,6 @@ class NimManager: pass def InitNimManager(nimmgr): - have_terrestrial_tuner = False - config.terrestrial = ConfigSubsection() config.Nims = [] for x in range(nimmgr.nimCount): config.Nims.append(ConfigSubsection()) @@ -660,8 +658,6 @@ def InitNimManager(nimmgr): nimmgr.nimPortCChanged(slotid, configElement.vals[configElement.value][1]) def nimPortDChanged(slotid, configElement): nimmgr.nimPortDChanged(slotid, configElement.vals[configElement.value][1]) - def terrestrial_5v_changed(configElement): - configElement.save() for slot in nimmgr.nimslots: x = slot.slotid @@ -769,20 +765,15 @@ def InitNimManager(nimmgr): elif slot.nimType == nimmgr.nimType["DVB-C"]: nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList, False); elif slot.nimType == nimmgr.nimType["DVB-T"]: - have_terrestrial_tuner = True list = [] for x in nimmgr.terrestrialsList: list.append(x[0]) nim.terrestrial = configElement(cname + "terrestrial", configSelection, 0, list, False); + nim.terrestrial_5V = configElement(cname + "terrestrial_5V", configSelection, 1, (("on", _("On")), ("off", _("Off"))), True); else: print "pls add support for this frontend type!" - if have_terrestrial_tuner: - config.terrestrial.enable_5V = configElement("config.terrestrial.enable_5V", configSelection, 1, (("yes", _("Yes")), ("no", _("No"))), True); - config.terrestrial.enable_5V.addNotifier(terrestrial_5v_changed) - nimmgr.sec = SecConfigure(nimmgr) - nimmanager = NimManager() diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 11091f1a..0a76e491 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -71,6 +71,7 @@ class NimSetup(Screen): elif self.nim_type == nimmanager.nimType["DVB-T"]: self.have_advanced = False self.list.append(getConfigListEntry(_("Terrestrial provider"), self.nimConfig.terrestrial)) + self.list.append(getConfigListEntry(_("Enable 5V for active antenna"), self.nimConfig.terrestrial_5V)) else: self.have_advanced = False diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 4eb7b8cd..a94645b1 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -259,7 +259,6 @@ class ScanSetup(Screen): self.list.append(getConfigListEntry(_("Hierarchy mode"), config.scan.ter.hierarchy)) elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete": self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices)) - self.list.append(getConfigListEntry(_("Enable 5V for active antenna"), config.terrestrial.enable_5V)) # if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"] and currentConfigSelectionElement(config.scan.type) == "single_transponder") or \ # (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"] and currentConfigSelectionElement(config.scan.typecable) == "single_transponder") or \ @@ -693,7 +692,6 @@ class ScanSimple(Screen): tlist = [] nimcount = nimmanager.getNimSocketCount() - have_terrestrial = False if nimcount > 0: nimtype = nimmanager.getNimType(0) scan_possible=True @@ -701,9 +699,7 @@ class ScanSimple(Screen): config.scan.clearallservices = configElement_nonSave("config.scan.clearallservices", configSelection, 0, (("no", _("no")), ("yes", _("yes")), ("yes_hold_feeds", _("yes (keep feeds)")))) self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices)) nim = configElement_nonSave(0, configSelection, 0, (("yes", _("yes")), ("no", _("no")))) - if nimtype == nimmanager.nimType["DVB-T"]: - have_terrestrial = True - elif nimtype == nimmanager.nimType["DVB-S"] and not len(nimmanager.getSatListForNim(0)): + if nimtype == nimmanager.nimType["DVB-S"] and not len(nimmanager.getSatListForNim(0)): scan_possible=False if scan_possible: self.list.append(getConfigListEntry(_("Scan NIM") + " 0 (" + nimmanager.getNimTypeName(0) + ")", nim)) @@ -711,11 +707,6 @@ class ScanSimple(Screen): if nimcount > 1 and self.ScanNimTwoNeeded(): nim = configElement_nonSave(1, configSelection, 0, (("yes", _("yes")), ("no", _("no")))) self.list.append(getConfigListEntry(_("Scan NIM") + " 1 (" + nimmanager.getNimTypeName(1) + ")", nim)) - if nimmanager.getNimType(1) == nimmanager.nimType["DVB-T"]: - have_terrestrial = True - - if have_terrestrial: - self.list.append(getConfigListEntry(_("Enable 5V for active antenna"), config.terrestrial.enable_5V)) self["config"] = ConfigList(self.list) self["header"] = Label(_("Automatic Scan")) |