From 4a3b0d7287ba7ce223021d33895bf5c953f1e4dc Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Tue, 16 Oct 2012 11:52:38 +0300 Subject: [PATCH] bitbake: bitbake: hob/hobwidget: "Brought in by" column is now displayed correctly In "Edit Recipes" and "Edit packages" pages, the "Brought in by" column is displayed correctly, with the right number of additional packages and a proper title. Fixes [YOCTO #2195]. (Bitbake rev: 4d1d3e5a54eb718e2eee02f734d929f15ccf99ce) Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hobwidget.py | 10 ++++++++-- bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 2 +- bitbake/lib/bb/ui/crumbs/recipeselectionpage.py | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/hobwidget.py b/bitbake/lib/bb/ui/crumbs/hobwidget.py index 28dc375da5..65de9df78f 100644 --- a/bitbake/lib/bb/ui/crumbs/hobwidget.py +++ b/bitbake/lib/bb/ui/crumbs/hobwidget.py @@ -155,9 +155,15 @@ class HobViewTable (gtk.VBox): bin = binb.split(', ') total_no = len(bin) if total_no > 1 and bin[0] == "User Selected": - present_binb = bin[1] + ' (+' + str(total_no) + ')' + if total_no > 2: + present_binb = bin[1] + ' (+' + str(total_no - 1) + ')' + else: + present_binb = bin[1] else: - present_binb = bin[0] + ' (+' + str(total_no) + ')' + if total_no > 1: + present_binb = bin[0] + ' (+' + str(total_no - 1) + ')' + else: + present_binb = bin[0] cell.set_property('text', present_binb) else: cell.set_property('text', "") diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py index 8eb388e57c..17b1dfe3c4 100755 --- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py @@ -52,7 +52,7 @@ class PackageSelectionPage (HobPage): 'col_max' : 300, 'expand' : 'True' }, { - 'col_name' : 'Brought in by', + 'col_name' : 'Brought in by (+others)', 'col_id' : PackageListModel.COL_BINB, 'col_style': 'binb', 'col_min' : 100, diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py index 79c7790819..fea92b5148 100755 --- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py @@ -52,7 +52,7 @@ class RecipeSelectionPage (HobPage): 'col_max' : 300, 'expand' : 'True' }, { - 'col_name' : 'Brought in by', + 'col_name' : 'Brought in by (+others)', 'col_id' : RecipeListModel.COL_BINB, 'col_style': 'binb', 'col_min' : 100,