backport 11443

Makefile.am

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

share/Makefile.am

@@ -80,7 +80,7 @@ DIST_icons48 = \
 	gvlc48x48.png \
 	kvlc48x48.png \
 	qvlc48x48.png \
-	vlc48x48.ico \
+	vlc48x48new.ico \
 	vlc48x48.png \
 	$(NULL)
 

share/vlc16x16.xpm

 /* XPM */
 static char * vlc16x16_xpm[] = {
-"16 16 71 1",
+"16 16 70 1",
 " 	c None",
-".	c #3E2201",
-"+	c #B07732",
-"@	c #483622",
-"#	c #653D0D",
-"$	c #FFC462",
-"%	c #B68653",
-"&	c #9D815F",
-"*	c #F8CB8B",
-"=	c #F1CEA8",
-"-	c #BDB8B3",
-";	c #E4ECF7",
-">	c #FFFFFF",
-",	c #75706B",
-"'	c #F19827",
-")	c #F1B670",
-"!	c #FED69D",
-"~	c #B78F65",
-"{	c #693D07",
-"]	c #FF9000",
-"^	c #FD8E0B",
-"/	c #FEAA46",
-"(	c #F1B36D",
-"_	c #918576",
-":	c #EDC797",
-"<	c #F1AE5F",
-"[	c #FCC382",
-"}	c #FFECCE",
-"|	c #908B88",
-"1	c #B6A38C",
-"2	c #DADCDF",
-"3	c #DFE9F5",
-"4	c #FDFFFF",
-"5	c #FEFFFF",
-"6	c #D6C4B3",
-"7	c #F18A09",
-"8	c #F79822",
-"9	c #F2A84F",
-"0	c #FDBC71",
-"a	c #FCC079",
-"b	c #FABF7B",
-"c	c #362819",
-"d	c #8F4E00",
-"e	c #FB8C00",
-"f	c #FF8900",
-"g	c #FF8800",
-"h	c #FF9410",
-"i	c #FFAC4D",
-"j	c #F8C382",
-"k	c #AA7233",
-"l	c #A25500",
-"m	c #7B4300",
-"n	c #BA6600",
-"o	c #D17300",
-"p	c #D97B02",
-"q	c #E48102",
-"r	c #DC830F",
-"s	c #D88C2D",
-"t	c #DF8E27",
-"u	c #E38003",
-"v	c #884A00",
-"w	c #000000",
-"x	c #231300",
-"y	c #492800",
-"z	c #7B4500",
-"A	c #B66500",
-"B	c #C16900",
-"C	c #693600",
-"D	c #1F1000",
-"E	c #090400",
-"F	c #070400",
+".	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",
 "                ",
-"      .         ",
-"      +@        ",
-"     #$%        ",
-"     &*=        ",
-"     -;>,       ",
-"     ')!~       ",
-"    {]^/(       ",
-"    _:<[}|      ",
-"    123456      ",
-"    7890abc     ",
-"   defghijkl    ",
-"  mnopqrstuv    ",
-"   wxyzABCDw    ",
-"       EF       ",
+"       .+       ",
+"       @#       ",
+"      $%&       ",
+"      *=-       ",
+"      ;>,'      ",
+"      )!~{      ",
+"     ]^/(_      ",
+"     :<[}|      ",
+"     123--4     ",
+"   567890abc    ",
+"   defgh(((ij   ",
+"   k{lmnopq{r   ",
+"    stuvwxyz    ",
+"     ABCDE      ",
 "                "};

share/vlc_win32_rc.rc

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

vlc.win32.nsi

@@ -39,8 +39,8 @@ InstType "Full"
 
 ; MUI Settings
 !define MUI_ABORTWARNING
-!define MUI_ICON "vlc48x48.ico"
-!define MUI_UNICON "vlc48x48.ico"
+!define MUI_ICON "vlc48x48new.ico"
+!define MUI_UNICON "vlc48x48new.ico"
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ; Welcome page