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>
This commit is contained in:
parent
64ea131e3d
commit
d875d62f8e
|
@ -653,6 +653,7 @@ class Builder(gtk.Window):
|
||||||
|
|
||||||
elif next_step == self.PACKAGE_SELECTION:
|
elif next_step == self.PACKAGE_SELECTION:
|
||||||
self.configuration.initial_selected_packages = self.configuration.selected_packages
|
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__:
|
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)
|
self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL)
|
||||||
else:
|
else:
|
||||||
|
@ -665,6 +666,7 @@ class Builder(gtk.Window):
|
||||||
self.build_details_page.show_page(next_step)
|
self.build_details_page.show_page(next_step)
|
||||||
|
|
||||||
elif next_step == self.PACKAGE_GENERATED:
|
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__:
|
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)
|
self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL)
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -38,6 +38,7 @@ class HobPage (gtk.VBox):
|
||||||
self.title = "Hob -- Image Creator"
|
self.title = "Hob -- Image Creator"
|
||||||
else:
|
else:
|
||||||
self.title = title
|
self.title = title
|
||||||
|
self.title_label = gtk.Label()
|
||||||
|
|
||||||
self.box_group_area = gtk.VBox(False, 12)
|
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)
|
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.group_align.add(self.box_group_area)
|
||||||
self.box_group_area.set_homogeneous(False)
|
self.box_group_area.set_homogeneous(False)
|
||||||
|
|
||||||
|
def set_title(self, title):
|
||||||
|
self.title = title
|
||||||
|
self.title_label.set_markup("<span size='x-large'>%s</span>" % self.title)
|
||||||
|
|
||||||
def add_onto_top_bar(self, widget = None, padding = 0):
|
def add_onto_top_bar(self, widget = None, padding = 0):
|
||||||
# the top button occupies 1/7 of the page height
|
# the top button occupies 1/7 of the page height
|
||||||
|
@ -58,9 +62,8 @@ class HobPage (gtk.VBox):
|
||||||
|
|
||||||
hbox = gtk.HBox()
|
hbox = gtk.HBox()
|
||||||
|
|
||||||
label = gtk.Label()
|
self.title_label.set_markup("<span size='x-large'>%s</span>" % self.title)
|
||||||
label.set_markup("<span size='x-large'>%s</span>" % self.title)
|
hbox.pack_start(self.title_label, expand=False, fill=False, padding=20)
|
||||||
hbox.pack_start(label, expand=False, fill=False, padding=20)
|
|
||||||
|
|
||||||
if widget:
|
if widget:
|
||||||
# add the widget in the event box
|
# add the widget in the event box
|
||||||
|
|
|
@ -123,7 +123,7 @@ class RecipeSelectionPage (HobPage):
|
||||||
TASKS) = range(3)
|
TASKS) = range(3)
|
||||||
|
|
||||||
def __init__(self, builder = None):
|
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
|
# set invisible members
|
||||||
self.recipe_model = self.builder.recipe_model
|
self.recipe_model = self.builder.recipe_model
|
||||||
|
|
Loading…
Reference in New Issue