From: Stefan Pluecken Date: Wed, 23 Nov 2005 00:01:54 +0000 (+0000) Subject: another try to fix ScanSetup X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=494697a00628cf277bd00b85967efbbe61f4fcee another try to fix ScanSetup --- diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp index 31dc65a..6bac392 100644 --- a/lib/dvb_ci/dvbci.cpp +++ b/lib/dvb_ci/dvbci.cpp @@ -189,11 +189,11 @@ void eDVBCIInterfaces::gotPMT(eDVBServicePMTHandler *pmthandler) // HACK this assigns ALL RUNNING SERVICES to the first free CI !!! for (eSmartPtrList::iterator ci_it(m_slots.begin()); ci_it != m_slots.end(); ++ci_it) { - eDVBCISlot **usedby = &it->usedby; +/* eDVBCISlot **usedby = &it->usedby; *usedby = ci_it; (*usedby)->resetPrevSentCAPMTVersion(); break; - + */ } } if (it->usedby) diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index f677f5c..aef62f6 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -56,7 +56,7 @@ 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 = [] @@ -101,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): @@ -111,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) @@ -171,33 +167,33 @@ 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.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, 9999))) - config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, ("horizontal", "vertical", "circular left", "circular right")) + 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", (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.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, 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 diff --git a/po/de.po b/po/de.po index 2dce328..f60a946 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tuxbox-enigma 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 21:04+0100\n" +"POT-Creation-Date: 2005-11-23 00:56+0100\n" "PO-Revision-Date: 2005-11-17 20:53+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -30,10 +30,29 @@ msgstr "%s (%s, %d MB frei)" msgid "Add" msgstr "Hinzufuegen" -#: ../lib/python/Screens/ScanSetup.py:362 ../data/ +#: ../lib/python/Screens/ScanSetup.py:170 +#: ../lib/python/Screens/ScanSetup.py:177 +#: ../lib/python/Screens/ScanSetup.py:178 +#: ../lib/python/Screens/ScanSetup.py:179 +#: ../lib/python/Screens/ScanSetup.py:184 +#: ../lib/python/Screens/ScanSetup.py:185 +#: ../lib/python/Screens/ScanSetup.py:186 +#: ../lib/python/Screens/ScanSetup.py:187 +#: ../lib/python/Screens/ScanSetup.py:188 +#: ../lib/python/Screens/ScanSetup.py:189 +#: ../lib/python/Screens/ScanSetup.py:190 +#: ../lib/python/Screens/ScanSetup.py:191 +msgid "Auto" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:364 ../data/ msgid "Automatic Scan" msgstr "Automatische Suche" +#: ../lib/python/Screens/ScanSetup.py:126 +msgid "Bandwidth" +msgstr "" + #: ../lib/python/Screens/HarddiskSetup.py:30 msgid "Bus: " msgstr "" @@ -54,6 +73,14 @@ msgstr "klassisch" msgid "Close this Screen..." msgstr "" +#: ../lib/python/Screens/ScanSetup.py:127 +msgid "Code rate high" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:128 +msgid "Code rate low" +msgstr "" + #: ../lib/python/Screens/Satconfig.py:31 ../lib/python/Screens/Satconfig.py:57 #: ../data/ msgid "Configmode" @@ -83,7 +110,8 @@ msgstr "" msgid "DiSEqC A/B/C/D" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:358 ../lib/python/Components/Lcd.py:32 +#: ../lib/python/Screens/ScanSetup.py:104 +#: ../lib/python/Screens/ScanSetup.py:360 ../lib/python/Components/Lcd.py:32 #: ../lib/python/Components/SetupDevices.py:38 #: ../lib/python/Components/SetupDevices.py:39 #: ../lib/python/Components/SetupDevices.py:43 @@ -103,7 +131,8 @@ msgstr "Diseqcmodus" msgid "ERROR - failed to scan (%s)!" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:358 ../lib/python/Components/Lcd.py:32 +#: ../lib/python/Screens/ScanSetup.py:104 +#: ../lib/python/Screens/ScanSetup.py:360 ../lib/python/Components/Lcd.py:32 #: ../lib/python/Components/SetupDevices.py:38 #: ../lib/python/Components/SetupDevices.py:39 #: ../lib/python/Components/SetupDevices.py:43 @@ -119,7 +148,14 @@ msgstr "Ein" msgid "English" msgstr "Englisch" -#: ../lib/python/Screens/ScanSetup.py:83 +#: ../lib/python/Screens/ScanSetup.py:91 +#: ../lib/python/Screens/ScanSetup.py:118 +msgid "FEC" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:87 +#: ../lib/python/Screens/ScanSetup.py:114 +#: ../lib/python/Screens/ScanSetup.py:124 msgid "Frequency" msgstr "Frequenz" @@ -132,6 +168,14 @@ msgstr "" msgid "German" msgstr "Deutsch" +#: ../lib/python/Screens/ScanSetup.py:131 +msgid "Guard interval mode" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:132 +msgid "Hierarchy mode" +msgstr "" + #: ../lib/python/Screens/NetworkSetup.py:42 ../data/ msgid "IP Address" msgstr "IP Adresse" @@ -144,7 +188,9 @@ msgstr "Initialisieren" msgid "Initializing Harddisk..." msgstr "Initialisiere Festplatte..." -#: ../lib/python/Screens/ScanSetup.py:84 +#: ../lib/python/Screens/ScanSetup.py:88 +#: ../lib/python/Screens/ScanSetup.py:115 +#: ../lib/python/Screens/ScanSetup.py:125 msgid "Inversion" msgstr "" @@ -168,6 +214,11 @@ msgstr "Laengengrad" msgid "Model: " msgstr "Modell:" +#: ../lib/python/Screens/ScanSetup.py:117 +#: ../lib/python/Screens/ScanSetup.py:129 +msgid "Modulation" +msgstr "" + #: ../lib/python/Components/NimManager.py:236 msgid "N/A" msgstr "Nicht verfuegbar" @@ -180,6 +231,17 @@ msgstr "" msgid "Netmask" msgstr "Netzmaske" +#: ../lib/python/Screens/ScanSetup.py:179 +#: ../lib/python/Screens/ScanSetup.py:186 +#: ../lib/python/Screens/ScanSetup.py:187 +#: ../lib/python/Screens/ScanSetup.py:191 +msgid "None" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:90 +msgid "Polarity" +msgstr "" + #: ../lib/python/Screens/Satconfig.py:15 msgid "Port A" msgstr "" @@ -200,11 +262,16 @@ msgstr "" msgid "Positioner" msgstr "Motor" -#: ../lib/python/Screens/ScanSetup.py:363 +#: ../lib/python/Screens/ScanSetup.py:365 msgid "Press OK to scan" msgstr "Zum Starten der Suche OK druecken." -#: ../lib/python/Screens/ScanSetup.py:82 ../lib/python/Screens/Satconfig.py:13 +#: ../lib/python/Screens/ScanSetup.py:59 +msgid "Press OK to start the scan" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:86 ../lib/python/Screens/ScanSetup.py:95 +#: ../lib/python/Screens/Satconfig.py:13 msgid "Satellite" msgstr "Satellit" @@ -228,7 +295,8 @@ msgstr "Sockel " msgid "Stop playing this movie?" msgstr "Das Abspielen dieses Films beenden?" -#: ../lib/python/Screens/ScanSetup.py:85 +#: ../lib/python/Screens/ScanSetup.py:89 +#: ../lib/python/Screens/ScanSetup.py:116 msgid "Symbolrate" msgstr "" @@ -240,13 +308,17 @@ msgstr "Region" msgid "Toneburst A/B" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:70 +#: ../lib/python/Screens/ScanSetup.py:130 +msgid "Transmission mode" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:74 #: ../lib/python/Screens/ScanSetup.py:149 msgid "Tuner" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:73 ../lib/python/Screens/ScanSetup.py:75 -#: ../lib/python/Screens/ScanSetup.py:77 +#: ../lib/python/Screens/ScanSetup.py:77 ../lib/python/Screens/ScanSetup.py:79 +#: ../lib/python/Screens/ScanSetup.py:81 #: ../lib/python/Screens/ScanSetup.py:147 msgid "Type of scan" msgstr "Art der Suche" @@ -270,10 +342,23 @@ msgstr "" "\n" "Bitte zuerst eine Kanalsuche durchfuehren!" +#: ../lib/python/Screens/ScanSetup.py:172 +msgid "circular left" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:172 +msgid "circular right" +msgstr "" + #: ../lib/python/Components/NimManager.py:299 msgid "empty/unknown" msgstr "leer/unbekannt" +#: ../lib/python/Screens/ScanSetup.py:172 +msgid "horizontal" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:196 #: ../lib/python/Components/Network.py:134 msgid "no" msgstr "nein" @@ -286,6 +371,18 @@ msgstr "keine Festplatte gefunden" msgid "none" msgstr "keins" +#: ../lib/python/Screens/ScanSetup.py:170 +#: ../lib/python/Screens/ScanSetup.py:177 +#: ../lib/python/Screens/ScanSetup.py:184 +msgid "off" +msgstr "" + +#: ../lib/python/Screens/ScanSetup.py:170 +#: ../lib/python/Screens/ScanSetup.py:177 +#: ../lib/python/Screens/ScanSetup.py:184 +msgid "on" +msgstr "" + #: ../lib/python/Components/ServiceScan.py:32 msgid "scan done!" msgstr "Suche beendet." @@ -307,10 +404,15 @@ msgstr "Status" msgid "unknown service" msgstr "unbekannter Service" +#: ../lib/python/Screens/ScanSetup.py:172 +msgid "vertical" +msgstr "" + #: ../lib/python/Components/EventInfo.py:43 msgid "waiting for event data..." msgstr "warte auf Programmdaten..." +#: ../lib/python/Screens/ScanSetup.py:196 #: ../lib/python/Components/Network.py:15 #: ../lib/python/Components/Network.py:134 msgid "yes"