From 7b4dda326f16fc85fa089bccabcf219f0e426def Mon Sep 17 00:00:00 2001 From: Charles Wilson Date: Tue, 29 Dec 2009 05:03:00 +0000 Subject: [PATCH] Add hippo.ico to cygicons DLL --- ChangeLog | 12 ++++++++++++ Makefile.am | 6 ++++-- NEWS | 4 ++++ src/cygicons/README | 36 ++++++++++++++++++++++++++++++++++-- src/cygicons/cygicons.h | 1 + src/cygicons/cygicons.rc.in | 9 +++++---- 6 files changed, 60 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 590cc48..f2cb34f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2009-12-06 Charles Wilson + + Add hippo.ico to cygicons DLL. + * src/cygicons/hippo.svg: New file. + * src/cygicons/hippo.ico: New file. + * src/cygicons/README: Update documentation. + * src/cygicons/cygicons.h: Add hippo.ico. + * src/cygicons/cygicons.rc.in: Add hippo.ico. Update + copyright date. + * Makefile.am: Add hippo.svg and hippo.ico. + * NEWS: Update documentation. + 2009-12-03 Dave Korn Fix mkshortcut bug. diff --git a/Makefile.am b/Makefile.am index 2ff9054..266346e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,11 +88,13 @@ cygicons_list = \ src/cygicons/cygwin.ico src/cygicons/cygwinpurple.ico \ src/cygicons/cygwinblue.ico src/cygicons/cygwinred.ico \ src/cygicons/cygwincyan.ico src/cygicons/cygwinshiny.ico \ - src/cygicons/cygwing.ico src/cygicons/cygwinyellow.ico + src/cygicons/cygwing.ico src/cygicons/cygwinyellow.ico \ + src/cygicons/hippo.ico EXTRA_DIST = bootstrap common.h \ BRANCHES $(man_MANS) $(doc_DATA) $(EXTRA_SCRIPTS) \ - $(licenses) $(po_files) $(extra_docs) $(cygicons_list) + $(licenses) $(po_files) $(extra_docs) $(cygicons_list) \ + src/cygicons/hippo.svg DISTCLEANFILES = \ po/Makefile \ diff --git a/NEWS b/NEWS index 2d30b9e..eeb942e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +1.4.2 + Add hippo icon to cygicons. + Fix mkshortcut bug. + 1.4.1 Add --help option to lpr. Build system improvements. diff --git a/src/cygicons/README b/src/cygicons/README index 8b0f403..f2187f2 100644 --- a/src/cygicons/README +++ b/src/cygicons/README @@ -1,7 +1,9 @@ Provenance, licensing, and resolution, Oh My! -Windows icons come in many flavors: size, number -of colors, transparency mechanism, etc. +Windows .ICO file format +======================================================================== +Windows icons come in many flavors: size, number of colors, transparency +mechanism, etc. The format of a single .ico image: ---------------------------------- @@ -126,11 +128,16 @@ Main icon sizes: 32x32 : default icon size for desktop icons 48x48 : DisplayProperties->Appearance->Advanced, Item=Icon, set size. Not often used. + 64x64 : New icon size for Vista. 256x256 : New icon size for Vista. Stored in compressed PNG format within the .ico file; completely violates all the rules described above. Icons in this package: +======================================================================== +Provenance, licensing, and resolution information. + + ================================================== cygwin.ico License : GPL @@ -238,3 +245,28 @@ cygwin-kdelook.ico 16x16 32bit +================================================== +hippo.ico + License : CC-BY-SA 3.0 + Author : Charles Wilson + Provenance: derived from public domain, Michal Pecyna + http://openclipart.org/media/files/TheStructorr/1751 + Comments : + Contents : + 48x48 16 color + 32x32 16 color + 24x24 16 color + 16x16 16 color + 48x48 256 color + 32x32 256 color + 24x24 256 color + 16x16 256 color + 64x64 32bit + 48x48 32bit + 32x32 32bit + 24x24 32bit + 16x16 32bit + 256x256 32bit PNG + +Creative Commons License
hippo.ico by Charles Wilson is licensed under a Creative Commons Attribution-Share Alike 3.0 United States License.
Based on a work at http://openclipart.org/media/files/TheStructorr/1751. + diff --git a/src/cygicons/cygicons.h b/src/cygicons/cygicons.h index fb0777c..1b6f000 100644 --- a/src/cygicons/cygicons.h +++ b/src/cygicons/cygicons.h @@ -33,6 +33,7 @@ #define IDI_CYGWIN_G 108 #define IDI_CYGWIN_GS 109 #define IDI_CYGWIN_KDE 110 +#define IDI_CYGWIN_HIPPO 111 #endif /* !CYGUTILS_CYGICONS_H */ diff --git a/src/cygicons/cygicons.rc.in b/src/cygicons/cygicons.rc.in index 524baf6..a7b9d1d 100644 --- a/src/cygicons/cygicons.rc.in +++ b/src/cygicons/cygicons.rc.in @@ -1,7 +1,7 @@ /** * cygicons.rc : resource description for cygwin-related icons * - * Copyright 2007 by Charles S. Wilson + * Copyright 2007,2009 by Charles S. Wilson * All rights reserved. * * This program is free software; you can redistribute it and/or @@ -39,6 +39,7 @@ IDI_CYGWIN_SHINY ICON "cygwinshiny.ico" IDI_CYGWIN_G ICON "cygwing.ico" IDI_CYGWIN_GS ICON "cygwings.ico" IDI_CYGWIN_KDE ICON "cygwin-kde.ico" +IDI_CYGWIN_HIPPO ICON "hippo.ico" #define VER_FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,@CYGICONS_DLL_VERSION@ #define VER_FILEVERSION_STR "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@.@CYGICONS_DLL_VERSION@\0" @@ -46,10 +47,10 @@ IDI_CYGWIN_KDE ICON "cygwin-kde.ico" #define VER_PRODUCTVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0 #define VER_PRODUCTVERSION_STR "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@\0" -#define VER_COMPANYNAME_STR "Charles S. Wilson @PACKAGE_BUGREPORT@\0" +#define VER_COMPANYNAME_STR "Charles S. Wilson @PACKAGE_BUGREPORT@\0" #define VER_FILEDESCRIPTION_STR "Provides cygwin-related icons.\0" #define VER_INTERNALNAME_STR "cygicons-@CYGICONS_DLL_VERSION@\0" -#define VER_LEGALCOPYRIGHT_STR "Copyright © 2007 Charles S. Wilson\0" +#define VER_LEGALCOPYRIGHT_STR "Copyright © 2007,2009 Charles S. Wilson\0" #define VER_ORIGINALFILENAME_STR "cygicons-@CYGICONS_DLL_VERSION@.dll\0" #define VER_PRODUCTNAME_STR "@PACKAGE_NAME@\0" #define VER_GNU_COPYLEFT_STR "Released under the GNU General Public License version 2 \ @@ -67,7 +68,7 @@ You should have received a copy of the GNU General Public License along with thi #define VER_DEBUG VS_FF_DEBUG #endif -VS_VERSION_INFO VERSIONINFO +VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION PRODUCTVERSION VER_PRODUCTVERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -- 2.43.5