From: John Darrington Date: Fri, 26 Jul 2013 17:34:45 +0000 (+0200) Subject: Integrated the application icons X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00fd6a404453624eeb7158958b94a6bdf9c41f98;p=pspp Integrated the application icons --- diff --git a/Smake b/Smake index 3991dd4c03..e620df9cf6 100644 --- a/Smake +++ b/Smake @@ -118,6 +118,13 @@ GNULIB_MODULES = \ xstrndup \ xvasprintf +APP_ICONS = \ +src/ui/gui/icons/apps/32x32/pspp.png \ +src/ui/gui/icons/apps/22x22/pspp.png \ +src/ui/gui/icons/apps/24x24/pspp.png \ +src/ui/gui/icons/apps/256x256/pspp.png \ +src/ui/gui/icons/apps/16x16/pspp.png \ +src/ui/gui/icons/apps/48x48/pspp.png MIMETYPE_ICONS = \ @@ -141,7 +148,7 @@ src/ui/gui/icons/mimetypes/48x48/application-x-spss-sav.png \ src/ui/gui/icons/mimetypes/48x48/application-x-spss-sps.png \ -ICONS=$(MIMETYPE_ICONS) +ICONS=$(MIMETYPE_ICONS) $(APP_ICONS) all: prep_ph icons diff --git a/src/ui/gui/artwork/apps/16x16/pspp.svg b/src/ui/gui/artwork/apps/16x16/pspp.svg new file mode 100644 index 0000000000..b2b959c143 --- /dev/null +++ b/src/ui/gui/artwork/apps/16x16/pspp.svg @@ -0,0 +1,910 @@ + + + + + Chart + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Chart + Icon adapted for use in GNU PSPP (application icon). Bastián Díaz + + + Jakub Steiner + + + + http://jimmac.musichall.cz/ + + + spreadsheet + chart + pie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ui/gui/artwork/apps/22x22/pspp.svg b/src/ui/gui/artwork/apps/22x22/pspp.svg new file mode 100644 index 0000000000..c6f0510691 --- /dev/null +++ b/src/ui/gui/artwork/apps/22x22/pspp.svg @@ -0,0 +1,966 @@ + + + + + Chart + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Chart + Icon adapted for use in GNU PSPP (application icon). Bastián Díaz + + + Jakub Steiner + + + + http://jimmac.musichall.cz/ + + + spreadsheet + chart + pie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ui/gui/artwork/apps/24x24/pspp.svg b/src/ui/gui/artwork/apps/24x24/pspp.svg new file mode 100644 index 0000000000..5af2be5e14 --- /dev/null +++ b/src/ui/gui/artwork/apps/24x24/pspp.svg @@ -0,0 +1,1205 @@ + + + + + Chart + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Chart + Icon adapted for use in GNU PSPP (application icon). Bastián Díaz + + + Jakub Steiner + + + + http://jimmac.musichall.cz/ + + + spreadsheet + chart + pie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ui/gui/artwork/apps/256x256/pspp.svg b/src/ui/gui/artwork/apps/256x256/pspp.svg new file mode 100644 index 0000000000..06d0d0c306 --- /dev/null +++ b/src/ui/gui/artwork/apps/256x256/pspp.svg @@ -0,0 +1,905 @@ + + + + + Chart + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Chart + Icon adapted for use in GNU PSPP (application icon). Bastián Díaz + + + Jakub Steiner + + + + http://jimmac.musichall.cz/ + + + spreadsheet + chart + pie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ui/gui/artwork/apps/32x32/pspp.svg b/src/ui/gui/artwork/apps/32x32/pspp.svg new file mode 100644 index 0000000000..5af2be5e14 --- /dev/null +++ b/src/ui/gui/artwork/apps/32x32/pspp.svg @@ -0,0 +1,1205 @@ + + + + + Chart + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Chart + Icon adapted for use in GNU PSPP (application icon). Bastián Díaz + + + Jakub Steiner + + + + http://jimmac.musichall.cz/ + + + spreadsheet + chart + pie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ui/gui/artwork/apps/48x48/pspp.svg b/src/ui/gui/artwork/apps/48x48/pspp.svg new file mode 100644 index 0000000000..585e3f5b49 --- /dev/null +++ b/src/ui/gui/artwork/apps/48x48/pspp.svg @@ -0,0 +1,1463 @@ + + + + + Chart + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Chart + Icon adapted for use in GNU PSPP (application icon). Bastián Díaz + + + Jakub Steiner + + + + http://jimmac.musichall.cz/ + + + spreadsheet + chart + pie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ui/gui/icons/automake.mk b/src/ui/gui/icons/automake.mk index 541090d8a5..b4845aa95e 100644 --- a/src/ui/gui/icons/automake.mk +++ b/src/ui/gui/icons/automake.mk @@ -6,22 +6,26 @@ themedir = $(DESTDIR)$(datadir)/icons/hicolor sizes=16x16 22x22 24x24 32x32 48x48 256x256 -install-mimetypes: +install-ext-icons: + for context in apps mimetypes; do \ for size in $(sizes); do \ - $(MKDIR_P) $(themedir)/$$size/mimetypes ; \ - if (cd $(top_srcdir)/src/ui/gui/icons/mimetypes/$$size && \ + $(MKDIR_P) $(themedir)/$$size/$$context ; \ + if (cd $(top_srcdir)/src/ui/gui/icons/$$context/$$size && \ (test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \ - $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/mimetypes/$$size/* $(themedir)/$$size/mimetypes ; \ + $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$context/$$size/* $(themedir)/$$size/$$context ; \ fi ; \ + done ; \ done -uninstall-mimetypes: +uninstall-ext-icons: + for context in apps mimetypes; do \ for size in $(sizes); do \ - if (cd $(top_srcdir)/src/ui/gui/icons/mimetypes/$$size && \ + if (cd $(top_srcdir)/src/ui/gui/icons/$$context/$$size && \ (test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \ - rm -rf $(themedir)/$$size/mimetypes/application-x-spss-* ; \ + rm -rf $(themedir)/$$size/$$context/application-x-spss-* ; \ fi ; \ + done ; \ done @@ -51,5 +55,5 @@ uninstall-icons: -INSTALL_DATA_HOOKS += install-icons install-mimetypes -UNINSTALL_DATA_HOOKS += uninstall-icons uninstall-mimetypes +INSTALL_DATA_HOOKS += install-icons install-ext-icons +UNINSTALL_DATA_HOOKS += uninstall-icons uninstall-ext-icons