From 399d7f20294766b9bf5d11902725b8167802bb30 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Fri, 31 Aug 2012 17:10:11 +0300 Subject: bitbake: hob/recipe&packageselectionpage: Change "Back" button to "Cancel" button "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] (Bitbake rev: 1785b49a1b0b9698851d6e8aea94d1d2aa22c445) Signed-off-by: Cristiana Voicu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 7 +++---- bitbake/lib/bb/ui/crumbs/recipeselectionpage.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py index f2983b2bdd..9eec0e0043 100755 --- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py @@ -162,9 +162,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() @@ -183,14 +183,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 d8e71b0979..18690077f5 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() -- cgit v1.2.3-54-g00ecf