add support for 16:10 display aspect ratio

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

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index a51c1c87f5a0787e32da79828041adf3b3b2eda5..0229d5e8758307b151c74ea7dbec48e1c9d02178 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -3,11 +3,9 @@ from ServiceScan import *
 from Components.config import *
 from Components.ActionMap import NumberActionMap
 from Components.ConfigList import ConfigList
-from Components.config import config
-from Components.config import getConfigListEntry
 from Components.NimManager import nimmanager
 from Components.Label import Label
-from enigma import eDVBFrontendParametersSatellite, eComponentScan
+from enigma import eDVBFrontendParametersSatellite, eComponentScan, eDVBSatelliteEquipmentControl
 
 def getInitialTransponderList(tlist, pos):
        list = nimmanager.getTransponders(pos)
@@ -63,6 +61,10 @@ class ScanSetup(Screen):
                        "9": self.keyNumberGlobal,
                        "0": self.keyNumberGlobal
                }, -1)
+               
+               self.statusTimer = eTimer()
+               self.statusTimer.timeout.get().append(self.updateStatus)
+               #self.statusTimer.start(5000, True)
 
                self.list = []
                self["config"] = ConfigList(self.list)
@@ -156,6 +158,19 @@ class ScanSetup(Screen):
                        elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete":
                                pass
 
+               if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"] and currentConfigSelectionElement(config.scan.type) == "single_transponder") or \
+                       (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"] and currentConfigSelectionElement(config.scan.typecable) == "single_transponder") or \
+                       (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"] and currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder"):
+                               self.configElementSNR = getConfigListEntry(_("SNR"), config.scan.snr)
+                               self.list.append(self.configElementSNR)
+                               self.configElementACG = getConfigListEntry(_("AGC"), config.scan.agc)
+                               self.list.append(self.configElementACG)
+                               self.configElementBER = getConfigListEntry(_("BER"), config.scan.ber)
+                               self.list.append(self.configElementBER)
+                               self.statusTimer.start(500, False)
+               else:
+                       self.statusTimer.stop()
+
                self["config"].list = self.list
                self["config"].l.setList(self.list)
 
@@ -187,6 +202,14 @@ class ScanSetup(Screen):
                                nimList.append(nim[0])
                        #nimList.append("all")
                        config.scan.nims = configElement_nonSave("config.scan.nims", configSelection, 0, nimList)
+                       
+                       # status
+                       config.scan.snr = configElement_nonSave("config.scan.snr", configSlider, 0, (1, 100))
+                       config.scan.snr.enabled = False
+                       config.scan.agc = configElement_nonSave("config.scan.agc", configSlider, 0, (1, 100))
+                       config.scan.agc.enabled = False
+                       config.scan.ber = configElement_nonSave("config.scan.ber", configSlider, 0, (1, 100))
+                       config.scan.ber.enabled = False
 
                        # sat
                        config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (1, 99999)))
@@ -235,6 +258,9 @@ class ScanSetup(Screen):
                self["config"].handleKey(config.key["nextElement"])
                self.newConfig()
 
+       def updateStatus(self):
+               print "updatestatus"
+
        def keyNumberGlobal(self, number):
                print "You pressed number " + str(number)
                if (self["config"].getCurrent()[1].parent.enabled == True):
@@ -382,6 +408,19 @@ class ScanSimple(Screen):
                                return 1
                return 0
 
+       def ScanNimTwoNeeded(self):
+               if nimmanager.getNimType(0) != nimmanager.getNimType(1):
+                       return True
+               if nimmanager.getNimType(0) == nimmanager.nimType["DVB-S"]: #two dvb-s nims
+                       if nimmanager.getNimConfigMode(1) in ["loopthrough", "satposdepends", "equal", "nothing"]:
+                               return False
+                       sec = eDVBSatelliteEquipmentControl.getInstance()
+                       if sec is not None:
+                               different_satellites = sec.get_different_satellites(0,1)
+                               if different_satellites is None:# or not len(different_satellites):
+                                       return False
+                       return True
+
        def __init__(self, session):
                Screen.__init__(self, session)
 
@@ -396,9 +435,13 @@ class ScanSimple(Screen):
                self.list = []
                tlist = []
 
-               for slotid in range(nimmanager.getNimSocketCount()):
-                       nim = configElement_nonSave(slotid, configSelection, 0, (("yes", _("yes")), ("no", _("no"))))
-                       self.list.append(getConfigListEntry(_("Scan NIM") + " " + str(slotid) + " (" + nimmanager.getNimTypeName(slotid) + ")", nim))
+               nimcount = nimmanager.getNimSocketCount()
+               if nimcount > 0:
+                       nim = configElement_nonSave(0, configSelection, 0,(("yes", _("yes")),("no", _("no"))))
+                       self.list.append(getConfigListEntry(_("Scan NIM") + " 0 (" + nimmanager.getNimTypeName(0) + ")", nim))
+               if nimcount > 1 and self.ScanNimTwoNeeded():
+                       nim = configElement_nonSave(1, configSelection, 0, (("yes", _("yes")), ("no", _("no"))))
+                       self.list.append(getConfigListEntry(_("Scan NIM") + " 1 (" + nimmanager.getNimTypeName(1) + ")", nim))
 
                self["config"] = ConfigList(self.list)
                self["header"] = Label(_("Automatic Scan"))