From ff18e4a342a200e47541acfdcd4fe3a5dce5af06 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Sat, 28 Mar 2020 18:10:42 -0400 Subject: [PATCH] Fix deprecation warnings for Gtk.Widget.render_icon [Gtk.Widget.render_icon](https://lazka.github.io/pgi-docs/#Gtk-3.0/classes/Widget.html#Gtk.Widget.render_icon) has been deprecated since 3.0. The replacement solution is to use Gtk.IconTheme.load_icon. Most of `Gtk.STOCK_*` value are deprecated: * `Gtk.STOCK_NEW` is now "document-new" * `Gtk.STOCK_GO_FORWARD` is now "go-next" * `Gtk.STOCK_GO_BACK` is now "go-previous" --- src/usr/bin/diffuse | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/usr/bin/diffuse b/src/usr/bin/diffuse index 58412eb..398fcb0 100755 --- a/src/usr/bin/diffuse +++ b/src/usr/bin/diffuse @@ -7450,9 +7450,12 @@ class Diffuse(Gtk.Window): DIFFUSE_STOCK_LEFT_RIGHT = 'diffuse-left-right' DIFFUSE_STOCK_RIGHT_LEFT = 'diffuse-right-left' + default_theme = Gtk.IconTheme.get_default() + icon_size = Gtk.IconSize.lookup(Gtk.IconSize.LARGE_TOOLBAR).height factory = Gtk.IconFactory() + # render the base item used to indicate a new document - p0 = self.render_icon(Gtk.STOCK_NEW, Gtk.IconSize.LARGE_TOOLBAR) + p0 = default_theme.load_icon("document-new", icon_size, 0) w, h = p0.get_width(), p0.get_height() # render new 2-way merge icon @@ -7478,8 +7481,8 @@ class Diffuse(Gtk.Window): factory.add(DIFFUSE_STOCK_NEW_3WAY_MERGE, Gtk.IconSet.new_from_pixbuf(p)) # render the left and right arrow we will use in our custom icons - p0 = self.render_icon(Gtk.STOCK_GO_FORWARD, Gtk.IconSize.LARGE_TOOLBAR) - p1 = self.render_icon(Gtk.STOCK_GO_BACK, Gtk.IconSize.LARGE_TOOLBAR) + p0 = default_theme.load_icon("go-next", icon_size, 0) + p1 = default_theme.load_icon("go-previous", icon_size, 0) w, h, s = p0.get_width(), p0.get_height(), 0.65 sw, sh = int(s * w), int(s * h) w1, h1 = w - sw, h - sh