Skip to content

V
vlc-1.1
Commit 301ea6e4 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

Add some icons 

Fix autoswitching to category view
parent 04b00aca
Show whitespace changes
Inline Side-by-side
Showing with 887 additions and 433 deletions
include/vlc_input.h
View file @ 301ea6e4
......@@ -68,12 +68,15 @@ struct input_item_t
};
#define ITEM_TYPE_UNKNOWN 0
#define ITEM_TYPE_FILE 1
#define ITEM_TYPE_DIRECTORY 2
#define ITEM_TYPE_DISC 3
#define ITEM_TYPE_CARD 4
#define ITEM_TYPE_NET 5
#define ITEM_TYPE_PLAYLIST 6
#define ITEM_TYPE_AFILE 1
#define ITEM_TYPE_VFILE 2
#define ITEM_TYPE_DIRECTORY 3
#define ITEM_TYPE_DISC 4
#define ITEM_TYPE_CDDA 5
#define ITEM_TYPE_CARD 6
#define ITEM_TYPE_NET 7
#define ITEM_TYPE_PLAYLIST 8
#define ITEM_TYPE_NODE 9
static inline void vlc_input_item_Init( vlc_object_t *p_o, input_item_t *p_i )
{
......
modules/access/directory.c
View file @ 301ea6e4
......@@ -481,7 +481,7 @@ static int ReadDir( playlist_t *p_playlist,
p_playlist,
psz_uri,
p_dir_content->d_name,
ITEM_TYPE_FILE );
ITEM_TYPE_VFILE );
playlist_NodeAddItem( p_playlist,p_item,
p_parent->pp_parents[0]->i_view,
p_parent,
......
modules/gui/wxwindows/bitmaps/type_afile.xpm 0 → 100644
View file @ 301ea6e4
/* XPM */
static char * type_afile_xpm[] = {
"16 16 107 2",
" c None",
". c #8F8F8F",
"+ c #FFFFFF",
"@ c #B7CFF9",
"# c #B8CFF8",
"$ c #BCD2F7",
"% c #AFCAF4",
"& c #93B7EE",
"* c #5B91E2",
"= c #4E88DE",
"- c #4481D9",
"; c #3A7AD6",
"> c #2F73D2",
", c #246CCD",
"' c #1663CA",
") c #F3F7FE",
"! c #F1F6FD",
"~ c #EFF5FD",
"{ c #F2F7FF",
"] c #F2F8FF",
"^ c #E8EFFB",
"/ c #E6EDF9",
"( c #E7EFFB",
"_ c #E2EAF7",
": c #DCE5F1",
"< c #D9E2EF",
"[ c #D6E1EE",
"} c #FFFFFE",
"| c #EFEEED",
"1 c #D5D5D3",
"2 c #CDCBC9",
"3 c #CCCBC9",
"4 c #D4D2D0",
"5 c #EAE8E5",
"6 c #FCFBF8",
"7 c #FBFAF7",
"8 c #F9F7F4",
"9 c #FAFAFA",
"0 c #CFCFCF",
"a c #A7A7A7",
"b c #818181",
"c c #696969",
"d c #686868",
"e c #808080",
"f c #A5A5A5",
"g c #C6C6C6",
"h c #EFEFEF",
"i c #F3F3F3",
"j c #D2D2D2",
"k c #B0B0B0",
"l c #858585",
"m c #828282",
"n c #989898",
"o c #999999",
"p c #838383",
"q c #848484",
"r c #AEAEAE",
"s c #CACACA",
"t c #F0F0F0",
"u c #F6F6F6",
"v c #BDBDBD",
"w c #9F9F9F",
"x c #E8E8E8",
"y c #C3C3C3",
"z c #A1A1A1",
"A c #ACACAC",
"B c #BBBBBB",
"C c #E4E4E4",
"D c #F4F4F4",
"E c #C9C9C9",
"F c #C2C2C2",
"G c #B8B8B8",
"H c #B9B9B9",
"I c #B5B5B5",
"J c #C1C1C1",
"K c #B1B1B1",
"L c #E5E5E5",
"M c #FEFEFE",
"N c #ABABAB",
"O c #EBEBEB",
"P c #C0C0C0",
"Q c #8B8B8B",
"R c #BABABA",
"S c #A6A6A6",
"T c #F1F1F1",
"U c #F9F9F9",
"V c #DEDEDE",
"W c #F2F2F2",
"X c #909090",
"Y c #D8D8D8",
"Z c #F5F5F5",
"` c #FCFCFC",
" . c #DCDCDC",
".. c #777777",
"+. c #6D6D6D",
"@. c #979797",
"#. c #8C8C8C",
"$. c #F7F7F7",
"%. c #F8F8F8",
"&. c #CECECE",
"*. c #868686",
"=. c #B2B2B2",
"-. c #A8A8A8",
";. c #EAEAEA",
">. c #FBFBFB",
",. c #FDFDFD",
"'. c #EEEEEE",
". . . . . . . . . . . . . . . . ",
". + @ # $ % & * = - ; > , ' + . ",
". + ) ! ~ { ] ^ / ( _ : < [ + . ",
". + + + } | 1 2 3 4 5 6 7 8 + . ",
". + + 9 0 a b c d e f g h i + . ",
". + + j k l m n o p q r s t + . ",
". + u v r w s t x y z A B C + . ",
". + D k E F G H I r J s K L + . ",
". + M N J O P . Q R O E S T + . ",
". + U V . v W W t h J X Y 9 + . ",
". + Z ` ...+.. @.#.q s D h + . ",
". + $.%.$.&.*.l =.v g -.-.-.-.. ",
". + U U U U h C C ;.;.-.+ + . ",
". + >.>.>.>.M M ,.+ '.-.+ . ",
". + + + + + + + + + U -.. ",
". . . . . . . . . . . . "};
modules/gui/wxwindows/bitmaps/type_cdda.xpm 0 → 100644
View file @ 301ea6e4
/* XPM */
static char * type_cdda_xpm[] = {
"16 16 119 2",
" c None",
". c #7E7E7E",
"+ c #A3A3A3",
"@ c #000000",
"# c #030303",
"$ c #BDCCFF",
"% c #C1CDF5",
"& c #D8DDF1",
"* c #C4CBE9",
"= c #C0C8F0",
"- c #646464",
"; c #A8A8A8",
"> c #DFF2FF",
", c #F9FDFF",
"' c #E0E7FB",
") c #B1C3F7",
"! c #F7FAFF",
"~ c #FFFFFF",
"{ c #DBDEEE",
"] c #727EB7",
"^ c #2A2928",
"/ c #BBBBBB",
"( c #E1E9FF",
"_ c #FEFFFD",
": c #BECDF6",
"< c #E5ECFC",
"[ c #E8EDFA",
"} c #747CAA",
"| c #85847F",
"1 c #B8B8B8",
"2 c #D4E6FF",
"3 c #EBEEFB",
"4 c #DDE5FB",
"5 c #FEFFFF",
"6 c #EFF3FE",
"7 c #91ABF5",
"8 c #B7BFE3",
"9 c #7C7A7B",
"0 c #878787",
"a c #1A1A1A",
"b c #D1E4FF",
"c c #D8E1F8",
"d c #FAFAFE",
"e c #FFFFFE",
"f c #D5E0FB",
"g c #EFF0F9",
"h c #FBFDFF",
"i c #AAC0FA",
"j c #B0C7FF",
"k c #DEF0FF",
"l c #8A8B8F",
"m c #A4A49F",
"n c #585857",
"o c #D1E5FF",
"p c #B9CAF5",
"q c #C7D4F8",
"r c #E4EBFC",
"s c #F1F5FF",
"t c #D4DDFD",
"u c #C1C9E9",
"v c #B2BEE9",
"w c #D7E6FF",
"x c #383428",
"y c #8B8C90",
"z c #D3E4FF",
"A c #ABBEF3",
"B c #BBCAF6",
"C c #CAD8F8",
"D c #CED9FC",
"E c #B5C5FC",
"F c #AFB4D7",
"G c #DDE6FF",
"H c #1D1B14",
"I c #34322B",
"J c #CFDCFF",
"K c #C2D8FF",
"L c #B8C8F4",
"M c #ABBDF4",
"N c #B8C9F6",
"O c #D1DCFB",
"P c #DAE2FE",
"Q c #AFBAE2",
"R c #CACDE3",
"S c #F8FBFF",
"T c #DAE7FF",
"U c #C5D8FF",
"V c #D5E6FF",
"W c #5E6592",
"X c #C4D3FF",
"Y c #9BB1F2",
"Z c #B0C4F5",
"` c #D6DDF5",
" . c #F5F6FA",
".. c #E2EAFC",
"+. c #DCE7FF",
"@. c #515886",
"#. c #C0D9FF",
"$. c #B3C5FA",
"%. c #FDFDFF",
"&. c #FAFCFF",
"*. c #E6EBFD",
"=. c #DBDDEE",
"-. c #CADBFF",
";. c #FFFEFE",
">. c #FEFDFF",
",. c #F9FAFE",
"'. c #C7D4F7",
"). c #FDFDFE",
"!. c #959AC1",
"~. c #C7D7FF",
"{. c #D2DEFC",
"]. c #DCE5FF",
"^. c #AFB3D2",
"/. c #ADC1FF",
"(. c #C7D2FF",
"_. c #DBE0FA",
":. c #D7DFF6",
"<. c #A1AEDC",
"[. c #98A1CC",
" . ",
" + @ # ",
" $ % & * = @ @ - ; ",
" > , ' ) ! ~ ~ { ] ^ / ",
" ( ~ _ : < ~ ~ ~ [ } | 1 ",
" 2 ~ ~ ~ 3 4 ~ 5 6 7 8 9 0 @ a ",
" b c d e 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 F G H I J ",
" K L M N O P Q R S T U V W ",
" X Y Z 5 e ` .~ e ..+.@. ",
" #.$.S %.~ &.*.~ ~ ~ =. ",
" -.~ ;.>.,.'.).~ ~ !. ",
" ~.~ ~ 5 {.].~ ^. ",
" /.(._.:.<.[. ",
" "};
modules/gui/wxwindows/bitmaps/type_directory.xpm
View file @ 301ea6e4
/* XPM */
static char * type_directory_xpm[] = {
"16 16 4 1",
"16 16 83 1",
" c None",
". c #000000",
"+ c #FFFF00",
"@ c #808000",
" ",
" ",
" ..... ",
" .+++........ ",
" .++++++++++. ",
" .++++++++++. ",
" .++........... ",
" .+@@@@@@@@@@@. ",
" .+.@@@@@@@@@@. ",
" .@@@@@@@@@@@. ",
" ..@@@@@@@@@@. ",
" .@@@@@@@@@@. ",
" ........... ",
" ",
" ",
". c #3274DB",
"+ c #3273DB",
"@ c #3373DB",
"# c #3274DC",
"$ c #3170D6",
"% c #F5FBFD",
"& c #F5F9FD",
"* c #306DD2",
"= c #E8F5FD",
"- c #E8F6FD",
"; c #E9F5FD",
"> c #5F7DB1",
", c #316DD1",
"' c #306ED1",
") c #316ED2",
"! c #306DD1",
"~ c #306ACC",
"{ c #DBF0FD",
"] c #DAEEFD",
"^ c #DBEEFD",
"/ c #DAF0FD",
"( c #2F66C6",
"_ c #CBE8FD",
": c #CBE9FD",
"< c #255FD1",
"[ c #2E63C0",
"} c #B9E2FD",
"| c #BCE2FD",
"1 c #B9E1FD",
"2 c #BCE1FD",
"3 c #9EC6EE",
"4 c #FCFCFD",
"5 c #ACD1FD",
"6 c #2D61BD",
"7 c #A9DAFD",
"8 c #A9DBFD",
"9 c #86B9EC",
"0 c #8CBDFD",
"a c #89BEFD",
"b c #89BDFD",
"c c #2C5EB8",
"d c #99D3FD",
"e c #2259CB",
"f c #6BAAFD",
"g c #6BA9FD",
"h c #2259CC",
"i c #2B5AB1",
"j c #88CBFD",
"k c #1F52C5",
"l c #5098FD",
"m c #4F98FD",
"n c #4F97FD",
"o c #1E52C5",
"p c #2A58AE",
"q c #7AC4FD",
"r c #1C49BD",
"s c #3987FD",
"t c #3988FD",
"u c #1B49BD",
"v c #2955A8",
"w c #6DBEFD",
"x c #1840B5",
"y c #287CFD",
"z c #287BFD",
"A c #277BFD",
"B c #183FB5",
"C c #2852A3",
"D c #62B7FD",
"E c #1337AA",
"F c #FDFDFD",
"G c #AEAEC6",
"H c #1337AC",
"I c #28509F",
"J c #102DA2",
"K c #274D9B",
"L c #4FAEFD",
"M c #0B2599",
"N c #0C2599",
"O c #274B97",
"P c #091D91",
"Q c #091E91",
"R c #091E90",
" .+@#.. ",
" $%&%&&&$ ",
"*===-=;=>,')'!, ",
"~{{{{{]{^^]{^{/~",
"(_______:<<<<<<<",
"[}}|}|12<344445<",
"678<<<<<940aabb<",
"cdef44444gfggggh",
"ijklmmnlmmmmlmno",
"pqrsttstsstttstu",
"vwxyyzyzzzAzAzzB",
"CDEFFFFFFFFFFFGH",
"IDJFFFFFFFFFFFGJ",
"KLMGGGGGGGGGGGGN",
" OPPPQRQRPRRQQP ",
" "};
modules/gui/wxwindows/bitmaps/type_disc.xpm
View file @ 301ea6e4
/* XPM */
static char * type_disc_xpm[] = {
"16 16 144 2",
"16 16 91 1",
" c None",
". c #FFFFFF",
"+ c #BEB2CA",
"@ c #B8A7C8",
"# c #AF99C3",
"$ c #B19CC5",
"% c #BEAECD",
"& c #C7BCD1",
"* c #C9C1D3",
"= c #BDADCF",
"- c #D6C9E2",
"; c #D9CDE5",
"> c #D5C7E2",
", c #E1D4EC",
"' c #ECE3F4",
") c #F4F0F8",
"! c #CFC3DA",
"~ c #CEC7D4",
"{ c #C8BED2",
"] c #CDBFDB",
"^ c #DED4E8",
"/ c #DCD1E7",
"( c #DACEE5",
"_ c #E4D7EE",
": c #F4EEF8",
"< c #FAF9FC",
"[ c #F9F8FB",
"} c #E2DAE9",
"| c #C7C0CF",
"1 c #E5E2E9",
"2 c #D2C5DE",
"3 c #E1D8EB",
"4 c #DFD5E9",
"5 c #D5C8E2",
"6 c #E8DDF1",
"7 c #F8F6FB",
"8 c #F9F8FC",
"9 c #D9CEE3",
"0 c #C8C2CF",
"a c #C8BBD6",
"b c #E3D9EB",
"c c #E2D9EB",
"d c #D6C9E3",
"e c #EFE6F5",
"f c #F9F6FB",
"g c #F0E9F6",
"h c #E5D8EF",
"i c #AE9CBF",
"j c #D9D4DE",
"k c #D7CCE3",
"l c #E4DCED",
"m c #D4C6E1",
"n c #C7B6D8",
"o c #D3C5E0",
"p c #F0EBF5",
"q c #F5F0F9",
"r c #EBE0F3",
"s c #E0D2EB",
"t c #D4C5E2",
"u c #AE98C4",
"v c #C7C2CC",
"w c #C8BDD3",
"x c #E3DAEC",
"y c #D8CCE4",
"z c #C6B6D7",
"A c #CFC0DE",
"B c #CFC1DE",
"C c #CBBCDB",
"D c #DACCE7",
"E c #D0C1E0",
"F c #C9B9DA",
"G c #C5B3D6",
"H c #BDAACF",
"I c #ADA2B8",
"J c #C9BED5",
"K c #D2C5E0",
"L c #CBBBDA",
"M c #CCC7D1",
"N c #C9B8D8",
"O c #C8B7D8",
"P c #CABADA",
"Q c #C7B7D8",
"R c #BEABD1",
"S c #A697B3",
"T c #C8BCD4",
"U c #E3DBEC",
"V c #BDB0CA",
"W c #CEC0DD",
"X c #A495B1",
"Y c #C7BDD2",
"Z c #E2DAEB",
"` c #E5DCED",
" . c #E5DDED",
".. c #E8E1EF",
"+. c #D1C4DF",
"@. c #CCBCDB",
"#. c #B9A6CD",
"$. c #ABA0B5",
"%. c #D6D2DB",
"&. c #D6CBE2",
"*. c #EAE4F1",
"=. c #F2EEF6",
"-. c #F4F1F8",
";. c #C8B8D8",
">. c #CABBDA",
",. c #CEBFDD",
"'. c #CDBDDC",
"). c #A28BB9",
"!. c #C9C6CC",
"~. c #C5B8D2",
"{. c #F6F4F9",
"]. c #D2C4E0",
"^. c #A190B1",
"/. c #D8D4DC",
"(. c #D9D0E3",
"_. c #F9F7FB",
":. c #F5F2F9",
"<. c #C4B3D6",
"[. c #A590B9",
"}. c #CAC8CD",
"|. c #D6D1DB",
"1. c #DED6E7",
"2. c #F8F6FA",
"3. c #FAF8FC",
"4. c #EFEAF4",
"5. c #C5B4D6",
"6. c #A490B8",
"7. c #BFBAC5",
"8. c #D7D3DB",
"9. c #C9BED4",
"0. c #E7E0EF",
"a. c #D3C5E1",
"b. c #D0C2DE",
"c. c #B39EC6",
"d. c #A392B4",
"e. c #D4D0D8",
"f. c #C0B5CB",
"g. c #AD9CBE",
"h. c #A593B6",
"i. c #AFA3BA",
"j. c #CCC9CF",
"k. c #E1E2E1",
"l. c #FDFDFD",
"m. c #FBFBFB",
". . . . . + @ # $ % & . . . . . ",
". . . * = - ; > , ' ) ! ~ . . . ",
". . { ] ^ / ( > _ : < [ } | . . ",
". 1 2 3 4 / ( 5 6 7 < < 8 9 0 . ",
". a b c 4 / ( d e < < f g h i . ",
"j k l c 4 / m n o p q r s t u v ",
"w x l c 4 y z A B C D E F G H I ",
"J l l c 4 K L M N O F P Q G R S ",
"T U l c 4 5 P V W n P P Q G R X ",
"Y Z ` U ...+.+.P n @.P Q G #.$.",
"%.&...*.=.[ -.;.>.,.'.P Q G ).!.",
". ~.*.{.< < [ > ].A '.P Q R ^.. ",
". /.(._.< < :.> ].A '.P <.[.}.. ",
". . |.1.2.3.4.> ].A '.5.6.7.. . ",
". . . 8.9.Z 0.a.b.C c.d.!.. . . ",
". . . . . e.f.g.h.i.j.k.l.l.l.m."};
". c #676767",
"+ c #989898",
"@ c #B7B7B7",
"# c #BEBEBE",
"$ c #919191",
"% c #5B5B5B",
"& c #CDCDCD",
"* c #FEFEFE",
"= c #FFFFFF",
"- c #FDFDFD",
"; c #BDBDBD",
"> c #717171",
", c #F3F3F3",
"' c #FBFBFB",
") c #F9F9F9",
"! c #F7F7F7",
"~ c #FAFAFA",
"{ c #EDEDED",
"] c #4A4A4A",
"^ c #DFDFDF",
"/ c #E4E4E4",
"( c #F1F1F1",
"_ c #F8F8F8",
": c #F4F4F4",
"< c #E5E5E5",
"[ c #AEAEAE",
"} c #D8D8D8",
"| c #D6D6D6",
"1 c #E2E2E2",
"2 c #F5F5F5",
"3 c #FCFCFC",
"4 c #979797",
"5 c #CFCFCF",
"6 c #CCCCCC",
"7 c #D7D7D7",
"8 c #EBEBEB",
"9 c #EEEEEE",
"0 c #EAEAEA",
"a c #E7E7E7",
"b c #D5D5D5",
"c c #6B6B6B",
"d c #C8C8C8",
"e c #E3E3E3",
"f c #DBDBDB",
"g c #C3C3C3",
"h c #EFEFEF",
"i c #DDDDDD",
"j c #D2D2D2",
"k c #D1D1D1",
"l c #484848",
"m c #787878",
"n c #CBCBCB",
"o c #CECECE",
"p c #E6E6E6",
"q c #C9C9C9",
"r c #C4C4C4",
"s c #5A5A5A",
"t c #757575",
"u c #E1E1E1",
"v c #E9E9E9",
"w c #E0E0E0",
"x c #7D7D7D",
"y c #BCBCBC",
"z c #B9B9B9",
"A c #515151",
"B c #545454",
"C c #DEDEDE",
"D c #E8E8E8",
"E c #DCDCDC",
"F c #C7C7C7",
"G c #BABABA",
"H c #BBBBBB",
"I c #C1C1C1",
"J c #333333",
"K c #ECECEC",
"L c #C0C0C0",
"M c #A6A6A6",
"N c #777777",
"O c #C2C2C2",
"P c #C6C6C6",
"Q c #555555",
"R c #828282",
"S c #9E9E9E",
"T c #848484",
"U c #9B9B9B",
"V c #B4B4B4",
"W c #DADADA",
"X c #454545",
"Y c #313131",
"Z c #2F2F2F",
" .+@#$ ",
" %&*====-; ",
" >,='')!~-={] ",
" ^/(_)!:!)-=< ",
" [}|1:~_2!3-!*4 ",
" 567^8,90!-:8ab ",
"cd6}1efg&<haijkl",
"mnofpin |}7q;rs",
"t}7uvw7.xd&dyzrA",
"BC1D{!wEf6F;GHIJ",
" o{{_~KpK0d@GLM ",
" N_~~{^p{DuOzPQ ",
" [=hwjCD<ae&R ",
" S/fqE88h/T ",
" QUV5WnUX ",
" YZ "};
modules/gui/wxwindows/bitmaps/type_net.xpm
View file @ 301ea6e4
/* XPM */
static char * type_net_xpm[] = {
"16 16 209 2",
" c #E6E7E6",
". c #E3E4E5",
"+ c #DCDAE2",
"@ c #D2CCDE",
"# c #D0C8E2",
"$ c #D2CAE6",
"% c #D4CDE6",
"& c #C8C2D8",
"* c #E5E6E5",
"= c #E5E5E6",
"- c #DDDAE5",
"; c #D7D1E9",
"> c #D2CBED",
", c #D2CBEF",
"' c #D6D2F1",
") c #C4CBED",
"! c #93A8ED",
"~ c #6578DD",
"{ c #5A69D3",
"] c #CAC4DA",
"^ c #DCDDDC",
"/ c #DFDDE5",
"( c #D5CEF8",
"_ c #BABCEB",
": c #8AACEE",
"< c #4686EA",
"[ c #0B5AF9",
"} c #0041EF",
"| c #002FDB",
"1 c #0022C9",
"2 c #0B1CB8",
"3 c #B5B0D9",
"4 c #D6D7D6",
"5 c #CEC6F5",
"6 c #93A8E4",
"7 c #3987FD",
"8 c #0865FD",
"9 c #004EFC",
"0 c #003EEC",
"a c #0030D9",
"b c #0020C8",
"c c #0615AF",
"d c #9C9BD6",
"e c #CFCFD0",
"f c #E3E2E5",
"g c #CFC8EC",
"h c #8EAAE4",
"i c #156EFD",
"j c #0157FE",
"k c #0049F7",
"l c #003DE7",
"m c #002CD5",
"n c #001ABF",
"o c #0209A3",
"p c #8A8DD1",
"q c #C5C2CB",
"r c #CEC7E6",
"s c #9DA8F2",
"t c #0C5DF9",
"u c #004EFA",
"v c #0042EC",
"w c #0034DE",
"x c #001EC8",
"y c #000CB1",
"z c #00049C",
"A c #7B82BA",
"B c #BFBBC9",
"C c #D3CDE1",
"D c #B9BAE3",
"E c #1F5CE8",
"F c #002EDE",
"G c #001DCB",
"H c #0010B9",
"I c #0008A8",
"J c #020096",
"K c #5852AF",
"L c #C3BFCD",
"M c #DFE4E9",
"N c #BECDEE",
"O c #A7B9F3",
"P c #9DB1F1",
"Q c #ABB3E4",
"R c #C0B6EB",
"S c #355EE2",
"T c #0030DC",
"U c #001FCB",
"V c #0013BD",
"W c #000BAC",
"X c #00029D",
"Y c #070885",
"Z c #3A7162",
"` c #C9C4D2",
" . c #E1E5EA",
".. c #A8C1FA",
"+. c #CCE4FD",
"@. c #DBEEFD",
"#. c #AAC9FD",
"$. c #7797FC",
"%. c #7885EC",
"&. c #5F78BC",
"*. c #0020CA",
"=. c #0015BC",
"-. c #000AB2",
";. c #0101A3",
">. c #0D0E97",
",. c #6472A6",
"'. c #CAD9D4",
"). c #B6B1C3",
"!. c #99AFF3",
"~. c #BFD3FD",
"{. c #E2EDFD",
"]. c #CEE4FD",
"^. c #A5C2FD",
"/. c #7090FD",
"(. c #4963F4",
"_. c #5561C5",
":. c #0011B7",
"<. c #0008AF",
"[. c #2124A9",
"}. c #7C85C1",
"|. c #C4C8DA",
"1. c #BCB4CF",
"2. c #B0ABBA",
"3. c #D0D1D0",
"4. c #657FF1",
"5. c #B4CFFD",
"6. c #C7DAFD",
"7. c #96B5FD",
"8. c #7D9EFD",
"9. c #5B7CFD",
"0. c #3445E8",
"a. c #575BCD",
"b. c #5762AD",
"c. c #9393D3",
"d. c #C4BEE7",
"e. c #ADA0D3",
"f. c #AEA7C1",
"g. c #CECED1",
"h. c #3D48E4",
"i. c #4E6BF0",
"j. c #BBD0FC",
"k. c #BDD2FD",
"l. c #5D7CFB",
"m. c #4E66F0",
"n. c #2729D9",
"o. c #5F64D0",
"p. c #B2A9D6",
"q. c #D4CDEE",
"r. c #D8D3FB",
"s. c #A596D4",
"t. c #B2AAE6",
"u. c #B8AEEC",
"v. c #C5BDE8",
"w. c #D9D7E0",
"x. c #4C4FDA",
"y. c #6A74EA",
"z. c #C0D3FB",
"A. c #CFDFFC",
"B. c #6872E8",
"C. c #7681EC",
"D. c #3130DA",
"E. c #9397D2",
"F. c #BAB0D4",
"G. c #DBD5F1",
"H. c #B3A6DC",
"I. c #A294D1",
"J. c #BAB1ED",
"K. c #B7ACED",
"L. c #9D8FCA",
"M. c #B5B2BF",
"N. c #B3BAE2",
"O. c #8D99F1",
"P. c #D5E4FD",
"Q. c #EEF3FD",
"R. c #DEEAFD",
"S. c #B6C9FA",
"T. c #8E9FE6",
"U. c #C7C8D6",
"V. c #E3E0F4",
"W. c #C4BAE3",
"X. c #D1CAF4",
"Y. c #BDB2EA",
"Z. c #A294C9",
"`. c #A6A0B6",
" + c #CDCECD",
".+ c #E2E3E2",
"++ c #E4E5E4",
"@+ c #AFB9D9",
"#+ c #727DE0",
"$+ c #6769E4",
"%+ c #7982E8",
"&+ c #8D9BCE",
"*+ c #A2A0BA",
"=+ c #ECEDF0",
"-+ c #EFEFFD",
";+ c #CBC4E9",
">+ c #A79CC5",
",+ c #ACA7B9",
"'+ c #CECFCE",
")+ c #E3E4E3",
"!+ c #CCCDCC",
"~+ c #B1B2B1",
"{+ c #AEAEAE",
"]+ c #B9BAB9",
"^+ c #C9C6D0",
"/+ c #C2B8DA",
"(+ c #ADA3C6",
"_+ c #B4B1BD",
":+ c #D3D4D3",
" . + @ # $ % & * ",
" = - ; > , ' ) ! ~ { ] ^ ",
" / ( _ : < [ } | 1 2 3 4 ",
" / 5 6 7 8 9 0 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 A B ",
" C D E v F G H I J K L ",
" M N O P Q R S T U V W X Y Z ` ",
" ...+.@.#.$.%.&.*.=.-.;.>.,.'.).",
"!.~.{.].^./.(._.:.<.[.}.|.1.2.3.",
"4.5.6.7.8.9.0.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.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.`. +.+",
"++@+#+$+%+&+*+=+-+;+>+,+'+.+ ",
" )+!+~+{+]+^+/+(+_+:+++ "};
"16 16 154 2",
" c None",
". c #667AAC",
"+ c #8293BC",
"@ c #8192BA",
"# c #6677A0",
"$ c #8C9BC3",
"% c #E9EBF5",
"& c #F8F8FC",
"* c #FDFCFE",
"= c #FFFFFF",
"- c #FCFCFF",
"; c #E7EBF9",
"> c #8996B4",
", c #99A5CD",
"' c #E7E8F2",
") c #CED2DD",
"! c #C0C6D6",
"~ c #CBD1E1",
"{ c #E7E9F4",
"] c #E8EAF5",
"^ c #E7E8F4",
"/ c #F0F2FE",
"( c #919DC3",
"_ c #53659F",
": c #B3BBD7",
"< c #98A2BB",
"[ c #93A0BE",
"} c #98A5C5",
"| c #C8CEE1",
"1 c #D5D8E7",
"2 c #CBCFE0",
"3 c #D0D4E5",
"4 c #D7DBEC",
"5 c #D0D5EF",
"6 c #47578E",
"7 c #3E579E",
"8 c #5F709B",
"9 c #7084B1",
"0 c #7588B6",
"a c #CBD1E5",
"b c #EBEDF6",
"c c #E2E6F1",
"d c #D9DCEB",
"e c #D3D7E9",
"f c #CBCFE5",
"g c #C0C5E2",
"h c #7B89C2",
"i c #29396C",
"j c #6273AF",
"k c #56699E",
"l c #4A619B",
"m c #49629E",
"n c #A2AECE",
"o c #E4E7F0",
"p c #E9EBF3",
"q c #E3E5F2",
"r c #D4D8EB",
"s c #C0C5DF",
"t c #8D97BF",
"u c #6F7FBD",
"v c #1F2B51",
"w c #3B4C83",
"x c #98A1D3",
"y c #A7AFD6",
"z c #7481A9",
"A c #1F397C",
"B c #234089",
"C c #2C4789",
"D c #AEB7D0",
"E c #EBEDF7",
"F c #D4D8EC",
"G c #959FC6",
"H c #364B86",
"I c #4159A0",
"J c #152652",
"K c #303D69",
"L c #919CD1",
"M c #AAB1D9",
"N c #6B79A3",
"O c #072670",
"P c #0B2C7C",
"Q c #001F73",
"R c #7989B5",
"S c #EDEDF8",
"T c #B4BCDB",
"U c #253D7D",
"V c #374B87",
"W c #4A62AA",
"X c #05143D",
"Y c #8490C8",
"Z c #5A699A",
"` c #123079",
" . c #0A2B7C",
".. c #0F2F7E",
"+. c #09297A",
"@. c #3B5495",
"#. c #B6BDDB",
"$. c #485F9C",
"%. c #09266D",
"&. c #5D6B9E",
"*. c #7483BD",
"=. c #415186",
"-. c #2F488D",
";. c #102E7A",
">. c #1A3885",
",. c #24418A",
"'. c #29458D",
"). c #27438B",
"!. c #28438C",
"~. c #0F2E7D",
"{. c #233F89",
"]. c #284694",
"^. c #172C60",
"/. c #294183",
"(. c #39549C",
"_. c #455D9D",
":. c #4C62A0",
"<. c #5065A1",
"[. c #4D63A0",
"}. c #455C9C",
"|. c #41599B",
"1. c #314E99",
"2. c #0E2766",
"3. c #2F3E6D",
"4. c #6375AE",
"5. c #7D8DC2",
"6. c #7A88BC",
"7. c #7C8BBF",
"8. c #7385BC",
"9. c #5065A0",
"0. c #1F305C",
"a. c #363D58",
"b. c #888FB2",
"c. c #676D8F",
"d. c #282F49",
"e. c #C6C6C9",
"f. c #8A8A8C",
"g. c #A8A8AF",
"h. c #C6C6CC",
"i. c #B9B9C0",
"j. c #C2C2C6",
"k. c #DADAD9",
"l. c #ADADB2",
"m. c #ABABB1",
"n. c #CCCCD2",
"o. c #8A8A91",
"p. c #373739",
"q. c #39393C",
"r. c #626268",
"s. c #68686C",
"t. c #6C6C6E",
"u. c #555559",
"v. c #313134",
"w. c #38383A",
" . + @ # ",
" $ % & * = - ; > ",
" , ' ) ! ~ { ] ^ / ( ",
" _ : < [ } | 1 2 3 4 5 6 ",
" 7 8 9 0 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 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 ` ...+.@.#.$.%.&.*. ",
" =.-.;.>.,.'.).!.~.{.].^. ",
" /.(._.:.<.[.}.|.1.2. ",
" 3.4.5.6.7.8.9.0. ",
" a.b.c.d. ",
" e.f. ",
" g.h.i.j.k.k.l.m.n.o. ",
" p.q.r.s.t.u.v.w. "};
modules/gui/wxwindows/bitmaps/type_node.xpm 0 → 100644
View file @ 301ea6e4
/* XPM */
static char * type_node_xpm[] = {
"16 16 55 1",
" c None",
". c #949494",
"+ c #919191",
"@ c #FAFAFA",
"# c #8F8F8F",
"$ c #F5F5F5",
"% c #F6F6F6",
"& c #999999",
"* c #909090",
"= c #8D8D8D",
"- c #F0F0F0",
"; c #EFEFEF",
"> c #898989",
", c #E9E9E9",
"' c #888888",
") c #868686",
"! c #E2E2E2",
"~ c #E3E3E3",
"{ c #D0D0D0",
"] c #FDFDFD",
"^ c #DCDCDC",
"/ c #848484",
"( c #DBDBDB",
"_ c #C4C4C4",
": c #CECECE",
"< c #CDCDCD",
"[ c #828282",
"} c #D4D4D4",
"| c #BFBFBF",
"1 c #858585",
"2 c #7E7E7E",
"3 c #CCCCCC",
"4 c #808080",
"5 c #B1B1B1",
"6 c #7F7F7F",
"7 c #7C7C7C",
"8 c #C6C6C6",
"9 c #7A7A7A",
"0 c #A5A5A5",
"a c #797979",
"b c #C0C0C0",
"c c #747474",
"d c #9C9C9C",
"e c #9B9B9B",
"f c #777777",
"g c #BABABA",
"h c #6D6D6D",
"i c #FEFEFE",
"j c #6E6E6E",
"k c #676767",
"l c #727272",
"m c #606060",
"n c #707070",
"o c #5B5B5B",
"p c #5A5A5A",
" ...... ",
" +@@@@@@+ ",
"#$$$$$%$&##*### ",
"=-----;---;---;=",
">,,,,,,,,'''''''",
")!!~!~!~'{]]]]^'",
"/(('''''_]:<<<<'",
"[}/|]]]]]||||||1",
"2345555555555556",
"7890000000000009",
"abcdddddddededdc",
"fghiiiiiiiiiii8j",
"cgkiiiiiiiiiii8k",
"l5m888888888888m",
" noopopopoppooo ",
" "};
modules/gui/wxwindows/bitmaps/type_vfile.xpm 0 → 100644
View file @ 301ea6e4
/* XPM */
static char * type_vfile_xpm[] = {
"16 16 108 2",
" c None",
". c #8F8F8F",
"+ c #FFFFFF",
"@ c #B0B0B0",
"# c #A7A7A7",
"$ c #939393",
"% c #8B8B8B",
"& c #2B2B2B",
"* c #0C0C0C",
"= c #010101",
"- c #000000",
"; c #EFEFEF",
"> c #ECECEC",
", c #E8E8E8",
"' c #E9E9E9",
") c #DFDFDF",
"! c #DCDCDC",
"~ c #E3E3E3",
"{ c #DADADA",
"] c #D5D5D5",
"^ c #D4D4D4",
"/ c #D2D2D2",
"( c #A6A6A6",
"_ c #828181",
": c #F2F2F2",
"< c #FBFBFB",
"[ c #FAFAFA",
"} c #929292",
"| c #3B3A3A",
"1 c #656769",
"2 c #626261",
"3 c #E6E6E5",
"4 c #FDFDFD",
"5 c #868685",
"6 c #292827",
"7 c #9CA4AF",
"8 c #E1F2FF",
"9 c #A6AEB4",
"0 c #5B5C5B",
"a c #D7D7D7",
"b c #F8F8F8",
"c c #787777",
"d c #1D1D1D",
"e c #787C80",
"f c #B6C2D2",
"g c #E0F0FF",
"h c #F3FEFF",
"i c #C3C6C8",
"j c #666666",
"k c #CCCCCB",
"l c #F4F4F4",
"m c #707070",
"n c #767E86",
"o c #EAF8FF",
"p c #BFC6D0",
"q c #C4CCD6",
"r c #EBF4FF",
"s c #767575",
"t c #9C9C9C",
"u c #EDEDED",
"v c #636363",
"w c #0E0F0F",
"x c #595C60",
"y c #88909B",
"z c #E6F1FD",
"A c #F1FDFF",
"B c #D4DBE1",
"C c #CDCED0",
"D c #7B7B7A",
"E c #949494",
"F c #F7F7F7",
"G c #878787",
"H c #0E0E0E",
"I c #999A9B",
"J c #ABB3BB",
"K c #858D97",
"L c #CCD7E5",
"M c #B0B3B6",
"N c #676665",
"O c #A0A0A0",
"P c #E4E4E4",
"Q c #616161",
"R c #7E7E80",
"S c #F1F8FC",
"T c #F7FFFF",
"U c #A0ABB5",
"V c #363738",
"W c #363535",
"X c #AEAEAE",
"Y c #FCFCFC",
"Z c #F1F1F1",
"` c #FEFEFE",
" . c #EEEEEE",
".. c #686766",
"+. c #76797D",
"@. c #C5CFDC",
"#. c #6A6D70",
"$. c #3C3B3A",
"%. c #BEBEBE",
"&. c #A8A8A8",
"*. c #F9F9F9",
"=. c #F6F6F5",
"-. c #767675",
";. c #444444",
">. c #525151",
",. c #CFCFCF",
"'. c #F0F0F0",
"). c #ADADAD",
". . . . . . . . . . . . . . . . ",
". + @ # $ % & * = - - - - - + . ",
". + ; > , ' ) ! ~ ~ { ] ^ / + . ",
". + + + + + + + ( _ : + < [ + . ",
". + + + + + + } | 1 2 3 4 : + . ",
". + + + + + 5 6 7 8 9 0 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 A B C D E F + . ",
". + G H I + J K L M N O 4 F + . ",
". + P Q R S T U V W X Y Z ; + . ",
". + ` ...+.@.#.$.%.< &.&.&.&.. ",
". + *.` =.-.;.>.,.+ '.&.+ + . ",
". + < < ` b ).a + 4 : &.+ . ",
". + + + + + + + + + Y &.. ",
". . . . . . . . . . . . "};
modules/gui/wxwindows/interface.cpp
View file @ 301ea6e4
......@@ -445,7 +445,7 @@ void Interface::CreateOurToolBar()
* version because we don't include wx.rc */
wxToolBar *toolbar =
CreateToolBar( wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE );
CreateToolBar( wxTB_HORIZONTAL | wxTB_FLAT ); //| wxTB_DOCKABLE );
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
......
modules/gui/wxwindows/playlist.cpp
View file @ 301ea6e4
......@@ -35,11 +35,15 @@
#include "bitmaps/loop.xpm"
#include "bitmaps/type_unknown.xpm"
#include "bitmaps/type_afile.xpm"
#include "bitmaps/type_vfile.xpm"
#include "bitmaps/type_net.xpm"
#include "bitmaps/type_card.xpm"
#include "bitmaps/type_disc.xpm"
#include "bitmaps/type_cdda.xpm"
#include "bitmaps/type_directory.xpm"
#include "bitmaps/type_playlist.xpm"
#include "bitmaps/type_node.xpm"
#include <wx/dynarray.h>
#include <wx/imaglist.h>
......@@ -332,12 +336,15 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
/* FIXME: absolutely needs to be in the right order FIXME */
p_images->Add( wxIcon( type_unknown_xpm ) );
p_images->Add( wxIcon( type_unknown_xpm ) );
p_images->Add( wxIcon( type_afile_xpm ) );
p_images->Add( wxIcon( type_vfile_xpm ) );
p_images->Add( wxIcon( type_directory_xpm ) );
p_images->Add( wxIcon( type_disc_xpm ) );
p_images->Add( wxIcon( type_cdda_xpm ) );
p_images->Add( wxIcon( type_card_xpm ) );
p_images->Add( wxIcon( type_net_xpm ) );
p_images->Add( wxIcon( type_playlist_xpm ) );
p_images->Add( wxIcon( type_node_xpm ) );
treectrl->AssignImageList( p_images );
treectrl->AddRoot( wxU(_("root" )), -1, -1, NULL );
......@@ -520,14 +527,14 @@ void Playlist::UpdateTreeItem( playlist_t *p_playlist, wxTreeItemId item )
if( !strcmp( psz_author, "" ) || p_item->input.b_fixed_name == VLC_TRUE )
{
msg.Printf( wxString( wxL2U( p_item->input.psz_name ) ) + wxU( " ( ") +
wxString(wxL2U(psz_duration ) ) + wxU( ")") );
msg.Printf( wxString( wxU( p_item->input.psz_name ) ) + wxU( " ( ") +
wxString(wxU(psz_duration ) ) + wxU( ")") );
}
else
{
msg.Printf( wxString(wxU( psz_author )) + wxT(" - ") +
wxString(wxL2U(p_item->input.psz_name)) + wxU( " ( ") +
wxString(wxL2U(psz_duration ) ) + wxU( ")") );
wxString(wxU(p_item->input.psz_name)) + wxU( " ( ") +
wxString(wxU(psz_duration ) ) + wxU( ")") );
}
treectrl->SetItemText( item , msg );
treectrl->SetItemImage( item, p_item->input.i_type );
......@@ -812,21 +819,13 @@ void Playlist::Rebuild()
{
return;
}
int i_count = CountItems( treectrl->GetRootItem()) ;
if( i_count > p_playlist->i_size && !b_changed_view )
{
i_current_view = VIEW_CATEGORY;
b_changed_view = VLC_TRUE;
}
/* ...and rebuild it */
vlc_mutex_lock( &p_playlist->object_lock );
p_view = playlist_ViewFind( p_playlist, i_current_view ); /* FIXME */
/* HACK we should really get new*/
msg_Dbg( p_intf, "rebuilding tree" );
msg_Dbg( p_intf, "rebuilding tree for view %i", i_current_view );
treectrl->DeleteAllItems();
treectrl->AddRoot( wxU(_("root" )), -1, -1,
new PlaylistItem( p_view->p_root) );
......@@ -853,9 +852,17 @@ void Playlist::Rebuild()
SetCurrentItem( item );
}
int i_count = CountItems( treectrl->GetRootItem() );
i_count = CountItems( treectrl->GetRootItem() );
if( i_count != p_playlist->i_size )
if( i_count < p_playlist->i_size && !b_changed_view )
{
i_current_view = VIEW_CATEGORY;
b_changed_view = VLC_TRUE;
vlc_mutex_unlock( &p_playlist->object_lock );
Rebuild();
vlc_mutex_lock( &p_playlist->object_lock );
}
else if( i_count != p_playlist->i_size )
{
statusbar->SetStatusText( wxString::Format( wxU(_(
"%i items in playlist (%i not shown)")),
......
src/playlist/item.c
View file @ 301ea6e4
......@@ -293,7 +293,7 @@ static void GuessType( input_item_t *p_item)
{
{ "http", ITEM_TYPE_NET },
{ "dvd", ITEM_TYPE_DISC },
{ "cdda", ITEM_TYPE_DISC },
{ "cdda", ITEM_TYPE_CDDA },
{ "mms", ITEM_TYPE_NET },
{ "rtsp", ITEM_TYPE_NET },
{ "udp", ITEM_TYPE_NET },
......@@ -308,6 +308,12 @@ static void GuessType( input_item_t *p_item)
{ NULL, 0 }
};
static struct { char *psz_search; int i_type; } exts_array[] =
{
{ "mp3", ITEM_TYPE_AFILE },
{ NULL, 0 }
};
for( i = 0; types_array[i].psz_search != NULL; i++ )
{
if( !strncmp( p_item->psz_uri, types_array[i].psz_search,
......@@ -317,5 +323,5 @@ static void GuessType( input_item_t *p_item)
return;
}
}
p_item->i_type = ITEM_TYPE_UNKNOWN;
p_item->i_type = ITEM_TYPE_VFILE;
}
src/playlist/view.c
View file @ 301ea6e4
......@@ -288,6 +288,8 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, int i_view,
p_item->input.pp_categories = NULL;
p_item->input.i_id = ++p_playlist->i_last_id;
p_item->input.i_type = ITEM_TYPE_NODE;
p_item->pp_parents = NULL;
p_item->i_parents = 0;
......
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