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




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

    Import emblem-new from Adwaita
    
    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.

 meld/resources/icons/16x16/emblems/emblem-new.png | Bin 0 -> 137 bytes
 meld/resources/icons/22x22/emblems/emblem-new.png | Bin 0 -> 197 bytes
 meld/resources/icons/24x24/emblems/emblem-new.png | Bin 0 -> 198 bytes
 meld/resources/icons/32x32/emblems/emblem-new.png | Bin 0 -> 276 bytes
 meld/resources/icons/48x48/emblems/emblem-new.png | Bin 0 -> 323 bytes
 meld/resources/icons/8x8/emblems/emblem-new.png   | Bin 0 -> 175 bytes
 meld/resources/meld.gresource.xml                 |   6 ++++++
 7 files changed, 6 insertions(+)
---
diff --git a/meld/resources/icons/16x16/emblems/emblem-new.png 
b/meld/resources/icons/16x16/emblems/emblem-new.png
new file mode 100644
index 00000000..a527b28b
Binary files /dev/null and b/meld/resources/icons/16x16/emblems/emblem-new.png differ
diff --git a/meld/resources/icons/22x22/emblems/emblem-new.png 
b/meld/resources/icons/22x22/emblems/emblem-new.png
new file mode 100644
index 00000000..aed13aac
Binary files /dev/null and b/meld/resources/icons/22x22/emblems/emblem-new.png differ
diff --git a/meld/resources/icons/24x24/emblems/emblem-new.png 
b/meld/resources/icons/24x24/emblems/emblem-new.png
new file mode 100644
index 00000000..33970d6f
Binary files /dev/null and b/meld/resources/icons/24x24/emblems/emblem-new.png differ
diff --git a/meld/resources/icons/32x32/emblems/emblem-new.png 
b/meld/resources/icons/32x32/emblems/emblem-new.png
new file mode 100644
index 00000000..a179f329
Binary files /dev/null and b/meld/resources/icons/32x32/emblems/emblem-new.png differ
diff --git a/meld/resources/icons/48x48/emblems/emblem-new.png 
b/meld/resources/icons/48x48/emblems/emblem-new.png
new file mode 100644
index 00000000..582ffeb7
Binary files /dev/null and b/meld/resources/icons/48x48/emblems/emblem-new.png differ
diff --git a/meld/resources/icons/8x8/emblems/emblem-new.png b/meld/resources/icons/8x8/emblems/emblem-new.png
new file mode 100644
index 00000000..c8cdd9c7
Binary files /dev/null and b/meld/resources/icons/8x8/emblems/emblem-new.png differ
diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml
index 689955e3..9e74b674 100644
--- a/meld/resources/meld.gresource.xml
+++ b/meld/resources/meld.gresource.xml
@@ -9,10 +9,16 @@
   <gresource prefix="/org/gnome/meld">
     <file>gtk/help-overlay.ui</file>
     <file>gtk/menus.ui</file>
+    <file>icons/8x8/emblems/emblem-new.png</file>
     <file>icons/16x16/actions/meld-change-apply-left.png</file>
     <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>icons/16x16/emblems/emblem-new.png</file>
+    <file>icons/22x22/emblems/emblem-new.png</file>
+    <file>icons/24x24/emblems/emblem-new.png</file>
+    <file>icons/32x32/emblems/emblem-new.png</file>
+    <file>icons/48x48/emblems/emblem-new.png</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]