Re: [PATCH 0/5] Some small fixes for Hob

Re: [PATCH 0/5] Some small fixes for Hob

[Xu, Dongxiao]

Hi Richard,

Could you hold this change for a moment?
I also have some changes which may have patching conflict with this one.

I will merge Shane's change together and send them out in all.

Thanks,
Dongxiao

On Wed, 2012-03-21 at 12:05 +0800, Shane Wang wrote:
> These are small fixes for Hob. Please review.
> 
> The following changes since commit 224ff370b4636cdd33c47c1e6341ef43a67e0227:
> 
>   xserver-kdrive: compile xserver without dtrace support (2012-03-20 15:21:39 +0000)
> 
> are available in the git repository at:
>   git://git.pokylinux.org/poky-contrib shane/hob2-v0.71
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=shane/hob2-v0.71
> 
> Shane Wang (5):
>   Hob: Change window title from HOB to Hob
>   Hob: Change "View Packages" description
>   Hob: In the recipe view, change the headings
>   Hob: In the package view, change the headings
>   Hob: Change the titles for recipe view and package view
> 
>  bitbake/lib/bb/ui/crumbs/builder.py                |    2 +-
>  bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py |    6 +++---
>  bitbake/lib/bb/ui/crumbs/packageselectionpage.py   |   12 ++++++------
>  bitbake/lib/bb/ui/crumbs/recipeselectionpage.py    |    8 ++++----
>  4 files changed, 14 insertions(+), 14 deletions(-)
> 

[PATCH 0/5] Some small fixes for Hob

[Shane Wang]

These are small fixes for Hob. Please review.

The following changes since commit 224ff370b4636cdd33c47c1e6341ef43a67e0227:

  xserver-kdrive: compile xserver without dtrace support (2012-03-20 15:21:39 +0000)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib shane/hob2-v0.71
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=shane/hob2-v0.71

Shane Wang (5):
  Hob: Change window title from HOB to Hob
  Hob: Change "View Packages" description
  Hob: In the recipe view, change the headings
  Hob: In the package view, change the headings
  Hob: Change the titles for recipe view and package view

 bitbake/lib/bb/ui/crumbs/builder.py                |    2 +-
 bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py |    6 +++---
 bitbake/lib/bb/ui/crumbs/packageselectionpage.py   |   12 ++++++------
 bitbake/lib/bb/ui/crumbs/recipeselectionpage.py    |    8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

-- 
1.7.6

[PATCH 1/5] Hob: Change window title from HOB to Hob

[Shane Wang]

[Yocto #2147]

Signed-off-by: Shane Wang <shane.wang@intel.com>
---
 bitbake/lib/bb/ui/crumbs/builder.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index b1aad54..d0d7e80 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -227,7 +227,7 @@ class Builder(gtk.Window):
         self.switch_page(self.MACHINE_SELECTION)
 
     def create_visual_elements(self):
-        self.set_title("Hob - Image Creator")
+        self.set_title("Hob")
         self.set_icon_name("applications-development")
         self.set_resizable(True)
         window_width = self.get_screen().get_width()
-- 
1.7.6

[PATCH 2/5] Hob: Change "View Packages" description

[Shane Wang]

Change 'View Packages' button description from 'Add/remove packages' to 'Add/remove previously built packages to/from your image'.
And we adjust the size to make "View Packages" button fit into the window.

[Yocto #2146]

Signed-off-by: Shane Wang <shane.wang@intel.com>
---
 bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index b0c5daa..9f4e4ea 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -200,7 +200,7 @@ class ImageConfigurationPage (HobPage):
         icon_file = hic.ICON_PACKAGES_DISPLAY_FILE
         hover_file = hic.ICON_PACKAGES_HOVER_FILE
         self.view_packages_button = HobXpmLabelButtonBox(icon_file, hover_file,
-            "View Packages", "Add/remove packages")
+            "View Packages", "Add/remove previously built packages to/from your image")
         self.view_packages_button.connect("button-release-event", self.view_packages_button_clicked_cb)
 
         self.image_separator = gtk.HSeparator()
@@ -213,8 +213,8 @@ class ImageConfigurationPage (HobPage):
         self.gtable.attach(self.image_separator, 0, 40, 35, 36)
 
     def set_rcppkg_layout(self):
-        self.gtable.attach(self.view_recipes_button, 0, 20, 28, 32)
-        self.gtable.attach(self.view_packages_button, 20, 40, 28, 32)
+        self.gtable.attach(self.view_recipes_button, 0, 18, 28, 32)
+        self.gtable.attach(self.view_packages_button, 18, 40, 28, 32)
 
     def create_config_build_button(self):
         # Create the "Build packages" and "Just bake" buttons at the bottom
-- 
1.7.6

[PATCH 3/5] Hob: In the recipe view, change the headings

[Shane Wang]

In 'Recipe' table, change 'Recipe' to 'Recipe Name'
In 'Included' table, change 'Recipe' to 'Recipe (Recipe Collection) Name', and 'Brought by' to 'Brought in by'.

[Yocto #2145]

Signed-off-by: Shane Wang <shane.wang@intel.com>
---
 bitbake/lib/bb/ui/crumbs/recipeselectionpage.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
index 6dd7c1e..409f446 100755
--- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
@@ -36,7 +36,7 @@ class RecipeSelectionPage (HobPage):
          'name'    : 'Recipe',
          'filter'  : { RecipeListModel.COL_TYPE : ['recipe'] },
          'columns' : [{
-                       'col_name' : 'Recipe',
+                       'col_name' : 'Recipe Name',
                        'col_id'   : RecipeListModel.COL_NAME,
                        'col_style': 'text',
                        'col_min'  : 100,
@@ -87,13 +87,13 @@ class RecipeSelectionPage (HobPage):
          'filter'  : { RecipeListModel.COL_INC  : [True],
                        RecipeListModel.COL_TYPE : ['recipe', 'task'] },
          'columns' : [{
-                       'col_name' : 'Recipe',
+                       'col_name' : 'Recipe (Recipe Collection) Name',
                        'col_id'   : RecipeListModel.COL_NAME,
                        'col_style': 'text',
                        'col_min'  : 100,
                        'col_max'  : 400
                       }, {
-                       'col_name' : 'Brought by',
+                       'col_name' : 'Brought in by',
                        'col_id'   : RecipeListModel.COL_BINB,
                        'col_style': 'text',
                        'col_min'  : 100,
-- 
1.7.6

[PATCH 4/5] Hob: In the package view, change the headings

[Shane Wang]

Change 'Name' to 'Package Name', 'size' to 'Size', 'Brought by' to 'Brought in by'.

Signed-off-by: Shane Wang <shane.wang@intel.com>
---
 bitbake/lib/bb/ui/crumbs/packageselectionpage.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
index 23e460c..7f8c351 100755
--- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
@@ -37,13 +37,13 @@ class PackageSelectionPage (HobPage):
          'name'    : 'All packages',
          'filter'  : {},
          'columns' : [{
-                       'col_name' : 'Name',
+                       'col_name' : 'Package Name',
                        'col_id'   : PackageListModel.COL_NAME,
                        'col_style': 'text',
                        'col_min'  : 100,
                        'col_max'  : 400
                       }, {
-                       'col_name' : 'size',
+                       'col_name' : 'Size',
                        'col_id'   : PackageListModel.COL_SIZE,
                        'col_style': 'text',
                        'col_min'  : 100,
@@ -59,19 +59,19 @@ class PackageSelectionPage (HobPage):
          'name'    : 'Included',
          'filter'  : { PackageListModel.COL_INC : [True] },
          'columns' : [{
-                       'col_name' : 'Name',
+                       'col_name' : 'Package Name',
                        'col_id'   : PackageListModel.COL_NAME,
                        'col_style': 'text',
                        'col_min'  : 100,
                        'col_max'  : 300
                       }, {
-                       'col_name' : 'Brought by',
+                       'col_name' : 'Brought in by',
                        'col_id'   : PackageListModel.COL_BINB,
                        'col_style': 'text',
                        'col_min'  : 100,
                        'col_max'  : 350
                       }, {
-                       'col_name' : 'size',
+                       'col_name' : 'Size',
                        'col_id'   : PackageListModel.COL_SIZE,
                        'col_style': 'text',
                        'col_min'  : 100,
-- 
1.7.6

[PATCH 5/5] Hob: Change the titles for recipe view and package view

[Shane Wang]

Signed-off-by: Shane Wang <shane.wang@intel.com>
---
 bitbake/lib/bb/ui/crumbs/packageselectionpage.py |    2 +-
 bitbake/lib/bb/ui/crumbs/recipeselectionpage.py  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
index 7f8c351..968d4a2 100755
--- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
@@ -87,7 +87,7 @@ class PackageSelectionPage (HobPage):
     ]
 
     def __init__(self, builder):
-        super(PackageSelectionPage, self).__init__(builder, "Package Selection")
+        super(PackageSelectionPage, self).__init__(builder, "Packages")
 
         # set invisiable members
         self.package_model = self.builder.package_model
diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
index 409f446..b47e8d4 100755
--- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
@@ -109,7 +109,7 @@ class RecipeSelectionPage (HobPage):
     ]
 
     def __init__(self, builder = None):
-        super(RecipeSelectionPage, self).__init__(builder, "Recipe Selection")
+        super(RecipeSelectionPage, self).__init__(builder, "Recipes")
 
         # set invisiable members
         self.recipe_model = self.builder.recipe_model
-- 
1.7.6