[pan2] Follow Icon Theme Specification

[Petr Kovář <pmkovar src gnome org>]

commit 75ae7842f6c149a657402fba5e3378761195f7b3
Author: Petr Kovar <pknbe volny cz>
Date:   Thu Dec 7 00:03:23 2017 +0100

    Follow Icon Theme Specification
    
    * https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
    * TODO: redraw larger size icons that were simply scaled up.
    * Update Pan.ico.

 Makefile.am                            |    5 --
 Pan.ico                                |  Bin 2238 -> 0 bytes
 pan.iss.in                             |    6 +-
 pan.png                                |  Bin 4041 -> 0 bytes
 pan/gui/Makefile.am                    |    2 +-
 pan/gui/panrc.rc                       |    4 +-
 pan/icons/Makefile.am                  |   74 +++++++++++++++++++++++++++++---
 pan/icons/Pan.ico                      |  Bin 0 -> 3262 bytes
 pan/icons/hicolor_apps_16x16_pan.png   |  Bin 0 -> 632 bytes
 pan/icons/hicolor_apps_24x24_pan.png   |  Bin 0 -> 1091 bytes
 pan/icons/hicolor_apps_256x256_pan.png |  Bin 0 -> 25441 bytes
 pan/icons/hicolor_apps_32x32_pan.png   |  Bin 0 -> 1512 bytes
 pan/icons/hicolor_apps_48x48_pan.png   |  Bin 0 -> 2869 bytes
 pan/icons/icon_pan_logo.png            |  Bin 17058 -> 0 bytes
 14 files changed, 73 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f551cf3..13911e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,13 +42,8 @@ EXTRA_DIST = \
  COPYING-DOCS \
  README \
  README.windows \
- Pan.ico \
  pan.appdata.xml.in \
  pan.desktop.in \
- pan.png \
  pan-git.version \
  $(NULL)
 
-icon_DATA = pan.png
-icondir = $(datadir)/pixmaps
-
diff --git a/pan.iss.in b/pan.iss.in
index e7655c9..fc16a0b 100644
--- a/pan.iss.in
+++ b/pan.iss.in
@@ -55,7 +55,7 @@ Root: HKLM; Subkey: "Software\Microsoft\Windows\CurrentVersion\App Paths\Pan.exe
 [Files]
 
 Source: "c:\msys\1.0\home\shk\pan\pan\Pan.exe"; DestDir: "{app}"; Components: component_app; Flags: 
ignoreversion
-Source: "c:\msys\1.0\home\shk\pan\Pan.ico"; DestDir: "{app}"; Components: component_app; Flags: ignoreversion
+Source: "c:\msys\1.0\home\shk\pan\pan\icons\Pan.ico"; DestDir: "{app}"; Components: component_app; Flags: 
ignoreversion
 Source: "c:\msys\1.0\home\shk\pan\Changelog"; DestDir: "{app}"; Components: component_app; Flags: 
ignoreversion
 Source: "c:\msys\1.0\home\shk\pan\COPYING"; DestDir: "{app}"; Components: component_app; Flags: ignoreversion
 Source: "c:\msys\1.0\home\shk\pan\CREDITS"; DestDir: "{app}"; Components: component_app; Flags: ignoreversion
@@ -95,9 +95,9 @@ Source: "c:\msys\1.0\home\shk\pan\po\zh_CN.mo"; DestDir: "{reg:HKLM\SOFTWARE\GTK
 
 [Icons]
 
-Name: "{group}\pan"; Filename: "{app}\Pan.exe"; WorkingDir: "{app}"; IconFilename: "{app}\Pan.ico"
+Name: "{group}\pan"; Filename: "{app}\Pan.exe"; WorkingDir: "{app}"; IconFilename: "{app}\pan\icons\Pan.ico"
 Name: "{group}\Uninstall Pan"; Filename: "{uninstallexe}"
-Name: "{userdesktop}\Pan"; Filename: "{app}\Pan.exe"; WorkingDir: "{app}"; IconFilename: "{app}\Pan.ico"; 
Tasks: desktopicon
+Name: "{userdesktop}\Pan"; Filename: "{app}\Pan.exe"; WorkingDir: "{app}"; IconFilename: 
"{app}\pan\icons\Pan.ico"; Tasks: desktopicon
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Pan"; Filename: "{app}\Pan.exe"; WorkingDir: 
"{app}"; Tasks: quicklaunchicon
 
 
diff --git a/pan/gui/Makefile.am b/pan/gui/Makefile.am
index ed0fd40..4b34640 100644
--- a/pan/gui/Makefile.am
+++ b/pan/gui/Makefile.am
@@ -95,7 +95,7 @@ bin_PROGRAMS = \
 if HAVE_WIN32
 WINRC = panrc.rc
 WINRCOBJ = $(WINRC:.rc=.o)
-.rc.o: ../../config.h $(srcdir)/Pan.ico
+.rc.o: ../../config.h $(srcdir)/pan/icons/Pan.ico
        $(WINDRES) -I . -I $(srcdir) -o $@ -i $<
 else
 WINRC =
diff --git a/pan/gui/panrc.rc b/pan/gui/panrc.rc
index ffa7df8..e283a51 100644
--- a/pan/gui/panrc.rc
+++ b/pan/gui/panrc.rc
@@ -29,7 +29,7 @@ FILETYPE VFT_APP
             VALUE "FileDescription", "Pan Newsreader"
             VALUE "FileVersion", PACKAGE_VERSION
             VALUE "InternalName", "pan"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2006  Charles Kerr <charles rebelbase com>"
+            VALUE "LegalCopyright", "Copyright (C) 2002-2017 Charles Kerr and others"
             VALUE "LegalTrademarks", "GPL 2"
             VALUE "OriginalFilename", "pan.exe"
             VALUE "ProductName", "pan"
@@ -43,4 +43,4 @@ FILETYPE VFT_APP
     }
 }
 
-IDI_ICON1 ICON DISCARDABLE "../../Pan.ico"
+IDI_ICON1 ICON DISCARDABLE "../icons/Pan.ico"
diff --git a/pan/icons/Makefile.am b/pan/icons/Makefile.am
index 7804d3c..2f41aa6 100644
--- a/pan/icons/Makefile.am
+++ b/pan/icons/Makefile.am
@@ -1,3 +1,16 @@
+NULL =
+
+public_icons_themes = \
+       hicolor \
+       $(NULL)
+
+public_icons = \
+       hicolor_apps_16x16_pan.png \
+       hicolor_apps_24x24_pan.png \
+       hicolor_apps_32x32_pan.png \
+       hicolor_apps_48x48_pan.png \
+       hicolor_apps_256x256_pan.png \
+       $(NULL)
 
 stock_images = \
        icon_article_read.png \
@@ -30,7 +43,6 @@ stock_images = \
        icon_layout_3.png \
        icon_layout_4.png \
        icon_layout_5.png \
-       icon_pan_logo.png \
        icon_pan_about_logo.png \
        icon_pan.png \
        icon_read_group.png \
@@ -70,21 +82,69 @@ stock_images = \
   icon_prefs_actions.png \
   icon_prefs_panes.png \
   icon_expand_thread.png \
-  icon_collapse_thread.png
+  icon_collapse_thread.png \
+  $(NULL)
+
+noinst_DATA = \
+       Pan.ico \
+       $(NULL)
 
 EXTRA_DIST = \
-       pan-template.xcf \
-       $(stock_images)
+       $(public_icons) \
+       $(stock_images) \
+       $(noinst_DATA) \
+       $(NULL)
 
 noinst_HEADERS = \
        pan-pixbufs-internal.h \
-       pan-pixbufs.h
+       pan-pixbufs.h \
+       $(NULL)
+
+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`; \
+               CONTEXT=`echo $$icon | cut -d_ -f2`; \
+               SIZE=`echo $$icon | cut -d_ -f3`; \
+               ICONFILE=`echo $$icon | cut -d_ -f4`; \
+               mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+       done
+
+uninstall-icons:
+       -for icon in $(public_icons); do \
+               THEME=`echo $$icon | cut -d_ -f1`; \
+               CONTEXT=`echo $$icon | cut -d_ -f2`; \
+               SIZE=`echo $$icon | cut -d_ -f3`; \
+               ICONFILE=`echo $$icon | cut -d_ -f4`; \
+               rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+       done
+
+install-data-local: install-icons
+install-data-hook: update-icon-cache
+
+uninstall-local: uninstall-icons
+uninstall-hook: update-icon-cache
 
 pan-pixbufs-internal.h: $(stock_images)
                -rm -f pan-pixbufs-internal.h
                var=`echo "$(stock_images)" | sed -e 's,icon_\([^\.]*\)\.png,icon_\1 
$(srcdir)/icon_\1.png,g'` ; \
-                  echo $$var; \
-                  gdk-pixbuf-csource --extern --raw --build-list $$var > pan-pixbufs-internal.h
+               echo $$var; \
+               gdk-pixbuf-csource --extern --raw --build-list $$var > pan-pixbufs-internal.h
 
 pan-pixbufs.h: pan-pixbufs-internal.h
                -rm -f pan-pixbufs.h
diff --git a/pan/icons/Pan.ico b/pan/icons/Pan.ico
new file mode 100644
index 0000000..6115edb
Binary files /dev/null and b/pan/icons/Pan.ico differ
diff --git a/pan/icons/hicolor_apps_16x16_pan.png b/pan/icons/hicolor_apps_16x16_pan.png
new file mode 100644
index 0000000..d8b0c73
Binary files /dev/null and b/pan/icons/hicolor_apps_16x16_pan.png differ
diff --git a/pan/icons/hicolor_apps_24x24_pan.png b/pan/icons/hicolor_apps_24x24_pan.png
new file mode 100644
index 0000000..ca0cec3
Binary files /dev/null and b/pan/icons/hicolor_apps_24x24_pan.png differ
diff --git a/pan/icons/hicolor_apps_256x256_pan.png b/pan/icons/hicolor_apps_256x256_pan.png
new file mode 100644
index 0000000..3c4f120
Binary files /dev/null and b/pan/icons/hicolor_apps_256x256_pan.png differ
diff --git a/pan/icons/hicolor_apps_32x32_pan.png b/pan/icons/hicolor_apps_32x32_pan.png
new file mode 100644
index 0000000..08870c3
Binary files /dev/null and b/pan/icons/hicolor_apps_32x32_pan.png differ
diff --git a/pan/icons/hicolor_apps_48x48_pan.png b/pan/icons/hicolor_apps_48x48_pan.png
new file mode 100644
index 0000000..30118bf
Binary files /dev/null and b/pan/icons/hicolor_apps_48x48_pan.png differ