diff options
18 files changed, 49 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 188b9a1..75954b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,6 +65,7 @@ requires: - gtk3 - intltool - iso-codes + - librsvg - make - mate-common - startup-notification @@ -86,6 +87,7 @@ requires: - libglib2.0-doc - libgtk-3-dev - libgtk-3-doc + - librsvg2-bin - libstartup-notification0-dev - libx11-dev - libxml2-dev @@ -105,6 +107,7 @@ requires: - gtk3-devel - iso-codes-devel - itstool + - librsvg2-tools - make - mate-common - redhat-rpm-config @@ -124,6 +127,7 @@ requires: - libglib2.0-doc - libgtk-3-dev - libgtk-3-doc + - librsvg2-bin - libstartup-notification0-dev - libx11-dev - libxml2-dev diff --git a/configure.ac b/configure.ac index 1e14e3c..45b20b6 100644 --- a/configure.ac +++ b/configure.ac @@ -228,6 +228,12 @@ AC_SEARCH_LIBS([sqrt], [m]) # check for gtk-doc GTK_DOC_CHECK([1.4]) +dnl ICONS: convert svg to png +AC_PATH_PROG(RSVG_CONVERT, rsvg-convert) +if test x$RSVG_CONVERT = x ; then + AC_MSG_ERROR([could not locate rsvg-convert]) +fi + AC_CONFIG_FILES([ Makefile mate-about/Makefile diff --git a/icons/Makefile.am b/icons/Makefile.am index 6fc233a..8c0bb75 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,27 +1,37 @@ NULL = public_icons_themes = \ - hicolor \ + hicolor \ + $(NULL) + +png_icons = \ + hicolor_apps_16x16_mate-desktop.png \ + hicolor_apps_22x22_mate-desktop.png \ + hicolor_apps_24x24_mate-desktop.png \ + hicolor_apps_32x32_mate-desktop.png \ + hicolor_apps_48x48_mate-desktop.png \ + hicolor_apps_128x128_mate-desktop.png \ $(NULL) public_icons = \ - hicolor_apps_16x16_mate.png \ - hicolor_apps_22x22_mate.png \ - hicolor_apps_24x24_mate.png \ - hicolor_apps_32x32_mate.png \ - hicolor_apps_48x48_mate.png \ - hicolor_apps_256x256_mate.png \ - hicolor_apps_scalable_mate.svg \ - hicolor_apps_scalable_mate-symbolic.svg \ + $(png_icons) \ + hicolor_apps_scalable_mate-desktop.svg \ + hicolor_apps_scalable_mate-desktop-symbolic.svg \ $(NULL) +hicolor_apps_%.png: hicolor_apps_scalable_mate-desktop.svg + $(RSVG_CONVERT) \ + -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) \ + -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) \ + $^ -o $@ + EXTRA_DIST = \ - $(public_icons) \ + $(public_icons) \ $(NULL) ############################################################################### -install-icons: +install-icons: $(public_icons) for icon in $(public_icons); do \ THEME=`echo $$icon | cut -d_ -f1`; \ CONTEXT=`echo $$icon | cut -d_ -f2`; \ @@ -43,3 +53,20 @@ uninstall-icons: 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: clean-png-icons +clean-png-icons: + rm -f $(png_icons) diff --git a/icons/hicolor_apps_128x128_mate-desktop.png b/icons/hicolor_apps_128x128_mate-desktop.png Binary files differnew file mode 100644 index 0000000..d1fa3fb --- /dev/null +++ b/icons/hicolor_apps_128x128_mate-desktop.png diff --git a/icons/hicolor_apps_16x16_mate-desktop.png b/icons/hicolor_apps_16x16_mate-desktop.png Binary files differnew file mode 100644 index 0000000..dd853cc --- /dev/null +++ b/icons/hicolor_apps_16x16_mate-desktop.png diff --git a/icons/hicolor_apps_16x16_mate.png b/icons/hicolor_apps_16x16_mate.png Binary files differdeleted file mode 100644 index 0a34149..0000000 --- a/icons/hicolor_apps_16x16_mate.png +++ /dev/null diff --git a/icons/hicolor_apps_22x22_mate-desktop.png b/icons/hicolor_apps_22x22_mate-desktop.png Binary files differnew file mode 100644 index 0000000..5e942ee --- /dev/null +++ b/icons/hicolor_apps_22x22_mate-desktop.png diff --git a/icons/hicolor_apps_22x22_mate.png b/icons/hicolor_apps_22x22_mate.png Binary files differdeleted file mode 100644 index 1fd92a8..0000000 --- a/icons/hicolor_apps_22x22_mate.png +++ /dev/null diff --git a/icons/hicolor_apps_24x24_mate-desktop.png b/icons/hicolor_apps_24x24_mate-desktop.png Binary files differnew file mode 100644 index 0000000..18c6555 --- /dev/null +++ b/icons/hicolor_apps_24x24_mate-desktop.png diff --git a/icons/hicolor_apps_24x24_mate.png b/icons/hicolor_apps_24x24_mate.png Binary files differdeleted file mode 100644 index 2065bea..0000000 --- a/icons/hicolor_apps_24x24_mate.png +++ /dev/null diff --git a/icons/hicolor_apps_256x256_mate.png b/icons/hicolor_apps_256x256_mate.png Binary files differdeleted file mode 100644 index 9708cdd..0000000 --- a/icons/hicolor_apps_256x256_mate.png +++ /dev/null diff --git a/icons/hicolor_apps_32x32_mate-desktop.png b/icons/hicolor_apps_32x32_mate-desktop.png Binary files differnew file mode 100644 index 0000000..334f47a --- /dev/null +++ b/icons/hicolor_apps_32x32_mate-desktop.png diff --git a/icons/hicolor_apps_32x32_mate.png b/icons/hicolor_apps_32x32_mate.png Binary files differdeleted file mode 100644 index 2a6a192..0000000 --- a/icons/hicolor_apps_32x32_mate.png +++ /dev/null diff --git a/icons/hicolor_apps_48x48_mate-desktop.png b/icons/hicolor_apps_48x48_mate-desktop.png Binary files differnew file mode 100644 index 0000000..f19a96c --- /dev/null +++ b/icons/hicolor_apps_48x48_mate-desktop.png diff --git a/icons/hicolor_apps_48x48_mate.png b/icons/hicolor_apps_48x48_mate.png Binary files differdeleted file mode 100644 index d00c802..0000000 --- a/icons/hicolor_apps_48x48_mate.png +++ /dev/null diff --git a/icons/hicolor_apps_scalable_mate-symbolic.svg b/icons/hicolor_apps_scalable_mate-desktop-symbolic.svg index 776a8dd..776a8dd 100644 --- a/icons/hicolor_apps_scalable_mate-symbolic.svg +++ b/icons/hicolor_apps_scalable_mate-desktop-symbolic.svg diff --git a/icons/hicolor_apps_scalable_mate.svg b/icons/hicolor_apps_scalable_mate-desktop.svg index ee60800..ee60800 100644 --- a/icons/hicolor_apps_scalable_mate.svg +++ b/icons/hicolor_apps_scalable_mate-desktop.svg diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h index 026cf70..ad9dd08 100644 --- a/mate-about/mate-about.h +++ b/mate-about/mate-about.h @@ -28,7 +28,7 @@ const char* program_name = "MATE Desktop Environment"; const char* version = PACKAGE_VERSION; -const char* icon = "mate"; +const char* icon = "mate-desktop"; const char* website = "http://www.mate-desktop.org/"; const char* copyright = "" |
