X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a1a69fc17bcc73908f23f0221e141661764fd6af..0bbd93ba1e8f12d5cf1756e6a80e7513af51fe79:/lib/python/Screens/ScanSetup.py diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 8f68b90e..648e6e7f 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -56,17 +56,21 @@ class ScanSetup(Screen): self["config"] = ConfigList(self.list) self.createSetup() - self["introduction"] = Label("Press OK to start the scan") + self["introduction"] = Label(_("Press OK to start the scan")) def updateSatList(self): self.satList = [] 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): @@ -107,32 +111,28 @@ class ScanSetup(Screen): if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"]): if (config.scan.typecable.value == 0): # single transponder - self.list.append(getConfigListEntry("Frequency", config.scan.cab.frequency)) - self.list.append(getConfigListEntry("Inversion", config.scan.cab.inversion)) - self.list.append(getConfigListEntry("Symbolrate", config.scan.cab.symbolrate)) - self.list.append(getConfigListEntry("Modulation", config.scan.cab.modulation)) - self.list.append(getConfigListEntry("FEC", config.scan.cab.fec)) + self.list.append(getConfigListEntry(_("Frequency"), config.scan.cab.frequency)) + self.list.append(getConfigListEntry(_("Inversion"), config.scan.cab.inversion)) + self.list.append(getConfigListEntry(_("Symbolrate"), config.scan.cab.symbolrate)) + self.list.append(getConfigListEntry(_("Modulation"), config.scan.cab.modulation)) + self.list.append(getConfigListEntry(_("FEC"), config.scan.cab.fec)) if (config.scan.typecable.value == 1): # complete pass - if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]): if (config.scan.typeterrestrial.value == 0): # single transponder - self.list.append(getConfigListEntry("Frequency", config.scan.ter.frequency)) - self.list.append(getConfigListEntry("Inversion", config.scan.ter.inversion)) - self.list.append(getConfigListEntry("Bandwidth", config.scan.ter.bandwidth)) - self.list.append(getConfigListEntry("Code rate high", config.scan.ter.fechigh)) - self.list.append(getConfigListEntry("Code rate low", config.scan.ter.feclow)) - self.list.append(getConfigListEntry("Modulation", config.scan.ter.modulation)) - self.list.append(getConfigListEntry("Transmission mode", config.scan.ter.transmission)) - self.list.append(getConfigListEntry("Guard interval mode", config.scan.ter.guard)) - self.list.append(getConfigListEntry("Hierarchy mode", config.scan.ter.hierarchy)) + self.list.append(getConfigListEntry(_("Frequency"), config.scan.ter.frequency)) + self.list.append(getConfigListEntry(_("Inversion"), config.scan.ter.inversion)) + self.list.append(getConfigListEntry(_("Bandwidth"), config.scan.ter.bandwidth)) + self.list.append(getConfigListEntry(_("Code rate high"), config.scan.ter.fechigh)) + self.list.append(getConfigListEntry(_("Code rate low"), config.scan.ter.feclow)) + self.list.append(getConfigListEntry(_("Modulation"), config.scan.ter.modulation)) + self.list.append(getConfigListEntry(_("Transmission mode"), config.scan.ter.transmission)) + self.list.append(getConfigListEntry(_("Guard interval mode"), config.scan.ter.guard)) + self.list.append(getConfigListEntry(_("Hierarchy mode"), config.scan.ter.hierarchy)) if (config.scan.typeterrestrial.value == 1): # complete pass - - - self["config"].list = self.list self["config"].l.setList(self.list) @@ -162,46 +162,47 @@ class ScanSetup(Screen): nimList = [ ] for nim in nimmanager.nimList(): nimList.append(nim[0]) - nimList.append("all") + #nimList.append("all") config.scan.nims = configElement_nonSave("config.scan.nims", configSelection, 0, nimList) # 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.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, ("horizontal", "vertical", "circular left", "circular right")) + 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, 99999))) + 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.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], configsequencearg.get("INTEGER", (1, 30000))) + 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, 9999))) # 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, 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.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: #print sat[1] - config.scan.scansat[sat[1]] = configElement_nonSave("config.scan.scansat[" + str(sat[1]) + "]", configSelection, 0, ("yes", "no")) + config.scan.scansat[sat[1]] = configElement_nonSave("config.scan.scansat[" + str(sat[1]) + "]", configSelection, 0, (_("yes"), _("no"))) config.scan.satselection = [] 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() @@ -300,9 +301,11 @@ class ScanSetup(Screen): feid = config.scan.nims.value # flags |= eComponentScan.scanSearchBAT - self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, feid, flags) + self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, flags) #self.close() + def doNothing(self): + pass def keyCancel(self): for x in self["config"].list: @@ -311,7 +314,19 @@ class ScanSetup(Screen): class ScanSimple(Screen): - def keyOK(self): + def run(self): + print "start scan for sats:" + tlist = [ ] + for x in self.list: + if x[1].parent.value == 0: + print " " + str(x[1].parent.configPath) + getInitialTransponderList(tlist, x[1].parent.configPath) + + feid = 0 # FIXME + self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch) + + + def keyGo(self): print "start scan for sats:" tlist = [ ] for x in self.list: @@ -320,8 +335,11 @@ class ScanSimple(Screen): getInitialTransponderList(tlist, x[1].parent.configPath) feid = 0 # FIXME - self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch) + self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch) + def doNothing(self): + pass + def keyCancel(self): self.close() @@ -342,7 +360,7 @@ class ScanSimple(Screen): self["actions"] = ActionMap(["SetupActions"], { - "ok": self.keyOK, + "ok": self.keyGo, "cancel": self.keyCancel, "left": self.keyLeft, "right": self.keyRight, @@ -356,9 +374,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"))