Skip to content

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

backport 11443

parent de1ca2be
Hide 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: ...@@ -768,7 +768,7 @@ package-win32-base:
$(top_builddir)/vlc-${VERSION}/http/vlm/ ; $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ; 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" mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
if BUILD_MOZILLA if BUILD_MOZILLA
......
share/Makefile.am
View file @ 66006c64
...@@ -80,7 +80,7 @@ DIST_icons48 = \ ...@@ -80,7 +80,7 @@ DIST_icons48 = \
gvlc48x48.png \ gvlc48x48.png \
kvlc48x48.png \ kvlc48x48.png \
qvlc48x48.png \ qvlc48x48.png \
vlc48x48.ico \ vlc48x48new.ico \
vlc48x48.png \ vlc48x48.png \
$(NULL) $(NULL)
......
share/vlc16x16.xpm
View file @ 66006c64
/* XPM */ /* XPM */
static char * vlc16x16_xpm[] = { static char * vlc16x16_xpm[] = {
"16 16 71 1", "16 16 70 1",
" c None", " c None",
". c #3E2201", ". c #D07515",
"+ c #B07732", "+ c #B0600D",
"@ c #483622", "@ c #CA7215",
"# c #653D0D", "# c #AD5F0D",
"$ c #FFC462", "$ c #F3AD60",
"% c #B68653", "% c #C2701A",
"& c #9D815F", "& c #B16C24",
"* c #F8CB8B", "* c #FAFAFA",
"= c #F1CEA8", "= c #D4D4D3",
"- c #BDB8B3", "- c #C3C3C3",
"; c #E4ECF7", "; c #F9EEE3",
"> c #FFFFFF", "> c #D2D2D2",
", c #75706B", ", c #C3C2C1",
"' c #F19827", "' c #BAA38C",
") c #F1B670", ") c #E5841E",
"! c #FED69D", "! c #BC7022",
"~ c #B78F65", "~ c #AF6518",
"{ c #693D07", "{ c #AC5E0D",
"] c #FF9000", "] c #F0A95E",
"^ c #FD8E0B", "^ c #DC7B17",
"/ c #FEAA46", "/ c #B8650E",
"( c #F1B36D", "( c #AE5F0D",
"_ c #918576", "_ c #B0671C",
": c #EDC797", ": c #FDFDFD",
"< c #F1AE5F", "< c #E9DCCD",
"[ c #FCC382", "[ c #C7AF96",
"} c #FFECCE", "} c #BEAA96",
"| c #908B88", "| c #C2BFBC",
"1 c #B6A38C", "1 c #FDF6ED",
"2 c #DADCDF", "2 c #E8E8E8",
"3 c #DFE9F5", "3 c #CDCDCD",
"4 c #FDFFFF", "4 c #BAA187",
"5 c #FEFFFF", "5 c #DB7711",
"6 c #D6C4B3", "6 c #D87611",
"7 c #F18A09", "7 c #E68826",
"8 c #F79822", "8 c #D69E64",
"9 c #F2A84F", "9 c #C29A72",
"0 c #FDBC71", "0 c #B89065",
"a c #FCC079", "a c #B4793C",
"b c #FABF7B", "b c #AF600E",
"c c #362819", "c c #BC6A13",
"d c #8F4E00", "d c #CB6F10",
"e c #FB8C00", "e c #C86E0F",
"f c #FF8900", "f c #DE7A12",
"g c #FF8800", "g c #C96E10",
"h c #FF9410", "h c #B6640E",
"i c #FFAC4D", "i c #AD5E0D",
"j c #F8C382", "j c #DB7913",
"k c #AA7233", "k c #462706",
"l c #A25500", "l c #BF680E",
"m c #7B4300", "m c #BE680E",
"n c #BA6600", "n c #B4620E",
"o c #D17300", "o c #AB5E0D",
"p c #D97B02", "p c #A65A0C",
"q c #E48102", "q c #A75B0D",
"r c #DC830F", "r c #8C4D0A",
"s c #D88C2D", "s c #301A04",
"t c #DF8E27", "t c #BB670F",
"u c #E38003", "u c #D07210",
"v c #884A00", "v c #C46C0F",
"w c #000000", "w c #AA5D0D",
"x c #231300", "x c #784209",
"y c #492800", "y c #361E04",
"z c #7B4500", "z c #0C0701",
"A c #B66500", "A c #201203",
"B c #C16900", "B c #5A3106",
"C c #693600", "C c #412305",
"D c #1F1000", "D c #130A01",
"E c #090400", "E c #000000",
"F c #070400",
" ", " ",
" . ", " .+ ",
" +@ ", " @# ",
" #$% ", " $%& ",
" &*= ", " *=- ",
" -;>, ", " ;>,' ",
" ')!~ ", " )!~{ ",
" {]^/( ", " ]^/(_ ",
" _:<[}| ", " :<[}| ",
" 123456 ", " 123--4 ",
" 7890abc ", " 567890abc ",
" defghijkl ", " defgh(((ij ",
" mnopqrstuv ", " k{lmnopq{r ",
" wxyzABCDw ", " stuvwxyz ",
" EF ", " ABCDE ",
" "}; " "};
share/vlc32x32.xpm
View file @ 66006c64
/* XPM */ /* XPM */
static char * vlc_xpm[] = { static char * vlc_xpm[] = {
"32 32 228 2", "32 32 221 2",
" c None", " c None",
". c #8A4E06", ". c #E17F17",
"+ c #915917", "+ c #C26E14",
"@ c #583710", "@ c #B6640E",
"# c #271A0B", "# c #E4821C",
"$ c #894D06", "$ c #BA660E",
"% c #8C5616", "% c #AE5F0D",
"& c #281E13", "& c #E0821E",
"* c #875A26", "* c #B7650E",
"= c #966935", "= c #AF600D",
"- c #966E42", "- c #ED881D",
"; c #C2915D", "; c #D97D1B",
"> c #3B2C1C", "> c #AA5D0C",
", c #956025", ", c #F39229",
"' c #FFB055", "' c #D17415",
") c #FFB96B", ") c #B5630E",
"! c #F4B776", "! c #AF5F0D",
"~ c #4A3824", "~ c #AD5E0D",
"{ c #3B2409", "{ c #F8C285",
"] c #CF832B", "] c #CE7E2C",
"^ c #FFAD4F", "^ c #B66A1B",
"/ c #FFB665", "/ c #B16D26",
"( c #FBBC78", "( c #B68450",
"_ c #AC8052", "_ c #F4F4F4",
": c #4D3921", ": c #FDFDFD",
"< c #E6A860", "< c #DFDFDF",
"[ c #FBAE55", "[ c #C9C9C8",
"} c #FEB665", "} c #C3C3C3",
"| c #FFC27F", "| c #BDBDBD",
"1 c #EABB8A", "1 c #F8F8F8",
"2 c #161616", "2 c #FBFBFB",
"3 c #5D5750", "3 c #DDDDDD",
"4 c #D2C5B5", "4 c #C9C9C9",
"5 c #E6C8A4", "5 c #C0C0C0",
"6 c #F3D5B2", "6 c #FEFEFD",
"7 c #FFE6CB", "7 c #F7F7F7",
"8 c #F6E7D9", "8 c #DBDBDB",
"9 c #7E756E", "9 c #C0BEBD",
"0 c #1C1C1C", "0 c #FBD7B0",
"a c #C1B19D", "a c #F3EEE9",
"b c #D5D4D3", "b c #DADADA",
"c c #DADADA", "c c #C2BFBC",
"d c #ECECEC", "d c #BA9A79",
"e c #FFFEFE", "e c #E98013",
"f c #A39C96", "f c #F38D22",
"g c #191919", "g c #DC7F20",
"h c #CAB59B", "h c #C57D33",
"i c #D8D3CC", "i c #B87938",
"j c #FFFDFC", "j c #B2702D",
"k c #D6C9BD", "k c #AF6517",
"l c #534D46", "l c #A95C0C",
"m c #3F2404", "m c #EB8114",
"n c #EC8D1B", "n c #F08B21",
"o c #EDAD60", "o c #D67714",
"p c #E8C294", "p c #C0690F",
"q c #F3D1A8", "q c #B3620D",
"r c #FFE0BE", "r c #AB5D0D",
"s c #FFE0BF", "s c #ED881F",
"t c #F4C08A", "t c #EA861E",
"u c #4D3B29", "u c #D17311",
"v c #904F00", "v c #BF680F",
"w c #FD8B01", "w c #B2620D",
"x c #FD9211", "x c #AE5F0E",
"y c #FD9E2F", "y c #F5B672",
"z c #FEA844", "z c #E4821B",
"A c #FFB45F", "A c #CF7211",
"B c #FFBD73", "B c #BE680F",
"C c #FBBC79", "C c #B2610D",
"D c #955100", "D c #AE6111",
"E c #FF8C00", "E c #B47E46",
"F c #FF8E05", "F c #FFFFFF",
"G c #FF981D", "G c #F2E1CF",
"H c #FFA133", "H c #DBB68F",
"I c #FFAD4E", "I c #C79765",
"J c #FFB664", "J c #BA8A57",
"K c #FFBF7A", "K c #B78B5E",
"L c #EAAF70", "L c #BA9875",
"M c #000000", "M c #C0B3A7",
"N c #3D260B", "N c #C3C2C1",
"O c #CB7712", "O c #BFBFBF",
"P c #FE8D02", "P c #FCFCFC",
"Q c #FF8C01", "Q c #F3F3F3",
"R c #FF9517", "R c #E4E4E4",
"S c #FF9E2D", "S c #D3D3D3",
"T c #FFAA48", "T c #C7C7C7",
"U c #FFB35E", "U c #FFFFFE",
"V c #FFBD76", "V c #FEFEFE",
"W c #F6B978", "W c #EFEFEF",
"X c #685239", "X c #E2E2E2",
"Y c #51493E", "Y c #C1BDB9",
"Z c #D4BD9F", "Z c #E88926",
"` c #ECAC5F", "` c #FBDEBF",
" . c #F0A64B", " . c #FCFBFA",
".. c #FB9822", ".. c #EDEDED",
"+. c #FEA030", "+. c #E0E0E0",
"@. c #FFAC4B", "@. c #D2D2D2",
"#. c #FFB460", "#. c #BCA287",
"$. c #FFC78A", "$. c #AE6F2D",
"%. c #FFDAB2", "%. c #D87610",
"&. c #C0B2A5", "&. c #D57511",
"*. c #4E4B48", "*. c #E87F12",
"=. c #514C45", "=. c #EA851C",
"-. c #CEC8BF", "-. c #E8A259",
";. c #D8D1CA", ";. c #E2C2A1",
">. c #DACEC1", ">. c #DAC6B2",
",. c #E6C091", ",. c #CEC1B4",
"'. c #F3CC9D", "'. c #C4B9AE",
"). c #FFDCB2", "). c #C0B4A7",
"!. c #FFDFBB", "!. c #BFAE9D",
"~. c #FFECD8", "~. c #BC9F82",
"{. c #FFFAF5", "{. c #B5834E",
"]. c #F1EBE6", "]. c #AE6010",
"^. c #5E5A56", "^. c #B2620F",
"/. c #827668", "/. c #C16E17",
"(. c #D1CDC8", "(. c #DC7810",
"_. c #D6D6D6", "_. c #E17B11",
":. c #FFFFFF", ":. c #D97611",
"<. c #F8F4F0", "<. c #E67D12",
"[. c #978F86", "[. c #E77E12",
"}. c #0B0B0B", "}. c #DD7A12",
"|. c #D09F63", "|. c #D17617",
"1. c #DBCAB6", "1. c #C97927",
"2. c #DACDBE", "2. c #BF7932",
"3. c #D8D2CC", "3. c #B67632",
"4. c #FFFBF7", "4. c #B2712D",
"5. c #FFF7EF", "5. c #B16B23",
"6. c #FEE9D4", "6. c #AF6212",
"7. c #E4BE96", "7. c #A95E0F",
"8. c #0D0D0D", "8. c #CC7315",
"9. c #E78308", "9. c #BF680E",
"0. c #FB9416", "0. c #DD7911",
"a. c #F9961E", "a. c #CB6F10",
"b. c #EDAA58", "b. c #EB8112",
"c. c #E8BB84", "c. c #E47D12",
"d. c #F3C793", "d. c #DB7811",
"e. c #FFD7A9", "e. c #CE7110",
"f. c #FFDAB1", "f. c #C56C0F",
"g. c #FFD19C", "g. c #B1610D",
"h. c #FFC37F", "h. c #98530C",
"i. c #FFC384", "i. c #DB7A14",
"j. c #F1B575", "j. c #D87814",
"k. c #663800", "k. c #B8640E",
"l. c #F68700", "l. c #CA6F10",
"m. c #FD8E07", "m. c #A85C0D",
"n. c #FD900C", "n. c #DE7A11",
"o. c #FE9312", "o. c #E27C12",
"p. c #FF9E2A", "p. c #D97711",
"q. c #FFA63F", "q. c #CD7110",
"r. c #FFB765", "r. c #AC5E0D",
"s. c #FEBE7A", "s. c #97520B",
"t. c #906B45", "t. c #C66C0F",
"u. c #271600", "u. c #DC7811",
"v. c #935100", "v. c #D17312",
"w. c #FF9516", "w. c #3C2206",
"x. c #FF9E2C", "x. c #92500B",
"y. c #FFAA47", "y. c #B3620E",
"z. c #FFB35D", "z. c #CD7010",
"A. c #FFBD75", "A. c #D47410",
"B. c #FFBF7B", "B. c #CC7010",
"C. c #B38656", "C. c #C46B0F",
"D. c #653C0B", "D. c #B9650E",
"E. c #A25900", "E. c #AD5F0D",
"F. c #472700", "F. c #A4590C",
"G. c #3B2000", "G. c #9A540C",
"H. c #925000", "H. c #BE670F",
"I. c #8A4B00", "I. c #BD680E",
"J. c #965200", "J. c #A0580C",
"K. c #FD8B00", "K. c #050302",
"L. c #FF9210", "L. c #261503",
"M. c #FF9B26", "M. c #94510B",
"N. c #FFA741", "N. c #BD670F",
"O. c #FFB057", "O. c #B0610D",
"P. c #FEBB71", "P. c #B6630E",
"Q. c #F2A958", "Q. c #B0600D",
"R. c #493013", "R. c #AB5E0D",
"S. c #E87F00", "S. c #A55A0C",
"T. c #EB8100", "T. c #9E560C",
"U. c #512C00", "U. c #9D550C",
"V. c #9E5600", "V. c #B4620E",
"W. c #EF8300", "W. c #A0570C",
"X. c #ED8100", "X. c #82470A",
"Y. c #F38500", "Y. c #5B3207",
"Z. c #D97900", "Z. c #010101",
"`. c #CA7200", "`. c #1B0F02",
" + c #D47600", " + c #764009",
".+ c #F28500", ".+ c #C86D0F",
"++ c #FF8F08", "++ c #BC670F",
"@+ c #FF981E", "@+ c #B0610E",
"#+ c #FEA339", "#+ c #B1610E",
"$+ c #E39A43", "$+ c #A1580C",
"%+ c #D49953", "%+ c #703D08",
"&+ c #BE853D", "&+ c #492806",
"*+ c #F38400", "*+ c #231303",
"=+ c #AB5E00", "=+ c #070400",
"-+ c #291600", "-+ c #160C02",
";+ c #482700", ";+ c #7E450A",
">+ c #4A2900", ">+ c #CA6F0F",
",+ c #AC5E00", ",+ c #DF7A11",
"'+ c #E27C00", "'+ c #DE7911",
")+ c #CA7100", ")+ c #D77611",
"!+ c #B96900", "!+ c #B2610E",
"~+ c #B26500", "~+ c #8F4E0B",
"{+ c #A45F00", "{+ c #5D3307",
"]+ c #A46002", "]+ c #311B04",
"^+ c #A4630C", "^+ c #140B02",
"/+ c #A86C1B", "/+ c #050300",
"(+ c #B36D12", "(+ c #000000",
"_+ c #BE700B", "_+ c #0F0902",
":+ c #DF7E05", ":+ c #532E06",
"<+ c #F58600", "<+ c #8A4B0A",
"[+ c #E17B00", "[+ c #95510B",
"}+ c #492800", "}+ c #81460A",
"|+ c #170C00", "|+ c #583006",
"1+ c #5B3200", "1+ c #321B04",
"2+ c #8A4C00", "2+ c #120A01",
"3+ c #D77700", "3+ c #020202",
"4+ c #DD7A00", "4+ c #080501",
"5+ c #E17D00", "5+ c #1E1002",
"6+ c #E78000", "6+ c #211202",
"7+ c #E98100", "7+ c #1A0E02",
"8+ c #EF8400", "8+ c #0B0601",
"9+ c #CF7100",
"0+ c #955200",
"a+ c #462600",
"b+ c #4A2800",
"c+ c #7C4400",
"d+ c #E47D00",
"e+ c #2E1900",
" ", " ",
" ", " ",
" ", " . + @ ",
" . + @ ", " # $ % ",
" # $ % & ", " & * = ",
" * = - ; > ", " - ; @ = > ",
" , ' ) ! ~ ", " , ' ) ! ~ ",
" { ] ^ / ( _ ", " { ] ^ / ( ",
" : < [ } | 1 2 ", " _ : < [ } } | ",
" 3 4 5 6 7 8 9 ", " 1 2 3 4 } } 5 ",
" 0 a b c d e e f ", " 6 7 8 4 } } 9 ",
" g h i c d e j k l ", " 0 a b 4 } c d ",
" m n o p q r s t u ", " e f g h i j k % l ",
" v w x y z A B C _ ", " m n o p q % % % r ",
" D E F G H I J K L M ", " s t u v w % % % x ",
" N O P Q R S T U V W X ", " y z A B C % % D E ",
" Y Z ` ...+.@.#.$.%.&.*. ", " 7 F G H I J K L M N O ",
" =.-.;.>.,.'.).!.~.{.].^. ", " P F Q R S T } } } } 5 ",
" /.(._._.c d e e e :.<.[. ", " U V W X S T } } } } Y ",
" }.|.1.2.3.c d e e 4.5.6.7.8. ", " Z ` ...+.@.T } } } } #.$. ",
" 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 ", " (._.:.B <.[.}.|.1.2.3.4.5.6.% % % 7.8. ",
" u.v.E E E E E Q w.x.y.z.A.B.C.D.E.F. ", " 9.0.a.= b.c.d.e.f.$ g.% % % % % % h.p i.j. ",
" G.H.I.J.K.K.E E E E L.M.N.O.P.s.Q.R.S.T.U. ", " k.l.m.n.o.p.q.f.$ g.% % % % % r.s.t.u.}.v. ",
" M V.W.X.Y.Z.`. +.+E E ++@+#+$+%+&+.+*+W.=+ ", " 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. ",
" M M M M 1+H.2+3+4+5+6+7+8+9+0+1+M M M ", " Z.`. +z.&..+++@+% #+P.#+$+%+&+*+=+Z. ",
" M M M M M M a+b+c+d+d+c+e+M M M M M ", " Z.-+;+>+,+'+0.)+!+~+{+]+^+/+(+(+ ",
" M M M M M M M M M M M M M M ", " Z._+:+<+[+}+|+1+2+(+(+(+(+ ",
" M M M M M M M M ", " 3+4+5+6+7+8+(+(+(+ ",
" M M ", " 3+Z.(+(+ ",
" "}; " "};
share/vlc_win32_rc.rc
View file @ 66006c64
VLC_ICON ICON "vlc48x48.ico" VLC_ICON ICON "vlc48x48new.ico"
#ifndef VERSION_NUMBER #ifndef VERSION_NUMBER
#define VERSION_NUMBER 0,0,0,0 #define VERSION_NUMBER 0,0,0,0
#endif #endif
......
vlc.win32.nsi
View file @ 66006c64
...@@ -39,8 +39,8 @@ InstType "Full" ...@@ -39,8 +39,8 @@ InstType "Full"
; MUI Settings ; MUI Settings
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
!define MUI_ICON "vlc48x48.ico" !define MUI_ICON "vlc48x48new.ico"
!define MUI_UNICON "vlc48x48.ico" !define MUI_UNICON "vlc48x48new.ico"
!define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_COMPONENTSPAGE_SMALLDESC
; Welcome page ; 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