Skip to content

V
vlc-2-2
Commit c541cec6 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/gui/wxwindows/*: simplified the look&feel of the main interface.

parent 01dfb2d8
Show whitespace changes
Inline Side-by-side
Showing with 318 additions and 896 deletions
modules/gui/wxwindows/Modules.am
View file @ c541cec6
...@@ -22,14 +22,11 @@ SOURCES_wxwindows = \ ...@@ -22,14 +22,11 @@ SOURCES_wxwindows = \
$(NULL) $(NULL)
EXTRA_DIST += \ EXTRA_DIST += \
bitmaps/file.xpm \
bitmaps/disc.xpm \
bitmaps/net.xpm \
bitmaps/stop.xpm \ bitmaps/stop.xpm \
bitmaps/play.xpm \ bitmaps/play.xpm \
bitmaps/pause.xpm \ bitmaps/pause.xpm \
bitmaps/playlist.xpm \ bitmaps/eject.xpm \
bitmaps/previous.xpm \ bitmaps/prev.xpm \
bitmaps/next.xpm \ bitmaps/next.xpm \
bitmaps/slow.xpm \ bitmaps/slow.xpm \
bitmaps/fast.xpm bitmaps/fast.xpm
modules/gui/wxwindows/bitmaps/disc.xpm deleted 100644 → 0
View file @ 01dfb2d8
/* XPM */
static char * disc_xpm[] = {
"36 36 138 2",
" c None",
". c #000000",
"+ c #AEB3B3",
"@ c #C6C9CD",
"# c #D7D4DF",
"$ c #ECDEF3",
"% c #E7CBE9",
"& c #D9B5D3",
"* c #B1B7A5",
"= c #B0B8AD",
"- c #B3B9B6",
"; c #C1C6C8",
"> c #D5D3DC",
", c #E5CAE6",
"' c #E0BBD7",
") c #E1ADC2",
"! c #E3ACA3",
"~ c #CAC1A4",
"{ c #C5C7AC",
"] c #B7BEAF",
"^ c #ADB4AF",
"/ c #BDC2C3",
"( c #D1D0D8",
"_ c #E5C7E4",
": c #E0B6D1",
"< c #E7A9B4",
"[ c #EDCDB6",
"} c #D6CFAE",
"| c #DFA79F",
"1 c #DDBFAA",
"2 c #CFC5A9",
"3 c #C1C4AC",
"4 c #B2BAAF",
"5 c #B6BBBB",
"6 c #CDCED4",
"7 c #E4C4E1",
"8 c #E0AFC7",
"9 c #EABCAE",
"0 c #E1D6B6",
"a c #C7CCAE",
"b c #A2AB9A",
"c c #E3ABC0",
"d c #E6A3A7",
"e c #DFBAA8",
"f c #BDC2AE",
"g c #E2BFDC",
"h c #E7D6B8",
"i c #ACB6A6",
"j c #9DA89F",
"k c #D9AFCF",
"l c #E1B4D2",
"m c #E2B0CB",
"n c #E4A9BB",
"o c #E2B2A6",
"p c #6A6A6A",
"q c #0D0D0D",
"r c #A6B1A3",
"s c #98A29C",
"t c #8F9796",
"u c #7E8485",
"v c #E8C6E7",
"w c #E5C2E3",
"x c #E3BDDD",
"y c #E1B6D5",
"z c #8B9092",
"A c #979EA2",
"B c #A0A7AE",
"C c #E7D3ED",
"D c #E8D1ED",
"E c #E8CEEC",
"F c #E9CCEB",
"G c #A7AEB7",
"H c #B2B6C5",
"I c #BABCCE",
"J c #BFBED3",
"K c #E9DFF0",
"L c #E1D2F7",
"M c #CAC7D2",
"N c #C5C4CD",
"O c #BFBFC7",
"P c #B8B9C0",
"Q c #AEAFB6",
"R c #D5A8E1",
"S c #D8B2E9",
"T c #D9B8ED",
"U c #DBBDF0",
"V c #DCBFF1",
"W c #A4A6AC",
"X c #A8AAAF",
"Y c #A0A6A8",
"Z c #989E9C",
"` c #A1A89E",
" . c #B1B6A1",
".. c #C08CAD",
"+. c #CC90B5",
"@. c #D394CA",
"#. c #D6A2DB",
"$. c #CFA7DF",
"%. c #989F9B",
"&. c #ACB3A0",
"*. c #B9B9A4",
"=. c #D0B8A8",
"-. c #C5B5B8",
";. c #B6BBAD",
">. c #E3D7B5",
",. c #DDB4A9",
"'. c #CB89AC",
"). c #C891B5",
"!. c #D18DB7",
"~. c #A1A798",
"{. c #BDB9A5",
"]. c #CAB5B7",
"^. c #B8B1B1",
"/. c #C2C8B2",
"(. c #E1BFAF",
"_. c #DB929A",
":. c #BE82A6",
"<. c #C891B4",
"[. c #C78BB0",
"}. c #BCB6A1",
"|. c #CDB6B7",
"1. c #C0B4B5",
"2. c #B1B1AA",
"3. c #CAD1B4",
"4. c #E2C1B0",
"5. c #DBA8A3",
"6. c #D28AA9",
"7. c #B77EA2",
"8. c #BD89A9",
"9. c #C9AFAF",
"0. c #D0D6B5",
"a. c #E2BFAF",
"b. c #C684A7",
"c. c #ACAAA6",
"d. c #BDC3B0",
"e. c #D2D7B5",
"f. c #E2BFAE",
"g. c #DBB6A8",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . . . . . . ",
" . . + @ # $ % & . . ",
" . * = - ; > $ , ' ) ! . ",
" . ~ { ] ^ / ( $ _ : < [ } . ",
" . | 1 2 3 4 5 6 $ 7 8 9 0 a b . ",
" . c d e 2 f ^ @ $ g < h a i j . ",
" . k l m n o 2 p q q p [ a r s t u . ",
" . v w x y m p . . p j t z A B . ",
" . C D E F v q q A G H I J . ",
" . K K K K K q q L L L L L . ",
" . M N O P Q p . . p R S T U V . ",
" . W X Y Z ` .p q q p ..+.@.#.R $.. ",
" . %.` &.*.=.-.;.>.,.'...).!.@.. ",
" . ~. .{.=.].^./.>.(._.:...<.[.. ",
" . }.=.|.1.2.3.>.4.5.6.7.8.. ",
" . 9.-.^.;.0.>.a.,._.b.. ",
" . . c.d.e.>.f.g.. . ",
" . . . . . . ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/eject.xpm 0 → 100644
View file @ c541cec6
/* XPM */
static char * eject_xpm[] = {
"16 16 17 1",
"* c None",
". c #000000",
"+ c #800000",
"@ c #008000",
"# c #808000",
"$ c #000080",
"% c #800080",
"& c #008080",
" c #C0C0C0",
"= c #808080",
"- c #FF0000",
"; c #00FF00",
"> c #FFFF00",
", c #0000FF",
"' c #FF00FF",
") c #00FFFF",
"! c #FFFFFF",
"****************",
"****************",
"****************",
"*******.********",
"******...*******",
"*****.....******",
"****.......*****",
"****.......*****",
"****************",
"****************",
"****.......*****",
"****.......*****",
"****************",
"****************",
"****************",
"****************"};
modules/gui/wxwindows/bitmaps/fast.xpm 100755 → 100644
View file @ c541cec6
/* XPM */ /* XPM */
static char * fast_xpm[] = { static char * fast_xpm[] = {
"36 36 23 1", "16 16 17 1",
" c None", "* c None",
". c #000000", ". c #000000",
"+ c #E4EBE2", "+ c #800000",
"@ c #E1EADF", "@ c #008000",
"# c #FCFDFC", "# c #808000",
"$ c #F0F4EF", "$ c #000080",
"% c #D9E4D7", "% c #800080",
"& c #EDF2EC", "& c #008080",
"* c #CBDAC7", " c #C0C0C0",
"= c #181818", "= c #808080",
"- c #B1C7AC", "- c #FF0000",
"; c #9DBB90", "; c #00FF00",
"> c #88AC80", "> c #FFFF00",
", c #83A97A", ", c #0000FF",
"' c #7EA476", "' c #FF00FF",
") c #749A6B", ") c #00FFFF",
"! c #5D8554", "! c #FFFFFF",
"~ c #3A5B32", "****************",
"{ c #537C49", "****************",
"] c #445840", "****************",
"^ c #4B7040", "****************",
"/ c #96B88C", "****.****.******",
"( c #3F6534", "****..***..*****",
" ", "****...**...****",
" ", "****....*....***",
" ", "****...**...****",
" ", "****..***..*****",
" ", "****.****.******",
" ", "****************",
" ", "****************",
" ", "****************",
" ", "****************",
" ", "****************"};
" ",
" .. .... .... ",
" .+.. .@+. .@+. ",
" .#$%.. .##. .##. ",
" .#$&$*.. .##. .##. ",
" .##$$&$*.. .##. .##. ",
" .#$$&&&+$*=. .##. .##. ",
" .#$$$&%%%%$-..##. .##. ",
" .;>,>,,',)!~..;;. .;;. ",
" .;,,,,,){].. .;;. .;;. ",
" .;,,,){^.. .;/. .;/. ",
" .>,){~.. .//. .//. ",
" .,!~.. .,,. .,,. ",
" .(.. .((. .((. ",
" .. .... .... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/file.xpm deleted 100644 → 0
View file @ 01dfb2d8
/* XPM */
static char * file_xpm[] = {
"36 36 54 1",
" c None",
". c #000000",
"+ c #0B0B0B",
"@ c #A4946F",
"# c #131313",
"$ c #FEFEF7",
"% c #FFFFFF",
"& c #C0B59C",
"* c #D5CEBD",
"= c #C4BAA2",
"- c #EFEDE7",
"; c #C5BBA4",
"> c #C5BBA3",
", c #E9E5DC",
"' c #D4CDBC",
") c #AD9E7D",
"! c #A99A77",
"~ c #DAD4C5",
"{ c #F1EEE8",
"] c #B5A88A",
"^ c #AFA281",
"/ c #A59671",
"( c #D5CDBC",
"_ c #EBE8E0",
": c #ECE8E0",
"< c #CBC2AD",
"[ c #B9AD91",
"} c #B8AC8F",
"| c #AA9B78",
"1 c #F3F1EC",
"2 c #C7BDA6",
"3 c #B7AA8D",
"4 c #B5A98B",
"5 c #B4A789",
"6 c #AB9C7B",
"7 c #D7D1C1",
"8 c #B7AB8E",
"9 c #B6A98C",
"0 c #B8AB8E",
"a c #685E46",
"b c #B3A688",
"c c #B1A484",
"d c #A89975",
"e c #938463",
"f c #D2CAB8",
"g c #B4A788",
"h c #CFC7B3",
"i c #AEA07F",
"j c #A79875",
"k c #7D7155",
"l c #C1B69D",
"m c #A79774",
"n c #8B7D5E",
"o c #A0906C",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .. ",
" +..@@. ",
" .. .#.@@@@$$%... ",
" .@@..@@@@$$$$..&*. ",
" .@@@@@$$$$$..=-;@. ",
" .@@$$$$$..>,')!@. ",
" .@@$$$..~{~]]^/@. ",
" .@$$.(_:<[})|@@. ",
" .@@$.12[3456@@@. ",
" .@$.78]90)@@@a. ",
" .@@.*]b9cd@e.. ",
" .@.f]]g|@.. ",
" .@.h4ijk. ",
" ..lmn.. ",
" ..o.. ",
" .. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/net.xpm deleted 100644 → 0
View file @ 01dfb2d8
/* XPM */
static char * net_xpm[] = {
"36 36 30 1",
" c None",
". c #272727",
"+ c #888888",
"@ c #B0A5BA",
"# c #7E6792",
"$ c #3C284D",
"% c #B8B0C1",
"& c #87709D",
"* c #70518A",
"= c #6C4C85",
"- c #65477C",
"; c #513663",
"> c #856E99",
", c #4B365F",
"' c #573E6D",
") c #483259",
"! c #372544",
"~ c #4B335C",
"{ c #776684",
"] c #A898B5",
"^ c #857991",
"/ c #8A759B",
"( c #747474",
"_ c #9C89AA",
": c #4D3663",
"< c #A095AC",
"[ c #65477E",
"} c #7A5695",
"| c #826A97",
"1 c #412D52",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" .+ ",
" .@#..$ ",
" .%&**=-;. ",
" .>*.$,--. ",
" . .. $'). ",
" . . !'. ",
" .. ~! ",
" !{ !. ",
" .]. . . ",
" .^/. (. . ",
" ._=:!.<[. ",
" !:**}|=*. ",
" 1!.=-. ",
" .. ",
" . ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/next.xpm
View file @ c541cec6
/* XPM */ /* XPM */
static char * next_xpm[] = { static char * next_xpm[] = {
"36 36 23 1", "16 16 17 1",
" c None", "* c None",
". c #000000", ". c #000000",
"+ c #E4EBE2", "+ c #800000",
"@ c #E1EADF", "@ c #008000",
"# c #FCFDFC", "# c #808000",
"$ c #F0F4EF", "$ c #000080",
"% c #D9E4D7", "% c #800080",
"& c #EDF2EC", "& c #008080",
"* c #CBDAC7", " c #C0C0C0",
"= c #181818", "= c #808080",
"- c #B1C7AC", "- c #FF0000",
"; c #9DBB90", "; c #00FF00",
"> c #88AC80", "> c #FFFF00",
", c #83A97A", ", c #0000FF",
"' c #7EA476", "' c #FF00FF",
") c #749A6B", ") c #00FFFF",
"! c #5D8554", "! c #FFFFFF",
"~ c #3A5B32", "****************",
"{ c #537C49", "****************",
"] c #445840", "****************",
"^ c #4B7040", "****************",
"/ c #96B88C", "**.****.****.***",
"( c #3F6534", "**..***..***.***",
" ", "**...**...**.***",
" ", "**....*....*.***",
" ", "**...**...**.***",
" ", "**..***..***.***",
" ", "**.****.****.***",
" ", "****************",
" ", "****************",
" ", "****************",
" ", "****************",
" ", "****************"};
" ",
" .. .... ",
" .+.. .@+. ",
" .#$%.. .##. ",
" .#$&$*.. .##. ",
" .##$$&$*.. .##. ",
" .#$$&&&+$*=. .##. ",
" .#$$$&%%%%$-..##. ",
" .;>,>,,',)!~..;;. ",
" .;,,,,,){].. .;;. ",
" .;,,,){^.. .;/. ",
" .>,){~.. .//. ",
" .,!~.. .,,. ",
" .(.. .((. ",
" .. .... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/pause.xpm
View file @ c541cec6
/* XPM */ /* XPM */
static char * pause_xpm[] = { static char * pause_xpm[] = {
"36 36 7 1", "16 16 17 1",
" c None", "* c None",
". c #000000", ". c #000000",
"+ c #C6D7C3", "+ c #800000",
"@ c #67925C", "@ c #008000",
"# c #608C56", "# c #808000",
"$ c #5B8851", "$ c #000080",
"% c #36582E", "% c #800080",
" ", "& c #008080",
" ", " c #C0C0C0",
" ", "= c #808080",
" ", "- c #FF0000",
" ", "; c #00FF00",
" ", "> c #FFFF00",
" ", ", c #0000FF",
" ", "' c #FF00FF",
" ", ") c #00FFFF",
" ", "! c #FFFFFF",
" ", "****************",
" ..... ..... ", "****************",
" .+++. .+++. ", "****************",
" .+++. .+++. ", "****...**...****",
" .+++. .+++. ", "****...**...****",
" .+++. .+++. ", "****...**...****",
" .+++. .+++. ", "****...**...****",
" .+++. .+++. ", "****...**...****",
" .@@@. .@@@. ", "****...**...****",
" .@@@. .@@@. ", "****...**...****",
" .@@@. .@@@. ", "****...**...****",
" .###. .###. ", "****...**...****",
" .$$$. .$$$. ", "****************",
" .%%%. .%%%. ", "****************",
" ..... ..... ", "****************",
" ", "****************"};
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/play.xpm
View file @ c541cec6
/* XPM */ /* XPM */
static char * play_xpm[] = { static char * play_xpm[] = {
"36 36 23 1", "16 16 17 1",
" c None", "* c None",
". c #000000", ". c #000000",
"+ c #E4EBE2", "+ c #800000",
"@ c #F9FBF9", "@ c #008000",
"# c #EDF2EC", "# c #808000",
"$ c #D9E4D7", "$ c #000080",
"% c #F0F4EF", "% c #800080",
"& c #CBDAC7", "& c #008080",
"* c #181818", " c #C0C0C0",
"= c #2B2B2B", "= c #808080",
"- c #B1C7AC", "- c #FF0000",
"; c #9DBB90", "; c #00FF00",
"> c #88AC80", "> c #FFFF00",
", c #83A87A", ", c #0000FF",
"' c #749A6B", "' c #FF00FF",
") c #59814F", ") c #00FFFF",
"! c #3A5B32", "! c #FFFFFF",
"~ c #537C49", "****************",
"{ c #445840", "****************",
"] c #96B88C", "***..***********",
"^ c #4B7040", "***....*********",
"/ c #5D8554", "***......*******",
"( c #3F6534", "***........*****",
" ", "***..........***",
" ", "***...........**",
" ", "***..........***",
" ", "***........*****",
" ", "***......*******",
" ", "***....*********",
" ", "***..***********",
" ", "****************",
" ", "****************",
" ", "****************"};
" ",
" .. ",
" .+.. ",
" .@#$.. ",
" .@%##&.. ",
" .@@%##%&.. ",
" .@#%%##+%&*. ",
" =@####+$$$%-.. ",
" .;>,,,,,,')!.. ",
" .;,,,,,'~{.. ",
" .]>,,'~^.. ",
" .],'~!.. ",
" .>/!.. ",
" .(.. ",
" .. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/playlist.xpm deleted 100644 → 0
View file @ 01dfb2d8
/* XPM */
static char * playlist_xpm[] = {
"36 36 16 1",
" c None",
". c #000000",
"+ c #E0E4E0",
"@ c #949C8C",
"# c #908669",
"$ c #736B54",
"% c #CAC3AA",
"& c #D3CDB8",
"* c #A3A5A3",
"= c #7A735A",
"- c #464233",
"; c #BBB191",
"> c #B4A884",
", c #998F70",
"' c #C1B89B",
") c #5C5543",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .................. ",
" .++++++++++++++++. ",
" .+++++..@++++++++. ",
" .++++.#$.@+++++++. ",
" ......%#.......... ",
" .++++.&#.@+++++++. ",
" .++++.%#...*+++++. ",
" .++++.%#.=-...@++. ",
" ......;#.>=.,$.... ",
" .++.$.'#.>#.>#.#$. ",
" .++.#.;;#>>#>>>>#. ",
" .++.>.''';;>>>>>$. ",
" ....>.>'';'>>>>>$. ",
" .++.#,;''';';>>>). ",
" .+++.#>'''';>>>#-. ",
" .+++.$>;'';'>>>#. ",
" ......#'''';>>#$. ",
" .$>>'''>>#). ",
" .#;'';>>$. ",
" .>;''>>). ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/prev.xpm 0 → 100644
View file @ c541cec6
/* XPM */
static char * prev_xpm[] = {
"16 16 17 1",
"* c None",
". c #000000",
"+ c #800000",
"@ c #008000",
"# c #808000",
"$ c #000080",
"% c #800080",
"& c #008080",
" c #C0C0C0",
"= c #808080",
"- c #FF0000",
"; c #00FF00",
"> c #FFFF00",
", c #0000FF",
"' c #FF00FF",
") c #00FFFF",
"! c #FFFFFF",
"****************",
"****************",
"****************",
"****************",
"**.****.****.***",
"**.***..***..***",
"**.**...**...***",
"**.*....*....***",
"**.**...**...***",
"**.***..***..***",
"**.****.****.***",
"****************",
"****************",
"****************",
"****************",
"****************"};
modules/gui/wxwindows/bitmaps/previous.xpm deleted 100644 → 0
View file @ 01dfb2d8
/* XPM */
static char * previous_xpm[] = {
"36 36 21 1",
" c None",
". c #000000",
"+ c #C6D7C3",
"@ c #E5ECE4",
"# c #F8FAF8",
"$ c #EDF2EC",
"% c #DCE6DA",
"& c #121B12",
"* c #B1C7AC",
"= c #67925C",
"- c #375930",
"; c #548149",
"> c #719A67",
", c #82A979",
"' c #7DA473",
") c #516F4A",
"! c #4E7C44",
"~ c #608C56",
"{ c #47733D",
"] c #5B8851",
"^ c #6FA763",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .... .. ",
" .++. ..+. ",
" .++. ..@#+. ",
" .++. ..@##$+. ",
" .++. ..%##$$#+. ",
" .++. .&@#$@$$$$+. ",
" .++..*#@%%@$$$$+. ",
" .==..-;>,',,,,,>. ",
" .==. ..)!>,,,,,=. ",
" .==. ..-!>,',=. ",
" .~~. ..{!>,~. ",
" .]]. ..{^]. ",
" .--. ..-. ",
" .... .. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/sat.xpm deleted 100644 → 0
View file @ 01dfb2d8
/* XPM */
static char * sat_xpm[] = {
"36 36 14 1",
" c None",
". c #000000",
"+ c #ABABAB",
"@ c #767676",
"# c #D4D4D4",
"$ c #8A8A8A",
"% c #F7F7F7",
"& c #989898",
"* c #525252",
"= c #CCCCCC",
"- c #6A6A6A",
"; c #BBBBBB",
"> c #4B4B4B",
", c #3C3C3C",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ... ",
" .+@+. ",
" .#$%@&. ",
" .*%@=*. ",
" .&$#-&. ",
" .*%-=*. ",
" ...&$#-$... ",
" . .*%@;>. . ",
" . .$@#*@. . ",
" . .>&-$,. . ",
" .. ..... .. ",
" .. .. ",
" ....... ",
" ... ",
" ... ",
" ... ",
" . ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/slow.xpm 100755 → 100644
View file @ c541cec6
/* XPM */ /* XPM */
static char * slow_xpm[] = { static char * slow_xpm[] = {
"36 36 21 1", "16 16 17 1",
" c None", "* c None",
". c #000000", ". c #000000",
"+ c #C6D7C3", "+ c #800000",
"@ c #E5ECE4", "@ c #008000",
"# c #F8FAF8", "# c #808000",
"$ c #EDF2EC", "$ c #000080",
"% c #DCE6DA", "% c #800080",
"& c #121B12", "& c #008080",
"* c #B1C7AC", " c #C0C0C0",
"= c #67925C", "= c #808080",
"- c #375930", "- c #FF0000",
"; c #548149", "; c #00FF00",
"> c #719A67", "> c #FFFF00",
", c #82A979", ", c #0000FF",
"' c #7DA473", "' c #FF00FF",
") c #516F4A", ") c #00FFFF",
"! c #4E7C44", "! c #FFFFFF",
"~ c #608C56", "****************",
"{ c #47733D", "****************",
"] c #5B8851", "****************",
"^ c #6FA763", "****************",
" ", "******.****.****",
" ", "*****..***..****",
" ", "****...**...****",
" ", "***....*....****",
" ", "****...**...****",
" ", "*****..***..****",
" ", "******.****.****",
" ", "****************",
" ", "****************",
" ", "****************",
" ", "****************",
" .... .... .. ", "****************"};
" .++. .++. ..+. ",
" .++. .++. ..@#+. ",
" .++. .++. ..@##$+. ",
" .++. .++. ..%##$$#+. ",
" .++. .++. .&@#$@$$$$+. ",
" .++. .++..*#@%%@$$$$+. ",
" .==. .==..-;>,',,,,,>. ",
" .==. .==. ..)!>,,,,,=. ",
" .==. .==. ..-!>,',=. ",
" .~~. .~~. ..{!>,~. ",
" .]]. .]]. ..{^]. ",
" .--. .--. ..-. ",
" .... .... .. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/bitmaps/stop.xpm
View file @ c541cec6
/* XPM */ /* XPM */
static char * stop_xpm[] = { static char * stop_xpm[] = {
"36 36 7 1", "16 16 17 1",
" c None", "* c None",
". c #000000", ". c #000000",
"+ c #C6D7C3", "+ c #800000",
"@ c #67925C", "@ c #008000",
"# c #608C56", "# c #808000",
"$ c #5B8851", "$ c #000080",
"% c #36582E", "% c #800080",
" ", "& c #008080",
" ", " c #C0C0C0",
" ", "= c #808080",
" ", "- c #FF0000",
" ", "; c #00FF00",
" ", "> c #FFFF00",
" ", ", c #0000FF",
" ", "' c #FF00FF",
" ", ") c #00FFFF",
" ", "! c #FFFFFF",
" ", "****************",
" ............ ", "****************",
" .++++++++++. ", "****************",
" .++++++++++. ", "****........****",
" .++++++++++. ", "****........****",
" .++++++++++. ", "****........****",
" .++++++++++. ", "****........****",
" .++++++++++. ", "****........****",
" .@@@@@@@@@@. ", "****........****",
" .@@@@@@@@@@. ", "****........****",
" .@@@@@@@@@@. ", "****........****",
" .##########. ", "****........****",
" .$$$$$$$$$$. ", "****************",
" .%%%%%%%%%%. ", "****************",
" ............ ", "****************",
" ", "****************"};
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
modules/gui/wxwindows/interface.cpp
View file @ c541cec6
...@@ -33,24 +33,17 @@ ...@@ -33,24 +33,17 @@
#include "wxwindows.h" #include "wxwindows.h"
/* include the toolbar graphics */ /* include the toolbar graphics */
#include "bitmaps/file.xpm"
#include "bitmaps/disc.xpm"
#include "bitmaps/net.xpm"
#if 0
#include "bitmaps/sat.xpm"
#endif
#include "bitmaps/play.xpm" #include "bitmaps/play.xpm"
#include "bitmaps/pause.xpm" #include "bitmaps/pause.xpm"
#include "bitmaps/stop.xpm" #include "bitmaps/stop.xpm"
#include "bitmaps/previous.xpm" #include "bitmaps/prev.xpm"
#include "bitmaps/next.xpm" #include "bitmaps/next.xpm"
#include "bitmaps/playlist.xpm" #include "bitmaps/eject.xpm"
#include "bitmaps/fast.xpm"
#include "bitmaps/slow.xpm" #include "bitmaps/slow.xpm"
#include "bitmaps/fast.xpm"
#define TOOLBAR_BMP_WIDTH 36 #define TOOLBAR_BMP_WIDTH 16
#define TOOLBAR_BMP_HEIGHT 36 #define TOOLBAR_BMP_HEIGHT 16
/* include the icon graphic */ /* include the icon graphic */
#include "../../../share/vlc32x32.xpm" #include "../../../share/vlc32x32.xpm"
...@@ -241,11 +234,6 @@ Interface::Interface( intf_thread_t *_p_intf ): ...@@ -241,11 +234,6 @@ Interface::Interface( intf_thread_t *_p_intf ):
/* Creation of the tool bar */ /* Creation of the tool bar */
CreateOurToolBar(); CreateOurToolBar();
/* Creation of the slider sub-window */
CreateOurSlider();
frame_sizer->Add( slider_frame, 0, wxEXPAND , 0 );
frame_sizer->Hide( slider_frame );
/* Create the extra panel */ /* Create the extra panel */
CreateOurExtendedPanel(); CreateOurExtendedPanel();
frame_sizer->Add( extra_frame, 0, wxEXPAND , 0 ); frame_sizer->Add( extra_frame, 0, wxEXPAND , 0 );
...@@ -259,9 +247,6 @@ Interface::Interface( intf_thread_t *_p_intf ): ...@@ -259,9 +247,6 @@ Interface::Interface( intf_thread_t *_p_intf ):
statusbar->SetStatusWidths( 3, i_status_width ); statusbar->SetStatusWidths( 3, i_status_width );
statusbar->SetStatusText( wxString::Format(wxT("x%.2f"), 1.0), 1 ); statusbar->SetStatusText( wxString::Format(wxT("x%.2f"), 1.0), 1 );
/* Make sure we've got the right background colour */
SetBackgroundColour( slider_frame->GetBackgroundColour() );
/* Video window */ /* Video window */
if( config_GetInt( p_intf, "wxwin-embed" ) ) if( config_GetInt( p_intf, "wxwin-embed" ) )
{ {
...@@ -269,6 +254,14 @@ Interface::Interface( intf_thread_t *_p_intf ): ...@@ -269,6 +254,14 @@ Interface::Interface( intf_thread_t *_p_intf ):
frame_sizer->Add( p_intf->p_sys->p_video_sizer, 1, wxEXPAND , 0 ); frame_sizer->Add( p_intf->p_sys->p_video_sizer, 1, wxEXPAND , 0 );
} }
/* Creation of the slider sub-window */
CreateOurSlider();
frame_sizer->Add( slider_frame, 0, wxEXPAND , 0 );
frame_sizer->Hide( slider_frame );
/* Make sure we've got the right background colour */
SetBackgroundColour( slider_frame->GetBackgroundColour() );
/* Layout everything */ /* Layout everything */
frame_sizer->Layout(); frame_sizer->Layout();
frame_sizer->Fit(this); frame_sizer->Fit(this);
...@@ -329,32 +322,33 @@ void Interface::CreateOurMenuBar() ...@@ -329,32 +322,33 @@ void Interface::CreateOurMenuBar()
/* Create the "File" menu */ /* Create the "File" menu */
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
file_menu->Append( OpenFileSimple_Event, wxU(_("Quick &Open File...")), file_menu->Append( OpenFileSimple_Event,
wxU(_("Quick &Open File...\tCtrl-O")),
wxU(_(HELP_SIMPLE)) ); wxU(_(HELP_SIMPLE)) );
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append( OpenFile_Event, wxU(_("Open &File...")), file_menu->Append( OpenFile_Event, wxU(_("Open &File...\tCtrl-F")),
wxU(_(HELP_FILE))); wxU(_(HELP_FILE)));
file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")), file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...\tCtrl-D")),
wxU(_(HELP_DISC))); wxU(_(HELP_DISC)));
file_menu->Append( OpenNet_Event, wxU(_("Open &Network Stream...")), file_menu->Append( OpenNet_Event,
wxU(_("Open &Network Stream...\tCtrl-N")),
wxU(_(HELP_NET))); wxU(_(HELP_NET)));
#if 0
file_menu->Append( OpenSat_Event, wxU(_("Open &Satellite Stream...")),
wxU(_(HELP_NET)) );
#endif
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append( StreamWizard_Event, wxU(_("Streaming Wizard...")), file_menu->Append( StreamWizard_Event,
wxU(_("Streaming &Wizard...\tCtrl-W")),
wxU(_(HELP_STREAMWIZARD)) ); wxU(_(HELP_STREAMWIZARD)) );
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append( Exit_Event, wxU(_("E&xit")), wxU(_(HELP_EXIT)) ); file_menu->Append( Exit_Event, wxU(_("E&xit\tCtrl-X")),
wxU(_(HELP_EXIT)) );
/* Create the "View" menu */ /* Create the "View" menu */
wxMenu *view_menu = new wxMenu; wxMenu *view_menu = new wxMenu;
view_menu->Append( Playlist_Event, wxU(_("&Playlist...")), view_menu->Append( Playlist_Event, wxU(_("&Playlist...\tCtrl-P")),
wxU(_(HELP_PLAYLIST)) ); wxU(_(HELP_PLAYLIST)) );
view_menu->Append( Logs_Event, wxU(_("&Messages...")), wxU(_(HELP_LOGS)) ); view_menu->Append( Logs_Event, wxU(_("&Messages...\tCtrl-M")),
wxU(_(HELP_LOGS)) );
view_menu->Append( FileInfo_Event, wxU(_("&Stream and Media info...")), view_menu->Append( FileInfo_Event, wxU(_("&Stream and Media info...")),
wxU(_(HELP_FILEINFO)) ); wxU(_(HELP_FILEINFO)) );
...@@ -420,34 +414,26 @@ void Interface::CreateOurToolBar() ...@@ -420,34 +414,26 @@ void Interface::CreateOurToolBar()
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) ); toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
toolbar->AddTool( OpenFileSimple_Event, wxT(""),
wxBitmap( file_xpm ), wxU(_(HELP_SIMPLE)) );
toolbar->AddSeparator();
toolbar->AddTool( OpenFile_Event, wxT(""), wxBitmap( file_xpm ),
wxU(_(HELP_FILE)) );
toolbar->AddTool( OpenDisc_Event, wxT(""), wxBitmap( disc_xpm ),
wxU(_(HELP_DISC)) );
toolbar->AddTool( OpenNet_Event, wxT(""), wxBitmap( net_xpm ),
wxU(_(HELP_NET)) );
toolbar->AddSeparator();
toolbar->AddTool( StopStream_Event, wxT(""), wxBitmap( stop_xpm ),
wxU(_(HELP_STOP)) );
toolbar->AddTool( PlayStream_Event, wxT(""), wxBitmap( play_xpm ), toolbar->AddTool( PlayStream_Event, wxT(""), wxBitmap( play_xpm ),
wxU(_(HELP_PLAY)) ); wxU(_(HELP_PLAY)) );
#if 0
toolbar->AddTool( PlayStream_Event, wxT(""), wxBitmap( pause_xpm ),
wxU(_(HELP_PAUSE)) );
#endif
toolbar->AddTool( StopStream_Event, wxT(""), wxBitmap( stop_xpm ),
wxU(_(HELP_STOP)) );
toolbar->AddSeparator(); toolbar->AddSeparator();
toolbar->AddTool( Playlist_Event, wxT(""),
wxBitmap( playlist_xpm ), wxU(_(HELP_PLO)) );
toolbar->AddTool( PrevStream_Event, wxT(""), toolbar->AddTool( PrevStream_Event, wxT(""),
wxBitmap( previous_xpm ), wxU(_(HELP_PLP)) ); wxBitmap( prev_xpm ), wxU(_(HELP_PLP)) );
toolbar->AddTool( SlowStream_Event, wxT(""),
wxBitmap( slow_xpm ), wxU(_(HELP_SLOW)) );
toolbar->AddTool( FastStream_Event, wxT(""),
wxBitmap( fast_xpm ), wxU(_(HELP_FAST)) );
toolbar->AddTool( NextStream_Event, wxT(""), wxBitmap( next_xpm ), toolbar->AddTool( NextStream_Event, wxT(""), wxBitmap( next_xpm ),
wxU(_(HELP_PLN)) ); wxU(_(HELP_PLN)) );
toolbar->AddTool( SlowStream_Event, wxT(""), wxBitmap( slow_xpm ), toolbar->AddSeparator();
wxU(_(HELP_SLOW)) ); toolbar->AddTool( Playlist_Event, wxT(""), wxBitmap( eject_xpm ),
toolbar->AddTool( FastStream_Event, wxT(""), wxBitmap( fast_xpm ), wxU(_(HELP_PLO)) );
wxU(_(HELP_FAST)) );
toolbar->Realize(); toolbar->Realize();
...@@ -457,11 +443,7 @@ void Interface::CreateOurToolBar() ...@@ -457,11 +443,7 @@ void Interface::CreateOurToolBar()
toolbar_sizer->Add( toolbar, 1, 0, 0 ); toolbar_sizer->Add( toolbar, 1, 0, 0 );
toolbar_sizer->Layout(); toolbar_sizer->Layout();
#ifndef WIN32 frame_sizer->SetMinSize( toolbar_sizer->GetMinSize().GetWidth()*2, -1 );
frame_sizer->SetMinSize( toolbar_sizer->GetMinSize().GetWidth(), -1 );
#else /* That sucks but for some reason it works better */
frame_sizer->SetMinSize( toolbar_sizer->GetMinSize().GetWidth()*2/3, -1 );
#endif
#if !defined(__WXX11__) #if !defined(__WXX11__)
/* Associate drop targets with the toolbar */ /* Associate drop targets with the toolbar */
...@@ -1315,13 +1297,13 @@ void Interface::TogglePlayButton( int i_playing_status ) ...@@ -1315,13 +1297,13 @@ void Interface::TogglePlayButton( int i_playing_status )
if( i_playing_status == PLAYING_S ) if( i_playing_status == PLAYING_S )
{ {
GetToolBar()->InsertTool( 8, PlayStream_Event, wxU(_("Pause")), GetToolBar()->InsertTool( 0, PlayStream_Event, wxU(_("Pause")),
wxBitmap( pause_xpm ), wxNullBitmap, wxBitmap( pause_xpm ), wxNullBitmap,
wxITEM_NORMAL, wxU(_(HELP_PAUSE)) ); wxITEM_NORMAL, wxU(_(HELP_PAUSE)) );
} }
else else
{ {
GetToolBar()->InsertTool( 8, PlayStream_Event, wxU(_("Play")), GetToolBar()->InsertTool( 0, PlayStream_Event, wxU(_("Play")),
wxBitmap( play_xpm ), wxNullBitmap, wxBitmap( play_xpm ), wxNullBitmap,
wxITEM_NORMAL, wxU(_(HELP_PLAY)) ); wxITEM_NORMAL, wxU(_(HELP_PLAY)) );
} }
......
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