X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ba844ce3b7d36486490e15066cf187e9e5f8e39c..1ebcd01ce9cb0e279e6f51e3629427c1964210ca:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index e24e4636..047bde23 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -5,15 +5,17 @@ from Components.ActionMap import ActionMap
 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.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement,\
+	ConfigSatlist
 from Components.Sources.List import List
 from Screens.MessageBox import MessageBox
 from Screens.ChoiceBox import ChoiceBox
+from Screens.ServiceStopScreen import ServiceStopScreen
 
 from time import mktime, localtime
 from datetime import datetime
 
-class NimSetup(Screen, ConfigListScreen):
+class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
 	def createSimpleSetup(self, list, mode):
 		nim = self.nimConfig
 		if mode == "single":
@@ -74,6 +76,7 @@ class NimSetup(Screen, ConfigListScreen):
 		print "Creating setup"
 		self.list = [ ]
 
+		self.multiType = None
 		self.configMode = None
 		self.diseqcModeEntry = None
 		self.advancedSatsEntry = None
@@ -92,6 +95,11 @@ class NimSetup(Screen, ConfigListScreen):
 		self.advancedType = None
 		self.advancedManufacturer = None
 		self.advancedSCR = 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)
@@ -145,6 +153,8 @@ class NimSetup(Screen, ConfigListScreen):
 					currSat = self.nimConfig.advanced.sat[cur_orb_pos]
 					self.fillListWithAdvancedSatEntrys(currSat)
 				self.have_advanced = True
+			if self.nim.description == "Alps BSBE2" and config.usage.setup_level.index >= 2: # expert
+				self.list.append(getConfigListEntry(_("Tone Amplitude"), self.nimConfig.toneAmplitude))
 		elif self.nim.isCompatible("DVB-C"):
 			self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode)
 			self.list.append(self.configMode)
@@ -196,10 +206,17 @@ class NimSetup(Screen, ConfigListScreen):
 			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.uncommittedDiseqcCommand, self.cableScanType, self.multiType)
+		if self["config"].getCurrent() == self.multiType:
+			nimmanager.enumerateNIMs()
+			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":
@@ -343,6 +360,7 @@ class NimSetup(Screen, ConfigListScreen):
 		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):
@@ -372,19 +390,21 @@ class NimSetup(Screen, ConfigListScreen):
 			if confirmed[1] == "yestoall" or confirmed[1] == "notoall":
 				self.deleteConfirmed(confirmed)
 			break
-		if not self.satpos_to_remove:
-			self.close()
 		
 	def __init__(self, session, slotid):
 		Screen.__init__(self, session)
 		self.list = [ ]
+		
+		ServiceStopScreen.__init__(self)
+		self.stopService()
 
 		ConfigListScreen.__init__(self, self.list)
 
-		self["actions"] = ActionMap(["SetupActions"],
+		self["actions"] = ActionMap(["SetupActions", "SatlistShortcutAction"],
 		{
 			"ok": self.keySave,
 			"cancel": self.keyCancel,
+			"nothingconnected": self.nothingConnectedShortcut
 		}, -2)
 
 		self.slotid = slotid
@@ -401,6 +421,12 @@ class NimSetup(Screen, ConfigListScreen):
 		ConfigListScreen.keyRight(self)
 		self.newConfig()
 		
+	def keyCancel(self):
+		if self["config"].isChanged():
+			self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"))
+		else:
+			self.restoreService(_("Zap back to service before tuner setup?"))
+		
 	def saveAll(self):
 		if self.nim.isCompatible("DVB-S"):
 			# reset connectedTo to all choices to properly store the default value
@@ -420,7 +446,12 @@ class NimSetup(Screen, ConfigListScreen):
 			x[1].cancel()
 		# we need to call saveAll to reset the connectedTo choices
 		self.saveAll()
-		self.close()
+		self.restoreService(_("Zap back to service before tuner setup?"))
+		
+	def nothingConnectedShortcut(self):
+		if type(self["config"].getCurrent()[1]) is ConfigSatlist:
+			self["config"].getCurrent()[1].setValue("3601")
+			self["config"].invalidateCurrent()
 			
 class NimSelection(Screen):
 	def __init__(self, session):
@@ -493,6 +524,8 @@ 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
 					
 				self.list.append((slotid, x.friendly_full_description, text, x))
 		self["nimlist"].setList(self.list)