[PATCH] hob/recipe&packageselectionpage: Change "Back" button to "Cancel" button

[PATCH] hob/recipe&packageselectionpage: Change "Back" button to "Cancel" button

[Cristiana Voicu]

"Back" button placed on RecipeSelectionPage and PackageSelectionPage
was changed to "Cancel" button to avoid any confusion.
Also, it was placed next to the other buttons on the page.

[YOCTO #3012]

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 bitbake/lib/bb/ui/crumbs/packageselectionpage.py |    7 +++----
 bitbake/lib/bb/ui/crumbs/recipeselectionpage.py  |    4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
index 3576ed5..ce05f9b 100755
--- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
@@ -157,9 +157,9 @@ class PackageSelectionPage (HobPage):
         self.build_image_button.connect("clicked", self.build_image_clicked_cb)
         self.button_box.pack_end(self.build_image_button, expand=False, fill=False)
 
-        self.back_button = HobAltButton('<< Back')
+        self.back_button = HobAltButton('Cancel')
         self.back_button.connect("clicked", self.back_button_clicked_cb)
-        self.button_box.pack_start(self.back_button, expand=False, fill=False)
+        self.button_box.pack_end(self.back_button, expand=False, fill=False)
 
     def button_click_cb(self, widget, event):
         path, col = widget.table_tree.get_cursor()
@@ -178,14 +178,13 @@ class PackageSelectionPage (HobPage):
         for child in children:
             self.button_box.remove(child)
         # re-packed the buttons as request, add the 'view log' button if build success
-        self.button_box.pack_start(self.back_button, expand=False, fill=False)
         self.button_box.pack_end(self.build_image_button, expand=False, fill=False)
         if log_file:
             view_log_button = HobAltButton("View log")
             view_log_button.connect("clicked", self.view_log_clicked_cb, log_file)
             view_log_button.set_tooltip_text("Open the building log files")
             self.button_box.pack_end(view_log_button, expand=False, fill=False)
-
+        self.button_box.pack_end(self.back_button, expand=False, fill=False)
         self.show_all()
 
     def build_image_clicked_cb(self, button):
diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
index d8e71b0..1869007 100755
--- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
@@ -184,9 +184,9 @@ class RecipeSelectionPage (HobPage):
         self.build_packages_button.connect("clicked", self.build_packages_clicked_cb)
         button_box.pack_end(self.build_packages_button, expand=False, fill=False)
 
-        self.back_button = HobAltButton('<< Back')
+        self.back_button = HobAltButton('Cancel')
         self.back_button.connect("clicked", self.back_button_clicked_cb)
-        button_box.pack_start(self.back_button, expand=False, fill=False)
+        button_box.pack_end(self.back_button, expand=False, fill=False)
 
     def button_click_cb(self, widget, event):
         path, col = widget.table_tree.get_cursor()
-- 
1.7.9.5

Re: [PATCH] hob/recipe&packageselectionpage: Change "Back" button to "Cancel" button

[Richard Purdie]

On Fri, 2012-08-31 at 17:10 +0300, Cristiana Voicu wrote:
> "Back" button placed on RecipeSelectionPage and PackageSelectionPage
> was changed to "Cancel" button to avoid any confusion.
> Also, it was placed next to the other buttons on the page.
> 
> [YOCTO #3012]
> 
> Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
> ---
>  bitbake/lib/bb/ui/crumbs/packageselectionpage.py |    7 +++----
>  bitbake/lib/bb/ui/crumbs/recipeselectionpage.py  |    4 ++--
>  2 files changed, 5 insertions(+), 6 deletions(-)

Merged to master, thanks (along with the previous 3 patches).

Richard