mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: hobwidget: Button theme is taken from host, fix

Browse Source 
- 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>
This commit is contained in:
Ioana Grigoropol
2012-09-03 12:51:06 +03:00
committed by Richard Purdie
parent 7d8b49cfe4
commit 40d55d37b6
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
bitbake/lib/bb/ui/crumbs/hobwidget.py
View File

@@ -214,7 +214,7 @@ def soften_color(widget, state=gtk.STATE_NORMAL):
color.blue = color.blue * blend + style.base[state].blue * (1.0 - blend) color.blue = color.blue * blend + style.base[state].blue * (1.0 - blend)
return color.to_string() 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 A gtk.Button subclass which follows the visual design of Hob for primary
action buttons action buttons
@@ -228,24 +228,33 @@ class HobButton(gtk.Button):
@staticmethod @staticmethod
def style_button(button): def style_button(button):
style = button.get_style() style = button.get_style()
button_color = gtk.gdk.Color(HobColors.ORANGE) style = gtk.rc_get_style_by_paths(gtk.settings_get_default(), 'gtk-button', 'gtk-button', gobject.TYPE_NONE)
button.modify_bg(gtk.STATE_NORMAL, button_color)
button.modify_bg(gtk.STATE_PRELIGHT, button_color)
button.modify_bg(gtk.STATE_SELECTED, button_color)
button.set_flags(gtk.CAN_DEFAULT) button.set_flags(gtk.CAN_DEFAULT)
button.grab_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.set_label(label)
button.child.set_use_markup(True) 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 A gtk.Button subclass which has no relief, and so is more discrete
""" """
def __init__(self, label): def __init__(self, label):
gtk.Button.__init__(self, label) BaseHobButton.__init__(self, label)
HobAltButton.style_button(self) 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.set_label("<span size='large' color='%s'><b>%s</b></span>" % (colour, gobject.markup_escape_text(button.text)))
button.child.set_use_markup(True) 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): class HobImageButton(gtk.Button):
""" """
A gtk.Button with an icon and two rows of text, the second of which is 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): def __init__(self, tip_markup, parent=None):
gtk.EventBox.__init__(self) gtk.EventBox.__init__(self)
self.image = gtk.Image() 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.image.show()
self.add(self.image) self.add(self.image)

8
bitbake/lib/bb/ui/crumbs/imagedetailspage.py
View File

@@ -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 name in buttonlist and self.test_type_runnable(image_name) and self.test_mach_runnable(image_name):
if created == True: if created == True:
# separator # separator
label = gtk.Label(" or ") #label = gtk.Label(" or ")
self.details_bottom_buttons.pack_end(label, expand=False, fill=False) #self.details_bottom_buttons.pack_end(label, expand=False, fill=False)
# create button "Run image" # create button "Run image"
run_button = HobAltButton("Run image") run_button = HobAltButton("Run image")
@@ -507,8 +507,8 @@ class ImageDetailsPage (HobPage):
if name in buttonlist: if name in buttonlist:
if created == True: if created == True:
# separator # separator
label = gtk.Label(" or ") #label = gtk.Label(" or ")
self.details_bottom_buttons.pack_end(label, expand=False, fill=False) #self.details_bottom_buttons.pack_end(label, expand=False, fill=False)
# create button "Save as template" # create button "Save as template"
save_button = HobAltButton("Save as template") save_button = HobAltButton("Save as template")