* Backport the new VLC icon by Eurodata Computer Club

Makefile.am

@@ -879,7 +879,7 @@ package-win32-base:
            $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
 
-	cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
@@ -983,7 +983,7 @@ package-wince-base:
            $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
 
-	cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
 if BUILD_MOZILLA
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"

THANKS

@@ -43,6 +43,7 @@ DirektX <direktx at freemail.hu> - Hungarian translation
 Emmanuel Blindauer <manu at agat.net> - aRts audio output
 Espen Skoglund <esk at ira.uka.de> - FreeBSD autoconf and Makefile patches
 Ethan C. Baldridge <BaldridgeE at cadmus.com> - directory browsing code
+Eurodata Rcomputer Rclub <retron.info> - VLC icon design (v0.8.4)
 François Seingier <francois.seingier at club-internet.fr> - TTL setting in the wx stream output dialog
 Frank Chao <frank0624 at gmail.com> - Chinese Traditional translation
 Fumio Nakayama <endymion at ca2.so-net.ne.jp> - Japanese translation

share/Makefile.am

@@ -9,6 +9,7 @@ dist_pkgdata_DATA = \
 	$(DIST_icons16) \
 	$(DIST_icons32) \
 	$(DIST_icons48) \
+	$(DIST_icons128) \
 	$(NULL)
 
 nobase_dist_pkgdata_DATA = \
@@ -22,13 +23,11 @@ DIST_fonts = \
 	$(NULL)
 
 DIST_rsrc = \
-	vlc.icns \
 	newres.h \
 	resource.h \
 	vlc_wince_rc.rc \
 	vlc_beos.rsrc \
 	vlc_win32_rc.rc \
-	vlc-icons.xcf \
 	$(NULL)
 
 DIST_pda = \
@@ -53,10 +52,14 @@ DIST_icons32 = \
 	$(NULL)
 
 DIST_icons48 = \
-	vlc48x48new.ico \
+	vlc48x48.ico \
 	vlc48x48.png \
 	$(NULL)
 
+DIST_icons128 = \
+	vlc128x128.png \
+	$(NULL)
+
 DIST_skins2 = \
 	skins2/default.vlt \
 	\

share/vlc16x16.xpm

-/* XPM */
-static char * vlc16x16_xpm[] = {
-"16 16 70 1",
-" 	c None",
-".	c #D07515",
-"+	c #B0600D",
-"@	c #CA7215",
-"#	c #AD5F0D",
-"$	c #F3AD60",
-"%	c #C2701A",
-"&	c #B16C24",
-"*	c #FAFAFA",
-"=	c #D4D4D3",
-"-	c #C3C3C3",
-";	c #F9EEE3",
-">	c #D2D2D2",
-",	c #C3C2C1",
-"'	c #BAA38C",
-")	c #E5841E",
-"!	c #BC7022",
-"~	c #AF6518",
-"{	c #AC5E0D",
-"]	c #F0A95E",
-"^	c #DC7B17",
-"/	c #B8650E",
-"(	c #AE5F0D",
-"_	c #B0671C",
-":	c #FDFDFD",
-"<	c #E9DCCD",
-"[	c #C7AF96",
-"}	c #BEAA96",
-"|	c #C2BFBC",
-"1	c #FDF6ED",
-"2	c #E8E8E8",
-"3	c #CDCDCD",
-"4	c #BAA187",
-"5	c #DB7711",
-"6	c #D87611",
-"7	c #E68826",
-"8	c #D69E64",
-"9	c #C29A72",
-"0	c #B89065",
-"a	c #B4793C",
-"b	c #AF600E",
-"c	c #BC6A13",
-"d	c #CB6F10",
-"e	c #C86E0F",
-"f	c #DE7A12",
-"g	c #C96E10",
-"h	c #B6640E",
-"i	c #AD5E0D",
-"j	c #DB7913",
-"k	c #462706",
-"l	c #BF680E",
-"m	c #BE680E",
-"n	c #B4620E",
-"o	c #AB5E0D",
-"p	c #A65A0C",
-"q	c #A75B0D",
-"r	c #8C4D0A",
-"s	c #301A04",
-"t	c #BB670F",
-"u	c #D07210",
-"v	c #C46C0F",
-"w	c #AA5D0D",
-"x	c #784209",
-"y	c #361E04",
-"z	c #0C0701",
-"A	c #201203",
-"B	c #5A3106",
-"C	c #412305",
-"D	c #130A01",
-"E	c #000000",
-"                ",
-"       .+       ",
-"       @#       ",
-"      $%&       ",
-"      *=-       ",
-"      ;>,'      ",
-"      )!~{      ",
-"     ]^/(_      ",
-"     :<[}|      ",
-"     123--4     ",
-"   567890abc    ",
-"   defgh(((ij   ",
-"   k{lmnopq{r   ",
-"    stuvwxyz    ",
-"     ABCDE      ",
-"                "};
+/* XPM */
+static char *vlc16x16_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 57 2",
+/* colors */
+"AA c #A6A646460E0E",
+"BA c #CACA92926262",
+"CA c #C2C28E8E5E5E",
+"DA c #FEFEBABA1A1A",
+"EA c #AEAEBABAC6C6",
+"FA c #E6E66A6A0202",
+"GA c #C6C6CECECECE",
+"HA c #E2E27E7E2222",
+"IA c #D6D65A5A0202",
+"JA c #C2C296967272",
+"KA c #EEEE76760202",
+"LA c #CACABEBEB2B2",
+"MA c #CECEDADAE2E2",
+"NA c #E2E25E5E0202",
+"OA c #E6E672720202",
+"PA c #FEFEAEAE1A1A",
+"AB c #FAFA8E8E0202",
+"BB c #A6A6B2B2BEBE",
+"CB c #BABA3E3E0202",
+"DB c #CECED6D6DEDE",
+"EB c #C2C2C6C6CACA",
+"FB c #EEEE6A6A0202",
+"GB c #C6C6D2D2D6D6",
+"HB c #F6F67E7E0202",
+"IB c #D6D662620202",
+"JB c #CECECACAC6C6",
+"KB c #E6E666660202",
+"LB c #CACAB6B69A9A",
+"MB c #E6E66E6E0202",
+"NB c #F2F27A7A0202",
+"OB c #DADAC2C2AAAA",
+"PB c #D6D6DEDEE2E2",
+"AC c #EEEE72720202",
+"BC c #BABA46460202",
+"CC c #FEFE9E9E1A1A",
+"DC c #B2B24E4E0E0E",
+"EC c #FEFEBEBE1A1A",
+"FC c #B2B2C2C2CECE",
+"GC c #C6C6CECED6D6",
+"HC c #DADA5A5A0202",
+"IC c #CACAA2A27676",
+"JC c #EEEE76760E0E",
+"KC c #CECEC2C2B6B6",
+"LC c #D2D2DEDEE6E6",
+"MC c #E2E262620202",
+"NC c #FEFEB6B61A1A",
+"OC c #EAEA8E8E2A2A",
+"PC c #A6A6B6B6C2C2",
+"AD c #BEBECACAD2D2",
+"BD c #F2F282820E0E",
+"CD c #DEDE66660202",
+"DD c #EAEA66660202",
+"ED c #CACAB6B69E9E",
+"FD c #F2F272720202",
+"GD c #C2C24A4A0202",
+"HD c #FEFEA2A21A1A",
+"ID s bg c None",
+/* pixels */
+"IDIDIDIDIDIDIDIDIDIDIDIDIDIDIDID",
+"IDIDIDIDIDIDIDOAOAIDIDIDIDIDIDID",
+"IDIDIDIDIDIDIDOCOCIDIDIDIDIDIDID",
+"IDIDIDIDIDIDOCPBDBOCIDIDIDIDIDID",
+"IDIDIDIDIDIDEALCMABBIDIDIDIDIDID",
+"IDIDIDIDIDIDICOBOBJAIDIDIDIDIDID",
+"IDIDIDIDIDIDFAFDHBFAIDIDIDIDIDID",
+"IDIDIDIDIDACMBFDHBKAACIDIDIDIDID",
+"IDIDIDIDIDHAHAJCBDHAHAIDIDIDIDID",
+"IDIDIDIDIDFCGAJBJBEBFCIDIDIDIDID",
+"IDIDIDIDDCFCGCGBGBADPCDCIDIDIDID",
+"IDIDIDIADCBAEDLAKCLBCAAACBIDIDID",
+"IDIDCDCDGDHCMCKBACACNABCIBCDIDID",
+"IDABABABKAFAKBDDFBACKANBABABABID",
+"IDECNCNCPACCCCCCCCHDHDPADAECECID",
+"IDIDGDGDGDGDGDGDGDGDGDGDGDGDIDID"};

share/vlc_win32_rc.rc

-VLC_ICON ICON "vlc48x48new.ico"
+VLC_ICON ICON "vlc48x48.ico"
 #ifndef VERSION_NUMBER
 #define VERSION_NUMBER 0,0,0,0
 #endif

vlc.win32.nsi

@@ -43,8 +43,8 @@ InstType "Full"
 
 ; MUI Settings
   !define MUI_ABORTWARNING
-  !define MUI_ICON "vlc48x48new.ico"
-  !define MUI_UNICON "vlc48x48new.ico"
+  !define MUI_ICON "vlc48x48.ico"
+  !define MUI_UNICON "vlc48x48.ico"
   !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ; Installer pages