summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-07-25 07:21:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-06 13:02:23 +0100
commit843ef1083243e1569d6cc429ae26e22dda699149 (patch)
tree27a9c74f2579c2c02f671a21daae9f60af7b56d4 /bitbake/lib/bb
parentadcce841b470cdec3788bc2e54c0588d34d94ea3 (diff)
downloadpoky-843ef1083243e1569d6cc429ae26e22dda699149.tar.gz
bitbake: hob: labelling changes in Hob
When the design document for templates in Hob was created, we've noticed that some labels need to change. [YOCTO #4193] (Bitbake rev: fcbadbb73a8a94a3d5e330e1a5fa9550130d2c62) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py2
-rw-r--r--bitbake/lib/bb/ui/crumbs/hoblistmodel.py4
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py22
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/imagedetailspage.py11
4 files changed, 20 insertions, 19 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 8788083d5c..4c6e6fd06e 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -174,7 +174,7 @@ class HobHandler(gobject.GObject):
174 targets.append(self.toolchain) 174 targets.append(self.toolchain)
175 if targets[0] == "hob-image": 175 if targets[0] == "hob-image":
176 hobImage = self.runCommand(["matchFile", "hob-image.bb"]) 176 hobImage = self.runCommand(["matchFile", "hob-image.bb"])
177 if self.base_image != "Create your own image": 177 if self.base_image != "Start with an empty image recipe":
178 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"]) 178 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"])
179 version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue]) 179 version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue])
180 targets[0] += version 180 targets[0] += version
diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
index 7f7d82f86b..94c2453abd 100644
--- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
@@ -476,7 +476,7 @@ class RecipeListModel(gtk.ListStore):
476 (COL_NAME, COL_DESC, COL_LIC, COL_GROUP, COL_DEPS, COL_BINB, COL_TYPE, COL_INC, COL_IMG, COL_INSTALL, COL_PN, COL_FADE_INC, COL_SUMMARY, COL_VERSION, 476 (COL_NAME, COL_DESC, COL_LIC, COL_GROUP, COL_DEPS, COL_BINB, COL_TYPE, COL_INC, COL_IMG, COL_INSTALL, COL_PN, COL_FADE_INC, COL_SUMMARY, COL_VERSION,
477 COL_REVISION, COL_HOMEPAGE, COL_BUGTRACKER) = range(17) 477 COL_REVISION, COL_HOMEPAGE, COL_BUGTRACKER) = range(17)
478 478
479 __custom_image__ = "Create your own image" 479 __custom_image__ = "Start with an empty image recipe"
480 480
481 __gsignals__ = { 481 __gsignals__ = {
482 "recipe-selection-changed" : (gobject.SIGNAL_RUN_LAST, 482 "recipe-selection-changed" : (gobject.SIGNAL_RUN_LAST,
@@ -679,7 +679,7 @@ class RecipeListModel(gtk.ListStore):
679 679
680 # dummy image for prompt 680 # dummy image for prompt
681 self.set(self.append(), self.COL_NAME, self.__custom_image__, 681 self.set(self.append(), self.COL_NAME, self.__custom_image__,
682 self.COL_DESC, "Use 'Edit image' to customize recipes and packages " \ 682 self.COL_DESC, "Use 'Edit image recipe' to customize recipes and packages " \
683 "to be included in your image ", 683 "to be included in your image ",
684 self.COL_LIC, "", self.COL_GROUP, "", 684 self.COL_LIC, "", self.COL_GROUP, "",
685 self.COL_DEPS, "", self.COL_BINB, "", 685 self.COL_DEPS, "", self.COL_BINB, "",
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index 1f7453ac33..e4c66060bf 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -35,7 +35,7 @@ from bb.ui.crumbs.hobpages import HobPage
35class ImageConfigurationPage (HobPage): 35class ImageConfigurationPage (HobPage):
36 36
37 __dummy_machine__ = "--select a machine--" 37 __dummy_machine__ = "--select a machine--"
38 __dummy_image__ = "--select a base image--" 38 __dummy_image__ = "Select from my image recipes"
39 39
40 def __init__(self, builder): 40 def __init__(self, builder):
41 super(ImageConfigurationPage, self).__init__(builder, "Image configuration") 41 super(ImageConfigurationPage, self).__init__(builder, "Image configuration")
@@ -200,12 +200,9 @@ class ImageConfigurationPage (HobPage):
200 markup += "http://www.yoctoproject.org/docs/current/dev-manual/" 200 markup += "http://www.yoctoproject.org/docs/current/dev-manual/"
201 markup += "dev-manual.html#understanding-and-using-layers\">reference manual</a>." 201 markup += "dev-manual.html#understanding-and-using-layers\">reference manual</a>."
202 self.layer_info_icon = HobInfoButton("<b>Layers</b>" + "*" + markup, self.get_parent()) 202 self.layer_info_icon = HobInfoButton("<b>Layers</b>" + "*" + markup, self.get_parent())
203# self.progress_box = gtk.HBox(False, 6)
204 self.progress_bar = HobProgressBar() 203 self.progress_bar = HobProgressBar()
205# self.progress_box.pack_start(self.progress_bar, expand=True, fill=True)
206 self.stop_button = HobAltButton("Stop") 204 self.stop_button = HobAltButton("Stop")
207 self.stop_button.connect("clicked", self.stop_button_clicked_cb) 205 self.stop_button.connect("clicked", self.stop_button_clicked_cb)
208# self.progress_box.pack_end(stop_button, expand=False, fill=False)
209 self.machine_separator = gtk.HSeparator() 206 self.machine_separator = gtk.HSeparator()
210 207
211 def set_config_machine_layout(self, show_progress_bar = False): 208 def set_config_machine_layout(self, show_progress_bar = False):
@@ -229,14 +226,15 @@ class ImageConfigurationPage (HobPage):
229 def create_config_baseimg(self): 226 def create_config_baseimg(self):
230 self.image_title = gtk.Label() 227 self.image_title = gtk.Label()
231 self.image_title.set_alignment(0, 1.0) 228 self.image_title.set_alignment(0, 1.0)
232 mark = "<span %s>Select a base image</span>" % self.span_tag('x-large', 'bold') 229 mark = "<span %s>Select an image recipe</span>" % self.span_tag('x-large', 'bold')
233 self.image_title.set_markup(mark) 230 self.image_title.set_markup(mark)
234 231
235 self.image_title_desc = gtk.Label() 232 self.image_title_desc = gtk.Label()
236 self.image_title_desc.set_alignment(0, 0.5) 233 self.image_title_desc.set_alignment(0, 0.5)
237 mark = ("<span %s>Base images are a starting point for the type of image you want. " 234
235 mark = ("<span %s>Image recipes are a starting point for the type of image you want. "
238 "You can build them as \n" 236 "You can build them as \n"
239 "they are or customize them to your specific needs.\n</span>") % self.span_tag('medium') 237 "they are or edit them to suit your needs.\n</span>") % self.span_tag('medium')
240 self.image_title_desc.set_markup(mark) 238 self.image_title_desc.set_markup(mark)
241 239
242 self.image_combo = gtk.combo_box_new_text() 240 self.image_combo = gtk.combo_box_new_text()
@@ -272,15 +270,13 @@ class ImageConfigurationPage (HobPage):
272 270
273 # create button "Build image" 271 # create button "Build image"
274 self.just_bake_button = HobButton("Build image") 272 self.just_bake_button = HobButton("Build image")
275 #self.just_bake_button.set_size_request(205, 49) 273 self.just_bake_button.set_tooltip_text("Build the image recipe as it is")
276 self.just_bake_button.set_tooltip_text("Build target image")
277 self.just_bake_button.connect("clicked", self.just_bake_button_clicked_cb) 274 self.just_bake_button.connect("clicked", self.just_bake_button_clicked_cb)
278 button_box.pack_end(self.just_bake_button, expand=False, fill=False) 275 button_box.pack_end(self.just_bake_button, expand=False, fill=False)
279 276
280 # create button "Edit Image" 277 # create button "Edit image recipe"
281 self.edit_image_button = HobAltButton("Edit image") 278 self.edit_image_button = HobAltButton("Edit image recipe")
282 #self.edit_image_button.set_size_request(205, 49) 279 self.edit_image_button.set_tooltip_text("Customize the recipes and packages to be included in your image")
283 self.edit_image_button.set_tooltip_text("Edit target image")
284 self.edit_image_button.connect("clicked", self.edit_image_button_clicked_cb) 280 self.edit_image_button.connect("clicked", self.edit_image_button_clicked_cb)
285 button_box.pack_end(self.edit_image_button, expand=False, fill=False) 281 button_box.pack_end(self.edit_image_button, expand=False, fill=False)
286 282
diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
index 268ac68b40..4b0e7498cd 100755
--- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
+++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
@@ -333,13 +333,18 @@ class ImageDetailsPage (HobPage):
333 # self.kernel_detail = self.DetailBox(varlist=varlist, vallist=vallist, button=change_kernel_button) 333 # self.kernel_detail = self.DetailBox(varlist=varlist, vallist=vallist, button=change_kernel_button)
334 # self.box_group_area.pack_start(self.kernel_detail, expand=True, fill=True) 334 # self.box_group_area.pack_start(self.kernel_detail, expand=True, fill=True)
335 335
336 # Machine, Base image and Layers 336 # Machine, Image recipe and Layers
337 layer_num_limit = 15 337 layer_num_limit = 15
338 varlist = ["Machine: ", "Base image: ", "Layers: "] 338 varlist = ["Machine: ", "Image recipe: ", "Layers: "]
339 vallist = [] 339 vallist = []
340 self.setting_detail = None 340 self.setting_detail = None
341 if self.build_succeeded: 341 if self.build_succeeded:
342 vallist.append(machine) 342 vallist.append(machine)
343 if base_image == self.builder.recipe_model.__custom_image__:
344 if self.builder.configuration.initial_selected_image == self.builder.recipe_model.__custom_image__:
345 base_image ="New image recipe"
346 else:
347 base_image = self.builder.configuration.initial_selected_image + " (edited)"
343 vallist.append(base_image) 348 vallist.append(base_image)
344 i = 0 349 i = 0
345 for layer in layers: 350 for layer in layers:
@@ -359,7 +364,7 @@ class ImageDetailsPage (HobPage):
359 i += 1 364 i += 1
360 365
361 edit_config_button = HobAltButton("Edit configuration") 366 edit_config_button = HobAltButton("Edit configuration")
362 edit_config_button.set_tooltip_text("Edit machine, base image and recipes") 367 edit_config_button.set_tooltip_text("Edit machine and image recipe")
363 edit_config_button.connect("clicked", self.edit_config_button_clicked_cb) 368 edit_config_button.connect("clicked", self.edit_config_button_clicked_cb)
364 self.setting_detail = self.DetailBox(varlist=varlist, vallist=vallist, button=edit_config_button) 369 self.setting_detail = self.DetailBox(varlist=varlist, vallist=vallist, button=edit_config_button)
365 self.box_group_area.pack_start(self.setting_detail, expand=True, fill=True) 370 self.box_group_area.pack_start(self.setting_detail, expand=True, fill=True)