From d9101535ee8a07dfdc932d5f5ddb8e8184c20e33 Mon Sep 17 00:00:00 2001
From: Anton <anton@picapica>
Date: Thu, 6 Jun 2019 21:01:00 +0400
Subject: update icon installation procedures

---
 Makefile.am                 | 3 ++-
 debian/pica-client.install  | 1 +
 debian/pica-client.postinst | 8 ++++----
 windows/pica-client.nsi     | 8 ++++----
 windows/pica-node.nsi       | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c0d93fa..be01e97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ EXTRA_DIST = 	iniparser/LICENSE \
 			debian \
 			gentoo \
 			windows \
-			apple/Info.plist
+			apple \
+			pica-client/icons
 
 #####################################
 if PICA_NODE
diff --git a/debian/pica-client.install b/debian/pica-client.install
index 476b769..420f319 100644
--- a/debian/pica-client.install
+++ b/debian/pica-client.install
@@ -1,4 +1,5 @@
 pica-client/pica-client.desktop usr/share/applications
+pica-client/icons/* usr/share/pica-client
 debian/tmp/usr/bin/pica-client
 debian/tmp/usr/share/pica-client/*
 
diff --git a/debian/pica-client.postinst b/debian/pica-client.postinst
index 23cd602..ecfcc83 100644
--- a/debian/pica-client.postinst
+++ b/debian/pica-client.postinst
@@ -20,10 +20,10 @@ set -e
 
 case "$1" in
     configure)
-
-        xdg-icon-resource install --size 32 "/usr/share/pica-client/picapica-icon-sit.png" pica-client
-	xdg-icon-resource install --size 22 "/usr/share/pica-client/picapica-icon-sit.png" pica-client
-	xdg-icon-resource install --size 64 "/usr/share/pica-client/picapica-icon-sit.png" pica-client
+	xdg-icon-resource install --size 16 "/usr/share/pica-client/icons/icon_16x16.png" pica-client
+        xdg-icon-resource install --size 32 "/usr/share/pica-client/icons/icon_32x32.png" pica-client
+	xdg-icon-resource install --size 48 "/usr/share/pica-client/icons/icon_48x48.png" pica-client
+	xdg-icon-resource install --size 256 "/usr/share/pica-client/picapica-icon-fly.png" pica-client
 
     ;;
 
diff --git a/windows/pica-client.nsi b/windows/pica-client.nsi
index ae71902..8f6e410 100644
--- a/windows/pica-client.nsi
+++ b/windows/pica-client.nsi
@@ -10,7 +10,7 @@ LicenseData "COPYING"
 
 InstallDir "$PROGRAMFILES\Pica Pica Messenger"
 
-Icon "picapica-icon-sit.ico"
+Icon "picapica.ico"
 
 RequestExecutionLevel admin
 
@@ -23,7 +23,7 @@ Section "" ;No components page, name is not important
   ; Put file there
   File "pica-client.exe"
   File "openssl.exe"
-  File "picapica-icon-sit.ico"
+  File "picapica.ico"
   File "COPYING"
   File "OPENSSL.LICENSE.txt"
   File "README"
@@ -63,7 +63,7 @@ Section "Start Menu Shortcuts"
 
   CreateDirectory "$SMPROGRAMS\Pica Pica Messenger"
   SetOutPath $INSTDIR
-  CreateShortCut "$SMPROGRAMS\Pica Pica Messenger\Pica Pica Messenger.lnk" "$INSTDIR\pica-client.exe" "" "$INSTDIR\picapica-icon-sit.ico" 
+  CreateShortCut "$SMPROGRAMS\Pica Pica Messenger\Pica Pica Messenger.lnk" "$INSTDIR\pica-client.exe" "" "$INSTDIR\picapica.ico" 
   
 SectionEnd
 
@@ -72,7 +72,7 @@ Section "Uninstall"
   Delete "$INSTDIR\pica-client.exe"
   Delete "$INSTDIR\openssl.exe"
   Delete "$INSTDIR\*.dll"
-  Delete "$INSTDIR\picapica-icon-sit.ico"
+  Delete "$INSTDIR\picapica.ico"
   Delete "$INSTDIR\COPYING"
   Delete "$INSTDIR\README"
   Delete "$INSTDIR\OPENSSL.LICENSE.txt"
diff --git a/windows/pica-node.nsi b/windows/pica-node.nsi
index be6192b..2fe9b9e 100644
--- a/windows/pica-node.nsi
+++ b/windows/pica-node.nsi
@@ -10,7 +10,7 @@ LicenseData "COPYING"
 
 InstallDir "$PROGRAMFILES\Pica Pica Node"
 
-Icon "picapica-icon-sit.ico"
+Icon "picapica.ico"
 
 RequestExecutionLevel admin
 
-- 
cgit v1.2.1