X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FNimManager.py;h=5154e2b05654ace4ad423c51da067fe5908434a0;hp=aa915937f8d4bb3828bd2aeb42a1b485c3002c65;hb=597d64c2e00be8759286e37fd15823b1c1518845;hpb=b9f48c64a16e501cc2d5bf28a9ab89aceb51c10c

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index aa91593..5154e2b 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -46,7 +46,7 @@ class SecConfigure:
 		if self.equal.has_key(slotid):
 			for slot in self.equal[slotid]:
 				tunermask |= (1 << slot)
-		elif self.linked.has_key(slotid):
+		if self.linked.has_key(slotid):
 			for slot in self.linked[slotid]:
 				tunermask |= (1 << slot)
 		sec.setLNBSatCR(-1)
@@ -262,7 +262,7 @@ class SecConfigure:
 				if self.equal.has_key(slotid):
 					for slot in self.equal[slotid]:
 						tunermask |= (1 << slot)
-				elif self.linked.has_key(slotid):
+				if self.linked.has_key(slotid):
 					for slot in self.linked[slotid]:
 						tunermask |= (1 << slot)
 
@@ -321,9 +321,9 @@ class SecConfigure:
 				elif dm == "1_2":
 					sec.setDiSEqCMode(diseqcParam.V1_2)
 
-				if self.satposdepends.has_key(slotid):
-					for slot in self.satposdepends[slotid]:
-						tunermask |= (1 << slot)
+					if self.satposdepends.has_key(slotid):
+						for slot in self.satposdepends[slotid]:
+							tunermask |= (1 << slot)
 
 				if dm != "none":
 					if currLnb.toneburst.value == "none":
@@ -759,6 +759,22 @@ class NimManager:
 
 	def getSatList(self):
 		return self.satList
+	
+	# returns True if something is configured to be connected to this nim
+	# if slotid == -1, returns if something is connected to ANY nim
+	def somethingConnected(self, slotid = -1):
+		if (slotid == -1):
+			connected = False
+			for id in range(self.getSlotCount()):
+				if self.somethingConnected(id):
+					connected = True
+			return connected
+		else:
+			nim = config.Nims[slotid]
+			configMode = nim.configMode.value
+		
+			if self.nim_slots[slotid].isCompatible("DVB-S") or self.nim_slots[slotid].isCompatible("DVB-T") or self.nim_slots[slotid].isCompatible("DVB-C"):
+				return not (configMode == "nothing")		
 
 	def getSatListForNim(self, slotid):
 		list = []
@@ -923,7 +939,7 @@ def InitNimManager(nimmgr):
 
 	lnb_choices = {
 		"universal_lnb": _("Universal LNB"),
-		"unicable": _("Unicable"),
+#		"unicable": _("Unicable"),
 		"c_band": _("C-Band"),
 		"user_defined": _("User defined")}