[gtk: 4/4] Merge branch 'wip/jimmac/app-icons' into 'master'



commit 131c2255986dbe5a74baad07acbd1fe98a4f7cd4
Merge: e1f903cb11 81f88baa2c
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Feb 9 15:09:59 2019 +0000

    Merge branch 'wip/jimmac/app-icons' into 'master'
    
    Wip/jimmac/app icons
    
    Closes #1658
    
    See merge request GNOME/gtk!572

 build-aux/flatpak/org.gtk.Demo.json                |    1 -
 build-aux/flatpak/org.gtk.WidgetFactory.json       |    1 -
 demos/gtk-demo/application.c                       |    2 +-
 .../data/16x16/gtk4-demo-symbolic.symbolic.png     |  Bin 324 -> 0 bytes
 demos/gtk-demo/data/16x16/gtk4-demo.png            |  Bin 874 -> 0 bytes
 .../data/22x22/gtk4-demo-symbolic.symbolic.png     |  Bin 437 -> 0 bytes
 demos/gtk-demo/data/22x22/gtk4-demo.png            |  Bin 1281 -> 0 bytes
 .../data/24x24/gtk4-demo-symbolic.symbolic.png     |  Bin 465 -> 0 bytes
 demos/gtk-demo/data/24x24/gtk4-demo.png            |  Bin 1374 -> 0 bytes
 .../data/256x256/gtk4-demo-symbolic.symbolic.png   |  Bin 3937 -> 0 bytes
 demos/gtk-demo/data/256x256/gtk4-demo.png          |  Bin 18667 -> 0 bytes
 .../data/32x32/gtk4-demo-symbolic.symbolic.png     |  Bin 581 -> 0 bytes
 demos/gtk-demo/data/32x32/gtk4-demo.png            |  Bin 1748 -> 0 bytes
 .../data/48x48/gtk4-demo-symbolic.symbolic.png     |  Bin 854 -> 0 bytes
 demos/gtk-demo/data/48x48/gtk4-demo.png            |  Bin 2640 -> 0 bytes
 .../data/512x512/gtk4-demo-symbolic.symbolic.png   |  Bin 7594 -> 0 bytes
 demos/gtk-demo/data/512x512/gtk4-demo.png          |  Bin 42374 -> 0 bytes
 demos/gtk-demo/data/scalable/apps/org.gtk.Demo.svg |    1 +
 demos/gtk-demo/data/source.svg                     | 2886 ------------
 demos/gtk-demo/data/symbolic-source.svg            |   29 -
 .../data/symbolic/apps/org.gtk.Demo-symbolic.svg   |  114 +
 demos/gtk-demo/main.c                              |    2 +-
 demos/gtk-demo/meson.build                         |   12 +-
 demos/gtk-demo/org.gtk.Demo.desktop                |    2 +-
 .../data/scalable/apps/org.gnome.IconBrowser.svg   |    1 +
 .../symbolic/apps/org.gtk.IconBrowser-symbolic.svg |  136 +
 demos/icon-browser/meson.build                     |    9 +
 demos/icon-browser/org.gtk.IconBrowser.desktop     |    2 +-
 .../gtk4-widget-factory-symbolic.symbolic.png      |  Bin 237 -> 0 bytes
 .../data/16x16/gtk4-widget-factory.png             |  Bin 550 -> 0 bytes
 .../gtk4-widget-factory-symbolic.symbolic.png      |  Bin 332 -> 0 bytes
 .../data/22x22/gtk4-widget-factory.png             |  Bin 685 -> 0 bytes
 .../gtk4-widget-factory-symbolic.symbolic.png      |  Bin 336 -> 0 bytes
 .../data/24x24/gtk4-widget-factory.png             |  Bin 750 -> 0 bytes
 .../gtk4-widget-factory-symbolic.symbolic.png      |  Bin 2950 -> 0 bytes
 .../data/256x256/gtk4-widget-factory.png           |  Bin 10864 -> 0 bytes
 .../gtk4-widget-factory-symbolic.symbolic.png      |  Bin 369 -> 0 bytes
 .../data/32x32/gtk4-widget-factory.png             |  Bin 963 -> 0 bytes
 .../gtk4-widget-factory-symbolic.symbolic.png      |  Bin 495 -> 0 bytes
 .../data/48x48/gtk4-widget-factory.png             |  Bin 1260 -> 0 bytes
 .../data/512x512/gtk4-widget-factory.png           |  Bin 24446 -> 0 bytes
 .../data/scalable/apps/org.gtk.WidgetFactory.svg   |    1 +
 demos/widget-factory/data/source.svg               | 4854 --------------------
 .../apps/org.gtk.WidgetFactory-symbolic.svg}       |    0
 demos/widget-factory/meson.build                   |   12 +-
 demos/widget-factory/org.gtk.WidgetFactory.desktop |    2 +-
 demos/widget-factory/widget-factory.c              |    2 +-
 47 files changed, 278 insertions(+), 7791 deletions(-)
---


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