r17139 - gnucash/branches/2.2 - [r17126] Bug #523922: Use correct scalable icon and add/fix 22x22/24x24 icons.

[Andreas Köhler]

Author: andi5
Date: 2008-04-26 12:50:34 -0400 (Sat, 26 Apr 2008)
New Revision: 17139
Trac: http://svn.gnucash.org/trac/changeset/17139

Added:
   gnucash/branches/2.2/art/tango/22x22/gnucash-22x22.png
   gnucash/branches/2.2/art/tango/22x22/gnucash-24x24.png
Removed:
   gnucash/branches/2.2/art/tango/22x22/gnucash.png
Modified:
   gnucash/branches/2.2/src/pixmaps/Makefile.am
Log:
[r17126] Bug #523922: Use correct scalable icon and add/fix 22x22/24x24 icons.

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.


Added: gnucash/branches/2.2/art/tango/22x22/gnucash-22x22.png
===================================================================
--- gnucash/branches/2.2/art/tango/22x22/gnucash-22x22.png	                        (rev 0)
+++ gnucash/branches/2.2/art/tango/22x22/gnucash-22x22.png	2008-04-26 16:50:34 UTC (rev 17139)
@@ -0,0 +1,9 @@
+‰PNG
+
+
+œ@
+åØe-MÛºi[ ¤aqmô/Æ/a&‘Ä« ¥
+ÖçLÃâŶEî씹fuç2LËâØðzY€æj™J^g×˯¢TCûÐÜ(é~´}6c=’Ì*3ðY5øãYàlyÝ.¶²ø‰¤”üp?=ZáÁ+»w"1X>ï*~&ÏÕñHÄÓEƆ@)QÌqûÆ»<t?¼¢h¤´?~§?z´€Ä|MŠBÞ5Ó{Úæ7/\¾r‘,1:u™D"jš¥áÙg©†±ñ±Ò[?§ä•–¹é„HMqu|‚™D¯6ŒÒ’é8ÙªŒÅ
\ No newline at end of file

Copied: gnucash/branches/2.2/art/tango/22x22/gnucash-24x24.png (from rev 17138, gnucash/branches/2.2/art/tango/22x22/gnucash.png)
===================================================================
(Binary files differ)

Deleted: gnucash/branches/2.2/art/tango/22x22/gnucash.png
===================================================================
(Binary files differ)

Modified: gnucash/branches/2.2/src/pixmaps/Makefile.am
===================================================================
--- gnucash/branches/2.2/src/pixmaps/Makefile.am	2008-04-26 16:50:22 UTC (rev 17138)
+++ gnucash/branches/2.2/src/pixmaps/Makefile.am	2008-04-26 16:50:34 UTC (rev 17139)
@@ -36,31 +36,48 @@
   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 @@
 
 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