diff options
| author |   Cristiana Voicu <cristiana.voicu@intel.com> | 2012-10-12 15:29:46 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-24 21:07:05 +0100 |
| commit | 0a755026661a18ae386eb64b807e9e9e8f0dfe4c (patch) | |
| tree | e9dda5c8ff063a6853cfef0d980c97f75a0058de /lib | |
| parent | 7dcea3884a45973ae332695dc8a53814b701151f (diff) | |
| download | bitbake-0a755026661a18ae386eb64b807e9e9e8f0dfe4c.tar.gz | |
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}
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/bb/ui/crumbs/builder.py | 1 | ||||
| -rw-r--r-- | lib/bb/ui/crumbs/imageconfigurationpage.py | 1 | ||||
| -rwxr-xr-x | lib/bb/ui/crumbs/recipeselectionpage.py | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index 44e2aa51f..d417e1b21 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/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/lib/bb/ui/crumbs/imageconfigurationpage.py b/lib/bb/ui/crumbs/imageconfigurationpage.py index 8988df0bd..cbef85a9c 100644 --- a/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/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/lib/bb/ui/crumbs/recipeselectionpage.py b/lib/bb/ui/crumbs/recipeselectionpage.py index 8655c29fc..79c779081 100755 --- a/lib/bb/ui/crumbs/recipeselectionpage.py +++ b/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): |