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

diff --git a/Makefile.am b/Makefile.am
index 81beaddbf89c39abab49aa7977428193be08bbce..402803d96f37ccc80ea50406ee09413defbd97d5 100644 (file)
--- 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 ba48fbf27b5b296027cdac5809ac707e72da3223..e64a96d1892152b69f89050b41df2811146d1cc0 100644 (file)
--- 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 3c1ffb766d2be3c0ef292e21114b371b9623a60a..938501ff36b129405bb671a6a40072a183431ced 100644 (file)
--- 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 (file)
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 d7c5ef7de068a09b7df8d8b2cb6bae1b06acadc0..787ba06e0920435fd4271f6f7096bf2c79f7ac08 100644 (file)
--- a/share/vlc_win32_rc.rc.in
+++ b/share/vlc_win32_rc.rc.in
@@ -1,6 +1,6 @@
 #define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@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 eb894ca9e580eaba75702e8ad61169e46db92566..88eae8dca55ef5349fe3231dd1220cb7f25744b3 100644 (file)
--- a/share/vlc_wince_rc.rc
+++ b/share/vlc_wince_rc.rc
@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 \r
 // Icon with lowest ID value placed first to ensure application icon\r
 // remains consistent on all systems.\r
-IDI_NIOUP               ICON    DISCARDABLE     "vlc48x48.ico"\r
+IDI_NIOUP               ICON    DISCARDABLE     "vlc.ico"\r
 \r
 #ifdef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r