X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScanSetup.py;h=f677f5c8dfb74cb122be51f2286ffedf07e78359;hp=583272339fc3c84e8d980224dc48ce4b967f8936;hb=2b72cfe222c5c013e9a10372c826ae5b3f56ef33;hpb=7f2be2921d806077eb1cca6c3016c767cb76fd22 diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 5832723..f677f5c 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -63,10 +63,14 @@ class ScanSetup(Screen): for slot in nimmanager.nimslots: if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]): self.satList.append(nimmanager.getSatListForNim(slot.slotid)) - + else: + self.satList.append(None) + def createSetup(self): self.list = [] + print "ID: " + str(config.scan.nims.value) + self.list.append(getConfigListEntry(_("Tuner"), config.scan.nims)) if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]): @@ -83,12 +87,12 @@ class ScanSetup(Screen): self.list.append(getConfigListEntry(_('Frequency'), config.scan.sat.frequency)) self.list.append(getConfigListEntry(_('Inversion'), config.scan.sat.inversion)) self.list.append(getConfigListEntry(_('Symbolrate'), config.scan.sat.symbolrate)) - self.list.append(getConfigListEntry("Polarity", config.scan.sat.polarization)) - self.list.append(getConfigListEntry("FEC", config.scan.sat.fec)) + self.list.append(getConfigListEntry(_("Polarity"), config.scan.sat.polarization)) + self.list.append(getConfigListEntry(_("FEC"), config.scan.sat.fec)) if (config.scan.type.value == 1): # single satellite scan self.updateSatList() print config.scan.satselection[config.scan.nims.value] - self.list.append(getConfigListEntry("Satellite", config.scan.satselection[config.scan.nims.value])) + self.list.append(getConfigListEntry(_("Satellite"), config.scan.satselection[config.scan.nims.value])) if (config.scan.type.value == 2): # multi sat scan # if (norotor) tlist = [] @@ -97,7 +101,7 @@ class ScanSetup(Screen): for x in SatList: if self.Satexists(tlist, x[1]) == 0: tlist.append(x[1]) - sat = configElement_nonSave(x[1], configSelection, 0, ("Enable", "Disable")) + sat = configElement_nonSave(x[1], configSelection, 0, (_("Enable"), "Disable")) self.list.append(getConfigListEntry(nimmanager.getSatDescription(x[1]), sat)) # if (rotor): @@ -168,28 +172,27 @@ class ScanSetup(Screen): # sat config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (10000, 14000))) config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, ("on", "off", "auto")) - config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 30000))) + config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 9999))) config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, ("horizontal", "vertical", "circular left", "circular right")) config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "auto")) - # cable - config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (10000, 14000))) - config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 0, ("auto", "off", "on")) - config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM")) - config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) + config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 9999))) + config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 2, ("off", "on", "Auto")) + config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 2, ("16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM", "Auto")) + config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 9, ("None", "1/2", "2/3", "3/4", "4/5", "5/6", "6/7", "7/8", "8/9", "Auto")) config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], configsequencearg.get("INTEGER", (1, 30000))) # terrestial config.scan.ter.frequency = configElement_nonSave("config.scan.ter.frequency", configSequence, [466], configsequencearg.get("INTEGER", (10000, 14000))) - config.scan.ter.inversion = configElement_nonSave("config.scan.ter.inversion", configSelection, 0, ("Auto", "off", "on")) - config.scan.ter.bandwidth = configElement_nonSave("config.scan.ter.bandwidth", configSelection, 0, ("Auto", "6 MHz", "7MHz", "8MHz")) - config.scan.ter.fechigh = configElement_nonSave("config.scan.ter.fechigh", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) - config.scan.ter.feclow = configElement_nonSave("config.scan.ter.feclow", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) - config.scan.ter.modulation = configElement_nonSave("config.scan.ter.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM")) - config.scan.ter.transmission = configElement_nonSave("config.scan.ter.transmission", configSelection, 0, ("Auto", "2K", "8K")) - config.scan.ter.guard = configElement_nonSave("config.scan.ter.guard", configSelection, 0, ("Auto", "1/4", "1/8", "1/16", "1/32")) - config.scan.ter.hierarchy = configElement_nonSave("config.scan.ter.hierarchy", configSelection, 0, ("Auto", "1", "2", "4")) + config.scan.ter.inversion = configElement_nonSave("config.scan.ter.inversion", configSelection, 2, ("off", "on", "Auto")) + config.scan.ter.bandwidth = configElement_nonSave("config.scan.ter.bandwidth", configSelection, 3, ("8MHz", "7MHz", "6MHz", "Auto")) + config.scan.ter.fechigh = configElement_nonSave("config.scan.ter.fechigh", configSelection, 6, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "Auto")) + config.scan.ter.feclow = configElement_nonSave("config.scan.ter.feclow", configSelection, 6, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "Auto")) + config.scan.ter.modulation = configElement_nonSave("config.scan.ter.modulation", configSelection, 2, ("QPSK", "QAM16", "Auto")) + config.scan.ter.transmission = configElement_nonSave("config.scan.ter.transmission", configSelection, 2, ("2K", "8K", "Auto")) + config.scan.ter.guard = configElement_nonSave("config.scan.ter.guard", configSelection, 4, ("1/32", "1/16", "1/8", "1/4", "Auto")) + config.scan.ter.hierarchy = configElement_nonSave("config.scan.ter.hierarchy", configSelection, 4, ("None", "1", "2", "4", "Auto")) config.scan.scansat = {} for sat in nimmanager.satList: @@ -200,8 +203,10 @@ class ScanSetup(Screen): slotid = 0 for slot in nimmanager.nimslots: if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]): + print str(slot.slotid) + " : " + str(self.satList) config.scan.satselection.append(configElement_nonSave("config.scan.satselection[" + str(slot.slotid) + "]", configSatlist, 0, self.satList[slot.slotid])) - + else: + config.scan.satselection.append(None) def keyLeft(self): self["config"].handleKey(config.key["prevElement"]) self.newConfig() @@ -356,9 +361,9 @@ class ScanSimple(Screen): for x in SatList: if self.Satexists(tlist, x) == 0: tlist.append(x) - sat = configElement_nonSave(x, configSelection, 0, ("Enable", "Disable")) + sat = configElement_nonSave(x, configSelection, 0, (_("Enable"), _("Disable"))) self.list.append(getConfigListEntry(nimmanager.getSatDescription(x), sat)) self["config"] = ConfigList(self.list) - self["header"] = Label("Automatic Scan") - self["footer"] = Label("Press OK to scan") + self["header"] = Label(_("Automatic Scan")) + self["footer"] = Label(_("Press OK to scan"))