diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2013-07-25 07:21:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-06 13:02:23 +0100 |
commit | 843ef1083243e1569d6cc429ae26e22dda699149 (patch) | |
tree | 27a9c74f2579c2c02f671a21daae9f60af7b56d4 /bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | |
parent | adcce841b470cdec3788bc2e54c0588d34d94ea3 (diff) | |
download | poky-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/ui/crumbs/imageconfigurationpage.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 22 |
1 files changed, 9 insertions, 13 deletions
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 | |||
35 | class ImageConfigurationPage (HobPage): | 35 | class 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 | ||