diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobwidget.py | 36 | ||||
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 8 |
2 files changed, 23 insertions, 21 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobwidget.py b/bitbake/lib/bb/ui/crumbs/hobwidget.py index 7c23440630..3ab30a6fce 100644 --- a/bitbake/lib/bb/ui/crumbs/hobwidget.py +++ b/bitbake/lib/bb/ui/crumbs/hobwidget.py | |||
@@ -214,7 +214,7 @@ def soften_color(widget, state=gtk.STATE_NORMAL): | |||
214 | color.blue = color.blue * blend + style.base[state].blue * (1.0 - blend) | 214 | color.blue = color.blue * blend + style.base[state].blue * (1.0 - blend) |
215 | return color.to_string() | 215 | return color.to_string() |
216 | 216 | ||
217 | class HobButton(gtk.Button): | 217 | class BaseHobButton(gtk.Button): |
218 | """ | 218 | """ |
219 | A gtk.Button subclass which follows the visual design of Hob for primary | 219 | A gtk.Button subclass which follows the visual design of Hob for primary |
220 | action buttons | 220 | action buttons |
@@ -228,24 +228,33 @@ class HobButton(gtk.Button): | |||
228 | @staticmethod | 228 | @staticmethod |
229 | def style_button(button): | 229 | def style_button(button): |
230 | style = button.get_style() | 230 | style = button.get_style() |
231 | button_color = gtk.gdk.Color(HobColors.ORANGE) | 231 | style = gtk.rc_get_style_by_paths(gtk.settings_get_default(), 'gtk-button', 'gtk-button', gobject.TYPE_NONE) |
232 | button.modify_bg(gtk.STATE_NORMAL, button_color) | ||
233 | button.modify_bg(gtk.STATE_PRELIGHT, button_color) | ||
234 | button.modify_bg(gtk.STATE_SELECTED, button_color) | ||
235 | 232 | ||
236 | button.set_flags(gtk.CAN_DEFAULT) | 233 | button.set_flags(gtk.CAN_DEFAULT) |
237 | button.grab_default() | 234 | button.grab_default() |
238 | 235 | ||
239 | label = "<span size='x-large'><b>%s</b></span>" % gobject.markup_escape_text(button.get_label()) | 236 | # label = "<span size='x-large'><b>%s</b></span>" % gobject.markup_escape_text(button.get_label()) |
237 | label = button.get_label() | ||
240 | button.set_label(label) | 238 | button.set_label(label) |
241 | button.child.set_use_markup(True) | 239 | button.child.set_use_markup(True) |
242 | 240 | ||
243 | class HobAltButton(gtk.Button): | 241 | class HobButton(BaseHobButton): |
242 | """ | ||
243 | A gtk.Button subclass which follows the visual design of Hob for primary | ||
244 | action buttons | ||
245 | |||
246 | label: the text to display as the button's label | ||
247 | """ | ||
248 | def __init__(self, label): | ||
249 | BaseHobButton.__init__(self, label) | ||
250 | HobButton.style_button(self) | ||
251 | |||
252 | class HobAltButton(BaseHobButton): | ||
244 | """ | 253 | """ |
245 | A gtk.Button subclass which has no relief, and so is more discrete | 254 | A gtk.Button subclass which has no relief, and so is more discrete |
246 | """ | 255 | """ |
247 | def __init__(self, label): | 256 | def __init__(self, label): |
248 | gtk.Button.__init__(self, label) | 257 | BaseHobButton.__init__(self, label) |
249 | HobAltButton.style_button(self) | 258 | HobAltButton.style_button(self) |
250 | 259 | ||
251 | """ | 260 | """ |
@@ -271,14 +280,6 @@ class HobAltButton(gtk.Button): | |||
271 | button.set_label("<span size='large' color='%s'><b>%s</b></span>" % (colour, gobject.markup_escape_text(button.text))) | 280 | button.set_label("<span size='large' color='%s'><b>%s</b></span>" % (colour, gobject.markup_escape_text(button.text))) |
272 | button.child.set_use_markup(True) | 281 | button.child.set_use_markup(True) |
273 | 282 | ||
274 | @staticmethod | ||
275 | def style_button(button): | ||
276 | button.text = button.get_label() | ||
277 | button.connect("state-changed", HobAltButton.desensitise_on_state_change_cb) | ||
278 | HobAltButton.set_text(button) | ||
279 | button.child.set_use_markup(True) | ||
280 | button.set_relief(gtk.RELIEF_NONE) | ||
281 | |||
282 | class HobImageButton(gtk.Button): | 283 | class HobImageButton(gtk.Button): |
283 | """ | 284 | """ |
284 | A gtk.Button with an icon and two rows of text, the second of which is | 285 | A gtk.Button with an icon and two rows of text, the second of which is |
@@ -331,7 +332,8 @@ class HobInfoButton(gtk.EventBox): | |||
331 | def __init__(self, tip_markup, parent=None): | 332 | def __init__(self, tip_markup, parent=None): |
332 | gtk.EventBox.__init__(self) | 333 | gtk.EventBox.__init__(self) |
333 | self.image = gtk.Image() | 334 | self.image = gtk.Image() |
334 | self.image.set_from_file(hic.ICON_INFO_DISPLAY_FILE) | 335 | self.image.set_from_file( |
336 | hic.ICON_INFO_DISPLAY_FILE) | ||
335 | self.image.show() | 337 | self.image.show() |
336 | self.add(self.image) | 338 | self.add(self.image) |
337 | 339 | ||
diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py index 40eb7a4540..c1a309de2b 100755 --- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py | |||
@@ -485,8 +485,8 @@ class ImageDetailsPage (HobPage): | |||
485 | if name in buttonlist and self.test_type_runnable(image_name) and self.test_mach_runnable(image_name): | 485 | if name in buttonlist and self.test_type_runnable(image_name) and self.test_mach_runnable(image_name): |
486 | if created == True: | 486 | if created == True: |
487 | # separator | 487 | # separator |
488 | label = gtk.Label(" or ") | 488 | #label = gtk.Label(" or ") |
489 | self.details_bottom_buttons.pack_end(label, expand=False, fill=False) | 489 | #self.details_bottom_buttons.pack_end(label, expand=False, fill=False) |
490 | 490 | ||
491 | # create button "Run image" | 491 | # create button "Run image" |
492 | run_button = HobAltButton("Run image") | 492 | run_button = HobAltButton("Run image") |
@@ -507,8 +507,8 @@ class ImageDetailsPage (HobPage): | |||
507 | if name in buttonlist: | 507 | if name in buttonlist: |
508 | if created == True: | 508 | if created == True: |
509 | # separator | 509 | # separator |
510 | label = gtk.Label(" or ") | 510 | #label = gtk.Label(" or ") |
511 | self.details_bottom_buttons.pack_end(label, expand=False, fill=False) | 511 | #self.details_bottom_buttons.pack_end(label, expand=False, fill=False) |
512 | 512 | ||
513 | # create button "Save as template" | 513 | # create button "Save as template" |
514 | save_button = HobAltButton("Save as template") | 514 | save_button = HobAltButton("Save as template") |