remove possibility to scan with "loopthrough" and "2nd cable from rotor" configured...

[enigma2.git] / lib / python / Screens / TaskView.py

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 06348579f77f46424c8c1ab2ab35a6c2c18a1935..69604279fee460cc2edb2d30993e82db7b3702b5 100644 (file)
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -13,14 +13,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,18 +33,15 @@ 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])
@@ -69,13 +69,17 @@ 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 = ""
+                       self["summary_job_task"].text = j.getStatustext()
                if j.status in [j.FINISHED, j.FAILED]:
                        self.performAfterEvent()
                        self["backgroundable"].boolean = False
@@ -100,6 +104,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
                        self.job.cancel()
 
        def performAfterEvent(self):
+               self["config"].hide()
                if self.settings.afterEvent.getValue() == "nothing":
                        return
                elif self.settings.afterEvent.getValue() == "close":