[meld/wip/jtojnar/bundle-icons] Import emblem-new from Evolution




commit f850cdf3eaf0f08abea003d5fae118a5e92a3d61
Author: Jan Tojnar <jtojnar gmail com>
Date:   Fri Apr 29 23:00:12 2022 +0200

    Import emblem-new from Evolution
    
    Emblems are considered deprecated since GNOME 3.32:
    https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/7f3f91f9c210ee240885c7d370c8ff3485c3a17b
    and `emblem-new` has been removed in GNOME 42:
    https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/becf0674bb631bb2f2e092e1fb0f4d55cf380de7
    
    This will cause Meld to complain loudly on vanilla GNOME, even breaking the file tree view:
    
            Traceback (most recent call last):
              File 
"/nix/store/i9gy3x995nn7js4xipzw01gysq4fh5zz-meld-3.21.1/lib/python3.9/site-packages/meld/ui/emblemcellrenderer.py",
 line 100, in do_render
                pixbuf = self._get_pixbuf(self.emblem_name, self._emblem_size)
              File 
"/nix/store/i9gy3x995nn7js4xipzw01gysq4fh5zz-meld-3.21.1/lib/python3.9/site-packages/meld/ui/emblemcellrenderer.py",
 line 64, in _get_pixbuf
                pixbuf = icon_theme.load_icon(name, size, 0).copy()
            gi.repository.GLib.GError: gtk-icon-theme-error-quark: Icon 'emblem-new' not present in theme 
Adwaita (0)
    
            cairo.Error: Context.restore() without matching Context.save()
    
    `emblem-default-symbolic` and `emblem-symbolic-link` are still available.
    
    Let’s bundle it with Meld as suggested.
    
    Though, for improved contrast on GNOME 42’s blue folder icons,
    let’s take the emblem from Evolution.
    
    https://gitlab.gnome.org/GNOME/evolution/-/issues/1811#note_1423465

 .../icons/scalable/emblems/emblem-new.svg          | 26 ++++++++++++++++++++++
 meld/resources/meld.gresource.xml                  |  1 +
 2 files changed, 27 insertions(+)
---
diff --git a/meld/resources/icons/scalable/emblems/emblem-new.svg 
b/meld/resources/icons/scalable/emblems/emblem-new.svg
new file mode 100644
index 00000000..b3971210
--- /dev/null
+++ b/meld/resources/icons/scalable/emblems/emblem-new.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:svg="http://www.w3.org/2000/svg";>
+  <defs
+     id="defs2" />
+  <circle
+     style="opacity:1;fill:#d7eef4;stroke-width:0.396874;stroke-linecap:round;paint-order:markers stroke 
fill"
+     id="path1283"
+     cx="2.1166666"
+     cy="2.1166666"
+     r="1.984375" />
+  <circle
+     
style="opacity:1;fill:#0044aa;fill-opacity:1;stroke-width:0.357187;stroke-linecap:round;paint-order:markers 
stroke fill"
+     id="path1285"
+     cx="2.1166666"
+     cy="2.1166666"
+     r="1.4287499" />
+</svg>
diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml
index 689955e3..34b07e65 100644
--- a/meld/resources/meld.gresource.xml
+++ b/meld/resources/meld.gresource.xml
@@ -13,6 +13,7 @@
     <file>icons/16x16/actions/meld-change-apply-right.png</file>
     <file>icons/16x16/actions/meld-change-copy.png</file>
     <file>icons/16x16/actions/meld-change-delete.png</file>
+    <file preprocess="xml-stripblanks">icons/scalable/emblems/emblem-new.svg</file>
     <file>meld.css</file>
     <file>ui/about-dialog.ui</file>
     <file>ui/appwindow.ui</file>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]