Skip to content

V
vlc-1.1
Commit 66006c64 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

backport 11443

parent de1ca2be
Show whitespace changes
Inline Side-by-side
Showing with 339 additions and 347 deletions
Makefile.am
View file @ 66006c64
......@@ -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
View file @ 66006c64
......@@ -80,7 +80,7 @@ DIST_icons48 = \
gvlc48x48.png \
kvlc48x48.png \
qvlc48x48.png \
vlc48x48.ico \
vlc48x48new.ico \
vlc48x48.png \
$(NULL)
......
share/vlc16x16.xpm
View file @ 66006c64
/* 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/vlc32x32.xpm
View file @ 66006c64
/* XPM */
static char * vlc_xpm[] = {
"32 32 228 2",
"32 32 221 2",
" c None",
". c #8A4E06",
"+ c #915917",
"@ c #583710",
"# c #271A0B",
"$ c #894D06",
"% c #8C5616",
"& c #281E13",
"* c #875A26",
"= c #966935",
"- c #966E42",
"; c #C2915D",
"> c #3B2C1C",
", c #956025",
"' c #FFB055",
") c #FFB96B",
"! c #F4B776",
"~ c #4A3824",
"{ c #3B2409",
"] c #CF832B",
"^ c #FFAD4F",
"/ c #FFB665",
"( c #FBBC78",
"_ c #AC8052",
": c #4D3921",
"< c #E6A860",
"[ c #FBAE55",
"} c #FEB665",
"| c #FFC27F",
"1 c #EABB8A",
"2 c #161616",
"3 c #5D5750",
"4 c #D2C5B5",
"5 c #E6C8A4",
"6 c #F3D5B2",
"7 c #FFE6CB",
"8 c #F6E7D9",
"9 c #7E756E",
"0 c #1C1C1C",
"a c #C1B19D",
"b c #D5D4D3",
"c c #DADADA",
"d c #ECECEC",
"e c #FFFEFE",
"f c #A39C96",
"g c #191919",
"h c #CAB59B",
"i c #D8D3CC",
"j c #FFFDFC",
"k c #D6C9BD",
"l c #534D46",
"m c #3F2404",
"n c #EC8D1B",
"o c #EDAD60",
"p c #E8C294",
"q c #F3D1A8",
"r c #FFE0BE",
"s c #FFE0BF",
"t c #F4C08A",
"u c #4D3B29",
"v c #904F00",
"w c #FD8B01",
"x c #FD9211",
"y c #FD9E2F",
"z c #FEA844",
"A c #FFB45F",
"B c #FFBD73",
"C c #FBBC79",
"D c #955100",
"E c #FF8C00",
"F c #FF8E05",
"G c #FF981D",
"H c #FFA133",
"I c #FFAD4E",
"J c #FFB664",
"K c #FFBF7A",
"L c #EAAF70",
"M c #000000",
"N c #3D260B",
"O c #CB7712",
"P c #FE8D02",
"Q c #FF8C01",
"R c #FF9517",
"S c #FF9E2D",
"T c #FFAA48",
"U c #FFB35E",
"V c #FFBD76",
"W c #F6B978",
"X c #685239",
"Y c #51493E",
"Z c #D4BD9F",
"` c #ECAC5F",
" . c #F0A64B",
".. c #FB9822",
"+. c #FEA030",
"@. c #FFAC4B",
"#. c #FFB460",
"$. c #FFC78A",
"%. c #FFDAB2",
"&. c #C0B2A5",
"*. c #4E4B48",
"=. c #514C45",
"-. c #CEC8BF",
";. c #D8D1CA",
">. c #DACEC1",
",. c #E6C091",
"'. c #F3CC9D",
"). c #FFDCB2",
"!. c #FFDFBB",
"~. c #FFECD8",
"{. c #FFFAF5",
"]. c #F1EBE6",
"^. c #5E5A56",
"/. c #827668",
"(. c #D1CDC8",
"_. c #D6D6D6",
":. c #FFFFFF",
"<. c #F8F4F0",
"[. c #978F86",
"}. c #0B0B0B",
"|. c #D09F63",
"1. c #DBCAB6",
"2. c #DACDBE",
"3. c #D8D2CC",
"4. c #FFFBF7",
"5. c #FFF7EF",
"6. c #FEE9D4",
"7. c #E4BE96",
"8. c #0D0D0D",
"9. c #E78308",
"0. c #FB9416",
"a. c #F9961E",
"b. c #EDAA58",
"c. c #E8BB84",
"d. c #F3C793",
"e. c #FFD7A9",
"f. c #FFDAB1",
"g. c #FFD19C",
"h. c #FFC37F",
"i. c #FFC384",
"j. c #F1B575",
"k. c #663800",
"l. c #F68700",
"m. c #FD8E07",
"n. c #FD900C",
"o. c #FE9312",
"p. c #FF9E2A",
"q. c #FFA63F",
"r. c #FFB765",
"s. c #FEBE7A",
"t. c #906B45",
"u. c #271600",
"v. c #935100",
"w. c #FF9516",
"x. c #FF9E2C",
"y. c #FFAA47",
"z. c #FFB35D",
"A. c #FFBD75",
"B. c #FFBF7B",
"C. c #B38656",
"D. c #653C0B",
"E. c #A25900",
"F. c #472700",
"G. c #3B2000",
"H. c #925000",
"I. c #8A4B00",
"J. c #965200",
"K. c #FD8B00",
"L. c #FF9210",
"M. c #FF9B26",
"N. c #FFA741",
"O. c #FFB057",
"P. c #FEBB71",
"Q. c #F2A958",
"R. c #493013",
"S. c #E87F00",
"T. c #EB8100",
"U. c #512C00",
"V. c #9E5600",
"W. c #EF8300",
"X. c #ED8100",
"Y. c #F38500",
"Z. c #D97900",
"`. c #CA7200",
" + c #D47600",
".+ c #F28500",
"++ c #FF8F08",
"@+ c #FF981E",
"#+ c #FEA339",
"$+ c #E39A43",
"%+ c #D49953",
"&+ c #BE853D",
"*+ c #F38400",
"=+ c #AB5E00",
"-+ c #291600",
";+ c #482700",
">+ c #4A2900",
",+ c #AC5E00",
"'+ c #E27C00",
")+ c #CA7100",
"!+ c #B96900",
"~+ c #B26500",
"{+ c #A45F00",
"]+ c #A46002",
"^+ c #A4630C",
"/+ c #A86C1B",
"(+ c #B36D12",
"_+ c #BE700B",
":+ c #DF7E05",
"<+ c #F58600",
"[+ c #E17B00",
"}+ c #492800",
"|+ c #170C00",
"1+ c #5B3200",
"2+ c #8A4C00",
"3+ c #D77700",
"4+ c #DD7A00",
"5+ c #E17D00",
"6+ c #E78000",
"7+ c #E98100",
"8+ c #EF8400",
"9+ c #CF7100",
"0+ c #955200",
"a+ c #462600",
"b+ c #4A2800",
"c+ c #7C4400",
"d+ c #E47D00",
"e+ c #2E1900",
" ",
". c #E17F17",
"+ c #C26E14",
"@ c #B6640E",
"# c #E4821C",
"$ c #BA660E",
"% c #AE5F0D",
"& c #E0821E",
"* c #B7650E",
"= c #AF600D",
"- c #ED881D",
"; c #D97D1B",
"> c #AA5D0C",
", c #F39229",
"' c #D17415",
") c #B5630E",
"! c #AF5F0D",
"~ c #AD5E0D",
"{ c #F8C285",
"] c #CE7E2C",
"^ c #B66A1B",
"/ c #B16D26",
"( c #B68450",
"_ c #F4F4F4",
": c #FDFDFD",
"< c #DFDFDF",
"[ c #C9C9C8",
"} c #C3C3C3",
"| c #BDBDBD",
"1 c #F8F8F8",
"2 c #FBFBFB",
"3 c #DDDDDD",
"4 c #C9C9C9",
"5 c #C0C0C0",
"6 c #FEFEFD",
"7 c #F7F7F7",
"8 c #DBDBDB",
"9 c #C0BEBD",
"0 c #FBD7B0",
"a c #F3EEE9",
"b c #DADADA",
"c c #C2BFBC",
"d c #BA9A79",
"e c #E98013",
"f c #F38D22",
"g c #DC7F20",
"h c #C57D33",
"i c #B87938",
"j c #B2702D",
"k c #AF6517",
"l c #A95C0C",
"m c #EB8114",
"n c #F08B21",
"o c #D67714",
"p c #C0690F",
"q c #B3620D",
"r c #AB5D0D",
"s c #ED881F",
"t c #EA861E",
"u c #D17311",
"v c #BF680F",
"w c #B2620D",
"x c #AE5F0E",
"y c #F5B672",
"z c #E4821B",
"A c #CF7211",
"B c #BE680F",
"C c #B2610D",
"D c #AE6111",
"E c #B47E46",
"F c #FFFFFF",
"G c #F2E1CF",
"H c #DBB68F",
"I c #C79765",
"J c #BA8A57",
"K c #B78B5E",
"L c #BA9875",
"M c #C0B3A7",
"N c #C3C2C1",
"O c #BFBFBF",
"P c #FCFCFC",
"Q c #F3F3F3",
"R c #E4E4E4",
"S c #D3D3D3",
"T c #C7C7C7",
"U c #FFFFFE",
"V c #FEFEFE",
"W c #EFEFEF",
"X c #E2E2E2",
"Y c #C1BDB9",
"Z c #E88926",
"` c #FBDEBF",
" . c #FCFBFA",
".. c #EDEDED",
"+. c #E0E0E0",
"@. c #D2D2D2",
"#. c #BCA287",
"$. c #AE6F2D",
"%. c #D87610",
"&. c #D57511",
"*. c #E87F12",
"=. c #EA851C",
"-. c #E8A259",
";. c #E2C2A1",
">. c #DAC6B2",
",. c #CEC1B4",
"'. c #C4B9AE",
"). c #C0B4A7",
"!. c #BFAE9D",
"~. c #BC9F82",
"{. c #B5834E",
"]. c #AE6010",
"^. c #B2620F",
"/. c #C16E17",
"(. c #DC7810",
"_. c #E17B11",
":. c #D97611",
"<. c #E67D12",
"[. c #E77E12",
"}. c #DD7A12",
"|. c #D17617",
"1. c #C97927",
"2. c #BF7932",
"3. c #B67632",
"4. c #B2712D",
"5. c #B16B23",
"6. c #AF6212",
"7. c #A95E0F",
"8. c #CC7315",
"9. c #BF680E",
"0. c #DD7911",
"a. c #CB6F10",
"b. c #EB8112",
"c. c #E47D12",
"d. c #DB7811",
"e. c #CE7110",
"f. c #C56C0F",
"g. c #B1610D",
"h. c #98530C",
"i. c #DB7A14",
"j. c #D87814",
"k. c #B8640E",
"l. c #CA6F10",
"m. c #A85C0D",
"n. c #DE7A11",
"o. c #E27C12",
"p. c #D97711",
"q. c #CD7110",
"r. c #AC5E0D",
"s. c #97520B",
"t. c #C66C0F",
"u. c #DC7811",
"v. c #D17312",
"w. c #3C2206",
"x. c #92500B",
"y. c #B3620E",
"z. c #CD7010",
"A. c #D47410",
"B. c #CC7010",
"C. c #C46B0F",
"D. c #B9650E",
"E. c #AD5F0D",
"F. c #A4590C",
"G. c #9A540C",
"H. c #BE670F",
"I. c #BD680E",
"J. c #A0580C",
"K. c #050302",
"L. c #261503",
"M. c #94510B",
"N. c #BD670F",
"O. c #B0610D",
"P. c #B6630E",
"Q. c #B0600D",
"R. c #AB5E0D",
"S. c #A55A0C",
"T. c #9E560C",
"U. c #9D550C",
"V. c #B4620E",
"W. c #A0570C",
"X. c #82470A",
"Y. c #5B3207",
"Z. c #010101",
"`. c #1B0F02",
" + c #764009",
".+ c #C86D0F",
"++ c #BC670F",
"@+ c #B0610E",
"#+ c #B1610E",
"$+ c #A1580C",
"%+ c #703D08",
"&+ c #492806",
"*+ c #231303",
"=+ c #070400",
"-+ c #160C02",
";+ c #7E450A",
">+ c #CA6F0F",
",+ c #DF7A11",
"'+ c #DE7911",
")+ c #D77611",
"!+ c #B2610E",
"~+ c #8F4E0B",
"{+ c #5D3307",
"]+ c #311B04",
"^+ c #140B02",
"/+ c #050300",
"(+ c #000000",
"_+ c #0F0902",
":+ c #532E06",
"<+ c #8A4B0A",
"[+ c #95510B",
"}+ c #81460A",
"|+ c #583006",
"1+ c #321B04",
"2+ c #120A01",
"3+ c #020202",
"4+ c #080501",
"5+ c #1E1002",
"6+ c #211202",
"7+ c #1A0E02",
"8+ c #0B0601",
" ",
" ",
" . + @ ",
" # $ % & ",
" * = - ; > ",
" # $ % ",
" & * = ",
" - ; @ = > ",
" , ' ) ! ~ ",
" { ] ^ / ( _ ",
" : < [ } | 1 2 ",
" 3 4 5 6 7 8 9 ",
" 0 a b c d e e f ",
" g h i c d e j k l ",
" m n o p q r s t u ",
" v w x y z A B C _ ",
" D E F G H I J K L M ",
" N O P Q R S T U V W X ",
" Y Z ` ...+.@.#.$.%.&.*. ",
" =.-.;.>.,.'.).!.~.{.].^. ",
" /.(._._.c d e e e :.<.[. ",
" }.|.1.2.3.c d e e 4.5.6.7.8. ",
" M 9.0.a.b.c.d.e.f.g.h.i.j.> ",
" k.l.E Q m.n.o.p.q.' r.K s.t.M ",
" u.v.E E E E E Q w.x.y.z.A.B.C.D.E.F. ",
" G.H.I.J.K.K.E E E E L.M.N.O.P.s.Q.R.S.T.U. ",
" M V.W.X.Y.Z.`. +.+E E ++@+#+$+%+&+.+*+W.=+ ",
" -+;+>+,+'+)+!+~+{+{+]+^+/+(+_+:+<+[+}+|+ ",
" M M M M 1+H.2+3+4+5+6+7+8+9+0+1+M M M ",
" M M M M M M a+b+c+d+d+c+e+M M M M M ",
" M M M M M M M M M M M M M M ",
" M M M M M M M M ",
" M M ",
" { ] ^ / ( ",
" _ : < [ } } | ",
" 1 2 3 4 } } 5 ",
" 6 7 8 4 } } 9 ",
" 0 a b 4 } c d ",
" e f g h i j k % l ",
" m n o p q % % % r ",
" s t u v w % % % x ",
" y z A B C % % D E ",
" 7 F G H I J K L M N O ",
" P F Q R S T } } } } 5 ",
" U V W X S T } } } } Y ",
" Z ` ...+.@.T } } } } #.$. ",
" %.&.*.=.-.;.>.,.'.).!.~.{.].^./. ",
" (._.:.B <.[.}.|.1.2.3.4.5.6.% % % 7.8. ",
" 9.0.a.= b.c.d.e.f.$ g.% % % % % % h.p i.j. ",
" k.l.m.n.o.p.q.f.$ g.% % % % % r.s.t.u.}.v. ",
" w.x.y.r.z.A.B.C.D.g.% % % E.F.G.H.e.I.J. ",
" K.L.M.N.O.r g.P.P.Q.R.S.T.U.R.V.W.X.Y. ",
" Z.`. +z.&..+++@+% #+P.#+$+%+&+*+=+Z. ",
" Z.-+;+>+,+'+0.)+!+~+{+]+^+/+(+(+ ",
" Z._+:+<+[+}+|+1+2+(+(+(+(+ ",
" 3+4+5+6+7+8+(+(+(+ ",
" 3+Z.(+(+ ",
" "};
share/vlc_win32_rc.rc
View file @ 66006c64
VLC_ICON ICON "vlc48x48.ico"
VLC_ICON ICON "vlc48x48new.ico"
#ifndef VERSION_NUMBER
#define VERSION_NUMBER 0,0,0,0
#endif
......
vlc.win32.nsi
View file @ 66006c64
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment