]> git.sesse.net Git - vlc/commitdiff
* Backport the new VLC icon by Eurodata Computer Club
authorDerk-Jan Hartman <hartman@videolan.org>
Thu, 24 Nov 2005 15:02:11 +0000 (15:02 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Thu, 24 Nov 2005 15:02:11 +0000 (15:02 +0000)
17 files changed:
Makefile.am
THANKS
extras/MacOSX/Resources/vlc.icns
share/Makefile.am
share/http/favicon.ico
share/vlc-icons.xcf [deleted file]
share/vlc.icns [deleted file]
share/vlc128x128.png [new file with mode: 0644]
share/vlc16x16.png
share/vlc16x16.xpm
share/vlc32x32.png
share/vlc32x32.xpm
share/vlc48x48.ico
share/vlc48x48.png
share/vlc48x48new.ico [deleted file]
share/vlc_win32_rc.rc
vlc.win32.nsi

index 3a510f84de3ae0f029d648e86b4ca2fa9eec586b..9097be4e81b169b12c6afcf7a2dbb8d5f6bcdb07 100644 (file)
@@ -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"
diff --git a/THANKS b/THANKS
index 72ba7b4f4799ec72c2e8468788e894969ddac67d..f20a1735945525c37f476144ded42b5e4ad8e9d8 100644 (file)
--- a/THANKS
+++ b/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
index d76a69e201af4269b16dd95477b78feb38167453..8cd6309ca5493396425c9a010c09e7ac166041c4 100644 (file)
Binary files a/extras/MacOSX/Resources/vlc.icns and b/extras/MacOSX/Resources/vlc.icns differ
index 3ab359034a22175e530b2724fe4d26dab3ec76eb..f4b00ec52bcbe6ca14b50d3fc9550ed04946649f 100644 (file)
@@ -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 \
        \
index dfacdf5e80edb11fa995bb397680a63abe9efd0e..a7d628836178517a887a92d8cf96b7d7e5af2d35 100644 (file)
Binary files a/share/http/favicon.ico and b/share/http/favicon.ico differ
diff --git a/share/vlc-icons.xcf b/share/vlc-icons.xcf
deleted file mode 100644 (file)
index af4ba1a..0000000
Binary files a/share/vlc-icons.xcf and /dev/null differ
diff --git a/share/vlc.icns b/share/vlc.icns
deleted file mode 100644 (file)
index b624528..0000000
Binary files a/share/vlc.icns and /dev/null differ
diff --git a/share/vlc128x128.png b/share/vlc128x128.png
new file mode 100644 (file)
index 0000000..3d8f9b3
Binary files /dev/null and b/share/vlc128x128.png differ
index b41a697f730c9e458f27c8894464812366271f65..ce7633e54ee4521bbaa710fc6119fd1e464c8122 100644 (file)
Binary files a/share/vlc16x16.png and b/share/vlc16x16.png differ
index 818d74c329e14137e1011edc71b1d7dde09e4971..bf7566dfc954b982c10052089d6554d80cda391f 100644 (file)
@@ -1,89 +1,79 @@
-/* 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 */\r
+static char *vlc16x16_xpm[] = {\r
+/* width height ncolors chars_per_pixel */\r
+"16 16 57 2",\r
+/* colors */\r
+"AA c #A6A646460E0E",\r
+"BA c #CACA92926262",\r
+"CA c #C2C28E8E5E5E",\r
+"DA c #FEFEBABA1A1A",\r
+"EA c #AEAEBABAC6C6",\r
+"FA c #E6E66A6A0202",\r
+"GA c #C6C6CECECECE",\r
+"HA c #E2E27E7E2222",\r
+"IA c #D6D65A5A0202",\r
+"JA c #C2C296967272",\r
+"KA c #EEEE76760202",\r
+"LA c #CACABEBEB2B2",\r
+"MA c #CECEDADAE2E2",\r
+"NA c #E2E25E5E0202",\r
+"OA c #E6E672720202",\r
+"PA c #FEFEAEAE1A1A",\r
+"AB c #FAFA8E8E0202",\r
+"BB c #A6A6B2B2BEBE",\r
+"CB c #BABA3E3E0202",\r
+"DB c #CECED6D6DEDE",\r
+"EB c #C2C2C6C6CACA",\r
+"FB c #EEEE6A6A0202",\r
+"GB c #C6C6D2D2D6D6",\r
+"HB c #F6F67E7E0202",\r
+"IB c #D6D662620202",\r
+"JB c #CECECACAC6C6",\r
+"KB c #E6E666660202",\r
+"LB c #CACAB6B69A9A",\r
+"MB c #E6E66E6E0202",\r
+"NB c #F2F27A7A0202",\r
+"OB c #DADAC2C2AAAA",\r
+"PB c #D6D6DEDEE2E2",\r
+"AC c #EEEE72720202",\r
+"BC c #BABA46460202",\r
+"CC c #FEFE9E9E1A1A",\r
+"DC c #B2B24E4E0E0E",\r
+"EC c #FEFEBEBE1A1A",\r
+"FC c #B2B2C2C2CECE",\r
+"GC c #C6C6CECED6D6",\r
+"HC c #DADA5A5A0202",\r
+"IC c #CACAA2A27676",\r
+"JC c #EEEE76760E0E",\r
+"KC c #CECEC2C2B6B6",\r
+"LC c #D2D2DEDEE6E6",\r
+"MC c #E2E262620202",\r
+"NC c #FEFEB6B61A1A",\r
+"OC c #EAEA8E8E2A2A",\r
+"PC c #A6A6B6B6C2C2",\r
+"AD c #BEBECACAD2D2",\r
+"BD c #F2F282820E0E",\r
+"CD c #DEDE66660202",\r
+"DD c #EAEA66660202",\r
+"ED c #CACAB6B69E9E",\r
+"FD c #F2F272720202",\r
+"GD c #C2C24A4A0202",\r
+"HD c #FEFEA2A21A1A",\r
+"ID s bg c None",\r
+/* pixels */\r
+"IDIDIDIDIDIDIDIDIDIDIDIDIDIDIDID",\r
+"IDIDIDIDIDIDIDOAOAIDIDIDIDIDIDID",\r
+"IDIDIDIDIDIDIDOCOCIDIDIDIDIDIDID",\r
+"IDIDIDIDIDIDOCPBDBOCIDIDIDIDIDID",\r
+"IDIDIDIDIDIDEALCMABBIDIDIDIDIDID",\r
+"IDIDIDIDIDIDICOBOBJAIDIDIDIDIDID",\r
+"IDIDIDIDIDIDFAFDHBFAIDIDIDIDIDID",\r
+"IDIDIDIDIDACMBFDHBKAACIDIDIDIDID",\r
+"IDIDIDIDIDHAHAJCBDHAHAIDIDIDIDID",\r
+"IDIDIDIDIDFCGAJBJBEBFCIDIDIDIDID",\r
+"IDIDIDIDDCFCGCGBGBADPCDCIDIDIDID",\r
+"IDIDIDIADCBAEDLAKCLBCAAACBIDIDID",\r
+"IDIDCDCDGDHCMCKBACACNABCIBCDIDID",\r
+"IDABABABKAFAKBDDFBACKANBABABABID",\r
+"IDECNCNCPACCCCCCCCHDHDPADAECECID",\r
+"IDIDGDGDGDGDGDGDGDGDGDGDGDGDIDID"};\r
index 0a717a1f502284c56823654c4887d9ed4d192dde..1a0f859991af7da7320eb2f8de446446fddad1a8 100644 (file)
Binary files a/share/vlc32x32.png and b/share/vlc32x32.png differ
index 79578d55bb67b91e0b1d358d9169abac2dc604b9..7a7e09602ab71c43d10b0ebe02f38e83c0fb3a32 100644 (file)
-/* XPM */
-static char * vlc_xpm[] = {
-"32 32 221 2",
-"      c None",
-".     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 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.(+(+                                ",
-"                                                                "};
+/* XPM */\r
+static char *vlc_xpm[] = {\r
+/* width height ncolors chars_per_pixel */\r
+"32 32 144 2",\r
+/* colors */\r
+"AA c #9A9A32320202",\r
+"BA c #9A9A9E9EA2A2",\r
+"CA c #C2C262620202",\r
+"DA c #FEFEC2C24A4A",\r
+"EA c #D2D266660606",\r
+"FA c #EAEA7A7A0202",\r
+"GA c #BABAC2C2C6C6",\r
+"HA c #D2D2DADADADA",\r
+"IA c #E6E662620202",\r
+"JA c #C6C652520202",\r
+"KA c #FAFA92920202",\r
+"LA c #DEDE7A7A2626",\r
+"MA c #E6E66E6E0202",\r
+"NA c #DADACACABEBE",\r
+"OA c #DEDEE6E6E6E6",\r
+"PA c #F6F686860202",\r
+"AB c #DEDE92925252",\r
+"BB c #DADA5A5A0202",\r
+"CB c #B6B646460202",\r
+"DB c #CACACECECECE",\r
+"EB c #F2F26E6E0202",\r
+"FB c #DEDE6E6E0202",\r
+"GB c #DEDEDADADADA",\r
+"HB c #C6C65A5A0202",\r
+"IB c #AEAEB2B2B6B6",\r
+"JB c #F6F67A7A0202",\r
+"KB c #DEDE62620202",\r
+"LB c #FEFEBEBE4A4A",\r
+"MB c #AAAA3E3E0606",\r
+"NB c #E6E66A6A0202",\r
+"OB c #E6E692924A4A",\r
+"PB c #DADAA6A66A6A",\r
+"AC c #BEBECACACECE",\r
+"BC c #DADADADADADA",\r
+"CC c #D2D252520202",\r
+"DC c #EAEA76760202",\r
+"EC c #CECED2D2D2D2",\r
+"FC c #CACAB2B29E9E",\r
+"GC c #F2F282820202",\r
+"HC c #E6E686862626",\r
+"IC c #E6E6EAEAEAEA",\r
+"JC c #F6F68E8E0202",\r
+"KC c #E2E29E9E5252",\r
+"LC c #CACAD6D6DEDE",\r
+"MC c #F2F276760202",\r
+"NC c #B6B6BABABEBE",\r
+"OC c #DEDE6A6A0202",\r
+"PC c #CECED6D6D6D6",\r
+"AD c #9A9A3A3A0E0E",\r
+"BD c #9A9A7A7A6666",\r
+"CD c #F2F27A7A0202",\r
+"DD c #EEEE66660202",\r
+"ED c #EEEE6E6E0202",\r
+"FD c #C2C24E4E0202",\r
+"GD c #CACAD2D2D2D2",\r
+"HD c #DEDEE2E2E2E2",\r
+"ID c #D2D25A5A0202",\r
+"JD c #F6F682820202",\r
+"KD c #CACAAAAA9292",\r
+"LD c #FEFECACA4A4A",\r
+"MD c #D2D26A6A1616",\r
+"ND c #C6C6C2C2BABA",\r
+"OD c #D2D2DEDEE2E2",\r
+"PD c #E6E666660202",\r
+"AE c #CECE52520202",\r
+"BE c #FAFAA6A60202",\r
+"CE c #E2E2E6E6E6E6",\r
+"DE c #FEFE86860202",\r
+"EE c #F2F272720202",\r
+"FE c #DEDE66660202",\r
+"GE c #EAEA9E9E4646",\r
+"HE c #E2E28E8E3A3A",\r
+"IE c #EAEAA2A25252",\r
+"JE c #B6B6BEBEC2C2",\r
+"KE c #D2D2D6D6D6D6",\r
+"LE c #A2A2AAAAB2B2",\r
+"ME c #DADA62620202",\r
+"NE c #EAEA7A7A0E0E",\r
+"OE c #EAEA72720202",\r
+"PE c #F6F68A8A0202",\r
+"AF c #E6E65E5E0202",\r
+"BF c #BEBE4A4A0202",\r
+"CF c #B6B642420202",\r
+"DF c #E6E696964646",\r
+"EF c #C6C6CACACACA",\r
+"FF c #DADADEDEDEDE",\r
+"GF c #D2D256560202",\r
+"HF c #A6A63A3A0202",\r
+"IF c #C6C67A7A3E3E",\r
+"JF c #CACAD2D2DADA",\r
+"KF c #D6D65E5E0202",\r
+"LF c #BABABEBEBEBE",\r
+"MF c #9E9E36360202",\r
+"NF c #BEBE72723A3A",\r
+"OF c #FEFEC6C64A4A",\r
+"PF c #EEEE7A7A0202",\r
+"AG c #BEBEC6C6CACA",\r
+"BG c #D6D6DADADADA",\r
+"CG c #FAFA9A9A0202",\r
+"DG c #DEDE82823A3A",\r
+"EG c #EAEA6E6E0202",\r
+"FG c #DEDEE6E6EAEA",\r
+"GG c #E6E69A9A5252",\r
+"HG c #CACACECED2D2",\r
+"IG c #E2E272720E0E",\r
+"JG c #DEDEDEDEE2E2",\r
+"KG c #CECE5A5A0202",\r
+"LG c #B6B6B6B6B6B6",\r
+"MG c #E2E262620202",\r
+"NG c #AEAE3E3E0202",\r
+"OG c #EAEA6A6A0202",\r
+"PG c #CECEB2B29292",\r
+"AH c #EEEE76760202",\r
+"BH c #CECED2D2D6D6",\r
+"CH c #E2E28A8A2A2A",\r
+"DH c #E6E6EAEAEEEE",\r
+"EH c #DADAA2A26E6E",\r
+"FH c #E2E26A6A0202",\r
+"GH c #AEAE8E8E7676",\r
+"HH c #AAAAAEAEAEAE",\r
+"IH c #C2C2C6C6C6C6",\r
+"JH c #BEBE52520202",\r
+"KH c #DEDE8E8E4646",\r
+"LH c #F2F27E7E0202",\r
+"MH c #EEEE72720202",\r
+"NH c #CECE56560202",\r
+"OH c #EAEAA2A25E5E",\r
+"PH c #DADA66660202",\r
+"AI c #CECED6D6DEDE",\r
+"BI c #D6D65A5A0202",\r
+"CI c #EAEA66660202",\r
+"DI c #FAFAA6A60A0A",\r
+"EI c #E2E266660202",\r
+"FI c #FAFA8A8A0202",\r
+"GI c #FAFA7E7E0202",\r
+"HI c #D6D656560202",\r
+"II c #CACAD2D2D6D6",\r
+"JI c #DEDEE2E2E6E6",\r
+"KI c #E2E2E6E6EAEA",\r
+"LI c #D2D2D6D6DADA",\r
+"MI c #C6C6CACACECE",\r
+"NI c #DADADEDEE2E2",\r
+"OI c #BABABEBEC2C2",\r
+"PI s bg c None",\r
+/* pixels */\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIPIPICACAPIPIPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIPICAJBDECAPIPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIPIFBJBJDOCPIPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIPIOEEEGIEDPIPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIOEOHOHOHOHOEPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIGADHODDHLCHGPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIFFHAICHACEJEPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIBGHGICLIICBHICHGPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIFFCEHAICHACEFFCEPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIFFPCICODDHAIJGPCPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIEACHDFGGIEGEHCNHPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIJHPHDCEBEBJBJDCDBIJHPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIJHOCFAEDEEJBJDLHMEJHPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIHBOCDCEDEEJBJDLHFEHBPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIKGKGFBDCEDEECDGCGCFHKGKGPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIMDMDFHEDDDEBMCJBJBNBMDMDPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIHHBCPGEHABOBDFKCPBKDLGHGPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIHHKEAGOALCFGAIKILCOAACBGHHOIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIEFNCFFDBCEGDCEECCEDBFFLFECBAPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPILEBGIHHDHGHDECCEHGHDIHBGIBMIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIMBGHGANIHGHDHGCEECHDMIFFGALIBDADPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIIDHFFDIFFCGBDBHDJFJIIIFFNDNANFCBAACFPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIAHJAHFJAGFKBIGLADGKHKHHEHCNENBCCBFMFCBHIPIPIPIPIPIPI",\r
+"PIPIPIPIPILHPFMECFJAKFFEFHAFAFDDDDEDEEMHNBBIBFNGKFMALHPIPIPIPIPI",\r
+"PIPIPIPIKAPAGCGCEIAEGFMEEIMGIACIOGEDEDEGPDBBCCFHPAPEKAKAPIPIPIPI",\r
+"PIPIPIBEBEKAJCJCPAJBEDIAIAAFIAIACIOGEDMHMCLHJDFIKAKACGBEDIPIPIPI",\r
+"PIPIPIOFOFDADAOFOFOFDALBLBLBLBLBLBLBLBLBDADALDLDLDLDLDLDLDPIPIPI",\r
+"PIPIPIHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBHBPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPI",\r
+"PIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPIPI"};\r
index 8c62276a38267da900a9687474431ea9d128a9ee..a7d628836178517a887a92d8cf96b7d7e5af2d35 100644 (file)
Binary files a/share/vlc48x48.ico and b/share/vlc48x48.ico differ
index be7a44ab3909082e8ab7a2e2ccf3fd45be477ea9..41b82ddfd9e67ca9e47bb99fdd322092154a4c2f 100644 (file)
Binary files a/share/vlc48x48.png and b/share/vlc48x48.png differ
diff --git a/share/vlc48x48new.ico b/share/vlc48x48new.ico
deleted file mode 100644 (file)
index b764a8b..0000000
Binary files a/share/vlc48x48new.ico and /dev/null differ
index a5cae28f980142719da2c13f6373c325f41ceb85..0c35d47b11b1f6032f865f02c9c60be1a03575e1 100644 (file)
@@ -1,4 +1,4 @@
-VLC_ICON ICON "vlc48x48new.ico"
+VLC_ICON ICON "vlc48x48.ico"
 #ifndef VERSION_NUMBER
 #define VERSION_NUMBER 0,0,0,0
 #endif
index ee859c242b1b5dc8c9e30b28594d89eb921c753f..64f9388fc4cdf0f69cd3989d12ba48fc486e57fb 100644 (file)
@@ -43,8 +43,8 @@ InstType "Full"
 \r
 ; MUI Settings\r
   !define MUI_ABORTWARNING\r
-  !define MUI_ICON "vlc48x48new.ico"\r
-  !define MUI_UNICON "vlc48x48new.ico"\r
+  !define MUI_ICON "vlc48x48.ico"\r
+  !define MUI_UNICON "vlc48x48.ico"\r
   !define MUI_COMPONENTSPAGE_SMALLDESC\r
 \r
 ; Installer pages\r