From a1416b5564a8a4cede651cbcb70c17c163177cbc Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Thu, 25 Jul 2013 07:40:49 +0000 Subject: [PATCH] bitbake: hob: change the name and description for the saveimagedialog The image name and description should be saved for a future save. [YOCTO #4193] (Bitbake rev: 6dc0fc243ac6046714523d08df4d8f88c48698cc) Signed-off-by: Cristiana Voicu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py | 8 +++++++- bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py b/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py index 9ea512f..a20afcd 100644 --- a/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py +++ b/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py @@ -29,10 +29,12 @@ class SaveImageDialog (CrumbsDialog): This class is used to create a dialog that permits to save a custom image in a predefined directory. """ - def __init__(self, directory, title, parent, flags, buttons=None): + def __init__(self, directory, name, description, title, parent, flags, buttons=None): super(SaveImageDialog, self).__init__(title, parent, flags, buttons) self.directory = directory self.builder = parent + self.name_field = name + self.description_field = description # create visual elements on the dialog self.create_visual_elements() @@ -52,6 +54,7 @@ class SaveImageDialog (CrumbsDialog): content += "characters. The only special character you can use is the ASCII hyphen (-)." sub_label.set_markup(content) self.name_entry = gtk.Entry() + self.name_entry.set_text(self.name_field) self.name_entry.set_size_request(350,30) self.name_entry.connect("changed", self.name_entry_changed) sub_vbox.pack_start(label, expand=False, fill=False) @@ -67,6 +70,7 @@ class SaveImageDialog (CrumbsDialog): sub_label.set_alignment(0, 0) sub_label.set_markup("The description should be less than 150 characters long.") self.description_entry = gtk.TextView() + self.description_entry.get_buffer().set_text(self.description_field) self.description_entry.set_wrap_mode(gtk.WRAP_WORD) self.description_entry.set_size_request(350,150) sub_vbox.pack_start(label, expand=False, fill=False) @@ -124,6 +128,8 @@ class SaveImageDialog (CrumbsDialog): self.builder.recipe_model.set_in_list(text, description) self.builder.recipe_model.set_selected_image(text) self.builder.image_details_page.show_page(self.builder.IMAGE_GENERATED) + self.builder.image_details_page.name_field_template = text + self.builder.image_details_page.description_field_template = description self.destroy() else: self.show_invalid_input_error_dialog() diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py index eaa4588..f50552f 100755 --- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py @@ -191,6 +191,8 @@ class ImageDetailsPage (HobPage): self.details_bottom_buttons = gtk.HBox(False, 6) self.image_saved = False self.create_visual_elements() + self.name_field_template = "" + self.description_field_template = "" def create_visual_elements(self): # create visual elements @@ -632,8 +634,8 @@ class ImageDetailsPage (HobPage): images_dir = topdir + "/recipes/images/" self.builder.ensure_dir(images_dir) - dialog = SaveImageDialog(images_dir, "Save image recipe", self.builder, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT) + dialog = SaveImageDialog(images_dir, self.name_field_template, self.description_field_template, + "Save image recipe", self.builder, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT) response = dialog.run() dialog.destroy() -- 2.7.4