sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Hob: fixed some not compatible places for make runningbuild.py can be reused by another application 

The runningbuild.py has been shared by different applications, not only hob, so fixed the some not compatibled codes

(From Poky rev: 99fa7388500fa97fe4629456daa50bb5637e51e6)

(Bitbake rev: 23c13560fa76442c798058700863bd91491ca826)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Liming An 2012-03-27 23:15:45 +08:00 committed by Richard Purdie
parent 26cce34e4d
commit 7990d36f50
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitbake/lib/bb/ui/crumbs/builddetailspage.py
View File

@ -150,7 +150,7 @@ class BuildDetailsPage (HobPage):
self.scrolled_view_failure.add(self.failure_tv) self.scrolled_view_failure.add(self.failure_tv)
self.notebook.append_page(self.scrolled_view_failure, gtk.Label("Issues")) self.notebook.append_page(self.scrolled_view_failure, gtk.Label("Issues"))
self.build_tv = RunningBuildTreeView(readonly=True) self.build_tv = RunningBuildTreeView(readonly=True, hob=True)
self.build_tv.set_model(self.builder.handler.build.model) self.build_tv.set_model(self.builder.handler.build.model)
self.scrolled_view_build = gtk.ScrolledWindow () self.scrolled_view_build = gtk.ScrolledWindow ()
self.scrolled_view_build.set_policy(gtk.POLICY_NEVER, gtk.POLICY_ALWAYS) self.scrolled_view_build.set_policy(gtk.POLICY_NEVER, gtk.POLICY_ALWAYS)

10
bitbake/lib/bb/ui/crumbs/hobwidget.py
View File

@ -824,6 +824,7 @@ class HobIconChecker(hic):
('hic-ok', 'gtk-ok', 'ok') : self.ICON_INDI_TICK_FILE, ('hic-ok', 'gtk-ok', 'ok') : self.ICON_INDI_TICK_FILE,
('hic-dialog-error', 'gtk-dialog-error', 'dialog-error') : self.ICON_INDI_ERROR_FILE, ('hic-dialog-error', 'gtk-dialog-error', 'dialog-error') : self.ICON_INDI_ERROR_FILE,
('hic-dialog-warning', 'gtk-dialog-warning', 'dialog-warning') : self.ICON_INDI_ALERT_FILE, ('hic-dialog-warning', 'gtk-dialog-warning', 'dialog-warning') : self.ICON_INDI_ALERT_FILE,
('hic-task-refresh', 'gtk-execute', 'execute') : self.ICON_INDI_REFRESH_FILE,
} }
valid_stock_id = stock_name valid_stock_id = stock_name
if stock_name: if stock_name:
@ -924,9 +925,8 @@ class HobCellRendererPixbuf(gtk.CellRendererPixbuf):
def __init__(self): def __init__(self):
gtk.CellRendererPixbuf.__init__(self) gtk.CellRendererPixbuf.__init__(self)
self.control = RefreshRuningController() self.control = RefreshRuningController()
# create default refrensh stock icon # add icon checker for make the gtk-icon transfer to hob-icon
self.checker = HobIconChecker() self.checker = HobIconChecker()
self.checker.set_hob_icon_to_stock_icon(hic.ICON_INDI_REFRESH_FILE, "task-refresh")
def get_pixbuf_from_stock_icon(self, widget, stock_id="", size=gtk.ICON_SIZE_DIALOG): def get_pixbuf_from_stock_icon(self, widget, stock_id="", size=gtk.ICON_SIZE_DIALOG):
if widget and stock_id and gtk.icon_factory_lookup_default(stock_id): if widget and stock_id and gtk.icon_factory_lookup_default(stock_id):
@ -938,7 +938,7 @@ class HobCellRendererPixbuf(gtk.CellRendererPixbuf):
if new_name and type(new_name) == str: if new_name and type(new_name) == str:
# check the name is need to transfer to hob icon or not # check the name is need to transfer to hob icon or not
name = self.checker.check_stock_icon(new_name) name = self.checker.check_stock_icon(new_name)
if name.startswith("hic") or name.startswith("gtk") or name == "task-refresh": if name.startswith("hic") or name.startswith("gtk"):
stock_id = name stock_id = name
else: else:
stock_id = 'gtk-' + name stock_id = 'gtk-' + name
@ -946,7 +946,7 @@ class HobCellRendererPixbuf(gtk.CellRendererPixbuf):
return stock_id return stock_id
''' render cell exactly, "icon-name" is priority ''' render cell exactly, "icon-name" is priority
if use the 'task-refresh' will make the pix animation if use the 'hic-task-refresh' will make the pix animation
if 'pix' will change the pixbuf for it from the pixbuf or image. if 'pix' will change the pixbuf for it from the pixbuf or image.
''' '''
def do_render(self, window, tree, background_area,cell_area, expose_area, flags): def do_render(self, window, tree, background_area,cell_area, expose_area, flags):
@ -971,7 +971,7 @@ class HobCellRendererPixbuf(gtk.CellRendererPixbuf):
if stock_id: if stock_id:
pix = self.get_pixbuf_from_stock_icon(tree, stock_id, self.props.stock_size) pix = self.get_pixbuf_from_stock_icon(tree, stock_id, self.props.stock_size)
if stock_id == 'task-refresh': if stock_id == 'hic-task-refresh':
self.control.append_running_cell_area(cell_area) self.control.append_running_cell_area(cell_area)
if self.control.is_active(): if self.control.is_active():
self.control.on_draw_cb(pix, window.cairo_create(), x, y, w, h, True) self.control.on_draw_cb(pix, window.cairo_create(), x, y, w, h, True)

20
bitbake/lib/bb/ui/crumbs/runningbuild.py
View File

@ -56,7 +56,7 @@ class RunningBuildModel (gtk.TreeStore):
return model return model
def foreach_cell_func(self, model, path, iter, usr_data=None): def foreach_cell_func(self, model, path, iter, usr_data=None):
if model.get_value(iter, self.COL_ICON) == "task-refresh": if model.get_value(iter, self.COL_ICON) == "gtk-execute":
model.set(iter, self.COL_ICON, "") model.set(iter, self.COL_ICON, "")
def close_task_refresh(self): def close_task_refresh(self):
@ -183,7 +183,7 @@ class RunningBuild (gobject.GObject):
# Because this parent package now has an active child mark it as # Because this parent package now has an active child mark it as
# such. # such.
# @todo if parent is already in error, don't mark it green # @todo if parent is already in error, don't mark it green
self.model.set(parent, self.model.COL_ICON, "task-refresh", self.model.set(parent, self.model.COL_ICON, "gtk-execute",
self.model.COL_COLOR, HobColors.RUNNING) self.model.COL_COLOR, HobColors.RUNNING)
# Add an entry in the model for this task # Add an entry in the model for this task
@ -191,7 +191,7 @@ class RunningBuild (gobject.GObject):
package, package,
task, task,
"Task: %s" % (task), "Task: %s" % (task),
"task-refresh", "gtk-execute",
HobColors.RUNNING, HobColors.RUNNING,
0)) 0))
@ -339,18 +339,26 @@ class RunningBuildTreeView (gtk.TreeView):
__gsignals__ = { __gsignals__ = {
"button_press_event" : "override" "button_press_event" : "override"
} }
def __init__ (self, readonly=False): def __init__ (self, readonly=False, hob=False):
gtk.TreeView.__init__ (self) gtk.TreeView.__init__ (self)
self.readonly = readonly self.readonly = readonly
# The icon that indicates whether we're building or failed. # The icon that indicates whether we're building or failed.
renderer = HobCellRendererPixbuf () # add 'hob' flag because there has not only hob to share this code
if hob:
renderer = HobCellRendererPixbuf ()
else:
renderer = gtk.CellRendererPixbuf()
col = gtk.TreeViewColumn ("Status", renderer) col = gtk.TreeViewColumn ("Status", renderer)
col.add_attribute (renderer, "icon-name", 4) col.add_attribute (renderer, "icon-name", 4)
self.append_column (col) self.append_column (col)
# The message of the build. # The message of the build.
self.message_renderer = HobWarpCellRendererText (col_number=1) # add 'hob' flag because there has not only hob to share this code
if hob:
self.message_renderer = HobWarpCellRendererText (col_number=1)
else:
self.message_renderer = gtk.CellRendererText ()
self.message_column = gtk.TreeViewColumn ("Message", self.message_renderer, text=3) self.message_column = gtk.TreeViewColumn ("Message", self.message_renderer, text=3)
self.message_column.add_attribute(self.message_renderer, 'background', 5) self.message_column.add_attribute(self.message_renderer, 'background', 5)
self.message_renderer.set_property('editable', (not self.readonly)) self.message_renderer.set_property('editable', (not self.readonly))