summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 11:56:51 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-16 22:32:40 (GMT)
commit31e34f26df41be7ebe3e1d60fd0be6b088261e69 (patch)
tree2452e510108db2553d00fc139fa44ea2c17170db
parent455f06497ebb589ab93c02322fbd0628a31ead73 (diff)
downloadpoky-31e34f26df41be7ebe3e1d60fd0be6b088261e69.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/image-writer3
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py2
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobwidget.py8
-rw-r--r--bitbake/lib/bb/ui/crumbs/progressbar.py15
4 files changed, 15 insertions, 13 deletions
diff --git a/bitbake/bin/image-writer b/bitbake/bin/image-writer
index 7ab1d8c..40e284d 100755
--- a/bitbake/bin/image-writer
+++ b/bitbake/bin/image-writer
@@ -67,7 +67,8 @@ class DeployWindow(gtk.Window):
67 67
68 self.deploy_dialog = DeployImageDialog(Title, image_path, self, 68 self.deploy_dialog = DeployImageDialog(Title, image_path, self,
69 gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT 69 gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT
70 | gtk.DIALOG_NO_SEPARATOR, None, standalone=True) 70 , None, standalone=True)
71#FIXME | gtk.DIALOG_NO_SEPARATOR
71 close_button = self.deploy_dialog.add_button("Close", gtk.RESPONSE_NO) 72 close_button = self.deploy_dialog.add_button("Close", gtk.RESPONSE_NO)
72 HobAltButton.style_button(close_button) 73 HobAltButton.style_button(close_button)
73 close_button.connect('clicked', gtk.main_quit) 74 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 c679f9a..73b9234 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):
36 def __init__(self, title="", parent=None, flags=0, buttons=None): 36 def __init__(self, title="", parent=None, flags=0, buttons=None):
37 super(CrumbsDialog, self).__init__(title, parent, flags, buttons) 37 super(CrumbsDialog, self).__init__(title, parent, flags, buttons)
38 38
39 self.set_property("has-separator", False) # note: deprecated in 2.22 39 #FIXME self.set_property("has-separator", False) # note: deprecated in 2.22
40 40
41 self.set_border_width(6) 41 self.set_border_width(6)
42 self.vbox.set_property("spacing", 12) 42 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 1f51a3c..3f6138b 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):
273 style = button.get_style() 273 style = button.get_style()
274 style = gtk.rc_get_style_by_paths(gtk.settings_get_default(), 'gtk-button', 'gtk-button', gobject.TYPE_NONE) 274 style = gtk.rc_get_style_by_paths(gtk.settings_get_default(), 'gtk-button', 'gtk-button', gobject.TYPE_NONE)
275 275
276 button.set_flags(gtk.CAN_DEFAULT) 276 #FIXME button.set_flags(gtk.CAN_DEFAULT)
277 button.grab_default() 277 button.grab_default()
278 278
279# label = "<span size='x-large'><b>%s</b></span>" % gobject.markup_escape_text(button.get_label()) 279# label = "<span size='x-large'><b>%s</b></span>" % gobject.markup_escape_text(button.get_label())
280 label = button.get_label() 280 label = button.get_label()
281 button.set_label(label) 281 button.set_label(label)
282 button.child.set_use_markup(True) 282 #FIXME button.child.set_use_markup(True)
283 283
284class HobButton(BaseHobButton): 284class HobButton(BaseHobButton):
285 """ 285 """
@@ -399,8 +399,8 @@ class HobInfoButton(gtk.EventBox):
399 self.dialog = PropertyDialog(title = '', 399 self.dialog = PropertyDialog(title = '',
400 parent = self.my_parent, 400 parent = self.my_parent,
401 information = self.tip_markup, 401 information = self.tip_markup,
402 flags = gtk.DIALOG_DESTROY_WITH_PARENT 402 flags = gtk.DIALOG_DESTROY_WITH_PARENT)
403 | gtk.DIALOG_NO_SEPARATOR) 403 #FMXIE | gtk.DIALOG_NO_SEPARATOR
404 404
405 button = self.dialog.add_button("Close", gtk.RESPONSE_CANCEL) 405 button = self.dialog.add_button("Close", gtk.RESPONSE_CANCEL)
406 HobAltButton.style_button(button) 406 HobAltButton.style_button(button)
diff --git a/bitbake/lib/bb/ui/crumbs/progressbar.py b/bitbake/lib/bb/ui/crumbs/progressbar.py
index 03230ae..ba3c7a0 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):
28 28
29 def set_rcstyle(self, status): 29 def set_rcstyle(self, status):
30 rcstyle = gtk.RcStyle() 30 rcstyle = gtk.RcStyle()
31 rcstyle.fg[2] = gtk.gdk.Color(HobColors.BLACK) 31#FIXME
32 if status == "stop": 32# rcstyle.fg[2] = gtk.gdk.Color(HobColors.BLACK)
33 rcstyle.bg[3] = gtk.gdk.Color(HobColors.WARNING) 33# if status == "stop":
34 elif status == "fail": 34# rcstyle.bg[3] = gtk.gdk.Color(HobColors.WARNING)
35 rcstyle.bg[3] = gtk.gdk.Color(HobColors.ERROR) 35# elif status == "fail":
36 else: 36# rcstyle.bg[3] = gtk.gdk.Color(HobColors.ERROR)
37 rcstyle.bg[3] = gtk.gdk.Color(HobColors.RUNNING) 37# else:
38# rcstyle.bg[3] = gtk.gdk.Color(HobColors.RUNNING)
38 self.modify_style(rcstyle) 39 self.modify_style(rcstyle)
39 40
40 def set_title(self, text=None): 41 def set_title(self, text=None):