summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2012-10-16 11:52:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-24 21:07:46 +0100
commit4d1d3e5a54eb718e2eee02f734d929f15ccf99ce (patch)
tree41ab12b6f889c5d4e8ca56176a438675554e38f7
parent7ab5775fceda1055b86bdc3313fc4bf928bf5155 (diff)
downloadbitbake-4d1d3e5a54eb718e2eee02f734d929f15ccf99ce.tar.gz
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]. Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/ui/crumbs/hobwidget.py10
-rwxr-xr-xlib/bb/ui/crumbs/packageselectionpage.py2
-rwxr-xr-xlib/bb/ui/crumbs/recipeselectionpage.py2
3 files changed, 10 insertions, 4 deletions
diff --git a/lib/bb/ui/crumbs/hobwidget.py b/lib/bb/ui/crumbs/hobwidget.py
index 28dc375da..65de9df78 100644
--- a/lib/bb/ui/crumbs/hobwidget.py
+++ b/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/lib/bb/ui/crumbs/packageselectionpage.py b/lib/bb/ui/crumbs/packageselectionpage.py
index 8eb388e57..17b1dfe3c 100755
--- a/lib/bb/ui/crumbs/packageselectionpage.py
+++ b/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/lib/bb/ui/crumbs/recipeselectionpage.py b/lib/bb/ui/crumbs/recipeselectionpage.py
index 79c779081..fea92b514 100755
--- a/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/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,