summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-09-21 10:28:43 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-24 11:13:49 (GMT)
commitd875d62f8ef606e188bf1e6561208e6b80b68d24 (patch)
treeca146fbea36677520e62a71633127ed8077a6483
parent64ea131e3d7c1920abe059974d621ff7bc899346 (diff)
downloadpoky-d875d62f8ef606e188bf1e6561208e6b80b68d24.tar.gz
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 <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py2
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/hobpages.py9
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/recipeselectionpage.py2
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 9e9d040..0a551ff 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):
653 653
654 elif next_step == self.PACKAGE_SELECTION: 654 elif next_step == self.PACKAGE_SELECTION:
655 self.configuration.initial_selected_packages = self.configuration.selected_packages 655 self.configuration.initial_selected_packages = self.configuration.selected_packages
656 self.package_details_page.set_title("Edit packages")
656 if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__: 657 if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__:
657 self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL) 658 self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL)
658 else: 659 else:
@@ -665,6 +666,7 @@ class Builder(gtk.Window):
665 self.build_details_page.show_page(next_step) 666 self.build_details_page.show_page(next_step)
666 667
667 elif next_step == self.PACKAGE_GENERATED: 668 elif next_step == self.PACKAGE_GENERATED:
669 self.package_details_page.set_title("Step 2 of 2: Edit packages")
668 if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__: 670 if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__:
669 self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL) 671 self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL)
670 else: 672 else:
diff --git a/bitbake/lib/bb/ui/crumbs/hobpages.py b/bitbake/lib/bb/ui/crumbs/hobpages.py
index 5045ea2..5b49764 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):
38 self.title = "Hob -- Image Creator" 38 self.title = "Hob -- Image Creator"
39 else: 39 else:
40 self.title = title 40 self.title = title
41 self.title_label = gtk.Label()
41 42
42 self.box_group_area = gtk.VBox(False, 12) 43 self.box_group_area = gtk.VBox(False, 12)
43 self.box_group_area.set_size_request(self.builder_width - 73 - 73, self.builder_height - 88 - 15 - 15) 44 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):
46 self.group_align.add(self.box_group_area) 47 self.group_align.add(self.box_group_area)
47 self.box_group_area.set_homogeneous(False) 48 self.box_group_area.set_homogeneous(False)
48 49
50 def set_title(self, title):
51 self.title = title
52 self.title_label.set_markup("<span size='x-large'>%s</span>" % self.title)
49 53
50 def add_onto_top_bar(self, widget = None, padding = 0): 54 def add_onto_top_bar(self, widget = None, padding = 0):
51 # the top button occupies 1/7 of the page height 55 # the top button occupies 1/7 of the page height
@@ -58,9 +62,8 @@ class HobPage (gtk.VBox):
58 62
59 hbox = gtk.HBox() 63 hbox = gtk.HBox()
60 64
61 label = gtk.Label() 65 self.title_label.set_markup("<span size='x-large'>%s</span>" % self.title)
62 label.set_markup("<span size='x-large'>%s</span>" % self.title) 66 hbox.pack_start(self.title_label, expand=False, fill=False, padding=20)
63 hbox.pack_start(label, expand=False, fill=False, padding=20)
64 67
65 if widget: 68 if widget:
66 # add the widget in the event box 69 # 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 0b159bb..f252202 100755
--- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
@@ -123,7 +123,7 @@ class RecipeSelectionPage (HobPage):
123 TASKS) = range(3) 123 TASKS) = range(3)
124 124
125 def __init__(self, builder = None): 125 def __init__(self, builder = None):
126 super(RecipeSelectionPage, self).__init__(builder, "Edit recipes") 126 super(RecipeSelectionPage, self).__init__(builder, "Step 1 of 2: Edit recipes")
127 127
128 # set invisible members 128 # set invisible members
129 self.recipe_model = self.builder.recipe_model 129 self.recipe_model = self.builder.recipe_model