From d875d62f8ef606e188bf1e6561208e6b80b68d24 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Fri, 21 Sep 2012 13:28:43 +0300 Subject: bitbake: hob: The title of the packages screen depends on the screen you arrive from - If you arrive to the packages screen from the recipes screen, the title should say: 'Step 2 of 2: Edit packages' - If you arrive to the packages screen from the image details screen, the title should say: 'Edit packages' - The title of the recipes screen should say 'Step 1 of 2: Edit recipes' [YOCTO #2982] (Bitbake rev: c366f4314c29b873a486daa9a0a4e29bb4225dd6) Signed-off-by: Constantin Musca Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 2 ++ bitbake/lib/bb/ui/crumbs/hobpages.py | 9 ++++++--- bitbake/lib/bb/ui/crumbs/recipeselectionpage.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 9e9d040025..0a551ff17c 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -653,6 +653,7 @@ class Builder(gtk.Window): elif next_step == self.PACKAGE_SELECTION: self.configuration.initial_selected_packages = self.configuration.selected_packages + self.package_details_page.set_title("Edit packages") if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__: self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL) else: @@ -665,6 +666,7 @@ class Builder(gtk.Window): self.build_details_page.show_page(next_step) elif next_step == self.PACKAGE_GENERATED: + self.package_details_page.set_title("Step 2 of 2: Edit packages") if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__: self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL) else: diff --git a/bitbake/lib/bb/ui/crumbs/hobpages.py b/bitbake/lib/bb/ui/crumbs/hobpages.py index 5045ea2019..5b497640e2 100755 --- a/bitbake/lib/bb/ui/crumbs/hobpages.py +++ b/bitbake/lib/bb/ui/crumbs/hobpages.py @@ -38,6 +38,7 @@ class HobPage (gtk.VBox): self.title = "Hob -- Image Creator" else: self.title = title + self.title_label = gtk.Label() self.box_group_area = gtk.VBox(False, 12) self.box_group_area.set_size_request(self.builder_width - 73 - 73, self.builder_height - 88 - 15 - 15) @@ -46,6 +47,9 @@ class HobPage (gtk.VBox): self.group_align.add(self.box_group_area) self.box_group_area.set_homogeneous(False) + def set_title(self, title): + self.title = title + self.title_label.set_markup("%s" % self.title) def add_onto_top_bar(self, widget = None, padding = 0): # the top button occupies 1/7 of the page height @@ -58,9 +62,8 @@ class HobPage (gtk.VBox): hbox = gtk.HBox() - label = gtk.Label() - label.set_markup("%s" % self.title) - hbox.pack_start(label, expand=False, fill=False, padding=20) + self.title_label.set_markup("%s" % self.title) + hbox.pack_start(self.title_label, expand=False, fill=False, padding=20) if widget: # add the widget in the event box diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py index 0b159bb108..f252202ae8 100755 --- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py @@ -123,7 +123,7 @@ class RecipeSelectionPage (HobPage): TASKS) = range(3) def __init__(self, builder = None): - super(RecipeSelectionPage, self).__init__(builder, "Edit recipes") + super(RecipeSelectionPage, self).__init__(builder, "Step 1 of 2: Edit recipes") # set invisible members self.recipe_model = self.builder.recipe_model -- cgit v1.2.3-54-g00ecf