From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 6 Jan 2006 09:54:19 +0000 (+0000)
Subject: enable manual search when nims are configured in advanced mode
X-Git-Tag: 2.6.0~4510
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/23cb40ee4636aa6a6883fd526fe21d5deb11bcae?ds=sidebyside

enable manual search when nims are configured in advanced mode
simple scan will follow
---

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index b52a2114..5f0c4b26 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -134,7 +134,7 @@ class SecConfigure:
 #					pass
 				elif currentConfigSelectionElement(nim.configMode) == "nothing":
 					pass
-				else: #advanced config
+				elif currentConfigSelectionElement(nim.configMode) == "advanced": #advanced config
 					self.updateAdvanced(sec, x)
 		print "sec config completed"
 
@@ -523,21 +523,27 @@ class NimManager:
 	
 	def getSatListForNim(self, slotid):
 		list = []
-		if (self.getNimType(slotid) != self.nimType["empty/unknown"]):
+		if (self.getNimType(slotid) == self.nimType["DVB-S"]):
 			#print "slotid:", slotid
 			
 			#print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
 			#print "diseqcA:", config.Nims[slotid].diseqcA.value
-			if (config.Nims[slotid].diseqcMode.value <= 3):
-				list.append(self.satList[config.Nims[slotid].diseqcA.value])
-			if (0 < config.Nims[slotid].diseqcMode.value <= 3):
-				list.append(self.satList[config.Nims[slotid].diseqcB.value])
-			if (config.Nims[slotid].diseqcMode.value == 3):
-				list.append(self.satList[config.Nims[slotid].diseqcC.value])
-				list.append(self.satList[config.Nims[slotid].diseqcD.value])
-			if (config.Nims[slotid].diseqcMode.value == 4):
+			configMode = currentConfigSelectionElement(config.Nims[slotid].configMode)
+			if configMode == "simple":
+				if (config.Nims[slotid].diseqcMode.value <= 3):
+					list.append(self.satList[config.Nims[slotid].diseqcA.value])
+				if (0 < config.Nims[slotid].diseqcMode.value <= 3):
+					list.append(self.satList[config.Nims[slotid].diseqcB.value])
+				if (config.Nims[slotid].diseqcMode.value == 3):
+					list.append(self.satList[config.Nims[slotid].diseqcC.value])
+					list.append(self.satList[config.Nims[slotid].diseqcD.value])
+				if (config.Nims[slotid].diseqcMode.value == 4):
+					for x in self.satList:
+						list.append(x)
+			elif configMode == "advanced":
 				for x in self.satList:
-					list.append(x)
+					if config.Nims[slotid].advanced.sat[x[1]].lnb.value != 0:
+						list.append(x)
 		return list
 
 #	#callbacks for c++ config