X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/28f2c454309697e78017bf2df4fdbcd8cebd9ed1..c9faacfea68f90597fb82504790dc1f7d7b71f3f:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index d2ff975b..ccb776ea 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -6,6 +6,7 @@ from Components.ConfigList import ConfigListScreen
 from Components.MenuList import MenuList
 from Components.NimManager import nimmanager
 from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement
+from Components.Sources.List import List
 from Screens.MessageBox import MessageBox
 
 from time import mktime, localtime
@@ -48,20 +49,21 @@ class NimSetup(Screen, ConfigListScreen):
 				nim.powerMeasurement.save()
 		
 	def createConfigMode(self):
-		choices = { "nothing": _("nothing connected"),
-					"simple": _("simple"),
-					"advanced": _("advanced")}
-		#if len(nimmanager.getNimListOfType(nimmanager.getNimType(self.slotid), exception = x)) > 0:
-		#	choices["equal"] = _("equal to")
-		#	choices["satposdepends"] = _("second cable of motorized LNB")
-		if len(nimmanager.canEqualTo(self.slotid)) > 0:
-			choices["equal"] = _("equal to")
-		if len(nimmanager.canDependOn(self.slotid)) > 0:
-			choices["satposdepends"] = _("second cable of motorized LNB")
-		if len(nimmanager.canConnectTo(self.slotid)) > 0:
-			choices["loopthrough"] = _("loopthrough to")
-		self.nimConfig.configMode.setChoices(choices)
-							
+		if self.nim.isCompatible("DVB-S"):
+			choices = { "nothing": _("nothing connected"),
+						"simple": _("simple"),
+						"advanced": _("advanced")}
+			#if len(nimmanager.getNimListOfType(nimmanager.getNimType(self.slotid), exception = x)) > 0:
+			#	choices["equal"] = _("equal to")
+			#	choices["satposdepends"] = _("second cable of motorized LNB")
+			if len(nimmanager.canEqualTo(self.slotid)) > 0:
+				choices["equal"] = _("equal to")
+			if len(nimmanager.canDependOn(self.slotid)) > 0:
+				choices["satposdepends"] = _("second cable of motorized LNB")
+			if len(nimmanager.canConnectTo(self.slotid)) > 0:
+				choices["loopthrough"] = _("loopthrough to")
+			self.nimConfig.configMode.setChoices(choices, default = "nothing")
+
 	def createSetup(self):
 		print "Creating setup"
 		self.list = [ ]
@@ -200,9 +202,11 @@ class NimSetup(Screen, ConfigListScreen):
 				x[1].value = int(mktime(dt.timetuple()))
 			x[1].save()
 		nimmanager.sec.update()
+		self.saveAll()
 
 	def fillListWithAdvancedSatEntrys(self, Sat):
-		currLnb = self.nimConfig.advanced.lnb[int(Sat.lnb.value)]
+		lnbnum = int(Sat.lnb.value)
+		currLnb = self.nimConfig.advanced.lnb[lnbnum]
 		
 		if isinstance(currLnb, ConfigNothing):
 			currLnb = None
@@ -210,17 +214,19 @@ class NimSetup(Screen, ConfigListScreen):
 		self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage))
 		self.list.append(getConfigListEntry(_("Tone mode"), Sat.tonemode))
 		if currLnb and currLnb.diseqcMode.value == "1_2":
-			self.advancedUsalsEntry = getConfigListEntry(_("Use usals for this sat"), Sat.usals)
-			self.list.append(self.advancedUsalsEntry)
-			if not Sat.usals.value:
-				self.list.append(getConfigListEntry(_("Stored position"), Sat.rotorposition))
+			if lnbnum < 33:
+				self.advancedUsalsEntry = getConfigListEntry(_("Use usals for this sat"), Sat.usals)
+				self.list.append(self.advancedUsalsEntry)
+				if not Sat.usals.value:
+					self.list.append(getConfigListEntry(_("Stored position"), Sat.rotorposition))
 
 		# LNBs
 		self.advancedLnbsEntry = getConfigListEntry(_("LNB"), Sat.lnb)
 		self.list.append(self.advancedLnbsEntry)
 		if currLnb:
-			self.advancedDiseqcMode = getConfigListEntry(_("DiSEqC mode"), currLnb.diseqcMode)
-			self.list.append(self.advancedDiseqcMode)
+			if lnbnum < 33:
+				self.advancedDiseqcMode = getConfigListEntry(_("DiSEqC mode"), currLnb.diseqcMode)
+				self.list.append(self.advancedDiseqcMode)
 			if currLnb.diseqcMode.value != "none":
 				self.list.append(getConfigListEntry(_("Toneburst"), currLnb.toneburst))
 				self.list.append(getConfigListEntry(_("Committed DiSEqC command"), currLnb.commitedDiseqcCommand))
@@ -279,8 +285,8 @@ class NimSetup(Screen, ConfigListScreen):
 		self.list.append(self.configMode)
 		self.advancedSatsEntry = getConfigListEntry(_("Satellite"), self.nimConfig.advanced.sats)
 		self.list.append(self.advancedSatsEntry)
-		for x in nimmanager.satList:
-			Sat = self.nimConfig.advanced.sat[x[0]]
+		for x in self.nimConfig.advanced.sat.keys():
+			Sat = self.nimConfig.advanced.sat[x]
 			self.fillListWithAdvancedSatEntrys(Sat)
 		self["config"].list = self.list
 
@@ -335,8 +341,6 @@ class NimSetup(Screen, ConfigListScreen):
 		self.nimConfig = self.nim.config
 		self.createConfigMode()
 		self.createSetup()
-		# safeAll is needed, so that keyCancel works properly
-		ConfigListScreen.saveAll(self)
 
 	def keyLeft(self):
 		ConfigListScreen.keyLeft(self)
@@ -356,16 +360,24 @@ class NimSetup(Screen, ConfigListScreen):
 			self.nimConfig.connectedTo.setChoices(choices)
 		for x in self["config"].list:
 			x[1].save()
+			
+	def cancelConfirm(self, result):
+		if not result:
+			return
 
+		for x in self["config"].list:
+			x[1].cancel()
+		# we need to call saveAll to reset the connectedTo choices
+		self.saveAll()
+		self.close()
+			
 class NimSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 		
-		menu = [ ]
-		for x in nimmanager.nim_slots:
-			menu.append((x.friendly_full_description, x))
-
-		self["nimlist"] = MenuList(menu)
+		self.list = [None] * nimmanager.getSlotCount()
+		self["nimlist"] = List(self.list)
+		self.updateList()
 
 		self["actions"] = ActionMap(["OkCancelActions"],
 		{
@@ -375,6 +387,47 @@ class NimSelection(Screen):
 
 	def okbuttonClick(self):
 		nim = self["nimlist"].getCurrent()
-		nim = nim and nim[1]
+		nim = nim and nim[3]
 		if nim is not None and not nim.empty:
-			self.session.open(NimSetup, nim.slot)
+			self.session.openWithCallback(self.updateList, NimSetup, nim.slot)
+
+	def updateList(self):
+		self.list = [ ]
+		for x in nimmanager.nim_slots:
+			slotid = x.slot
+			nimConfig = nimmanager.getNimConfig(x.slot)
+			text = nimConfig.configMode.value
+			if x.isCompatible("DVB-S"):
+				if nimConfig.configMode.value in ["loopthrough", "equal", "satposdepends"]:
+					text = { "loopthrough": _("loopthrough to"),
+							 "equal": _("equal to"),
+							 "satposdepends": _("second cable of motorized LNB") } [nimConfig.configMode.value]
+					text += " " + _("Tuner") + " " + ["A", "B", "C", "D"][int(nimConfig.connectedTo.value)]
+				elif nimConfig.configMode.value == "nothing":
+					text = _("nothing connected")
+				elif nimConfig.configMode.value == "simple":
+					if nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+						text = _("Sats") + ": " + nimmanager.getSatName(int(nimConfig.diseqcA.value))
+						if nimConfig.diseqcMode.value in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+							text += "," + nimmanager.getSatName(int(nimConfig.diseqcB.value))
+						if nimConfig.diseqcMode.value == "diseqc_a_b_c_d":
+							text += "," + nimmanager.getSatName(int(nimConfig.diseqcC.value))
+							text += "," + nimmanager.getSatName(int(nimConfig.diseqcD.value))
+					elif nimConfig.diseqcMode.value == "positioner":
+						text = _("Positioner") + ":"
+						if nimConfig.positionerMode.value == "usals":
+							text += _("USALS")
+						elif nimConfig.positionerMode.value == "manual":
+							text += _("manual")
+					else:	
+						text = _("simple")
+				elif nimConfig.configMode.value == "advanced":
+					text = _("advanced")
+			elif x.isCompatible("DVB-T") or x.isCompatible("DVB-C"):
+				if nimConfig.configMode.value == "nothing":
+					text = _("nothing connected")
+				elif nimConfig.configMode.value == "enabled":
+					text = _("enabled")
+				
+			self.list.append((slotid, x.friendly_full_description, text, x))
+		self["nimlist"].updateList(self.list)
\ No newline at end of file