diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/runningbuild.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/runningbuild.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/runningbuild.py b/bitbake/lib/bb/ui/crumbs/runningbuild.py index 102cc7dc86..8d1f4e1cb9 100644 --- a/bitbake/lib/bb/ui/crumbs/runningbuild.py +++ b/bitbake/lib/bb/ui/crumbs/runningbuild.py | |||
@@ -56,7 +56,7 @@ class RunningBuildModel (gtk.TreeStore): | |||
56 | return model | 56 | return model |
57 | 57 | ||
58 | def foreach_cell_func(self, model, path, iter, usr_data=None): | 58 | def foreach_cell_func(self, model, path, iter, usr_data=None): |
59 | if model.get_value(iter, self.COL_ICON) == "task-refresh": | 59 | if model.get_value(iter, self.COL_ICON) == "gtk-execute": |
60 | model.set(iter, self.COL_ICON, "") | 60 | model.set(iter, self.COL_ICON, "") |
61 | 61 | ||
62 | def close_task_refresh(self): | 62 | def close_task_refresh(self): |
@@ -183,7 +183,7 @@ class RunningBuild (gobject.GObject): | |||
183 | # Because this parent package now has an active child mark it as | 183 | # Because this parent package now has an active child mark it as |
184 | # such. | 184 | # such. |
185 | # @todo if parent is already in error, don't mark it green | 185 | # @todo if parent is already in error, don't mark it green |
186 | self.model.set(parent, self.model.COL_ICON, "task-refresh", | 186 | self.model.set(parent, self.model.COL_ICON, "gtk-execute", |
187 | self.model.COL_COLOR, HobColors.RUNNING) | 187 | self.model.COL_COLOR, HobColors.RUNNING) |
188 | 188 | ||
189 | # Add an entry in the model for this task | 189 | # Add an entry in the model for this task |
@@ -191,7 +191,7 @@ class RunningBuild (gobject.GObject): | |||
191 | package, | 191 | package, |
192 | task, | 192 | task, |
193 | "Task: %s" % (task), | 193 | "Task: %s" % (task), |
194 | "task-refresh", | 194 | "gtk-execute", |
195 | HobColors.RUNNING, | 195 | HobColors.RUNNING, |
196 | 0)) | 196 | 0)) |
197 | 197 | ||
@@ -339,18 +339,26 @@ class RunningBuildTreeView (gtk.TreeView): | |||
339 | __gsignals__ = { | 339 | __gsignals__ = { |
340 | "button_press_event" : "override" | 340 | "button_press_event" : "override" |
341 | } | 341 | } |
342 | def __init__ (self, readonly=False): | 342 | def __init__ (self, readonly=False, hob=False): |
343 | gtk.TreeView.__init__ (self) | 343 | gtk.TreeView.__init__ (self) |
344 | self.readonly = readonly | 344 | self.readonly = readonly |
345 | 345 | ||
346 | # The icon that indicates whether we're building or failed. | 346 | # The icon that indicates whether we're building or failed. |
347 | renderer = HobCellRendererPixbuf () | 347 | # add 'hob' flag because there has not only hob to share this code |
348 | if hob: | ||
349 | renderer = HobCellRendererPixbuf () | ||
350 | else: | ||
351 | renderer = gtk.CellRendererPixbuf() | ||
348 | col = gtk.TreeViewColumn ("Status", renderer) | 352 | col = gtk.TreeViewColumn ("Status", renderer) |
349 | col.add_attribute (renderer, "icon-name", 4) | 353 | col.add_attribute (renderer, "icon-name", 4) |
350 | self.append_column (col) | 354 | self.append_column (col) |
351 | 355 | ||
352 | # The message of the build. | 356 | # The message of the build. |
353 | self.message_renderer = HobWarpCellRendererText (col_number=1) | 357 | # add 'hob' flag because there has not only hob to share this code |
358 | if hob: | ||
359 | self.message_renderer = HobWarpCellRendererText (col_number=1) | ||
360 | else: | ||
361 | self.message_renderer = gtk.CellRendererText () | ||
354 | self.message_column = gtk.TreeViewColumn ("Message", self.message_renderer, text=3) | 362 | self.message_column = gtk.TreeViewColumn ("Message", self.message_renderer, text=3) |
355 | self.message_column.add_attribute(self.message_renderer, 'background', 5) | 363 | self.message_column.add_attribute(self.message_renderer, 'background', 5) |
356 | self.message_renderer.set_property('editable', (not self.readonly)) | 364 | self.message_renderer.set_property('editable', (not self.readonly)) |