translations

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

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 57ff33f..f677f5c 100644 (file)
--- 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,16 +172,15 @@ 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, ("off", "on", "Auto"))
-                       config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 0, ("16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM", "Auto"))
-                       config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 0, ("None", "1/2", "2/3", "3/4", "4/5", "5/6", "6/7", "7/8", "8/9", "Auto"))
+                       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
@@ -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"))