turn around action maps so that red key (abort) works again

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

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 8d38ed62fde70f83236c966111470537cfb659ae..69604279fee460cc2edb2d30993e82db7b3702b5 100644 (file)
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -16,12 +16,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 +33,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,
@@ -67,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.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