fix

[enigma2.git] / lib / python / Screens / ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 2f204b03a4e286d3e743a6cb395b88da7ac15f52..72340780dac9bbe0a2ee1a0689ff4251181710e6 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -86,7 +86,7 @@ class ScanSetup(Screen):
                                self.list.append(getConfigListEntry(_('Satellite'), config.scan.satselection[config.scan.nims.value]))
                                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(_('Symbol Rate'), config.scan.sat.symbolrate))
                                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
@@ -113,7 +113,7 @@ class ScanSetup(Screen):
                        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(_("Symbol Rate"), 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
@@ -167,7 +167,7 @@ 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, (_("off"), _("on"), _("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"))
@@ -301,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:
@@ -312,7 +314,7 @@ class ScanSetup(Screen):
 
 class ScanSimple(Screen):
 
-       def keyOK(self):
+       def run(self):
                print "start scan for sats:"
                tlist = [ ]
                for x in self.list:
@@ -321,8 +323,23 @@ 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 keyGo(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 doNothing(self):
+               pass
+       
        def keyCancel(self):
                self.close()
 
@@ -343,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,