X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTaskView.py;h=0b5abcc0bff6e5bef755f910f098f57ee2681155;hb=932f1ec948f517d2cf739cba5ac564fcac618aa9;hp=1dcdc5158aac8549f73cc5ee5e7e37caf1b16902;hpb=5f9d73992b72be7c9b889daef04a8a91e902c394;p=vuplus_dvbapp

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 1dcdc51..0b5abcc 100644
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -1,12 +1,13 @@
 from Screen import Screen
 from Components.ConfigList import ConfigListScreen
 from Components.config import config, ConfigSubsection, ConfigSelection, getConfigListEntry
+from Components.SystemInfo import SystemInfo
 from InfoBarGenerics import InfoBarNotifications
 import Screens.Standby
 from Tools import Notifications
 
 class JobView(InfoBarNotifications, Screen, ConfigListScreen):
-	def __init__(self, session, job, parent=None, cancelable = True, backgroundable = True, afterEvent = 0):
+	def __init__(self, session, job, parent=None, cancelable = True, backgroundable = True):
 		from Components.Sources.StaticText import StaticText
 		from Components.Sources.Progress import Progress
 		from Components.Sources.Boolean import Boolean
@@ -33,7 +34,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 		self.onShow.append(self.windowShow)
 		self.onHide.append(self.windowHide)
 
-		self["setupActions"] = ActionMap(["SetupActions", "ColorActions"],
+		self["setupActions"] = ActionMap(["ColorActions", "SetupActions"],
 		{
 		    "green": self.ok,
 		    "red": self.abort,
@@ -42,15 +43,20 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 		    "ok": self.ok,
 		}, -2)
 
-		self.afterevents = [ "nothing", "standby", "deepstandby", "close" ]
 		self.settings = ConfigSubsection()
-		self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to standby")), ("deepstandby", _("go to deep standby"))], default = self.afterevents[afterEvent])
+		if SystemInfo["DeepstandbySupport"]:
+			shutdownString = _("go to deep standby")
+		else:
+			shutdownString = _("shut down")
+		self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to standby")), ("deepstandby", shutdownString)], default = self.job.afterEvent or "nothing")
+		self.job.afterEvent = self.settings.afterEvent.getValue()
 		self.setupList()
 		self.state_changed()
 
 	def setupList(self):
 		self["config"].setList( [ getConfigListEntry(_("After event"), self.settings.afterEvent) ])
-		
+		self.job.afterEvent = self.settings.afterEvent.getValue()
+
 	def keyLeft(self):
 		ConfigListScreen.keyLeft(self)
 		self.setupList()
@@ -80,7 +86,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 		else:
 			self["job_task"].text = ""
 			self["summary_job_task"].text = j.getStatustext()
-		if j.status in [j.FINISHED, j.FAILED]:
+		if j.status in (j.FINISHED, j.FAILED):
 			self.performAfterEvent()
 			self["backgroundable"].boolean = False
 			if j.status == j.FINISHED:
@@ -94,11 +100,11 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 			self.close(True)
 
 	def ok(self):
-		if self.job.status in [self.job.FINISHED, self.job.FAILED]:
+		if self.job.status in (self.job.FINISHED, self.job.FAILED):
 			self.close(False)
 
 	def abort(self):
-		if self.job.status in [self.job.FINISHED, self.job.FAILED]:
+		if self.job.status in (self.job.FINISHED, self.job.FAILED):
 			self.close(False)
 		if self["cancelable"].boolean == True:
 			self.job.cancel()
@@ -108,7 +114,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 		if self.settings.afterEvent.getValue() == "nothing":
 			return
 		elif self.settings.afterEvent.getValue() == "close":
-			self.abort()
+			self.close(False)
 		from Screens.MessageBox import MessageBox
 		if self.settings.afterEvent.getValue() == "deepstandby":
 			if not Screens.Standby.inTryQuitMainloop: