some German translations (especially for the parental control)

improve automatic cable scan

3 files changed, 32 insertions, 14 deletions

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index e968cfe1..7677a502 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -353,14 +353,14 @@ class NimManager:
 				self.parsedCab = str(tname)
 			elif (name == "transponder"):
 				freq = int(attrs.get('frequency',""))
-				sr = int(attrs.get('symbol_rate',""))
-				mod = int(attrs.get('modulation',"3")) # QAM64 default
-				fec = int(attrs.get('fec_inner',"0")) # AUTO default
+				#sr = int(attrs.get('symbol_rate',""))
+				#mod = int(attrs.get('modulation',"3")) # QAM64 default
+				#fec = int(attrs.get('fec_inner',"0")) # AUTO default
 				if self.parsedCab in self.transponders:
 					pass
 				else:
 					self.transponders[self.parsedCab] = [ ]
-				self.transponders[self.parsedCab].append((1, freq, sr, mod, fec))
+				self.transponders[self.parsedCab].append((1, freq))
 
 	class parseTerrestrials(ContentHandler):
 		def __init__(self, terrestrialsList, transponders):
@@ -410,7 +410,10 @@ class NimManager:
 		return self.transpondersterrestrial[region]
 	
 	def getCableDescription(self, nim):
-		return self.cablesList[config.Nims[nim].cable.value]
+		return self.cablesList[0]
+	
+	def getCableTrustNit(self, nim):
+		return (config.Nims[nim].cabletype.value == "quick")
 
 	def getTerrestrialDescription(self, nim):
 		return self.terrestrialsList[config.Nims[nim].terrestrial.value][0]
@@ -783,7 +786,7 @@ def InitNimManager(nimmgr):
 				nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))
 
 		elif slot.nimType == nimmgr.nimType["DVB-C"]:
-			nim.cable = ConfigSelection(choices = nimmgr.cablesList)
+			nim.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))])
 		elif slot.nimType == nimmgr.nimType["DVB-T"]:
 			list = []
 			for x in nimmgr.terrestrialsList:
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index a72d7564..d6d9904c 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -64,7 +64,7 @@ class NimSetup(Screen, ConfigListScreen):
 				self.fillListWithAdvancedSatEntrys(currSat)
 			self.have_advanced = True
 		elif self.nim_type == nimmanager.nimType["DVB-C"]:
-			self.list.append(getConfigListEntry(_("Cable provider"), self.nimConfig.cable))
+			self.list.append(getConfigListEntry(_("Service scan type needed"), self.nimConfig.cabletype))
 			self.have_advanced = False
 		elif self.nim_type == nimmanager.nimType["DVB-T"]:
 			self.have_advanced = False
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 6237b50d..ea8d0b0a 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -91,15 +91,25 @@ def getInitialTransponderList(tlist, pos):
 def getInitialCableTransponderList(tlist, cable):
 	list = nimmanager.getTranspondersCable(cable)
 
+	symbolrates = [6900000, 6875000]
+	modulations = [3, 5, 1, 2, 4] # QAM 64, 256, 16, 32, 128
+
 	for x in list:
 		if x[0] == 1: #CABLE
-			parm = eDVBFrontendParametersCable()
-			parm.frequency = x[1]
-			parm.symbol_rate = x[2]
-			parm.modulation = x[3]
-			parm.fec_inner = x[4]
-			parm.inversion = 2 # AUTO
-			tlist.append(parm)
+			for symbolrate in symbolrates:
+				for modulation in modulations:
+					parm = eDVBFrontendParametersCable()
+					parm.frequency = x[1]
+					parm.symbol_rate = symbolrate
+					parm.modulation = modulation
+					parm.fec_inner = 0
+					parm.inversion = 2 # AUTO
+					#print "frequency:", x[1]
+					#print "symbol_rate:", x[2]
+					#print "modulation:", x[3]
+					#print "fec_inner:", x[4]
+					#print "inversion:", 2
+					tlist.append(parm)
 
 def getInitialTerrestrialTransponderList(tlist, region):
 	list = nimmanager.getTranspondersTerrestrial(region)
@@ -613,6 +623,7 @@ class ScanSimple(ConfigListScreen, Screen):
 			print "Scan Tuner", slotid, "-", c.value
 			if c.value:
 				scanPossible = False
+				trustNit = False
 				tlist = [ ]
 				if nimmanager.getNimType(slotid) == nimmanager.nimType["DVB-S"]:
 					print "is sat"
@@ -632,6 +643,8 @@ class ScanSimple(ConfigListScreen, Screen):
 				elif nimmanager.getNimType(slotid) == nimmanager.nimType["DVB-C"]:
 					scanPossible = True
 					getInitialCableTransponderList(tlist, nimmanager.getCableDescription(slotid))
+					if nimmanager.getCableTrustNit(slotid):
+						trustNit = True
 				elif nimmanager.getNimType(slotid) == nimmanager.nimType["DVB-T"]:
 					scanPossible = True
 					getInitialTerrestrialTransponderList(tlist, nimmanager.getTerrestrialDescription(slotid))
@@ -640,6 +653,8 @@ class ScanSimple(ConfigListScreen, Screen):
 
 				if scanPossible:
 					flags=eComponentScan.scanNetworkSearch
+					if trustNit:
+						flags |= eComponentScan.clearToScanOnFirstNIT
 					tmp = self.scan_clearallservices.value
 					if tmp == "yes":
 						flags |= eComponentScan.scanRemoveServices