X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0c2185a46606c2ac3e41205fe92e6d5ba4ead1b9..0e903a5d9d38bd48c792c095d786fc40091a47fa:/lib/python/Screens/TaskView.py

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 8d38ed62..9907e2fb 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
@@ -16,12 +17,14 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 		ConfigListScreen.__init__(self, [])
 		self.parent = parent
 		self.job = job
-		self.job.taskview = self
 
 		self["job_name"] = StaticText(job.name)
 		self["job_progress"] = Progress()
-		self["job_status"] = StaticText()
 		self["job_task"] = StaticText()
+		self["summary_job_name"] = StaticText(job.name)
+		self["summary_job_progress"] = Progress()
+		self["summary_job_task"] = StaticText()
+		self["job_status"] = StaticText()
 		self["finished"] = Boolean()
 		self["cancelable"] = Boolean(cancelable)
 		self["backgroundable"] = Boolean(backgroundable)
@@ -31,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,
@@ -40,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()
@@ -67,14 +75,18 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 	def state_changed(self):
 		j = self.job
 		self["job_progress"].range = j.end
+		self["summary_job_progress"].range = j.end
 		self["job_progress"].value = j.progress
+		self["summary_job_progress"].value = j.progress
 		#print "JobView::state_changed:", j.end, j.progress
 		self["job_status"].text = j.getStatustext()
 		if j.status == j.IN_PROGRESS:
 			self["job_task"].text = j.tasks[j.current_task].name
+			self["summary_job_task"].text = j.tasks[j.current_task].name
 		else:
 			self["job_task"].text = ""
-		if j.status in [j.FINISHED, j.FAILED]:
+			self["summary_job_task"].text = j.getStatustext()
+		if j.status in (j.FINISHED, j.FAILED):
 			self.performAfterEvent()
 			self["backgroundable"].boolean = False
 			if j.status == j.FINISHED:
@@ -88,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()