add summary screen for task view

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 68a3641e0136d8586663e975a9a181fed26db9e8..88cf8b408b1083223a96ebb43c3e665a7f96304e 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1078,7 +1078,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                        <convert type="ConditionalShowHide">Blink</convert>
                </widget>
        </screen>
                        <convert type="ConditionalShowHide">Blink</convert>
                </widget>
        </screen>

-       <!-- LCD screen (menu's) -->
+       <!-- LCD screen (menus) -->

        <screen name="MenuSummary" position="0,0" size="132,64">
                <widget source="parent.title" render="Label" position="6,0" size="120,32" font="Regular;14" halign="center" valign="center"/>
                <widget source="parent.menu" render="Label" position="6,32" size="120,32" font="Regular;16" halign="center" valign="center">
        <screen name="MenuSummary" position="0,0" size="132,64">
                <widget source="parent.title" render="Label" position="6,0" size="120,32" font="Regular;14" halign="center" valign="center"/>
                <widget source="parent.menu" render="Label" position="6,32" size="120,32" font="Regular;16" halign="center" valign="center">


@@ -1149,4 +1149,12 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                        <convert type="ConditionalShowHide" />
                </widget>
        </screen>
                        <convert type="ConditionalShowHide" />
                </widget>
        </screen>

+       <screen name="JobView_summary" position="0,0" size="132,64">
+               <widget source="parent.summary_job_name" render="Label" position="6,4" size="120,42" font="Regular;16" />
+               <widget source="parent.summary_job_task" render="Label" position="6,22" size="120,26" font="Regular;12" />
+               <widget source="parent.summary_job_progress" render="Progress" position="6,50" size="60,12" borderWidth="1" zPosition="1" />
+               <widget source="parent.summary_job_progress" render="Label" position="66,50" size="50,12" font="Regular;12" zPosition="2" halign="center" transparent="1"  >
+                       <convert type="ProgressToText" />
+               </widget>
+       </screen>

 </skin>
 </skin>

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 8d38ed62fde70f83236c966111470537cfb659ae..1dcdc5158aac8549f73cc5ee5e7e37caf1b16902 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
                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_name"] = StaticText(job.name)
                self["job_progress"] = Progress()

-               self["job_status"] = StaticText()

                self["job_task"] = 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)
                self["finished"] = Boolean()
                self["cancelable"] = Boolean(cancelable)
                self["backgroundable"] = Boolean(backgroundable)


@@ -67,13 +69,17 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
        def state_changed(self):
                j = self.job
                self["job_progress"].range = j.end
        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["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
                #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 = ""
                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
                if j.status in [j.FINISHED, j.FAILED]:
                        self.performAfterEvent()
                        self["backgroundable"].boolean = False