From 14cd43685163f3ad3e9a79a5b2cb05e7fb420f91 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sat, 16 Mar 2019 18:22:58 +0100 Subject: GEN png icons from svg files PNG icons are created if they are not present in icon folder. To remove png icons: make -C baobab/pixmaps clean-png-icons make -C logview/data/icons clean-png-icons To build png icons: make -C baobab/pixmaps build-png-icons make -C logview/data/icons build-png-icons This removes baobab/pixmaps/shot.png file, use applets-screenshooter named icon (used in mate-screenshot). --- logview/data/icons/Makefile.am | 67 ++++++++++++++------- .../icons/hicolor_apps_16x16_mate-system-log.png | Bin 714 -> 713 bytes .../icons/hicolor_apps_22x22_mate-system-log.png | Bin 1337 -> 1335 bytes .../icons/hicolor_apps_256x256_mate-system-log.png | Bin 59630 -> 59882 bytes .../icons/hicolor_apps_32x32_mate-system-log.png | Bin 1944 -> 1910 bytes .../icons/hicolor_apps_48x48_mate-system-log.png | Bin 3993 -> 3996 bytes 6 files changed, 45 insertions(+), 22 deletions(-) (limited to 'logview/data') diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am index 20f0da67..7dcf7a2c 100644 --- a/logview/data/icons/Makefile.am +++ b/logview/data/icons/Makefile.am @@ -4,15 +4,34 @@ public_icons_themes = \ hicolor \ $(NULL) +png_icons = \ + hicolor_apps_16x16_mate-system-log.png \ + hicolor_apps_22x22_mate-system-log.png \ + hicolor_apps_32x32_mate-system-log.png \ + hicolor_apps_48x48_mate-system-log.png \ + hicolor_apps_256x256_mate-system-log.png \ + $(NULL) + public_icons = \ - hicolor_apps_16x16_mate-system-log.png \ - hicolor_apps_22x22_mate-system-log.png \ - hicolor_apps_32x32_mate-system-log.png \ - hicolor_apps_48x48_mate-system-log.png \ - hicolor_apps_256x256_mate-system-log.png \ + $(png_icons) \ hicolor_apps_scalable_mate-system-log-symbolic.svg \ $(NULL) +hicolor_apps_16x16_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@ + +hicolor_apps_22x22_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@ + +hicolor_apps_32x32_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@ + +hicolor_apps_48x48_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@ + +hicolor_apps_256x256_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@ + noinst_DATA = \ logview.svg \ $(NULL) @@ -24,21 +43,6 @@ EXTRA_DIST = \ ############################################################################### -gtk_update_icon_cache = gtk-update-icon-cache -f -t - -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - for theme in $(public_icons_themes); do \ - $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ - done; \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - for theme in $(public_icons_themes); do \ - echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ - done; \ - fi - install-icons: for icon in $(public_icons); do \ THEME=`echo $$icon | cut -d_ -f1`; \ @@ -58,6 +62,25 @@ uninstall-icons: rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done -install-data-local: install-icons update-icon-cache +install-data-local: install-icons + +uninstall-local: uninstall-icons + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: $(public_icons) + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +.PHONY: build-png-icons clean-png-icons +build-png-icons: $(png_icons) -uninstall-local: uninstall-icons update-icon-cache +clean-png-icons: + rm -f $(png_icons) diff --git a/logview/data/icons/hicolor_apps_16x16_mate-system-log.png b/logview/data/icons/hicolor_apps_16x16_mate-system-log.png index 34638e07..0a8ff744 100644 Binary files a/logview/data/icons/hicolor_apps_16x16_mate-system-log.png and b/logview/data/icons/hicolor_apps_16x16_mate-system-log.png differ diff --git a/logview/data/icons/hicolor_apps_22x22_mate-system-log.png b/logview/data/icons/hicolor_apps_22x22_mate-system-log.png index ff6fad54..55a132f0 100644 Binary files a/logview/data/icons/hicolor_apps_22x22_mate-system-log.png and b/logview/data/icons/hicolor_apps_22x22_mate-system-log.png differ diff --git a/logview/data/icons/hicolor_apps_256x256_mate-system-log.png b/logview/data/icons/hicolor_apps_256x256_mate-system-log.png index 45334bf8..bccadd7d 100644 Binary files a/logview/data/icons/hicolor_apps_256x256_mate-system-log.png and b/logview/data/icons/hicolor_apps_256x256_mate-system-log.png differ diff --git a/logview/data/icons/hicolor_apps_32x32_mate-system-log.png b/logview/data/icons/hicolor_apps_32x32_mate-system-log.png index 943028d1..11f1e749 100644 Binary files a/logview/data/icons/hicolor_apps_32x32_mate-system-log.png and b/logview/data/icons/hicolor_apps_32x32_mate-system-log.png differ diff --git a/logview/data/icons/hicolor_apps_48x48_mate-system-log.png b/logview/data/icons/hicolor_apps_48x48_mate-system-log.png index b00429e9..cc023091 100644 Binary files a/logview/data/icons/hicolor_apps_48x48_mate-system-log.png and b/logview/data/icons/hicolor_apps_48x48_mate-system-log.png differ -- cgit v1.2.1