diff options
author | Shane Wang <shane.wang@intel.com> | 2012-03-24 00:05:13 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-25 12:23:34 +0100 |
commit | a80fc637def4d9568ceb79f7f4b40e0e15aa162b (patch) | |
tree | 7fc77ca216021d0771640136879b6de65253c6aa | |
parent | fb7eb75f33ba27917624ffe65d352247f0e71069 (diff) | |
download | poky-a80fc637def4d9568ceb79f7f4b40e0e15aa162b.tar.gz |
Hob: add build status labels in the build details screen to make it more close to the visual design
This patch is to add build status (incl. "Running task XX of XX: XXXXXX") in the build details screen,
in order to provide clear information about task in progress and make the GUI close to the visual design.
[Yocto #2098]
(Bitbake rev: 02d3451b2e0744204a1280f9effe9fd862bb4faf)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builddetailspage.py | 17 | ||||
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/runningbuild.py | 33 |
3 files changed, 34 insertions, 19 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/bitbake/lib/bb/ui/crumbs/builddetailspage.py index 59d552547d..c2f980fe77 100755 --- a/bitbake/lib/bb/ui/crumbs/builddetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/builddetailspage.py | |||
@@ -46,12 +46,17 @@ class BuildDetailsPage (HobPage): | |||
46 | # create visual elements | 46 | # create visual elements |
47 | self.vbox = gtk.VBox(False, 12) | 47 | self.vbox = gtk.VBox(False, 12) |
48 | 48 | ||
49 | self.progress_box = gtk.HBox(False, 6) | 49 | self.progress_box = gtk.VBox(False, 12) |
50 | self.task_status = gtk.Label() | ||
51 | self.task_status.set_alignment(0.0, 0.5) | ||
52 | self.progress_box.pack_start(self.task_status, expand=False, fill=False) | ||
53 | self.progress_hbox = gtk.HBox(False, 6) | ||
54 | self.progress_box.pack_end(self.progress_hbox, expand=True, fill=True) | ||
50 | self.progress_bar = HobProgressBar() | 55 | self.progress_bar = HobProgressBar() |
51 | self.progress_box.pack_start(self.progress_bar, expand=True, fill=True) | 56 | self.progress_hbox.pack_start(self.progress_bar, expand=True, fill=True) |
52 | self.stop_button = HobAltButton("Stop") | 57 | self.stop_button = HobAltButton("Stop") |
53 | self.stop_button.connect("clicked", self.stop_button_clicked_cb) | 58 | self.stop_button.connect("clicked", self.stop_button_clicked_cb) |
54 | self.progress_box.pack_end(self.stop_button, expand=False, fill=False) | 59 | self.progress_hbox.pack_end(self.stop_button, expand=False, fill=False) |
55 | 60 | ||
56 | self.notebook = HobNotebook() | 61 | self.notebook = HobNotebook() |
57 | self.config_tv = BuildConfigurationTreeView() | 62 | self.config_tv = BuildConfigurationTreeView() |
@@ -84,6 +89,12 @@ class BuildDetailsPage (HobPage): | |||
84 | self.back_button.connect("clicked", self.back_button_clicked_cb) | 89 | self.back_button.connect("clicked", self.back_button_clicked_cb) |
85 | self.button_box.pack_start(self.back_button, expand=False, fill=False) | 90 | self.button_box.pack_start(self.back_button, expand=False, fill=False) |
86 | 91 | ||
92 | def update_build_status(self, tsk_msg): | ||
93 | self.task_status.set_markup(tsk_msg) | ||
94 | |||
95 | def reset_build_status(self): | ||
96 | self.task_status.set_markup("") | ||
97 | |||
87 | def show_issues(self): | 98 | def show_issues(self): |
88 | self.num_of_issues += 1 | 99 | self.num_of_issues += 1 |
89 | self.notebook.show_indicator_icon("Issues", self.num_of_issues) | 100 | self.notebook.show_indicator_icon("Issues", self.num_of_issues) |
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 53216850ef..f32a0661e8 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -543,6 +543,7 @@ class Builder(gtk.Window): | |||
543 | elif self.current_step == self.PACKAGE_GENERATING: | 543 | elif self.current_step == self.PACKAGE_GENERATING: |
544 | fraction = 0 | 544 | fraction = 0 |
545 | self.build_details_page.update_progress_bar("Build Started: ", fraction) | 545 | self.build_details_page.update_progress_bar("Build Started: ", fraction) |
546 | self.build_details_page.reset_build_status() | ||
546 | self.build_details_page.reset_issues() | 547 | self.build_details_page.reset_issues() |
547 | 548 | ||
548 | def build_succeeded(self): | 549 | def build_succeeded(self): |
@@ -610,6 +611,8 @@ class Builder(gtk.Window): | |||
610 | elif message["eventname"] == "runQueueTaskStarted": | 611 | elif message["eventname"] == "runQueueTaskStarted": |
611 | fraction = 0.2 + 0.8 * fraction | 612 | fraction = 0.2 + 0.8 * fraction |
612 | self.build_details_page.update_progress_bar(title + ": ", fraction) | 613 | self.build_details_page.update_progress_bar(title + ": ", fraction) |
614 | self.build_details_page.update_build_status( | ||
615 | "<span weight=\'bold\'>Running task %s of %s:</span> %s" % (message["current"], message["total"], message["task"])) | ||
613 | 616 | ||
614 | def handler_build_failure_cb(self, running_build): | 617 | def handler_build_failure_cb(self, running_build): |
615 | self.build_details_page.show_issues() | 618 | self.build_details_page.show_issues() |
diff --git a/bitbake/lib/bb/ui/crumbs/runningbuild.py b/bitbake/lib/bb/ui/crumbs/runningbuild.py index f202a9098e..0f58e4e678 100644 --- a/bitbake/lib/bb/ui/crumbs/runningbuild.py +++ b/bitbake/lib/bb/ui/crumbs/runningbuild.py | |||
@@ -70,24 +70,24 @@ class RunningBuildModel (gtk.TreeStore): | |||
70 | 70 | ||
71 | class RunningBuild (gobject.GObject): | 71 | class RunningBuild (gobject.GObject): |
72 | __gsignals__ = { | 72 | __gsignals__ = { |
73 | 'build-started' : (gobject.SIGNAL_RUN_LAST, | 73 | 'build-started' : (gobject.SIGNAL_RUN_LAST, |
74 | gobject.TYPE_NONE, | 74 | gobject.TYPE_NONE, |
75 | ()), | 75 | ()), |
76 | 'build-succeeded' : (gobject.SIGNAL_RUN_LAST, | 76 | 'build-succeeded' : (gobject.SIGNAL_RUN_LAST, |
77 | gobject.TYPE_NONE, | 77 | gobject.TYPE_NONE, |
78 | ()), | ||
79 | 'build-failed' : (gobject.SIGNAL_RUN_LAST, | ||
80 | gobject.TYPE_NONE, | ||
81 | ()), | ||
82 | 'build-complete' : (gobject.SIGNAL_RUN_LAST, | ||
83 | gobject.TYPE_NONE, | ||
84 | ()), | ||
85 | 'task-started' : (gobject.SIGNAL_RUN_LAST, | ||
86 | gobject.TYPE_NONE, | ||
87 | (gobject.TYPE_PYOBJECT,)), | ||
88 | 'log-error' : (gobject.SIGNAL_RUN_LAST, | ||
89 | gobject.TYPE_NONE, | ||
78 | ()), | 90 | ()), |
79 | 'build-failed' : (gobject.SIGNAL_RUN_LAST, | ||
80 | gobject.TYPE_NONE, | ||
81 | ()), | ||
82 | 'build-complete' : (gobject.SIGNAL_RUN_LAST, | ||
83 | gobject.TYPE_NONE, | ||
84 | ()), | ||
85 | 'task-started' : (gobject.SIGNAL_RUN_LAST, | ||
86 | gobject.TYPE_NONE, | ||
87 | (gobject.TYPE_PYOBJECT,)), | ||
88 | 'log-error' : (gobject.SIGNAL_RUN_LAST, | ||
89 | gobject.TYPE_NONE, | ||
90 | ()), | ||
91 | } | 91 | } |
92 | pids_to_task = {} | 92 | pids_to_task = {} |
93 | tasks_to_iter = {} | 93 | tasks_to_iter = {} |
@@ -320,6 +320,7 @@ class RunningBuild (gobject.GObject): | |||
320 | message["current"] = num_of_completed | 320 | message["current"] = num_of_completed |
321 | message["total"] = event.stats.total | 321 | message["total"] = event.stats.total |
322 | message["title"] = "" | 322 | message["title"] = "" |
323 | message["task"] = event.taskstring | ||
323 | self.emit("task-started", message) | 324 | self.emit("task-started", message) |
324 | 325 | ||
325 | return | 326 | return |