From 31e34f26df41be7ebe3e1d60fd0be6b088261e69 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 13 May 2016 12:56:51 +0100 Subject: bitbake: image-writer/goggle: Disable pygtkcompat problems Disable the problematic gtk usage for use with pygtkcompat. The following commit removes these tools/UIs entirely but we may as well leave this piece in the history in case anyone does want a starting point for reusing them. (Bitbake rev: 024d7889c31be500d658b819891aec2a7e3c7c0d) Signed-off-by: Richard Purdie --- bitbake/bin/image-writer | 3 ++- bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py | 2 +- bitbake/lib/bb/ui/crumbs/hobwidget.py | 8 ++++---- bitbake/lib/bb/ui/crumbs/progressbar.py | 15 ++++++++------- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/bitbake/bin/image-writer b/bitbake/bin/image-writer index 7ab1d8c979..40e284d59c 100755 --- a/bitbake/bin/image-writer +++ b/bitbake/bin/image-writer @@ -67,7 +67,8 @@ class DeployWindow(gtk.Window): self.deploy_dialog = DeployImageDialog(Title, image_path, self, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT - | gtk.DIALOG_NO_SEPARATOR, None, standalone=True) + , None, standalone=True) +#FIXME | gtk.DIALOG_NO_SEPARATOR close_button = self.deploy_dialog.add_button("Close", gtk.RESPONSE_NO) HobAltButton.style_button(close_button) close_button.connect('clicked', gtk.main_quit) diff --git a/bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py b/bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py index c679f9a070..73b9234c27 100644 --- a/bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py +++ b/bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py @@ -36,7 +36,7 @@ class CrumbsDialog(gtk.Dialog): def __init__(self, title="", parent=None, flags=0, buttons=None): super(CrumbsDialog, self).__init__(title, parent, flags, buttons) - self.set_property("has-separator", False) # note: deprecated in 2.22 + #FIXME self.set_property("has-separator", False) # note: deprecated in 2.22 self.set_border_width(6) self.vbox.set_property("spacing", 12) diff --git a/bitbake/lib/bb/ui/crumbs/hobwidget.py b/bitbake/lib/bb/ui/crumbs/hobwidget.py index 1f51a3cf7f..3f6138b277 100644 --- a/bitbake/lib/bb/ui/crumbs/hobwidget.py +++ b/bitbake/lib/bb/ui/crumbs/hobwidget.py @@ -273,13 +273,13 @@ class BaseHobButton(gtk.Button): style = button.get_style() style = gtk.rc_get_style_by_paths(gtk.settings_get_default(), 'gtk-button', 'gtk-button', gobject.TYPE_NONE) - button.set_flags(gtk.CAN_DEFAULT) + #FIXME button.set_flags(gtk.CAN_DEFAULT) button.grab_default() # label = "%s" % gobject.markup_escape_text(button.get_label()) label = button.get_label() button.set_label(label) - button.child.set_use_markup(True) + #FIXME button.child.set_use_markup(True) class HobButton(BaseHobButton): """ @@ -399,8 +399,8 @@ class HobInfoButton(gtk.EventBox): self.dialog = PropertyDialog(title = '', parent = self.my_parent, information = self.tip_markup, - flags = gtk.DIALOG_DESTROY_WITH_PARENT - | gtk.DIALOG_NO_SEPARATOR) + flags = gtk.DIALOG_DESTROY_WITH_PARENT) + #FMXIE | gtk.DIALOG_NO_SEPARATOR button = self.dialog.add_button("Close", gtk.RESPONSE_CANCEL) HobAltButton.style_button(button) diff --git a/bitbake/lib/bb/ui/crumbs/progressbar.py b/bitbake/lib/bb/ui/crumbs/progressbar.py index 03230ae8a9..ba3c7a0754 100644 --- a/bitbake/lib/bb/ui/crumbs/progressbar.py +++ b/bitbake/lib/bb/ui/crumbs/progressbar.py @@ -28,13 +28,14 @@ class HobProgressBar (gtk.ProgressBar): def set_rcstyle(self, status): rcstyle = gtk.RcStyle() - rcstyle.fg[2] = gtk.gdk.Color(HobColors.BLACK) - if status == "stop": - rcstyle.bg[3] = gtk.gdk.Color(HobColors.WARNING) - elif status == "fail": - rcstyle.bg[3] = gtk.gdk.Color(HobColors.ERROR) - else: - rcstyle.bg[3] = gtk.gdk.Color(HobColors.RUNNING) +#FIXME +# rcstyle.fg[2] = gtk.gdk.Color(HobColors.BLACK) +# if status == "stop": +# rcstyle.bg[3] = gtk.gdk.Color(HobColors.WARNING) +# elif status == "fail": +# rcstyle.bg[3] = gtk.gdk.Color(HobColors.ERROR) +# else: +# rcstyle.bg[3] = gtk.gdk.Color(HobColors.RUNNING) self.modify_style(rcstyle) def set_title(self, text=None): -- cgit v1.2.3-54-g00ecf