hob:bug-fix
cover hob:bug-fix
The following changes since commit 99c85ba93075a1aff789cafabbacf42e6a93bd32:
build-appliance-image: Update to latest poky master (2012-09-04 18:04:40 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib limx/hob-bug-fixes-continue
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=limx/hob-bug-fixes-continue
Liming An (1):
Hob: change view of 'recipes' and 'packages' tables as ui design
bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 9 ++++- bitbake/lib/bb/ui/crumbs/hobwidget.py | 7 +++- bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 48 +++++---------------- bitbake/lib/bb/ui/crumbs/recipeselectionpage.py | 37 +++++++---------- 4 files changed, 41 insertions(+), 60 deletions(-)
Signature · 1 line
1.7.5.4
PATCH 1/1 Hob: change view of 'recipes' and 'packages' tables as ui design
changed the order of task tables,
cancel the 'description' column,
add the binb total number indicator, and so on
[YOCTO 2195]
Signed-off-by Liming An <[email protected]>
--- bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 9 ++++- bitbake/lib/bb/ui/crumbs/hobwidget.py | 7 +++- bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 48 +++++---------------- bitbake/lib/bb/ui/crumbs/recipeselectionpage.py | 37 +++++++---------- 4 files changed, 41 insertions(+), 60 deletions(-)
bitbake/lib/bb/ui/crumbs/hoblistmodel.py +8 -1
@@ -521,17 +521,24 @@ class RecipeListModel(gtk.ListStore): val2 = model.get_value(iter2, RecipeListModel.COL_INC) return ((val1 == True) and (val2 == False)) + def include_item_sort_func(self, model, iter1, iter2): + val1 = model.get_value(iter1, RecipeListModel.COL_INC) + val2 = model.get_value(iter2, RecipeListModel.COL_INC) + return ((val1 == False) and (val2 == True)) + """ Create, if required, and return a filtered gtk.TreeModelSort containing only the items which are items specified by filter """ - def tree_model(self, filter, excluded_items_ahead=False): + def tree_model(self, filter, excluded_items_ahead=False, included_items_ahead=True): model = self.filter_new() model.set_visible_func(self.tree_model_filter, filter) sort = gtk.TreeModelSort(model) if excluded_items_ahead: sort.set_default_sort_func(self.exclude_item_sort_func) + elif included_items_ahead: + sort.set_default_sort_func(self.include_item_sort_func) else: sort.set_sort_column_id(RecipeListModel.COL_NAME, gtk.SORT_ASCENDING) sort.set_default_sort_func(None)
bitbake/lib/bb/ui/crumbs/hobwidget.py +6 -1
@@ -182,7 +182,12 @@ class HobViewTable (gtk.VBox): # Just display the first item if binb: bin = binb.split(', ') - cell.set_property('text', bin[0]) + total_no = len(bin) + if total_no > 1 and bin[0] == "User Selected": + present_binb = bin[1] + ' (+' + str(total_no) + ')' + else: + present_binb = bin[0] + ' (+' + str(total_no) + ')' + cell.set_property('text', present_binb) else: cell.set_property('text', "") return True
bitbake/lib/bb/ui/crumbs/packageselectionpage.py +12 -36
113 lines not on this page · raw message
bitbake/lib/bb/ui/crumbs/recipeselectionpage.py +15 -22
@@ -33,7 +33,7 @@ from bb.ui.crumbs.hobpages import HobPage class RecipeSelectionPage (HobPage): pages = [ { - 'name' : 'Included', + 'name' : 'Included recipes', 'tooltip' : 'The recipes currently included for your image', 'filter' : { RecipeListModel.COL_INC : [True], RecipeListModel.COL_TYPE : ['recipe', 'task'] },
@@ -45,13 +45,6 @@ class RecipeSelectionPage (HobPage): 'col_max' : 400, 'expand' : 'True' }, { - 'col_name' : 'Brought in by', - 'col_id' : RecipeListModel.COL_BINB, - 'col_style': 'binb', - 'col_min' : 100, - 'col_max' : 500, - 'expand' : 'True' - }, { 'col_name' : 'Group', 'col_id' : RecipeListModel.COL_GROUP, 'col_style': 'text',
@@ -59,6 +52,13 @@ class RecipeSelectionPage (HobPage): 'col_max' : 300, 'expand' : 'True' }, { + 'col_name' : 'Brought in by', + 'col_id' : RecipeListModel.COL_BINB, + 'col_style': 'binb', + 'col_min' : 100, + 'col_max' : 500, + 'expand' : 'True' + }, { 'col_name' : 'Included', 'col_id' : RecipeListModel.COL_INC, 'col_style': 'check toggle',
@@ -77,15 +77,15 @@ class RecipeSelectionPage (HobPage): 'col_max' : 400, 'expand' : 'True' }, { - 'col_name' : 'License', - 'col_id' : RecipeListModel.COL_LIC, + 'col_name' : 'Group', + 'col_id' : RecipeListModel.COL_GROUP, 'col_style': 'text', 'col_min' : 100, 'col_max' : 400, 'expand' : 'True' }, { - 'col_name' : 'Group', - 'col_id' : RecipeListModel.COL_GROUP, + 'col_name' : 'License', + 'col_id' : RecipeListModel.COL_LIC, 'col_style': 'text', 'col_min' : 100, 'col_max' : 400,
@@ -109,13 +109,6 @@ class RecipeSelectionPage (HobPage): 'col_max' : 400, 'expand' : 'True' }, { - 'col_name' : 'Description', - 'col_id' : RecipeListModel.COL_DESC, - 'col_style': 'text', - 'col_min' : 100, - 'col_max' : 400, - 'expand' : 'True' - }, { 'col_name' : 'Included', 'col_id' : RecipeListModel.COL_INC, 'col_style': 'check toggle',
@@ -156,7 +149,7 @@ class RecipeSelectionPage (HobPage): filter = page['filter'] tab.set_model(self.recipe_model.tree_model(filter)) tab.connect("toggled", self.table_toggled_cb, page['name']) - if page['name'] == "Included": + if page['name'] == "Included recipes": tab.connect("button-release-event", self.button_click_cb) tab.connect("cell-fadeinout-stopped", self.after_fadeout_checkin_include) self.ins.append_page(tab, page['name'], page['tooltip'])
@@ -205,13 +198,13 @@ class RecipeSelectionPage (HobPage): def refresh_selection(self): self.builder.configuration.selected_image = self.recipe_model.get_selected_image() _, self.builder.configuration.selected_recipes = self.recipe_model.get_selected_recipes() - self.ins.show_indicator_icon("Included", len(self.builder.configuration.selected_recipes)) + self.ins.show_indicator_icon("Included recipes", len(self.builder.configuration.selected_recipes)) def toggle_item_idle_cb(self, path, view_tree, cell, pagename): if not self.recipe_model.path_included(path): self.recipe_model.include_item(item_path=path, binb="User Selected", image_contents=False) else: - if pagename == "Included": + if pagename == "Included recipes": self.pre_fadeout_checkout_include(view_tree) self.recipe_model.exclude_item(item_path=path) self.render_fadeout(view_tree, cell)
Signature · 1 line
1.7.5.4
Richard Purdie
AppliedRe: [PATCH 1/1] Hob: change view of 'recipes' and 'packages' tables as ui design
Quoted 6 lines · Liming An
changed the order of task tables,
cancel the 'description' column,
add the binb total number indicator, and so on[YOCTO 2195]
Quoted 7 lines
Signed-off-by Liming An <[email protected]>--- bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 9 ++++- bitbake/lib/bb/ui/crumbs/hobwidget.py | 7 +++- bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 48 +++++---------------- bitbake/lib/bb/ui/crumbs/recipeselectionpage.py | 37 +++++++---------- 4 files changed, 41 insertions(+), 60 deletions(-)
Merged to master, thanks.
Richard