summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2012-10-12 15:29:46 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-24 21:13:07 +0100
commit9cf610680f669c0b85036fdf2cb9c431eb040f6f (patch)
tree36a476ec5145b34a5e25e9efafad2b1841d9133c /bitbake/lib/bb/ui
parent759dadf80ae6061860a2cd1b67e431658353c15c (diff)
downloadpoky-9cf610680f669c0b85036fdf2cb9c431eb040f6f.tar.gz
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 <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py1
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py1
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/recipeselectionpage.py3
3 files changed, 5 insertions, 0 deletions
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:
126 self.selected_image = None 126 self.selected_image = None
127 self.selected_recipes = [] 127 self.selected_recipes = []
128 self.selected_packages = [] 128 self.selected_packages = []
129 self.initial_selected_image = None
129 self.initial_selected_packages = [] 130 self.initial_selected_packages = []
130 self.initial_user_selected_packages = [] 131 self.initial_user_selected_packages = []
131 132
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):
432 self.builder.just_bake() 432 self.builder.just_bake()
433 433
434 def edit_image_button_clicked_cb(self, button): 434 def edit_image_button_clicked_cb(self, button):
435 self.builder.configuration.initial_selected_image = self.builder.configuration.selected_image
435 self.builder.show_recipes() 436 self.builder.show_recipes()
436 437
437 def template_button_clicked_cb(self, button): 438 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):
193 self.builder.build_packages() 193 self.builder.build_packages()
194 194
195 def back_button_clicked_cb(self, button): 195 def back_button_clicked_cb(self, button):
196 self.builder.recipe_model.set_selected_image(self.builder.configuration.initial_selected_image)
197 self.builder.image_configuration_page.update_image_combo(self.builder.recipe_model, self.builder.configuration.initial_selected_image)
198 self.builder.image_configuration_page.update_image_desc()
196 self.builder.show_configuration() 199 self.builder.show_configuration()
197 200
198 def refresh_selection(self): 201 def refresh_selection(self):