Merge remote branch 'origin/bug_380_stop_service_entering_tuner_setup'

3 files changed, 43 insertions, 4 deletions

diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index 5457bf64..d96b491e 100755
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -14,5 +14,5 @@ install_PYTHON = \
 	SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \
 	SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py DefaultWizard.py \
 	SessionGlobals.py LocationBox.py WizardLanguage.py TaskView.py Rc.py VirtualKeyBoard.py \
-	TextBox.py FactoryReset.py RecordPaths.py UnhandledKey.py
+	TextBox.py FactoryReset.py RecordPaths.py UnhandledKey.py ServiceStopScreen.py
 
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index d5249b99..62480b5f 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -10,11 +10,12 @@ from Components.config import getConfigListEntry, config, ConfigNothing, ConfigS
 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":
@@ -376,11 +377,14 @@ class NimSetup(Screen, ConfigListScreen):
 				self.deleteConfirmed(confirmed)
 			break
 		if not self.satpos_to_remove:
-			self.close()
+			self.restoreService(_("Zap back to service before tuner setup?"))
 		
 	def __init__(self, session, slotid):
 		Screen.__init__(self, session)
 		self.list = [ ]
+		
+		ServiceStopScreen.__init__(self)
+		self.stopService()
 
 		ConfigListScreen.__init__(self, self.list)
 
@@ -405,6 +409,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
@@ -424,7 +434,7 @@ 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:
diff --git a/lib/python/Screens/ServiceStopScreen.py b/lib/python/Screens/ServiceStopScreen.py
new file mode 100644
index 00000000..3b3dda88
--- /dev/null
+++ b/lib/python/Screens/ServiceStopScreen.py
@@ -0,0 +1,29 @@
+from Screens.MessageBox import MessageBox
+
+class ServiceStopScreen:
+	def __init__(self):
+		try:
+			self.session
+		except:
+			print "[ServiceStopScreen] ERROR: no self.session set"
+			
+		self.oldref = None
+		self.onClose.append(self.__onClose)
+		
+	def stopService(self):		
+		self.oldref = self.session.nav.getCurrentlyPlayingServiceReference()
+		self.session.nav.stopService()
+		
+	def __onClose(self):
+		self.session.nav.playService(self.oldref)
+		
+	def restoreService(self, msg = _("Zap back to previously tuned service?")):
+		if self.oldref:
+			self.session.openWithCallback(self.restartPrevService, MessageBox, msg, MessageBox.TYPE_YESNO)
+		else:
+			self.restartPrevService(False)
+		
+	def restartPrevService(self, yesno):
+		if not yesno:
+			self.oldref=None
+		self.close()
\ No newline at end of file