Skip to content

V
vlc-1.1
Commit d4366aa1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4 - New icons for extended preferences.

parent 69a15c7c
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 625 deletions
modules/gui/qt4/Modules.am
View file @ d4366aa1
...@@ -31,7 +31,7 @@ nodist_SOURCES_qt4 = \ ...@@ -31,7 +31,7 @@ nodist_SOURCES_qt4 = \
dialogs/gototime.moc.cpp \ dialogs/gototime.moc.cpp \
dialogs/open.moc.cpp \ dialogs/open.moc.cpp \
dialogs/podcast_configuration.moc.cpp \ dialogs/podcast_configuration.moc.cpp \
dialogs/vlm.moc.cpp \ dialogs/vlm.moc.cpp \
components/extended_panels.moc.cpp \ components/extended_panels.moc.cpp \
components/infopanels.moc.cpp \ components/infopanels.moc.cpp \
components/preferences_widgets.moc.cpp \ components/preferences_widgets.moc.cpp \
...@@ -183,13 +183,9 @@ EXTRA_DIST += \ ...@@ -183,13 +183,9 @@ EXTRA_DIST += \
ui/streampanel.ui \ ui/streampanel.ui \
ui/sout.ui \ ui/sout.ui \
ui/vlm.ui \ ui/vlm.ui \
pixmaps/advanced.xpm \
pixmaps/audio.xpm \
pixmaps/codec.xpm \ pixmaps/codec.xpm \
pixmaps/intf.xpm \
pixmaps/type_net.xpm \ pixmaps/type_net.xpm \
pixmaps/type_playlist.xpm \ pixmaps/type_playlist.xpm \
pixmaps/video.xpm \
pixmaps/type_unknown.xpm \ pixmaps/type_unknown.xpm \
pixmaps/type_file.xpm \ pixmaps/type_file.xpm \
pixmaps/type_card.xpm \ pixmaps/type_card.xpm \
...@@ -241,4 +237,10 @@ EXTRA_DIST += \ ...@@ -241,4 +237,10 @@ EXTRA_DIST += \
pixmaps/vlc_playlist_repeat_all.png \ pixmaps/vlc_playlist_repeat_all.png \
pixmaps/vlc_playlist_repeat_one.png \ pixmaps/vlc_playlist_repeat_one.png \
pixmaps/vlc_playlist_shuffle_on.png \ pixmaps/vlc_playlist_shuffle_on.png \
pixmaps/vlc_playlist_shuffle_off.png pixmaps/vlc_playlist_shuffle_off.png \
pixmaps/vlc_advprefs_audio.png \
pixmaps/vlc_advprefs_video.png \
pixmaps/vlc_advprefs_intf.png \
pixmaps/vlc_advprefs_sout.png \
pixmaps/vlc_advprefs_extended.png \
pixmaps/vlc_advprefs_playlist.png
modules/gui/qt4/components/complete_preferences.cpp
View file @ d4366aa1
...@@ -45,13 +45,7 @@ ...@@ -45,13 +45,7 @@
#include <vlc_intf_strings.h> #include <vlc_intf_strings.h>
#include <assert.h> #include <assert.h>
#include "pixmaps/audio.xpm"
#include "pixmaps/video.xpm"
#include "pixmaps/type_net.xpm"
#include "pixmaps/type_playlist.xpm"
#include "pixmaps/advanced.xpm"
#include "pixmaps/codec.xpm" #include "pixmaps/codec.xpm"
#include "pixmaps/intf.xpm"
#define ITEM_HEIGHT 25 #define ITEM_HEIGHT 25
...@@ -68,14 +62,14 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : ...@@ -68,14 +62,14 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
setTextElideMode( Qt::ElideNone ); setTextElideMode( Qt::ElideNone );
setHorizontalScrollBarPolicy ( Qt::ScrollBarAlwaysOn ); setHorizontalScrollBarPolicy ( Qt::ScrollBarAlwaysOn );
#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b##_xpm )) #define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b ))
BI( audio, audio ); BI( audio, ":/pixmaps/vlc_advprefs_audio.png" );
BI( video, video ); BI( video, ":/pixmaps/vlc_advprefs_video.png" );
BI( input, codec ); BI( input, codec_xpm );
BI( sout, type_net ); BI( sout, ":/pixmaps/vlc_advprefs_sout.png" );
BI( advanced, advanced ); BI( advanced, ":/pixmaps/vlc_advprefs_extended.png" );
BI( playlist, type_playlist ); BI( playlist, ":/pixmaps/vlc_advprefs_playlist.png" );
BI( interface, intf ); BI( interface, ":/pixmaps/vlc_advprefs_intf.png" );
#undef BI #undef BI
/* Build the tree for the main module */ /* Build the tree for the main module */
......
modules/gui/qt4/pixmaps/advanced.xpm deleted 100644 → 0
View file @ 69a15c7c
/* XPM */
static const char *const advanced_xpm[] = {
"16 16 106 2",
" c None",
". c #AEAEBE",
"+ c #D7D7E0",
"@ c #D5D5DD",
"# c #C2C2CE",
"$ c #CECED7",
"% c #FEFEFE",
"& c #DCDCE2",
"* c #9F9FB2",
"= c #C3C3CE",
"- c #FBFBFB",
"; c #D0D0D8",
"> c #86869E",
", c #8F8FA4",
"' c #EBEBEE",
") c #EEEEF2",
"! c #9595A9",
"~ c #A2A2B5",
"{ c #9A9AAE",
"] c #CACAD5",
"^ c #F8F8F9",
"/ c #F7F7F9",
"( c #9999AC",
"_ c #A8A8B8",
": c #E7E7EB",
"< c #87879F",
"[ c #6F6F8B",
"} c #BFBFCB",
"| c #F1F1F5",
"1 c #E9E9EE",
"2 c #EDEDF2",
"3 c #DBDBE2",
"4 c #7C7F9B",
"5 c #818199",
"6 c #E2E2E7",
"7 c #D2D2DC",
"8 c #BDBDCA",
"9 c #E3E3E8",
"0 c #E0E0E6",
"a c #E0E0E4",
"b c #E1E1E7",
"c c #C6C6D1",
"d c #707599",
"e c #9B9BAE",
"f c #DEDEE4",
"g c #D8D8E1",
"h c #DADAE2",
"i c #D8D8E0",
"j c #BEBECB",
"k c #B2B6CE",
"l c #B09E8F",
"m c #CC8B22",
"n c #808098",
"o c #AFAFBF",
"p c #B9B9C8",
"q c #B3B3C2",
"r c #BCBCC9",
"s c #C3C6DA",
"t c #BDAA9A",
"u c #CF8925",
"v c #E68208",
"w c #DA9217",
"x c #49496A",
"y c #565674",
"z c #4B4B6D",
"A c #5D6186",
"B c #B3A196",
"C c #CF8B28",
"D c #E98606",
"E c #FD8606",
"F c #F38F0B",
"G c #D59018",
"H c #B2721C",
"I c #F19C0D",
"J c #FEA310",
"K c #FEA210",
"L c #F8A410",
"M c #D28F19",
"N c #CF8918",
"O c #FEBC19",
"P c #FEBE1B",
"Q c #FEB518",
"R c #FEA913",
"S c #FDA610",
"T c #CF8717",
"U c #C98819",
"V c #FECE20",
"W c #FEAC13",
"X c #FE8907",
"Y c #FE8506",
"Z c #FC980B",
"` c #B26E16",
" . c #C27F18",
".. c #FEA410",
"+. c #FE9109",
"@. c #FE8004",
"#. c #FE9106",
"$. c #BD7013",
"%. c #BB650F",
"&. c #FE9F0D",
"*. c #FE9808",
"=. c #ED8108",
"-. c #915216",
";. c #994E10",
">. c #AB5A0D",
",. c #894914",
" . + @ # ",
" $ % % & * ",
" = - % ; ",
"> , ' % ) ! ",
"~ { ] ^ / ) ( ",
"_ : < [ } | 1 2 3 4 ",
"5 6 7 8 9 0 a b c d ",
" e f b 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 J K L M ",
" N O P Q R S T ",
" U V W X Y Z ` ",
" ...+.@.#.$.",
" %.&.*.=.-.",
" ;.>.,. "};
modules/gui/qt4/pixmaps/audio.xpm deleted 100644 → 0
View file @ 69a15c7c
/* XPM */
static const char *const audio_xpm[] = {
"16 16 83 1",
" c None",
". c #00E000",
"+ c #00F100",
"@ c #00F500",
"# c #00DE00",
"$ c #00AF00",
"% c #00AF01",
"& c #00A402",
"* c #00A100",
"= c #00A400",
"- c #009401",
"; c #009301",
"> c #007700",
", c #007A02",
"' c #008101",
") c #00EE00",
"! c #00F300",
"~ c #00A701",
"{ c #009C02",
"] c #009C00",
"^ c #007E03",
"/ c #007401",
"( c #929292",
"_ c #9E9E9E",
": c #A8A8A8",
"< c #747474",
"[ c #737373",
"} c #6C6C6C",
"| c #666666",
"1 c #787878",
"2 c #8F8F8F",
"3 c #A7A7A7",
"4 c #B6B6B7",
"5 c #6D6D6D",
"6 c #626262",
"7 c #646464",
"8 c #848484",
"9 c #969696",
"0 c #B9B9B9",
"a c #C6C6C6",
"b c #A6A6AA",
"c c #6A6A6A",
"d c #7A7A7A",
"e c #B2B2B2",
"f c #BFBFBF",
"g c #BABABA",
"h c #B6B6B6",
"i c #B4B4B4",
"j c #D7D7D7",
"k c #C3C3C4",
"l c #6B6B6B",
"m c #636363",
"n c #606060",
"o c #575757",
"p c #555555",
"q c #535353",
"r c #888888",
"s c #D3D3D3",
"t c #E1E1E1",
"u c #B3B3B4",
"v c #383838",
"w c #707070",
"x c #585858",
"y c #3C3C3C",
"z c #3B3B3B",
"A c #494949",
"B c #DEDEDE",
"C c #C4C4C4",
"D c #57575D",
"E c #242424",
"F c #7C7C7C",
"G c #949494",
"H c #A2A2A2",
"I c #BCBCBC",
"J c #8B8B8D",
"K c #444444",
"L c #414141",
"M c #464646",
"N c #5D5D5D",
"O c #7B7B7B",
"P c #4A4A4F",
"Q c #4A4A4B",
"R c #515153",
" .+@# ",
" $%& *=- ",
" ; >, ",
" ' ",
" )! ",
" ~{ ]- ",
" ^ / ",
" (_: ",
" <[}||1234 ",
" 5|667<89:0ab ",
" c66defghiajk ",
" l6mnopqmrstu ",
" vwcxyvzA3BCD ",
" EoF2GHIhJ ",
" KLMNOP ",
" QR "};
modules/gui/qt4/pixmaps/intf.xpm deleted 100644 → 0
View file @ 69a15c7c
/* XPM */
static const char *const intf_xpm[] = {
"16 16 216 2",
" c None",
". c #715F39",
"+ c #DDA434",
"@ c #CD8A01",
"# c #CC8A04",
"$ c #B79042",
"% c #D49411",
"& c #D18D03",
"* c #B27D11",
"= c #ECECEC",
"- c #FFFDFA",
"; c #FEFBF8",
"> c #FDFAF7",
", c #FCFAF7",
"' c #FCF9F6",
") c #FBF8F6",
"! c #F8F8FA",
"~ c #BAAB8C",
"{ c #D09824",
"] c #CD8B02",
"^ c #C88600",
"/ c #987D48",
"( c #CFD1D6",
"_ c #B0B0AF",
": c #FCFCFD",
"< c #BAC7DC",
"[ c #C0D1E6",
"} c #C5D6E8",
"| c #C9DAEB",
"1 c #CDDEED",
"2 c #CFE3F3",
"3 c #C0CCD7",
"4 c #BE9648",
"5 c #D3910C",
"6 c #CD8B03",
"7 c #A06E0A",
"8 c #868A90",
"9 c #FFFFFF",
"0 c #797979",
"a c #B4B4B2",
"b c #E9ECF2",
"c c #2962B7",
"d c #3C7ED0",
"e c #4D8ED9",
"f c #5B9DE2",
"g c #66A9EA",
"h c #64A8ED",
"i c #868978",
"j c #D4961A",
"k c #CD8A02",
"l c #C08205",
"m c #5D5844",
"n c #4977C2",
"o c #7B7B7A",
"p c #B5B4B1",
"q c #ECEFF5",
"r c #3670C4",
"s c #3A7DD1",
"t c #4A8DDA",
"u c #5397E1",
"v c #60A5EC",
"w c #92ABC7",
"x c #A88A4F",
"y c #CF8E09",
"z c #C88602",
"A c #8E691F",
"B c #295A9D",
"C c #5287D4",
"D c #F4F5F7",
"E c #797978",
"F c #B6B6B5",
"G c #EDF0F5",
"H c #2E68BD",
"I c #3577CE",
"J c #3F81D4",
"K c #619BDE",
"L c #639CDB",
"M c #91A0B1",
"N c #CFCDCB",
"O c #A4916A",
"P c #9F7012",
"Q c #455C77",
"R c #2268CA",
"S c #4D7FCA",
"T c #E9E9EB",
"U c #787676",
"V c #BAB9B6",
"W c #EEF1F7",
"X c #1850AF",
"Y c #2363C2",
"Z c #3878CE",
"` c #4B8DDA",
" . c #638DBE",
".. c #C2C3C3",
"+. c #C6C5C5",
"@. c #8E8D8E",
"#. c #4E6277",
"$. c #2E6DC3",
"%. c #1A5DC0",
"&. c #3E6EBF",
"*. c #E7E8E9",
"=. c #797876",
"-. c #BBBBB9",
";. c #F0F3F9",
">. c #1048AA",
",. c #033FAB",
"'. c #2465C3",
"). c #4F96E0",
"!. c #97A9BD",
"~. c #CFCBC6",
"{. c #949290",
"]. c #6B7E8C",
"^. c #6EA5D8",
"/. c #2766C3",
"(. c #023CAA",
"_. c #3766BA",
":. c #E5E6E7",
"<. c #797976",
"[. c #BDBBBA",
"}. c #F1F4FA",
"|. c #164EAF",
"1. c #0948B1",
"2. c #114FB2",
"3. c #365885",
"4. c #767472",
"5. c #949495",
"6. c #566E8D",
"7. c #7DB0DB",
"8. c #70AAE6",
"9. c #0D4BB2",
"0. c #0039A8",
"a. c #3868BA",
"b. c #E3E4E5",
"c. c #BEBDBB",
"d. c #F2F5FC",
"e. c #215AB6",
"f. c #1459C1",
"g. c #21477E",
"h. c #95918B",
"i. c #17130F",
"j. c #536774",
"k. c #7FB4E5",
"l. c #76B1E9",
"m. c #2F6DC5",
"n. c #1957BA",
"o. c #0747B1",
"p. c #3C6CBD",
"q. c #E0E0E2",
"r. c #BFBEBD",
"s. c #F3F6FC",
"t. c #2965BF",
"u. c #1D5CB8",
"v. c #344256",
"w. c #3A352F",
"x. c #020407",
"y. c #789DBB",
"z. c #5694E0",
"A. c #397ACE",
"B. c #3070C9",
"C. c #2564C2",
"D. c #1152B8",
"E. c #4272C2",
"F. c #DDDDDF",
"G. c #C0BFBE",
"H. c #F1F4FB",
"I. c #346EC2",
"J. c #4067A3",
"K. c #29364B",
"L. c #09182B",
"M. c #336298",
"N. c #4F93E1",
"O. c #498DDC",
"P. c #4386D8",
"Q. c #3B7DD3",
"R. c #2F71CB",
"S. c #195CC0",
"T. c #4879C8",
"U. c #D9DADB",
"V. c #C2C1C1",
"W. c #FBFCFE",
"X. c #BAC9E2",
"Y. c #BFCADD",
"Z. c #AFBBCB",
"`. c #B2C6DE",
" + c #BAD4F1",
".+ c #B7CFE9",
"++ c #B4CCE7",
"@+ c #B0C8E3",
"#+ c #ABC2DF",
"$+ c #A4BBDA",
"%+ c #9BB2D5",
"&+ c #A8B9D5",
"*+ c #D7D7D7",
"=+ c #7B7B7B",
"-+ c #848484",
";+ c #FFFFFE",
">+ c #FDFBF9",
",+ c #F8F6F3",
"'+ c #F3F0EC",
")+ c #EFEBE7",
"!+ c #EBE7E3",
"~+ c #E8E5E0",
"{+ c #E4E1DD",
"]+ c #E1DED9",
"^+ c #DEDBD6",
"/+ c #D8D6D2",
"(+ c #D3D3D3",
"_+ c #535353",
":+ c #4F4F4F",
"<+ c #5B5B5B",
"[+ c #5A5A5A",
"}+ c #595959",
"|+ c #575757",
"1+ c #555555",
"2+ c #545454",
"3+ c #414141",
" . + @ # ",
" $ % & * ",
" = - ; > , ' ) ! ~ { ] ^ / ( ",
"_ : < [ } | 1 2 3 4 5 6 7 8 9 0 ",
"a b c d e f g h i j k l m n 9 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.E ",
"c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.E ",
"r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.E ",
"G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.E ",
"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+",
"-+9 ;+- >+,+'+)+!+~+{+]+^+/+(+_+",
" :+<+[+}+}+|+|+|+1+1+1+_+2+3+ "};
modules/gui/qt4/pixmaps/video.xpm deleted 100644 → 0
View file @ 69a15c7c
/* XPM */
static const char *const video_xpm[] = {
"16 16 124 2",
" c None",
". c #FFFFFF",
"+ c #1B4260",
"@ c #1E4869",
"# c #1E4B6D",
"$ c #1E4A6B",
"% c #204F73",
"& c #215175",
"* c #325C7C",
"= c #37607E",
"- c #255B84",
"; c #296491",
"> c #4D7CA0",
", c #6A90AB",
"' c #7697B0",
") c #235174",
"! c #2C6894",
"~ c #3375A7",
"{ c #3677A8",
"] c #4E8BBA",
"^ c #81ADCE",
"/ c #AFCBE0",
"( c #C7DAE9",
"_ c #42759D",
": c #275478",
"< c #326D9B",
"[ c #3C81B7",
"} c #447FAE",
"| c #5390BF",
"1 c #5994C2",
"2 c #5C95C2",
"3 c #92B8D6",
"4 c #C8DBEA",
"5 c #4D7EA4",
"6 c #2D5B80",
"7 c #366E9D",
"8 c #3974A3",
"9 c #336893",
"0 c #3D7DB0",
"a c #5592C3",
"b c #5792C3",
"c c #89B3D5",
"d c #B4CFE4",
"e c #CADDEC",
"f c #4A7DA6",
"g c #3E6688",
"h c #42749D",
"i c #BDBDBD",
"j c #326088",
"k c #4380B5",
"l c #396D99",
"m c #6C9FCA",
"n c #8CB6D8",
"o c #99BDDD",
"p c #6EA2CE",
"q c #3C74A4",
"r c #446B8C",
"s c #000000",
"t c #5F5F5F",
"u c #969696",
"v c #959595",
"w c #447AA5",
"x c #3D6B94",
"y c #6198C9",
"z c #6BA1D1",
"A c #639CCE",
"B c #4E8FC8",
"C c #4279A9",
"D c #424242",
"E c #7F7F7F",
"F c #606060",
"G c #636363",
"H c #484848",
"I c #1E1E1E",
"J c #7A7A7A",
"K c #5C80A2",
"L c #6594C1",
"M c #70A5D6",
"N c #6FA3D4",
"O c #5E8AB4",
"P c #8C8C8C",
"Q c #383838",
"R c #3D3D3D",
"S c #5D5D5D",
"T c #B8B8B8",
"U c #6A6A6A",
"V c #4C4C4C",
"W c #171717",
"X c #94BCE2",
"Y c #205B07",
"Z c #1F5A06",
"` c #2A2A2A",
" . c #4E4E4E",
".. c #4B4B4B",
"+. c #585858",
"@. c #727272",
"#. c #454545",
"$. c #050505",
"%. c #2B2B2B",
"&. c #121212",
"*. c #36960D",
"=. c #318A0C",
"-. c #246608",
";. c #363636",
">. c #323232",
",. c #4D4D4D",
"'. c #3E3E3E",
"). c #1B1B1B",
"!. c #154700",
"~. c #236308",
"{. c #2B780A",
"]. c #31840E",
"^. c #3E7326",
"/. c #468A29",
"(. c #0B0B0B",
"_. c #040404",
":. c #517D3E",
"<. c #328E0B",
"[. c #389013",
"}. c #3E9A17",
"|. c #2F840B",
"1. c #308C09",
"2. c #FDFDFD",
"3. c #FBFBFB",
". . . . . . . . . . . . . . . . ",
". + @ # $ % & & & & * = * & & . ",
". # - ; ; ; ; ; ; > , ' , > ; . ",
". ) ! ~ ~ { { ~ ] ^ / ( / ^ _ . ",
". : < [ [ } | 1 2 3 4 . 4 3 5 . ",
". 6 7 8 . 9 0 a b c d e d c f . ",
". g h . i . j k l m n o n p q . ",
". r s t u v . w . x y z A B C . ",
". s D E F G H I J . K L M N O . ",
". s P D Q R s S T U V W X Y Z . ",
". ` .s s ..+.@.#.$.%.&.Y *.=.. ",
". -.Y ;.>.V ,.'.).s !.~.{.{.].. ",
". ^./.{.~.(._.!.~.{.].*.~.{.*.. ",
". :.*.*.<.].].{.].[.}.|.*.1.*.. ",
". . . . . . . . . 2.3.3.. . . . ",
" "};
modules/gui/qt4/res.qrc
View file @ d4366aa1
...@@ -46,5 +46,11 @@ ...@@ -46,5 +46,11 @@
<file>pixmaps/vlc_playlist_repeat_off.png</file> <file>pixmaps/vlc_playlist_repeat_off.png</file>
<file>pixmaps/vlc_playlist_shuffle_off.png</file> <file>pixmaps/vlc_playlist_shuffle_off.png</file>
<file>pixmaps/vlc_playlist_shuffle_on.png</file> <file>pixmaps/vlc_playlist_shuffle_on.png</file>
<file>pixmaps/vlc_advprefs_audio.png</file>
<file>pixmaps/vlc_advprefs_video.png</file>
<file>pixmaps/vlc_advprefs_intf.png</file>
<file>pixmaps/vlc_advprefs_sout.png</file>
<file>pixmaps/vlc_advprefs_extended.png</file>
<file>pixmaps/vlc_advprefs_playlist.png</file>
</qresource> </qresource>
</RCC> </RCC>
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