From 9cf610680f669c0b85036fdf2cb9c431eb040f6f Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Fri, 12 Oct 2012 15:29:46 +0300 Subject: bitbake: hob: change behavior for "cancel" button from the Recipe selection page -when returned to the Image configuration page, after canceling on the Recipe selection page, the image selected previously is now shown corectly [YOCTO #3205} (Bitbake rev: 0a755026661a18ae386eb64b807e9e9e8f0dfe4c) Signed-off-by: Cristiana Voicu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 1 + bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 1 + bitbake/lib/bb/ui/crumbs/recipeselectionpage.py | 3 +++ 3 files changed, 5 insertions(+) (limited to 'bitbake/lib/bb/ui') diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 44e2aa51fb..d417e1b214 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -126,6 +126,7 @@ class Configuration: self.selected_image = None self.selected_recipes = [] self.selected_packages = [] + self.initial_selected_image = None self.initial_selected_packages = [] self.initial_user_selected_packages = [] diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index 8988df0bda..cbef85a9ce 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -432,6 +432,7 @@ class ImageConfigurationPage (HobPage): self.builder.just_bake() def edit_image_button_clicked_cb(self, button): + self.builder.configuration.initial_selected_image = self.builder.configuration.selected_image self.builder.show_recipes() def template_button_clicked_cb(self, button): diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py index 8655c29fce..79c7790819 100755 --- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py @@ -193,6 +193,9 @@ class RecipeSelectionPage (HobPage): self.builder.build_packages() def back_button_clicked_cb(self, button): + self.builder.recipe_model.set_selected_image(self.builder.configuration.initial_selected_image) + self.builder.image_configuration_page.update_image_combo(self.builder.recipe_model, self.builder.configuration.initial_selected_image) + self.builder.image_configuration_page.update_image_desc() self.builder.show_configuration() def refresh_selection(self): -- cgit v1.2.3-54-g00ecf