From ff4387370667cdb5a7ac0c94732fa7e7e022b893 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Thu, 29 Mar 2012 00:10:30 +0800 Subject: Hob: add Templates and Settings on image details screen This patch is to add Templates and Settings tool buttons on the image details screen, which makes things easier and simplier. In order to fulfill that, the code splits the functions show_load_template_dialog() and show_adv_settings_dialog() in builder.py because they will possibly be called from different screens later. [Yocto #2163] (Bitbake rev: 29bea7b7076a7b74d36237da86a4eff6605d17ec) Signed-off-by: Shane Wang Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 19 ++++++++------ bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 12 +++++++-- bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 29 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 9 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 2af14dc6ef..1a06dd741a 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -757,10 +757,11 @@ class Builder(gtk.Window): dialog.add_filter(filter) response = dialog.run() + path = None if response == gtk.RESPONSE_YES: path = dialog.get_filename() - self.load_template(path) dialog.destroy() + return response == gtk.RESPONSE_YES, path def show_save_template_dialog(self): dialog = gtk.FileChooserDialog("Save Template Files", self, @@ -820,16 +821,20 @@ class Builder(gtk.Window): button = dialog.add_button("Save", gtk.RESPONSE_YES) HobButton.style_button(button) response = dialog.run() + settings_changed = False if response == gtk.RESPONSE_YES: self.parameters.enable_proxy = dialog.enable_proxy self.configuration = dialog.configuration - # DO reparse recipes - if dialog.settings_changed: - if self.configuration.curr_mach == "": - self.switch_page(self.MACHINE_SELECTION) - else: - self.switch_page(self.RCPPKGINFO_POPULATING) + settings_changed = dialog.settings_changed dialog.destroy() + return response == gtk.RESPONSE_YES, settings_changed + + def reparse_post_adv_settings(self): + # DO reparse recipes + if self.configuration.curr_mach == "": + self.switch_page(self.MACHINE_SELECTION) + else: + self.switch_page(self.RCPPKGINFO_POPULATING) def deploy_image(self, image_name): if not image_name: diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index d7437a9925..9ad1ea43d5 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -360,11 +360,19 @@ class ImageConfigurationPage (HobPage): self.builder.build_packages() def template_button_clicked_cb(self, button): - self.builder.show_load_template_dialog() + response, path = self.builder.show_load_template_dialog() + if not response: + return + if path: + self.builder.load_template(path) def my_images_button_clicked_cb(self, button): self.builder.show_load_my_images_dialog() def settings_button_clicked_cb(self, button): # Create an advanced settings dialog - self.builder.show_adv_settings_dialog() + response, settings_changed = self.builder.show_adv_settings_dialog() + if not response: + return + if settings_changed: + self.builder.reparse_post_adv_settings() diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py index 7d06124048..f15aad30a5 100755 --- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py @@ -122,12 +122,24 @@ class ImageDetailsPage (HobPage): self.toolbar.set_orientation(gtk.ORIENTATION_HORIZONTAL) self.toolbar.set_style(gtk.TOOLBAR_BOTH) + template_button = self.append_toolbar_button(self.toolbar, + "Templates", + hic.ICON_TEMPLATES_DISPLAY_FILE, + hic.ICON_TEMPLATES_HOVER_FILE, + "Load a hob building template saved before", + self.template_button_clicked_cb) my_images_button = self.append_toolbar_button(self.toolbar, "My images", hic.ICON_IMAGES_DISPLAY_FILE, hic.ICON_IMAGES_HOVER_FILE, "Open images built out previously for running or deployment", self.my_images_button_clicked_cb) + settings_button = self.append_toolbar_button(self.toolbar, + "Settings", + hic.ICON_SETTINGS_DISPLAY_FILE, + hic.ICON_SETTINGS_HOVER_FILE, + "Other advanced settings for build", + self.settings_button_clicked_cb) self.details_top_buttons = self.add_onto_top_bar(self.toolbar) @@ -386,5 +398,22 @@ class ImageDetailsPage (HobPage): def edit_packages_button_clicked_cb(self, button): self.builder.show_packages(ask=False) + def template_button_clicked_cb(self, button): + response, path = self.builder.show_load_template_dialog() + if not response: + return + self.builder.initiate_new_build() + if path: + self.builder.load_template(path) + def my_images_button_clicked_cb(self, button): self.builder.show_load_my_images_dialog() + + def settings_button_clicked_cb(self, button): + # Create an advanced settings dialog + response, settings_changed = self.builder.show_adv_settings_dialog() + if not response: + return + self.builder.initiate_new_build() + if settings_changed: + self.builder.reparse_post_adv_settings() -- cgit v1.2.3-54-g00ecf