diff options
author | Joshua Lock <josh@linux.intel.com> | 2012-03-22 15:54:37 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-23 16:10:22 +0000 |
commit | f76dcdb1cad85dd755ae14d18b3f5f7c67e273ee (patch) | |
tree | 5075e50585ce766af11e8f2c9aa29a6345df25cc /bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | |
parent | ce914a6742fd7802452295fb49cca58d3a2f133c (diff) | |
download | poky-f76dcdb1cad85dd755ae14d18b3f5f7c67e273ee.tar.gz |
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>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index c358a970e4..836bd0a798 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | |||
@@ -24,7 +24,7 @@ import gtk | |||
24 | import glib | 24 | import glib |
25 | from bb.ui.crumbs.progressbar import HobProgressBar | 25 | from bb.ui.crumbs.progressbar import HobProgressBar |
26 | from bb.ui.crumbs.hobcolor import HobColors | 26 | from bb.ui.crumbs.hobcolor import HobColors |
27 | from bb.ui.crumbs.hobwidget import hic, HobXpmLabelButtonBox, HobInfoButton, HobAltButton | 27 | from bb.ui.crumbs.hobwidget import hic, HobImageButton, HobInfoButton, HobAltButton, HobButton |
28 | from bb.ui.crumbs.hoblistmodel import RecipeListModel | 28 | from bb.ui.crumbs.hoblistmodel import RecipeListModel |
29 | from bb.ui.crumbs.hobpages import HobPage | 29 | from bb.ui.crumbs.hobpages import HobPage |
30 | 30 | ||
@@ -139,9 +139,9 @@ class ImageConfigurationPage (HobPage): | |||
139 | 139 | ||
140 | icon_file = hic.ICON_LAYERS_DISPLAY_FILE | 140 | icon_file = hic.ICON_LAYERS_DISPLAY_FILE |
141 | hover_file = hic.ICON_LAYERS_HOVER_FILE | 141 | hover_file = hic.ICON_LAYERS_HOVER_FILE |
142 | self.layer_button = HobXpmLabelButtonBox(icon_file, hover_file, | 142 | self.layer_button = HobImageButton("Layers", "Add support for machines, software, etc.", |
143 | "Layers", "Add support for machines, software, etc") | 143 | icon_file, hover_file) |
144 | self.layer_button.connect("button-release-event", self.layer_button_clicked_cb) | 144 | self.layer_button.connect("clicked", self.layer_button_clicked_cb) |
145 | 145 | ||
146 | markup = "Layers are a powerful mechanism to extend the Yocto Project " | 146 | markup = "Layers are a powerful mechanism to extend the Yocto Project " |
147 | markup += "with your own functionality.\n" | 147 | markup += "with your own functionality.\n" |
@@ -163,9 +163,9 @@ class ImageConfigurationPage (HobPage): | |||
163 | self.gtable.attach(self.machine_title, 0, 40, 0, 4) | 163 | self.gtable.attach(self.machine_title, 0, 40, 0, 4) |
164 | self.gtable.attach(self.machine_title_desc, 0, 40, 4, 6) | 164 | self.gtable.attach(self.machine_title_desc, 0, 40, 4, 6) |
165 | self.gtable.attach(self.machine_combo, 0, 12, 6, 9) | 165 | self.gtable.attach(self.machine_combo, 0, 12, 6, 9) |
166 | self.gtable.attach(self.layer_button, 12, 36, 6, 10) | 166 | self.gtable.attach(self.layer_button, 12, 36, 6, 11) |
167 | self.gtable.attach(self.layer_info_icon, 36, 40, 6, 9) | 167 | self.gtable.attach(self.layer_info_icon, 36, 40, 6, 10) |
168 | if show_progress_bar == True: | 168 | if show_progress_bar: |
169 | self.gtable.attach(self.progress_box, 0, 40, 13, 17) | 169 | self.gtable.attach(self.progress_box, 0, 40, 13, 17) |
170 | self.gtable.attach(self.machine_separator, 0, 40, 12, 13) | 170 | self.gtable.attach(self.machine_separator, 0, 40, 12, 13) |
171 | 171 | ||
@@ -186,22 +186,24 @@ class ImageConfigurationPage (HobPage): | |||
186 | self.image_combo_id = self.image_combo.connect("changed", self.image_combo_changed_cb) | 186 | self.image_combo_id = self.image_combo.connect("changed", self.image_combo_changed_cb) |
187 | 187 | ||
188 | self.image_desc = gtk.Label() | 188 | self.image_desc = gtk.Label() |
189 | self.image_desc.set_alignment(0, 0) | 189 | self.image_desc.set_alignment(0, 0.5) |
190 | self.image_desc.set_line_wrap(True) | 190 | self.image_desc.set_line_wrap(True) |
191 | 191 | ||
192 | # button to view recipes | 192 | # button to view recipes |
193 | icon_file = hic.ICON_RCIPE_DISPLAY_FILE | 193 | icon_file = hic.ICON_RCIPE_DISPLAY_FILE |
194 | hover_file = hic.ICON_RCIPE_HOVER_FILE | 194 | hover_file = hic.ICON_RCIPE_HOVER_FILE |
195 | self.view_recipes_button = HobXpmLabelButtonBox(icon_file, hover_file, | 195 | self.view_recipes_button = HobImageButton("View Recipes", |
196 | "View Recipes", "Add/remove recipes and collections") | 196 | "Add/remove recipes and collections", |
197 | self.view_recipes_button.connect("button-release-event", self.view_recipes_button_clicked_cb) | 197 | icon_file, hover_file) |
198 | self.view_recipes_button.connect("clicked", self.view_recipes_button_clicked_cb) | ||
198 | 199 | ||
199 | # button to view packages | 200 | # button to view packages |
200 | icon_file = hic.ICON_PACKAGES_DISPLAY_FILE | 201 | icon_file = hic.ICON_PACKAGES_DISPLAY_FILE |
201 | hover_file = hic.ICON_PACKAGES_HOVER_FILE | 202 | hover_file = hic.ICON_PACKAGES_HOVER_FILE |
202 | self.view_packages_button = HobXpmLabelButtonBox(icon_file, hover_file, | 203 | self.view_packages_button = HobImageButton("View Packages", |
203 | "View Packages", "Add/remove previously built packages to/from your image") | 204 | "Add/remove previously built packages to/from your image", |
204 | self.view_packages_button.connect("button-release-event", self.view_packages_button_clicked_cb) | 205 | icon_file, hover_file) |
206 | self.view_packages_button.connect("clicked", self.view_packages_button_clicked_cb) | ||
205 | 207 | ||
206 | self.image_separator = gtk.HSeparator() | 208 | self.image_separator = gtk.HSeparator() |
207 | 209 | ||
@@ -213,8 +215,8 @@ class ImageConfigurationPage (HobPage): | |||
213 | self.gtable.attach(self.image_separator, 0, 40, 35, 36) | 215 | self.gtable.attach(self.image_separator, 0, 40, 35, 36) |
214 | 216 | ||
215 | def set_rcppkg_layout(self): | 217 | def set_rcppkg_layout(self): |
216 | self.gtable.attach(self.view_recipes_button, 0, 18, 28, 32) | 218 | self.gtable.attach(self.view_recipes_button, 0, 20, 27, 32) |
217 | self.gtable.attach(self.view_packages_button, 18, 40, 28, 32) | 219 | self.gtable.attach(self.view_packages_button, 20, 40, 27, 32) |
218 | 220 | ||
219 | def create_config_build_button(self): | 221 | def create_config_build_button(self): |
220 | # Create the "Build packages" and "Just bake" buttons at the bottom | 222 | # Create the "Build packages" and "Just bake" buttons at the bottom |
@@ -343,14 +345,14 @@ class ImageConfigurationPage (HobPage): | |||
343 | self.image_combo.set_active(-1) | 345 | self.image_combo.set_active(-1) |
344 | self.image_combo.set_active(active) | 346 | self.image_combo.set_active(active) |
345 | 347 | ||
346 | def layer_button_clicked_cb(self, event, data): | 348 | def layer_button_clicked_cb(self, button): |
347 | # Create a layer selection dialog | 349 | # Create a layer selection dialog |
348 | self.builder.show_layer_selection_dialog() | 350 | self.builder.show_layer_selection_dialog() |
349 | 351 | ||
350 | def view_recipes_button_clicked_cb(self, event, data): | 352 | def view_recipes_button_clicked_cb(self, button): |
351 | self.builder.show_recipes() | 353 | self.builder.show_recipes() |
352 | 354 | ||
353 | def view_packages_button_clicked_cb(self, event, data): | 355 | def view_packages_button_clicked_cb(self, button): |
354 | self.builder.show_packages() | 356 | self.builder.show_packages() |
355 | 357 | ||
356 | def just_bake_button_clicked_cb(self, button): | 358 | def just_bake_button_clicked_cb(self, button): |