Commit Graph

46 Commits

Author SHA1 Message Date
Ioana Grigoropol 0e1a427a25 bitbake: hob: Buttons width and height are taken for host
- removed all set_size_request calls for buttons in order to:
	- force autosizing of buttons with regard to the text length
	- use host theme default height for buttons
- modified buttons on image details page to have the same height (default host one) and the width of the button with the largest text
- modified Stop button on build details page to have the default height by directly attaching it to the containing table instead of hbox

(Bitbake rev: 9cdfaa17309d368c3bbae0f1cce0ad875d340e83)

Signed-off-by: Ioana Grigoropol <ioanax.grigoropol@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-27 16:45:25 +01:00
Valentin Popa b3ba9eb7e2 bitbake: Implement 'settings' dialog as designed
[YOCTO #2162]

(Bitbake rev: ac75b06744e73399ca1fbda322ef851ae5754b0a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-14 09:50:36 +01:00
Paul Eggleton 78b14140d6 bitbake: hob: sort base image drop-down list
Sort the list of base images to make it easier to find a specific image
in the list. Note that "Create your own image" still remains the last
item in the list.

(Bitbake rev: db16f575a774de7d9d44b4bc727b252de5d0f34d)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-14 09:50:32 +01:00
Cristiana Voicu e843d56a31 bitbake: hob/imageconfigurationpage: remove or_label reference
When or_label was removed, I forgot to remove also the references to it.

[YOCTO #3010]

(Bitbake rev: 4d208aaedd60f79a4277f501fdbf8c2afc32c250)

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-10 13:14:08 +01:00
Cristiana Voicu 34c4b3a93d bitbake: hob/imageconfigurationpage: Set secondary action for "Edit image" button
The image configuration screen should have only one primary action.
"Edit image" button has now secondary action, and also I have removed
"or" label.

[YOCTO #3010]

(Bitbake rev: f54191dac18b4e1100944cc6da86705c1e9c1683)

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-07 12:10:41 +01:00
Cristian Iorga 164083d31f bitbake: Hob wizard-like reorganization
Hob is now more context-sensitive regarding
user changes/options. Also, the workflow have been
streamlined and resembles more of a wizard.
Beautified some hardcoded values.
Fixed typo.
New streamlined Image Configuration page.
Build and/or Edit image buttons presence
is context sensitive.
Recipes and packages tabs selected automatically
based on custom image or pre-defined target image
(included or all).
Context sensitive Back button.

Fixes [YOCTO 2165]

(Bitbake rev: b48cd7dcf57b1abc8c5b46ced11d4f57bf06e557)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-22 13:59:55 +01:00
Liming An 574b5ecfa5 Hob: fixed the index issue when set actived item for base image combo
The combo item index dosn't be increased as the insert a dummy item, when
execute the upadate base image combo operation.

[YOCTO #2500]

(Bitbake rev: 59e19634a84fcb4c34b92cdcf7a9ea807c9abb63)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-08 12:13:16 +01:00
Liming An 3ee1cfab7d Hob: fixed the line width of base image description view
As ui design, adjusted the line width for each base image description

[YOCTO 2310]

(Bitbake rev: 8bce98b23bc9cbc4da4464bfbaeb4e1a1aaca5c5)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-23 11:33:18 +01:00
Liming An 39a9267dee Hob: add '--select a machine--' and '--select a base image--' to GUI
[YOCTO #2175]

(Bitbake rev: 2729729012f035043fedc5098be2ec12b761166d)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-22 14:56:17 +01:00
Dongxiao Xu 5c880fb301 Hob: Get image name internally when updating the image description
The image name shouldn't be passed from outside caller, since the image
name may not in the combobox list. Getting the name from
update_image_desc() internally.

(Bitbake rev: 6635cd7bc2a448d1324e9344100f97613f4272b5)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-22 14:56:16 +01:00
Dongxiao Xu 7690c45c71 Hob: Add filter for images listed in image combo
Define BBUI_IMAGE_WHITE_PATTERN variable to indicate which image is
allowed to be displayed in image combobox.

Define BBUI_IMAGE_BLACK_PATTERN variable to indicate which image is NOT
allowed to be displayed in image combobox.

This fixes [YOCTO #1581]

(Bitbake rev: 960461bc12945675af3081eb469f932f4a6eb1cd)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-22 14:56:16 +01:00
Joshua Lock f9aa3dadb1 lib/bb/ui/crumbs/imageconfiguration: fix combo boxes drop-down width
The width of the combo boxes drop down should match the combo box
itself.

(Bitbake rev: 93e66f494730d0840dd1d4f3ed924d91e6489995)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-20 09:24:25 +01:00
Liming An e80c1a3708 Hob: Apply a line length to consistantly display image descriptions
[YOCTO #2310]

(Bitbake rev: e9d65e06aaf20bd9f5ca02544c1bf976c6bff9be)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-20 09:24:24 +01:00
Shane Wang 9ff001cba1 Hob: reset user recipe selection and package selection after settings are changed
Reset user recipe list and package list after the user changes the settings and
triggers recipe reparsing.

This is to continue to fix the bug [Yocto #2255]

[Yocto #2255]

(Bitbake rev: 95f4e9dc351f67442844ff52f90fc154fa95ba95)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-14 23:48:48 +01:00
Shane Wang ccf4f7653b Hob: forget selected_recipes and selected_packages after users change the machine
The patch is to fix [Yocto #2255]. Now the logic is:

- If users change the machine, the image combo is empty for users to select.
- If users load the template, the image combo should set the value of
  selected_image specified in the template.
- After loading a template, if users change the machine, the selected_image
  specified in the template should be removed from the image combo because
  it is probably invalid for a new machine.
- If users customize the recipe/package list, and change the settings which
  causes reparsing, selected_recipes and selected_packages should be remembered.
- If users add more layers, selected_recipes and selected_packages should be
  remembered.

(Bitbake rev: e549b11f4f31863393f62a253ee96bead4594523)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-11 00:05:22 +01:00
Shane Wang 59cd6a56e3 Hob: clean up and reword stop_parse()
(Bitbake rev: f6e0d93c96d1626e7da298e296b1be9e425173b2)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-11 00:05:22 +01:00
Shane Wang 47caae2f21 Hob: clean up and unify the steps for RCPPKGINFO_POPULATING to call populate_recipe_package_info_async()
For the steps in RCPPKGINFO_POPULATING, This patch consolidates them into
populate_recipe_package_info_async() to call.

(Bitbake rev: ed2aa6f235e1b789af8a33729302a4269674c6b4)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-11 00:04:45 +01:00
Dongxiao Xu f9d7043b62 Hob: Fix tooltips in image configuration page
This fixes [YOCTO #2228]

(Bitbake rev: f99e90726716bc89bdd980a3db027f1c3a66f2fa)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-11 00:04:43 +01:00
Dongxiao Xu c546037dc9 Hob: Change base image to "Create your own image" if customized
Once user did customization to his base image, we change the base image
to be "Create your own image" to avoid some issues caused by the
relationship between base image and its default recipes and packages.

This fixes [YOCTO #2211]

(Bitbake rev: 8edad8d282b69896237e956a00c66cd4d10ef494)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-11 00:04:42 +01:00
Shane Wang 0d76c5b9c5 Hob: avoid the empty white space appearing on top of the gtk.ComboBox
Avoid the empty white space appearing on top of the machine selection combo
box and the image selection combo box in the "Image configuration" screen

[Yocto #2166]

(Bitbake rev: 9d30ad56803c67d2dc7ebddd7c339038438f02ba)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-05 18:48:07 +01:00
Dongxiao Xu 041cc16dd9 Hob: Check "dummy" image while update_image_combo
We also need to check if the selected image is "Create your own image"
and set it as active.

Besides, to avoid the impact of set_active(), we need to move the
connect signal in the end of the update_image_combo() function.

(Bitbake rev: 54ae7ddac450b4717e5ccae3bfe9acb479449451)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-05 15:13:41 +01:00
Joshua Lock 8c5536543f Hob: tweak font sizes and layout
Switch to proportional font sizes and tweak padding and layout based on
feedback from design team.

(Bitbake rev: 356f190bb3f0ee9a15df900714edcb85593d6989)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-30 17:20:20 +01:00
Shane Wang 59ca1af3a1 Hob: Change "Just bake" to "Build image" as required
[Yocto #2160]

(Bitbake rev: 4ed5b8b862027755d5e9e480fd8a1d0250f7a3b7)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:25:54 +01:00
Joshua Lock 57434b40b8 lib/bb/ui/crumbs: hob progress bar should not be red when user stops build
If the user explicitly stops the build telling them the build failed is a
misnomer.

(Bitbake rev: 722f4f0e31f9debf5ad20a91da759a8c25151567)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:12:57 +01:00
Joshua Lock 25e9e16a39 lib/bb/ui/crumbs/imageconfigurationpage: add extra space between widgets
Add space between the target machine combo and the 'Layers' button.

(Bitbake rev: bdd50d92e90f96bf7ff433bb539cdde4b0d21cdb)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:12:57 +01:00
Shane Wang 3ac86ce2ea Hob: change some words on image configuration screen to make them consistent
(Bitbake rev: 6d5bcf80afbd081d41572985b724c615bd3a16b6)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:12:56 +01:00
Shane Wang ff43873706 Hob: add Templates and Settings on image details screen
This patch is to add Templates and Settings tool buttons on the image
details screen, which makes things easier and simplier.

In order to fulfill that, the code splits the functions
show_load_template_dialog() and show_adv_settings_dialog() in builder.py
because they will possibly be called from different screens later.

[Yocto #2163]

(Bitbake rev: 29bea7b7076a7b74d36237da86a4eff6605d17ec)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:12:56 +01:00
Joshua Lock 9df6a793cb lib/bb/ui/crumbs/imageconfigurationpage: ensure widgets stay positioned
Tweak the table layout and insert some dummy widgets when the buttons
aren't drawn such that when the buttons do get drawn the existing widgets
don't all jump up.

(From Poky rev: 9edd833e7e36aea6a7350a36a5aad0ef300959c4)

(Bitbake rev: c09f71414d459eb926aa567d90a63407407d173e)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-28 16:49:18 +01:00
Shane Wang ad5dd7d3ca Hob: Change the descriptions for view_recipe_button and view_package_button
Change the text of view_recipe_button to 'Add/remove recipes and tasks'
Change the text of view_packages_button to 'Add/remove previously built packages'

[Yocto #2146]

(Bitbake rev: 0348ef08db9ac425d83126d2e6eb465adc28b110)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-23 16:10:25 +00:00
Joshua Lock ac53520823 lib/bb/ui/crumbs: make use of HobButton for existing primary action buttons
Replace all gtk.Button instances that have the orange style applied with
HobButton.

(Bitbake rev: f4dfdc23a6498fdaa164a1bfccf616ff8fcbd251)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-23 16:10:24 +00:00
Joshua Lock f76dcdb1ca lib/bb/ui/crumbs: replace HobXpmLabelButtonBox with HobImageButton
HobImageButton is an gtk.Button subclass, and therefore behaves like a
button with prelight and focus states, with an icon and two lines of text -
primary and secondary. The secondary text is displayed in a lighter colour
using a new module method, soften_color(), per the design.

(Bitbake rev: b91cc96c4ff4195ac26fdfd1fb0c2ff8db06aff8)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-23 16:10:22 +00:00
Shane Wang 8dda137c12 Hob: Revert interfaces of callbacks for layer_button, view_recipes_button, and view_packages_button.
(From Poky rev: 35942a7dd973796673ab0215f68b4a25356ec053)

(Bitbake rev: 96e235a151fa04f5a15cd8b46f50a5852e2ba739)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-22 14:43:51 +00:00
Joshua Lock 21970f4755 lib/bb/ui/crumbs: Add HobAltButton and use it
This adds a gtk.Button subclass for secondary actions which unsets the
relief so that the user is aware that the button is clickable and yet it is
more subtle than the primary action (such that the primary action is the
most obvious one) - this is per the interaction design.

Further we replace all uses of gtk.LinkButton with the new HobAltButton

Partially addresses [YOCTO #2105], a follow on patch will theme the button
so that it matches the visual design.

(From Poky rev: c3f17fed243180678264168968333463b203bfa0)

(Bitbake rev: 601521c2d7f5568d94529a77b2cbe19fef7cbf48)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-22 14:40:41 +00:00
Shane Wang b8cbd7e445 Hob: Change "View Packages" description
Change 'View Packages' button description from 'Add/remove packages' to 'Add/remove previously built packages to/from your image'.
And we adjust the size to make "View Packages" button fit into the window.

[Yocto #2146]

(From Poky rev: 279dbff3ef9f8e8bc58b86f8c4f5ffe70d4a2e8b)

(Bitbake rev: 594f5936c2450d596967f062c14434f5357cb5aa)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-22 14:40:40 +00:00
Dongxiao Xu df20012654 Hob: Move "Create your own image" to the bottom of image list
Move "Create your own image" item to the bottom of base image list.
Besides, remove an un-used hob list entry.

This fixes [YOCTO #2104]

(From Poky rev: f215ce518ad644ca4747ae17279db4b82d0c715d)

(Bitbake rev: 7e00723a6508023ffbefed2c2de1bc9c55564faa)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-22 14:40:39 +00:00
Dongxiao Xu ec6272396f Hob: Change template button name from "Template" to "Templates"
Change the button name according to UI team's design.

This fixes [YOCTO #2126]

(From Poky rev: 1e4477f9b121b2523685cc6440050c47d3ae1cde)

(Bitbake rev: f75dde11f2d73119702026d4dd531c0b242303c7)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-22 14:40:39 +00:00
Joshua Lock 740bd44c5a ui/crumbs: remove unused return value from append_toolbar_button
No caller of the method uses the returned toolbar variable

(Bitbake rev: 77ed4bb3468d5d256f08329fd307df5a219ae242)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:35 +00:00
Dongxiao Xu 602adb0e58 Hob: Change Box's padding value
For Box type of widget, change the padding value to be HIG consistent,
that is an increments of 6 pixels.

(Bitbake rev: 0347e99ca5c232832f2b490584d76872c6d77311)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-15 10:35:18 +00:00
Dongxiao Xu ea8a7a82da Hob: Add stop button for parsing progress
Add a Stop button to allow user to quit the parsing process.

(Bitbake rev: a1936ff544f21cde0765f24dc9b0af126ca98752)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-15 10:35:17 +00:00
Dongxiao Xu c1cc10d013 Hob: Show recipe/package editing button after base image is selected
Only show recipe and package editing button after base image is selected.

(Bitbake rev: 5290d99f4d0f36076c59ec0b59e3f69b04d69ebf)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-15 10:35:16 +00:00
Dongxiao Xu 552672abba Hob: Remove the indication in machine/base image combobox
Remove the "--select a machine--" prompt in machine selection.
Also change "--select a base image--" to "Start from scratch" for
base image selection.

(Bitbake rev: ac36d218ed6793d6fbf3edfadaf193629ea1e46d)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-15 10:35:16 +00:00
Joshua Lock ee0c3023c4 ui/crumbs/imageconfigurationpage: make use of the HobInfoButton
Use the new HobInfoButton widget in place of the existing gtk.Image with
tooltip.

Modify the markup of the tooltip so that the link to the reference manual
is a clickable hyperlink.

(Bitbake rev: 10b4a6770640db49f2f55b8ad7ce55aebb250598)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-12 02:26:13 +00:00
Shane Wang 69317f70e9 Hob: make the image configuration page not to flash the progress bar
Sometimes the image configuration page flashes the progress bar, that is because we show_all() and then hide() the progress bar. For this case, the patch doesn't add the progress bar onto the gtable. Then, it will not be flashed any more.

(Bitbake rev: ef472710589580b9bfc64d2c02fa42f3ecbdfeb1)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-01 15:51:32 +00:00
Shane Wang 23efe612f6 Hob: fix a bug in builder.configuration.curr_mach
When the user changes the machine to be "--select a machine--", the builder.configuration.curr_mach should be set to empty.
Otherwise, if the user adds more layers after the above, the action will trigger recipe parsing, which is not correct.

(Bitbake rev: d5c7c9471b8e101ebcb91d707415b9c820b1419f)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-01 15:51:32 +00:00
Shane Wang edf3942403 Hob: image configuration page doesn't need dialogs any more
The dialog references are all in builder.py. We remove the useless "import" in image configuration page.

(Bitbake rev: 804f35e6864aeae2bb02550d9eb34120bbb60fa0)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-01 15:51:32 +00:00
Dongxiao Xu 656f9a0758 Hob: A new implemetation (v2)
This commit implements a new design for hob
Some of the new features:
 - Friendly new designed GUI. Quick response to user actions.
 - Two step builds support package generation and image generation.
 - Support running GUI seprarately from bitbake server.
 - Recipe/package selection and deselection.
 - Accurate customization for image contents and size.
 - Progress bars showing the parsing and build status.
 - Load/save user configurations from/into templates.

(Bitbake rev: 4dacd29f9c957d20f4583330b51e5420f9c3338d)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Fengxia Hua <fengxia.hua@intel.com>
Designed-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-24 18:04:27 +00:00