diff options
author | Ioana Grigoropol <ioanax.grigoropol@intel.com> | 2012-09-03 12:51:06 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-07 12:10:42 +0100 |
commit | 40d55d37b6dadf05c116edcf0686e087a8ebe3b6 (patch) | |
tree | f10882eeb4bf3602dc08638b7a5889598c8163d8 /bitbake | |
parent | 7d8b49cfe478e82ca0a06095a5b3699c50b34080 (diff) | |
download | ast2050-yocto-poky-40d55d37b6dadf05c116edcf0686e087a8ebe3b6.zip ast2050-yocto-poky-40d55d37b6dadf05c116edcf0686e087a8ebe3b6.tar.gz |
bitbake: hobwidget: Button theme is taken from host, fix
- All buttons in the interface inherit a BaseHobButton that
use the gtk settings for buttons from the host;
- Removed 'or' label between actions on image details page
[Yocto #3011]
(Bitbake rev: 1a8356b57f906cf575612eb52fc8d3a9824ff9a7)
Signed-off-by: Ioana Grigoropol <ioanax.grigoropol@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 7c23440..3ab30a6 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): color.blue = color.blue * blend + style.base[state].blue * (1.0 - blend) return color.to_string() -class HobButton(gtk.Button): +class BaseHobButton(gtk.Button): """ A gtk.Button subclass which follows the visual design of Hob for primary action buttons @@ -228,24 +228,33 @@ class HobButton(gtk.Button): @staticmethod def style_button(button): style = button.get_style() - button_color = gtk.gdk.Color(HobColors.ORANGE) - button.modify_bg(gtk.STATE_NORMAL, button_color) - button.modify_bg(gtk.STATE_PRELIGHT, button_color) - button.modify_bg(gtk.STATE_SELECTED, button_color) + style = gtk.rc_get_style_by_paths(gtk.settings_get_default(), 'gtk-button', 'gtk-button', gobject.TYPE_NONE) button.set_flags(gtk.CAN_DEFAULT) button.grab_default() - label = "<span size='x-large'><b>%s</b></span>" % gobject.markup_escape_text(button.get_label()) +# label = "<span size='x-large'><b>%s</b></span>" % gobject.markup_escape_text(button.get_label()) + label = button.get_label() button.set_label(label) button.child.set_use_markup(True) -class HobAltButton(gtk.Button): +class HobButton(BaseHobButton): + """ + A gtk.Button subclass which follows the visual design of Hob for primary + action buttons + + label: the text to display as the button's label + """ + def __init__(self, label): + BaseHobButton.__init__(self, label) + HobButton.style_button(self) + +class HobAltButton(BaseHobButton): """ A gtk.Button subclass which has no relief, and so is more discrete """ def __init__(self, label): - gtk.Button.__init__(self, label) + BaseHobButton.__init__(self, label) HobAltButton.style_button(self) """ @@ -271,14 +280,6 @@ class HobAltButton(gtk.Button): button.set_label("<span size='large' color='%s'><b>%s</b></span>" % (colour, gobject.markup_escape_text(button.text))) button.child.set_use_markup(True) - @staticmethod - def style_button(button): - button.text = button.get_label() - button.connect("state-changed", HobAltButton.desensitise_on_state_change_cb) - HobAltButton.set_text(button) - button.child.set_use_markup(True) - button.set_relief(gtk.RELIEF_NONE) - class HobImageButton(gtk.Button): """ A gtk.Button with an icon and two rows of text, the second of which is @@ -331,7 +332,8 @@ class HobInfoButton(gtk.EventBox): def __init__(self, tip_markup, parent=None): gtk.EventBox.__init__(self) self.image = gtk.Image() - self.image.set_from_file(hic.ICON_INFO_DISPLAY_FILE) + self.image.set_from_file( + hic.ICON_INFO_DISPLAY_FILE) self.image.show() self.add(self.image) diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py index 40eb7a4..c1a309d 100755 --- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py @@ -485,8 +485,8 @@ class ImageDetailsPage (HobPage): if name in buttonlist and self.test_type_runnable(image_name) and self.test_mach_runnable(image_name): if created == True: # separator - label = gtk.Label(" or ") - self.details_bottom_buttons.pack_end(label, expand=False, fill=False) + #label = gtk.Label(" or ") + #self.details_bottom_buttons.pack_end(label, expand=False, fill=False) # create button "Run image" run_button = HobAltButton("Run image") @@ -507,8 +507,8 @@ class ImageDetailsPage (HobPage): if name in buttonlist: if created == True: # separator - label = gtk.Label(" or ") - self.details_bottom_buttons.pack_end(label, expand=False, fill=False) + #label = gtk.Label(" or ") + #self.details_bottom_buttons.pack_end(label, expand=False, fill=False) # create button "Save as template" save_button = HobAltButton("Save as template") |