X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTaskView.py;h=eb926ca3acf9615501bd214b178cfbf1c8eefa48;hp=06348579f77f46424c8c1ab2ab35a6c2c18a1935;hb=28dcf6be0ee22fedd728fef11ccff484f8a851e8;hpb=33550b7ceb5ad65d1d0f71dac7295a8c9b54c8c0

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 0634857..eb926ca 100644
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -1,6 +1,7 @@
 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
@@ -13,14 +14,17 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 		from Components.ActionMap import ActionMap
 		Screen.__init__(self, session, parent)
 		InfoBarNotifications.__init__(self)
+		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)
@@ -30,21 +34,22 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 		self.onShow.append(self.windowShow)
 		self.onHide.append(self.windowHide)
 
-		self["actions"] = ActionMap(["OkCancelActions"], 
-			{
-				"ok": self.ok,
-				"cancel": self.ok
-			})
-		self["ColorActions"] = ActionMap(["ColorActions"],
-			{
-				"red": self.abort,
-				"green": self.ok,
-				"blue": self.background,
-			})
-		ConfigListScreen.__init__(self, [])
+		self["setupActions"] = ActionMap(["ColorActions", "SetupActions"],
+		{
+		    "green": self.ok,
+		    "red": self.abort,
+		    "blue": self.background,
+		    "cancel": self.ok,
+		    "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.afterevents[afterEvent])
 		self.setupList()
 		self.state_changed()
 
@@ -69,14 +74,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.NOT_STARTED: _("Waiting"), j.IN_PROGRESS: _("In Progress"), j.FINISHED: _("Finished"), j.FAILED: _("Failed")}[j.status]
+		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:
@@ -90,16 +99,17 @@ 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()
 
 	def performAfterEvent(self):
+		self["config"].hide()
 		if self.settings.afterEvent.getValue() == "nothing":
 			return
 		elif self.settings.afterEvent.getValue() == "close":