core: add different icons sizes (16x16 to 512x512) (closes #1347)

CMakeLists.txt

@@ -235,6 +235,8 @@ if(DL_LIBRARY)
   list(APPEND EXTRA_LIBS dl)
 endif()
 
+add_subdirectory(icons)
+
 if(ENABLE_NLS)
   add_subdirectory(po)
 endif()
@@ -299,9 +301,6 @@ if(CYGWIN)
   )
 endif()
 
-# icon
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)
-
 # desktop file
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION ${SHAREDIR}/applications)
 

ChangeLog.adoc

@@ -20,6 +20,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 
 New features::
 
+  * core: add different icons sizes (16x16 to 512x512) (issue #1347)
   * core: add file weechat.desktop
   * core: add reverse of string for screen in evaluation of expressions with "revscr:"
   * core: add length of string (number of chars and on screen) in evaluation of expressions with "length:xxx" and "lengthscr:xxx"

Makefile.am

@@ -29,7 +29,7 @@ if TESTS
 tests_dir = tests
 endif
 
-SUBDIRS = po doc intl src $(tests_dir)
+SUBDIRS = icons po doc intl src $(tests_dir)
 
 EXTRA_DIST = AUTHORS.adoc \
              ChangeLog.adoc \
@@ -67,7 +67,6 @@ EXTRA_DIST = AUTHORS.adoc \
              tools/makedist.sh \
              version.sh \
              weechat.desktop \
-             weechat.png \
              weechat.pc.in \
              weechat.cygport.in
 
@@ -76,9 +75,6 @@ ACLOCAL_AMFLAGS = -I m4
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = weechat.pc
 
-icondir = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = weechat.png
-
 desktopdir = $(datadir)/applications
 desktop_DATA = weechat.desktop
 

configure.ac

@@ -1375,6 +1375,7 @@ AM_CONDITIONAL(MAN,                     test "$enable_man" = "yes")
 AM_CONDITIONAL(DOC,                     test "$enable_doc" = "yes")
 
 AC_OUTPUT([Makefile
+           icons/Makefile
            doc/Makefile
            doc/en/Makefile
            doc/fr/Makefile

icons/CMakeLists.txt

@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+#
+# This file is part of WeeChat, the extensible chat client.
+#
+# WeeChat is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# WeeChat is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+foreach(size 16 32 64 128 256 512)
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${size}x${size}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/${size}x${size}/apps)
+endforeach()

icons/Makefile.am

@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+#
+# This file is part of WeeChat, the extensible chat client.
+#
+# WeeChat is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# WeeChat is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+EXTRA_DIST = 16x16/weechat.png \
+             32x32/weechat.png \
+             64x64/weechat.png \
+             128x128/weechat.png \
+             256x256/weechat.png \
+             512x512/weechat.png
+
+icon16dir = $(datadir)/icons/hicolor/16x16/apps
+icon32dir = $(datadir)/icons/hicolor/32x32/apps
+icon64dir = $(datadir)/icons/hicolor/64x64/apps
+icon128dir = $(datadir)/icons/hicolor/128x128/apps
+icon256dir = $(datadir)/icons/hicolor/256x256/apps
+icon512dir = $(datadir)/icons/hicolor/512x512/apps
+
+icon16_DATA = 16x16/weechat.png
+icon32_DATA = 32x32/weechat.png
+icon64_DATA = 64x64/weechat.png
+icon128_DATA = 128x128/weechat.png
+icon256_DATA = 256x256/weechat.png
+icon512_DATA = 512x512/weechat.png

weechat.spec

@@ -74,7 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/*
 %{_libdir}/pkgconfig/weechat.pc
 %{_includedir}/%{name}/weechat-plugin.h
+%{_prefix}/share/icons/hicolor/16x16/apps/weechat.png
 %{_prefix}/share/icons/hicolor/32x32/apps/weechat.png
+%{_prefix}/share/icons/hicolor/64x64/apps/weechat.png
+%{_prefix}/share/icons/hicolor/128x128/apps/weechat.png
+%{_prefix}/share/icons/hicolor/256x256/apps/weechat.png
+%{_prefix}/share/icons/hicolor/512x512/apps/weechat.png
 
 %changelog
 * Sun Sep 08 2019 Sébastien Helleu <flashcode@flashtux.org> 2.6-1