From 4a9c10288ab7dcd26c667c5d8fefbbc44e8c4cf3 Mon Sep 17 00:00:00 2001 From: monsta Date: Mon, 4 Jan 2016 17:50:08 +0300 Subject: stickynotes: new icon names and paths + fix deprecations adapted from https://git.gnome.org/browse/gnome-applets/commit/?id=76982eb73ce1bd912cc19a55d3b6682b9da93687 --- stickynotes/pixmaps/Makefile.am | 22 +++++++++++++-------- stickynotes/pixmaps/close.png | Bin 363 -> 0 bytes stickynotes/pixmaps/locked.png | Bin 403 -> 0 bytes stickynotes/pixmaps/resize_se.png | Bin 312 -> 0 bytes stickynotes/pixmaps/resize_sw.png | Bin 295 -> 0 bytes stickynotes/pixmaps/stickynotes-stock-close.png | Bin 0 -> 363 bytes stickynotes/pixmaps/stickynotes-stock-locked.png | Bin 0 -> 403 bytes .../pixmaps/stickynotes-stock-resize-se.png | Bin 0 -> 312 bytes .../pixmaps/stickynotes-stock-resize-sw.png | Bin 0 -> 295 bytes stickynotes/pixmaps/stickynotes-stock-unlocked.png | Bin 0 -> 398 bytes stickynotes/pixmaps/unlocked.png | Bin 398 -> 0 bytes 11 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 stickynotes/pixmaps/close.png delete mode 100644 stickynotes/pixmaps/locked.png delete mode 100644 stickynotes/pixmaps/resize_se.png delete mode 100644 stickynotes/pixmaps/resize_sw.png create mode 100644 stickynotes/pixmaps/stickynotes-stock-close.png create mode 100644 stickynotes/pixmaps/stickynotes-stock-locked.png create mode 100644 stickynotes/pixmaps/stickynotes-stock-resize-se.png create mode 100644 stickynotes/pixmaps/stickynotes-stock-resize-sw.png create mode 100644 stickynotes/pixmaps/stickynotes-stock-unlocked.png delete mode 100644 stickynotes/pixmaps/unlocked.png (limited to 'stickynotes/pixmaps') diff --git a/stickynotes/pixmaps/Makefile.am b/stickynotes/pixmaps/Makefile.am index 837ecbb8..c5c39781 100644 --- a/stickynotes/pixmaps/Makefile.am +++ b/stickynotes/pixmaps/Makefile.am @@ -1,12 +1,11 @@ ## Process this file with automake to produce Makefile.in -stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/mate-stickynotes -stickynotes_applet_pixmaps_DATA = \ - locked.png \ - unlocked.png \ - close.png \ - resize_se.png \ - resize_sw.png +app_icons = \ + stickynotes-stock-locked.png \ + stickynotes-stock-unlocked.png \ + stickynotes-stock-close.png \ + stickynotes-stock-resize-se.png \ + stickynotes-stock-resize-sw.png icons = \ mate-sticky-notes-applet.16.png \ @@ -16,7 +15,7 @@ icons = \ mate-sticky-notes-applet.svg EXTRA_DIST = \ - $(stickynotes_applet_pixmaps_DATA) \ + $(app_icons) \ $(icons) gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor @@ -33,6 +32,9 @@ uninstall-local: fi; \ rm -f $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \ done + for icon in $(app_icons); do \ + rm -f $(DESTDIR)$(pkgdatadir)/icons/hicolor/48x48/apps/$$icon; \ + done @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ @@ -54,6 +56,10 @@ install-data-local: mkdir -p $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/; \ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \ done + for icon in $(app_icons); do \ + mkdir -p $(DESTDIR)$(pkgdatadir)/icons/hicolor/48x48/apps/; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/hicolor/48x48/apps/$$icon; \ + done @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ diff --git a/stickynotes/pixmaps/close.png b/stickynotes/pixmaps/close.png deleted file mode 100644 index ad0e1eaa..00000000 Binary files a/stickynotes/pixmaps/close.png and /dev/null differ diff --git a/stickynotes/pixmaps/locked.png b/stickynotes/pixmaps/locked.png deleted file mode 100644 index 878eedb4..00000000 Binary files a/stickynotes/pixmaps/locked.png and /dev/null differ diff --git a/stickynotes/pixmaps/resize_se.png b/stickynotes/pixmaps/resize_se.png deleted file mode 100644 index 374314ba..00000000 Binary files a/stickynotes/pixmaps/resize_se.png and /dev/null differ diff --git a/stickynotes/pixmaps/resize_sw.png b/stickynotes/pixmaps/resize_sw.png deleted file mode 100644 index fa216283..00000000 Binary files a/stickynotes/pixmaps/resize_sw.png and /dev/null differ diff --git a/stickynotes/pixmaps/stickynotes-stock-close.png b/stickynotes/pixmaps/stickynotes-stock-close.png new file mode 100644 index 00000000..ad0e1eaa Binary files /dev/null and b/stickynotes/pixmaps/stickynotes-stock-close.png differ diff --git a/stickynotes/pixmaps/stickynotes-stock-locked.png b/stickynotes/pixmaps/stickynotes-stock-locked.png new file mode 100644 index 00000000..878eedb4 Binary files /dev/null and b/stickynotes/pixmaps/stickynotes-stock-locked.png differ diff --git a/stickynotes/pixmaps/stickynotes-stock-resize-se.png b/stickynotes/pixmaps/stickynotes-stock-resize-se.png new file mode 100644 index 00000000..374314ba Binary files /dev/null and b/stickynotes/pixmaps/stickynotes-stock-resize-se.png differ diff --git a/stickynotes/pixmaps/stickynotes-stock-resize-sw.png b/stickynotes/pixmaps/stickynotes-stock-resize-sw.png new file mode 100644 index 00000000..fa216283 Binary files /dev/null and b/stickynotes/pixmaps/stickynotes-stock-resize-sw.png differ diff --git a/stickynotes/pixmaps/stickynotes-stock-unlocked.png b/stickynotes/pixmaps/stickynotes-stock-unlocked.png new file mode 100644 index 00000000..72bbc9ee Binary files /dev/null and b/stickynotes/pixmaps/stickynotes-stock-unlocked.png differ diff --git a/stickynotes/pixmaps/unlocked.png b/stickynotes/pixmaps/unlocked.png deleted file mode 100644 index 72bbc9ee..00000000 Binary files a/stickynotes/pixmaps/unlocked.png and /dev/null differ -- cgit v1.2.1