From 95ae927dfc8cbb0b1b8a60edb5af7c448cbc9a9e Mon Sep 17 00:00:00 2001 From: Liming An Date: Wed, 5 Sep 2012 19:13:48 +0800 Subject: bitbake: 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] (Bitbake rev: 6dc3263d60a6d35f9eebfcdbc2665201ee40b953) Signed-off-by: Liming An Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/recipeselectionpage.py | 37 ++++++++++--------------- 1 file changed, 15 insertions(+), 22 deletions(-) (limited to 'bitbake/lib/bb/ui/crumbs/recipeselectionpage.py') diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py index 18690077f5..693a449bcf 100755 --- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py @@ -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'] }, @@ -44,13 +44,6 @@ class RecipeSelectionPage (HobPage): 'col_min' : 100, '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, @@ -58,6 +51,13 @@ class RecipeSelectionPage (HobPage): 'col_min' : 100, '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, @@ -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, @@ -108,13 +108,6 @@ class RecipeSelectionPage (HobPage): 'col_min' : 100, '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, @@ -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) -- cgit v1.2.3-54-g00ecf