From b4d3f97c53120c3aa02cd80c7e18c97fa2569a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=C3=B6hler?= <andi5.py@gmx.net>
Date: Fri, 25 Apr 2008 23:19:33 +0000
Subject: [PATCH] Bug #523922: Use correct scalable icon and add/fix
 22x22/24x24 icons.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For the scalable icon, use art/tango/scalable/gnucash.svg instead of
art/icon.svgz.

art/tango/22x22/gnucash.png is actually of size 24², so rename it to
gnucash-24x24.png and create gnucash-22x22.png by removing the
transparent 1px border.  Install those icons into
${datadir}/icons/hicolor/${size}/apps so that apps like gnome-panel do
not scale down the .svg instead.

BP


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17126 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 art/tango/22x22/gnucash-22x22.png             | Bin 0 -> 1184 bytes
 .../22x22/{gnucash.png => gnucash-24x24.png}  | Bin
 src/pixmaps/Makefile.am                       |  56 ++++++++++++------
 3 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 art/tango/22x22/gnucash-22x22.png
 rename art/tango/22x22/{gnucash.png => gnucash-24x24.png} (100%)

diff --git a/art/tango/22x22/gnucash-22x22.png b/art/tango/22x22/gnucash-22x22.png
new file mode 100644
index 0000000000000000000000000000000000000000..768c89f80c75c27c9bd7ebe58f550c0742cfbaf8
GIT binary patch
literal 1184
zcmV;R1Yi4!P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOD|
z76mpyPBbY100baOL_t(I%axT|h?Hd<#((eo9cOmFJ+y~*wRBx^bB$ILHAOTDqHx_U
zK_XJR$g(5|f-WNPuA2xuTy#|tLXm_-xMf0ti<GOGZiMEltL?7mX%92AbN=Rg-!8@(
zcie&Uz54V0|2#bZ=Xu`u6IyEkwr$_G#B;)XGuiBBrIf)v94TcGa@|9jbn>nJ`@g*a
zV3wMm6W+Ua?Yb>}y?w%U-Fv|$o6Q;r`wwn8Hh9bcdMbc3+3e=N-acVFHh#e`e$<-c
zKDr8=KmZ7VZQJzq_K70{N1iTkQ7V*DhU>cYf8UQ`m`G`mOeHZ41H&*$rBWD%Ijc61
zhDkggqYwnRu8UHtjAvF`EgqjP*NH^DY8{Wq@O>Yp0wyP;w6)H!)V&(8=XrQuEdY^-
zN5u1rwO6dQ)`UVKyxQVSeM7@sL#qL6pp+J^HA?A{TqvdR{X9ykikZ7lRVk7)GeoB{
zeEsu9wm;QLQ(ZA7>12{vB2AzIlu~zOiNy%F*8Df)>7?Sb{$W;kweWfWd8U#9S}CHj
z9LLX1AOzGzB4vq6vi&FHPYw*R^O;9zYp{8!y_pZb`khrv>p6X4iZ`BLLD(v;UzURZ
zA%)hO7oJ?q{dER~f=|Q_cxm%uKK$lS-h8f`h*g|Rr&9R&8HSI)$MlUsvgsHbI&40E
z+c{tG^F4EbqtRPz+SCAO^65NIC`88shxcD!hZAxDK`xWUb{&R(+D%;~$NFtMXlQC-
zdLqi{69b)NmxfQ8)l;F-s^oZp(qfkTw-XZN@$*S6rv}rqFiji7w6H82t+i7XSO5x*
z<=AB{P20Mi1c7N=paY~~ac%T3#xI>=CXvLejUc4}T?j<?4%q=*s)&j<SrYVuhRfz*
ze32>l_Pz593tKx;D&X*!J=|9pW%<fQ)Hl=+n@aM>smqL9yqPwEp7y1!*_9i+%1>H+
z#KatV5GUj?uW1AI%kqHc%!$AG=!<vhYF-aoVJB{pPsO-)Ws*cZMQvRTQVNaM=S;)m
z#kNI_?(7?sxe{h|=Q2#o;@I#AdRZ2L<_Bt-N?vEz%detTfkXQa(A+5LezbiyV?C10
zDl_m|HTdIM;B0x_F1E7xi4LTc{BQ^cKRsIE!7ICWA~9G#?<#&K&(-mNNW{}c#)d#C
zQOt4s#=ATm5OhDhqG+TRv_F2QKYFx)#C%PPLf$pgd)nqVFI>KIkt{JDI(3;uB5InY
z;n`=YhOzOn(px{L59F1Wx#@&RkB?1pb$o)EL>jL)jM9?nIN7R<#Q==o1{R{SKYFx)
z7EDMTD1jD@Esbi;W9_oBsfNjk6eoWh4X)q3E=BhaIp?Bx`p=erJZLl*tnVr}Dr{Y&
yv<SlTMrc9p&>kuL75SXs;yC6_;MZKPu<Kv6MCbY}#5iC80000<MNUMnLSTaJsxH$2

literal 0
HcmV?d00001

diff --git a/art/tango/22x22/gnucash.png b/art/tango/22x22/gnucash-24x24.png
similarity index 100%
rename from art/tango/22x22/gnucash.png
rename to art/tango/22x22/gnucash-24x24.png
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index fa6acbbc9a..d4e21c7618 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -36,31 +36,48 @@ gncpixmap_DATA = \
   stock_split_title.png \
   stock_split_watermark.png
 
-gncnormalicondir = ${datadir}/icons/hicolor/48x48/apps
-gncnormalicon_DATA = 48x48/gnucash-icon.png
-48x48/gnucash-icon.png: gnucash-icon-48x48.png
-	-mkdir -p 48x48
-	cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png
+gnclargeicondir = ${datadir}/icons/hicolor/48x48/apps
+gnclargeicon_DATA = 48x48/gnucash-icon.png
 
 gncmediumicondir = ${datadir}/icons/hicolor/32x32/apps
 gncmediumicon_DATA = 32x32/gnucash-icon.png
-32x32/gnucash-icon.png: gnucash-icon-32x32.png
-	-mkdir -p 32x32
-	cp ${srcdir}/gnucash-icon-32x32.png 32x32/gnucash-icon.png
 
-gncsmallicondir = ${datadir}/icons/hicolor/16x16/apps
-gncsmallicon_DATA = 16x16/gnucash-icon.png
-16x16/gnucash-icon.png: gnucash-icon-16x16.png
-	-mkdir -p 16x16
-	cp ${srcdir}/gnucash-icon-16x16.png 16x16/gnucash-icon.png
+gncsmalltwfouricondir = ${datadir}/icons/hicolor/24x24/apps
+gncsmalltwfouricon_DATA = 24x24/gnucash-icon.png
+
+gncsmalltwtwoicondir = ${datadir}/icons/hicolor/22x22/apps
+gncsmalltwtwoicon_DATA = 22x22/gnucash-icon.png
+
+gncextrasmallicondir = ${datadir}/icons/hicolor/16x16/apps
+gncextrasmallicon_DATA = 16x16/gnucash-icon.png
 
 gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
 gncscalableicon_DATA = scalable/gnucash-icon.svg
 
 if BUILDING_FROM_SVN
-scalable/gnucash-icon.svg: ${top_srcdir}/art/icon.svgz
+48x48/gnucash-icon.png: gnucash-icon-48x48.png
+	-mkdir -p 48x48
+	cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png
+
+32x32/gnucash-icon.png: ${top_srcdir}/art/tango/32x32/gnucash.png
+	-mkdir -p 32x32
+	cp ${top_srcdir}/art/tango/32x32/gnucash.png 32x32/gnucash-icon.png
+
+24x24/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-24x24.png
+	-mkdir -p 24x24
+	cp ${top_srcdir}/art/tango/22x22/gnucash-24x24.png 24x24/gnucash-icon.png
+
+22x22/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-22x22.png
+	-mkdir -p 22x22
+	cp ${top_srcdir}/art/tango/22x22/gnucash-22x22.png 22x22/gnucash-icon.png
+
+16x16/gnucash-icon.png: ${top_srcdir}/art/tango/16x16/gnucash.png
+	-mkdir -p 16x16
+	cp ${top_srcdir}/art/tango/16x16/gnucash.png 16x16/gnucash-icon.png
+
+scalable/gnucash-icon.svg: ${top_srcdir}/art/tango/scalable/gnucash.svg
 	-mkdir -p scalable
-	gzip -cd ${top_srcdir}/art/icon.svgz > scalable/gnucash-icon.svg
+	cp ${top_srcdir}/art/tango/scalable/gnucash.svg scalable/gnucash-icon.svg
 endif
 
 # As suggested by <http://live.gnome.org/GnomeGoals/AppIcon>
@@ -80,7 +97,12 @@ endif
 
 EXTRA_DIST = \
   ${gncpixmap_DATA} \
-  ${gncnormalicon_DATA} ${gncmediumicon_DATA} ${gncsmallicon_DATA} ${gncscalableicon_DATA}
+  ${gnclargeicon_DATA} \
+  ${gncmediumicon_DATA} \
+  ${gncsmalltwfouricon_DATA} \
+  ${gncsmalltwtwoicon_DATA} \
+  ${gncextrasmallicon_DATA} \
+  ${gncscalableicon_DATA}
 
 clean-local:
-	-rm -rf 48x48 32x32 16x16 scalable
+	-rm -rf 48x48 32x32 24x24 22x22 16x16 scalable