X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FSatconfig.py;h=a5712dcd9af2237e895c117cef034ff3a2d5ffa5;hp=3de125b980d72e392665b9de4958992b35115cd1;hb=80a99b08bd6e0932a420e805d928dc5ae5b80f61;hpb=f9c85f244f88881da62c27b130a8675b1929ff8a

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 3de125b..a5712dc 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -76,6 +76,7 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 		print "Creating setup"
 		self.list = [ ]
 
+		self.multiType = None
 		self.configMode = None
 		self.diseqcModeEntry = None
 		self.advancedSatsEntry = None
@@ -94,6 +95,12 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 		self.advancedType = None
 		self.advancedManufacturer = None
 		self.advancedSCR = None
+		self.advancedConnected = None
+		
+		if self.nim.isMultiType():
+			multiType = self.nimConfig.multiType
+			self.multiType = getConfigListEntry(_("Tuner type"), multiType)
+			self.list.append(self.multiType)
 
 		if self.nim.isCompatible("DVB-S"):
 			self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode)
@@ -199,11 +206,18 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 		checkList = (self.configMode, self.diseqcModeEntry, self.advancedSatsEntry, \
 			self.advancedLnbsEntry, self.advancedDiseqcMode, self.advancedUsalsEntry, \
 			self.advancedLof, self.advancedPowerMeasurement, self.turningSpeed, \
-			self.advancedType, self.advancedSCR, self.advancedManufacturer, self.advancedUnicable, \
-			self.uncommittedDiseqcCommand, self.cableScanType)
+			self.advancedType, self.advancedSCR, self.advancedManufacturer, self.advancedUnicable, self.advancedConnected, \
+			self.uncommittedDiseqcCommand, self.cableScanType, self.multiType)
+		if self["config"].getCurrent() == self.multiType:
+			from Components.NimManager import InitNimManager
+			InitNimManager(nimmanager)
+			self.nim = nimmanager.nim_slots[self.slotid]
+			self.nimConfig = self.nim.config
+			
 		for x in checkList:
 			if self["config"].getCurrent() == x:
 				self.createSetup()
+				break
 
 	def run(self):
 		if self.have_advanced and self.nim.config_mode == "advanced":
@@ -272,6 +286,18 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 					self.list.append(self.advancedType)
 					self.list.append(self.advancedSCR)
 					self.list.append(getConfigListEntry(_("Frequency"), manufacturer.vco[product_name][manufacturer.scr[product_name].index])) 
+
+				choices = []
+				connectable = nimmanager.canConnectTo(self.slotid)
+				for id in connectable:
+					choices.append((str(id), nimmanager.getNimDescription(id)))
+				if len(choices):
+					self.advancedConnected = getConfigListEntry(_("connected"), self.nimConfig.advanced.unicableconnected)
+					self.list.append(self.advancedConnected)
+					if self.nimConfig.advanced.unicableconnected.value == True:
+						self.nimConfig.advanced.unicableconnectedTo.setChoices(choices)
+						self.list.append(getConfigListEntry(_("Connected to"),self.nimConfig.advanced.unicableconnectedTo))
+
 			else:	#kein Unicable
 				self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage))
 				self.list.append(getConfigListEntry(_("Increased voltage"), currLnb.increased_voltage))
@@ -347,7 +373,6 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 		new_configured_sats = nimmanager.getConfiguredSats()
 		self.unconfed_sats = old_configured_sats - new_configured_sats
 		self.satpos_to_remove = None
-		self.restoreService(_("Zap back to service before tuner setup?"))
 		self.deleteConfirmed((None, "no"))
 
 	def deleteConfirmed(self, confirmed):
@@ -377,7 +402,9 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 			if confirmed[1] == "yestoall" or confirmed[1] == "notoall":
 				self.deleteConfirmed(confirmed)
 			break
-		
+		else:
+			self.restoreService(_("Zap back to service before tuner setup?"))
+
 	def __init__(self, session, slotid):
 		Screen.__init__(self, session)
 		self.list = [ ]
@@ -462,7 +489,7 @@ class NimSelection(Screen):
 	def okbuttonClick(self):
 		nim = self["nimlist"].getCurrent()
 		nim = nim and nim[3]
-		if nim is not None and not nim.empty:
+		if nim is not None and not nim.empty and nim.isSupported():
 			self.session.openWithCallback(self.updateList, self.resultclass, nim.slot)
 			
 	def showNim(self, nim):
@@ -519,6 +546,10 @@ class NimSelection(Screen):
 						text = _("nothing connected")
 					elif nimConfig.configMode.value == "enabled":
 						text = _("enabled")
+				if x.isMultiType():
+					text = _("Switchable tuner types:") + "(" + ','.join(x.getMultiTypeList().values()) + ")" + "\n" + text
+				if not x.isSupported():
+					text = _("tuner is not supported")
 					
 				self.list.append((slotid, x.friendly_full_description, text, x))
 		self["nimlist"].setList(self.list)