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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bin/image-writer b/bin/image-writer
index 7ab1d8c979083e6c6dd992347bd1d7cf9aadd0d5..40e284d59c47425425051d3a86cd5b2d5d215c61 100755 (executable)
--- a/bin/image-writer
+++ b/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/lib/bb/ui/crumbs/hig/crumbsdialog.py b/lib/bb/ui/crumbs/hig/crumbsdialog.py
index c679f9a070a4e6d45b0738fc8d7db74857b2ff76..73b9234c27e9b951228db4077eaea5078645f02c 100644 (file)
--- a/lib/bb/ui/crumbs/hig/crumbsdialog.py
+++ b/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/lib/bb/ui/crumbs/hobwidget.py b/lib/bb/ui/crumbs/hobwidget.py
index 1f51a3cf7f909bbda8858424a973c81acdb61ade..3f6138b27784dd839a691b10c6b13878718ec9b7 100644 (file)
--- a/lib/bb/ui/crumbs/hobwidget.py
+++ b/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 = "<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)
+        #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/lib/bb/ui/crumbs/progressbar.py b/lib/bb/ui/crumbs/progressbar.py
index 03230ae8a972873d513daddd17af00e510d82230..ba3c7a0754bad532b1cb0abbb082bb568a9450cc 100644 (file)
--- a/lib/bb/ui/crumbs/progressbar.py
+++ b/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):