Patchwork [bitbake-devel] bitbake: hob/hobwidget: "Brought in by" column is now displayed correctly

login
register
mail settings
Submitter Cristian Iorga
Date Oct. 16, 2012, 8:52 a.m.
Message ID <1350377558-26471-1-git-send-email-cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/38177/
State New
Headers show

Comments

Cristian Iorga - Oct. 16, 2012, 8:52 a.m.
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>
---
 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(-)
Richard Purdie - Oct. 24, 2012, 8:10 p.m.
On Tue, 2012-10-16 at 11:52 +0300, Cristian Iorga wrote:
> 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>
> ---
>  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(-)

Merged to master, thanks.

Richard

Patch

diff --git a/bitbake/lib/bb/ui/crumbs/hobwidget.py b/bitbake/lib/bb/ui/crumbs/hobwidget.py
index 28dc375..65de9df 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 6792fe0..d05b4a2 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 8655c29..27872ca 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,