diff options
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/NimManager.py | 6 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 8454bbe5..a4bcb80b 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -641,6 +641,8 @@ 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()) @@ -765,6 +767,7 @@ 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]) @@ -772,6 +775,9 @@ def InitNimManager(nimmgr): 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); + nimmgr.sec = SecConfigure(nimmgr) nimmanager = NimManager() diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index e8d3781f..5becc898 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -254,6 +254,7 @@ 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 \ @@ -638,19 +639,29 @@ class ScanSimple(Screen): tlist = [] nimcount = nimmanager.getNimSocketCount() + have_terrestrial = False if nimcount > 0: + nimtype = nimmanager.getNimType(0) scan_possible=True config.scan = ConfigSubsection() 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 nimmanager.getNimType(0) == nimmanager.nimType["DVB-S"] and not len(nimmanager.getSatListForNim(0)): + if nimtype == nimmanager.nimType["DVB-T"]: + have_terrestrial = True + elif 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)) + 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 nimtype = 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")) |