fix translations

[vuplus_dvbapp] / lib / python / Screens / ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 4eb7b8c..cc11aa7 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -130,11 +130,14 @@ class ScanSetup(Screen):
 
                self.updateSatList()
                self.service = session.nav.getCurrentService()
+               self.feinfo = None
                frontendData = None
                if self.service is not None:
                        self.feinfo = self.service.frontendInfo()
                        frontendData = self.feinfo and self.feinfo.getFrontendData(True)
                self.createConfig(frontendData)
+               del self.feinfo
+               del self.service
 
 
                self["actions"] = NumberActionMap(["SetupActions"],
@@ -259,7 +262,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 \
@@ -324,7 +326,7 @@ class ScanSetup(Screen):
                                           #("Guard Interval", frontendData["guard_interval"], TYPE_TEXT),
                                           #("Hierarchy Inform.", frontendData["hierarchy_information"], TYPE_TEXT),
                        defaultSat = { "orbpos": 192, "system": 0, "frequency": [11836], "inversion": 2, "symbolrate": [27500], "polarization": 0, "fec": 0, "fec_s2": 8, "modulation": 0 }
-                       defaultCab = {"frequency": [466], "inversion": 2, "modulation": 0, "fec": 0, "symbolrate": [6900]}
+                       defaultCab = {"frequency": [466], "inversion": 2, "modulation": 2, "fec": 0, "symbolrate": [6900]}
                        if frontendData is not None:
                                if frontendData["tuner_type"] == "DVB-S":
                                        defaultSat["system"] = {"DVB-S": 0, "DVB-S2": 1}[frontendData["system"]]
@@ -379,7 +381,7 @@ class ScanSetup(Screen):
                        # cable
                        config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, defaultCab["frequency"], configsequencearg.get("INTEGER", (50, 999)))
                        config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, defaultCab["inversion"], (("off", _("off")), ("on", _("on")), ("auto", _("Auto"))))
-                       config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, defaultCab["modulation"], (("auto", _("Auto")), ("16qam", "16-QAM"), ("32qam", "32-QAM"), ("64qam", "64-QAM"), ("128qam", "128-QAM"), ("256qam", "256-QAM")))
+                       config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, defaultCab["modulation"], (("16qam", "16-QAM"), ("32qam", "32-QAM"), ("64qam", "64-QAM"), ("128qam", "128-QAM"), ("256qam", "256-QAM")))
                        config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, defaultCab["fec"], (("auto", _("Auto")), ("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("8_9", "8/9"), ("none", _("None"))))
                        config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, defaultCab["symbolrate"], configsequencearg.get("INTEGER", (1, 9999)))
                        config.scan.cab.networkScan = configElement_nonSave("config.scan.cab.networkScan", configSelection, 0, (("no", _("no")), ("yes", _("yes"))))
@@ -441,7 +443,7 @@ class ScanSetup(Screen):
                           }
 
        def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position, system, modulation):
-               print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion)
+               print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(self.fecmap[fec]) + " inversion: " + str(inversion) + " modulation: " + str(modulation) + " system: " + str(system)
                print "orbpos: " + str(orbital_position)
                parm = eDVBFrontendParametersSatellite()
                if modulation == 1:
@@ -500,7 +502,7 @@ class ScanSetup(Screen):
                                                                                config.scan.sat.inversion.value,
                                                                                orbpos,
                                                                                config.scan.sat.system.value,
-                                                                               config.scan.sat.modulation)
+                                                                               config.scan.sat.modulation.value)
                        elif currentConfigSelectionElement(config.scan.type) == "single_satellite":
                                sat = self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value]
                                getInitialTransponderList(tlist, int(sat[1]))
@@ -529,7 +531,7 @@ class ScanSetup(Screen):
                        if currentConfigSelectionElement(config.scan.typecable) == "single_transponder":
                                self.addCabTransponder(tlist, config.scan.cab.frequency.value[0],
                                                                                          config.scan.cab.symbolrate.value[0],
-                                                                                         config.scan.cab.modulation.value,
+                                                                                         config.scan.cab.modulation.value + 1,
                                                                                          config.scan.cab.fec.value,
                                                                                          config.scan.cab.inversion.value)
                                if currentConfigSelectionElement(config.scan.cab.networkScan) == "yes":
@@ -693,7 +695,6 @@ class ScanSimple(Screen):
                tlist = []
 
                nimcount = nimmanager.getNimSocketCount()
-               have_terrestrial = False
                if nimcount > 0:
                        nimtype = nimmanager.getNimType(0)
                        scan_possible=True
@@ -701,9 +702,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 +710,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"))