Merge lp:~sinzui/bzr-gtk/get_style_context into lp:bzr-gtk

[Curtis Hovey]

bzr gannotate fails to start using Gtk 3.4 as provided by quantal. The get_style() method and the GtkStyle object are deprecated. Most of the calls were fixed earlier this year, but a few remain and now must be removed. Per the previous fixes, get_style() becomes get_style_context(). The new object uses methods instead of properties. Also note that 'cell-background-gdk' was replaced with 'cell-background-rgba' It is a simple mechanical change that fixes the only issues I have encountered with bzr-gtk on quantal.

While this branch did fix most of the test suite and all of the issue I see running bzr-gtk tip, there are two test failures that relate to fonts. Fonts in quantal are broken at the moment, there are warnings shown on the command line for all gtk apps that this moment. There are two errors and I am confident that one will be fixed with quantal is fixed. There is an error about setting the monospace font in the DiffView is confusing. The test says the font was not set, but I can see it was. I tried re writing both the test and how the font was set, but there is no change. We may want to consider deleting the assert if the issue is not resolved for quantal.

[Jelmer Vernooij (jelmer)]

Thanks Curtis.

review: Approve

=== modified file 'annotate/gannotate.py'
--- annotate/gannotate.py	2012-03-11 18:24:06 +0000
+++ annotate/gannotate.py	2012-09-02 15:01:18 +0000
@@ -279,19 +279,23 @@
         cell.set_property("xalign", 1.0)
         cell.set_property("ypad", 0)
         cell.set_property("family", "Monospace")
-        cell.set_property("cell-background-gdk",
-                          tv.get_style().bg[Gtk.StateType.NORMAL])
+        cell.set_property(
+            "cell-background-rgba",
+            tv.get_style_context().get_background_color(Gtk.StateType.NORMAL))
         col = Gtk.TreeViewColumn()
         col.set_resizable(False)
         col.pack_start(cell, True)
         col.add_attribute(cell, "text", LINE_NUM_COL)
         tv.append_column(col)
 
+        style_context = self.get_style_context()
+
         cell = Gtk.CellRendererText()
         cell.set_property("ypad", 0)
         cell.set_property("ellipsize", Pango.EllipsizeMode.END)
-        cell.set_property("cell-background-gdk",
-                          self.get_style().bg[Gtk.StateType.NORMAL])
+        cell.set_property(
+            "cell-background-rgba",
+            style_context.get_background_color(Gtk.StateType.NORMAL))
         col = Gtk.TreeViewColumn("Committer")
         col.set_resizable(True)
         col.pack_start(cell, True)
@@ -301,8 +305,9 @@
         cell = Gtk.CellRendererText()
         cell.set_property("xalign", 1.0)
         cell.set_property("ypad", 0)
-        cell.set_property("cell-background-gdk",
-                          self.get_style().bg[Gtk.StateType.NORMAL])
+        cell.set_property(
+            "cell-background-rgba",
+            style_context.get_background_color(Gtk.StateType.NORMAL))
         col = Gtk.TreeViewColumn("Revno")
         col.set_resizable(False)
         col.pack_start(cell, True)
 
=== modified file 'branchview/graphcell.py'
--- branchview/graphcell.py	2011-09-07 16:01:14 +0000
+++ branchview/graphcell.py	2012-09-02 15:01:18 +0000
@@ -90,7 +90,8 @@
             return self._box_size
         except AttributeError:
             pango_ctx = widget.get_pango_context()
-            font_desc = widget.get_style().font_desc
+            font_desc = widget.get_style_context().get_font(
+                Gtk.StateType.NORMAL)
             metrics = pango_ctx.get_metrics(font_desc, None)
             ascent = PANGO_PIXELS(metrics.get_ascent())
             descent = PANGO_PIXELS(metrics.get_descent())