[vlc-devel] commit: Win32: add a new vlc.ico that supports Vista and Seven guidelines. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan  5 00:11:11 2009 +0100| [5db54724d4a25800c52c675a7a2acf2e0bcf99e5] | committer: Jean-Baptiste Kempf 

Win32: add a new vlc.ico that supports Vista and Seven guidelines.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5db54724d4a25800c52c675a7a2acf2e0bcf99e5
---

 Makefile.am                           |    2 +-
 extras/package/win32/vlc.win32.nsi.in |    4 ++--
 share/Makefile.am                     |    5 ++++-
 share/vlc.ico                         |  Bin 0 -> 73164 bytes
 share/vlc_win32_rc.rc.in              |    2 +-
 share/vlc_wince_rc.rc                 |    2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 81beadd..402803d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -709,7 +709,7 @@ package-win-common:
 	unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
 
 # Necessary icons
-	cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/
+	cp $(srcdir)/share/vlc.ico $(win32_destdir)/
 
 # Copy the locales
 	mkdir -p $(win32_destdir)/locale
diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index ba48fbf..e64a96d 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -56,8 +56,8 @@ InstType $Name_InstTypeFull
 
 ; MUI Settings
   !define MUI_ABORTWARNING
-  !define MUI_ICON "vlc48x48.ico"
-  !define MUI_UNICON "vlc48x48.ico"
+  !define MUI_ICON "vlc.ico"
+  !define MUI_UNICON "vlc.ico"
   !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ; Installer pages
diff --git a/share/Makefile.am b/share/Makefile.am
index 3c1ffb7..938501f 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -5,6 +5,7 @@ pkgdatadir = $(datadir)/vlc
 nobase_dist_data_DATA = applications/vlc.desktop
 
 dist_pkgdata_DATA = \
+	$(DIST_icons) \
 	$(DIST_icons16) \
 	$(DIST_icons32) \
 	$(DIST_icons48) \
@@ -79,11 +80,13 @@ DIST_pda = \
 	pda-rewindb16x16.xpm \
 	pda-stopb16x16.xpm
 
+DIST_icons = vlc.ico
+
 DIST_icons16 = vlc16x16.png vlc16x16.xpm
 
 DIST_icons32 = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
 
-DIST_icons48 = vlc48x48.ico vlc48x48.png vlc48x48-christmas.png
+DIST_icons48 = vlc48x48.png vlc48x48-christmas.png
 
 DIST_icons128 = vlc128x128.png vlc128x128-christmas.png
 
diff --git a/share/vlc.ico b/share/vlc.ico
new file mode 100644
index 0000000..6337009
Binary files /dev/null and b/share/vlc.ico differ
diff --git a/share/vlc_win32_rc.rc.in b/share/vlc_win32_rc.rc.in
index d7c5ef7..787ba06 100644
--- a/share/vlc_win32_rc.rc.in
+++ b/share/vlc_win32_rc.rc.in
@@ -1,6 +1,6 @@
 #define VERSION_NUMBER @VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA_RC@
 
-VLC_ICON ICON "vlc48x48.ico"
+VLC_ICON ICON "vlc.ico"
 
 1 VERSIONINFO
 FILETYPE 1
diff --git a/share/vlc_wince_rc.rc b/share/vlc_wince_rc.rc
index eb894ca..88eae8d 100644
--- a/share/vlc_wince_rc.rc
+++ b/share/vlc_wince_rc.rc
@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_NIOUP               ICON    DISCARDABLE     "vlc48x48.ico"
+IDI_NIOUP               ICON    DISCARDABLE     "vlc.ico"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////