From: Jean-Baptiste Kempf Date: Mon, 1 Oct 2007 10:08:30 +0000 (+0000) Subject: Qt4 - Prefs: Change audio icon and modify the codec one. X-Git-Tag: 0.9.0-test0~5292 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d4f0a1e140b0c0e0d5f8d95a9988a63bc84be30b;p=vlc Qt4 - Prefs: Change audio icon and modify the codec one. --- diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index d3a5c7ae23..25fb2950e8 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -34,8 +34,8 @@ nodist_SOURCES_qt4 = \ dialogs/vlm.moc.cpp \ components/extended_panels.moc.cpp \ components/infopanels.moc.cpp \ - components/preferences_widgets.moc.cpp \ - components/complete_preferences.moc.cpp \ + components/preferences_widgets.moc.cpp \ + components/complete_preferences.moc.cpp \ components/simple_preferences.moc.cpp \ components/open.moc.cpp \ components/interface_widgets.moc.cpp \ @@ -114,7 +114,7 @@ SOURCES_qt4 = qt4.cpp \ dialogs/help.cpp \ dialogs/gototime.cpp \ dialogs/open.cpp \ - dialogs/vlm.cpp \ + dialogs/vlm.cpp \ dialogs/podcast_configuration.cpp \ components/extended_panels.cpp \ components/infopanels.cpp \ @@ -147,7 +147,7 @@ noinst_HEADERS = \ dialogs/help.hpp \ dialogs/gototime.hpp \ dialogs/open.hpp \ - dialogs/vlm.hpp \ + dialogs/vlm.hpp \ dialogs/podcast_configuration.hpp \ components/extended_panels.hpp \ components/infopanels.hpp \ @@ -243,5 +243,6 @@ EXTRA_DIST += \ pixmaps/vlc_advprefs_video.png \ pixmaps/vlc_advprefs_intf.png \ pixmaps/vlc_advprefs_sout.png \ + pixmaps/vlc_advprefs_codec.png \ pixmaps/vlc_advprefs_extended.png \ pixmaps/vlc_advprefs_playlist.png diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp index 3574ca14dd..6ffa19b05d 100644 --- a/modules/gui/qt4/components/complete_preferences.cpp +++ b/modules/gui/qt4/components/complete_preferences.cpp @@ -45,8 +45,6 @@ #include #include -#include "pixmaps/codec.xpm" - #define ITEM_HEIGHT 25 /********************************************************************* @@ -65,7 +63,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : #define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b )) BI( audio, ":/pixmaps/vlc_advprefs_audio.png" ); BI( video, ":/pixmaps/vlc_advprefs_video.png" ); - BI( input, codec_xpm ); + BI( input, ":/pixmaps/vlc_advprefs_codec.png" ); BI( sout, ":/pixmaps/vlc_advprefs_sout.png" ); BI( advanced, ":/pixmaps/vlc_advprefs_extended.png" ); BI( playlist, ":/pixmaps/vlc_advprefs_playlist.png" ); diff --git a/modules/gui/qt4/pixmaps/codec.xpm b/modules/gui/qt4/pixmaps/codec.xpm deleted file mode 100644 index 1d645d64fe..0000000000 --- a/modules/gui/qt4/pixmaps/codec.xpm +++ /dev/null @@ -1,151 +0,0 @@ -/* XPM */ -static const char *const codec_xpm[] = { -"16 16 132 2", -" c None", -". c #131313", -"+ c #464646", -"@ c #E0E0E0", -"# c #656565", -"$ c #3D3D3D", -"% c #E4E9EC", -"& c #FBFFFF", -"* c #E8E9EB", -"= c #595858", -"- c #393A3B", -"; c #D1DBE6", -"> c #ECF8FF", -", c #E8F4FF", -"' c #D5DAE1", -") c #C1C1C1", -"! c #4F4E4D", -"~ c #0A0A0A", -"{ c #909295", -"] c #D8EAFD", -"^ c #DFF1FF", -"/ c #C0CAD6", -"( c #C6CCD4", -"_ c #E5ECF1", -": c #828385", -"< c #080808", -"[ c #989898", -"} c #5B5B5B", -"| c #2F2E2D", -"1 c #898E94", -"2 c #ADB8C6", -"3 c #B6BDC7", -"4 c #E6F1FD", -"5 c #F6FFFF", -"6 c #8D96A2", -"7 c #121213", -"8 c #646464", -"9 c #B6B6B6", -"0 c #898989", -"a c #767676", -"b c #3F3F3F", -"c c #292827", -"d c #6D6E6F", -"e c #D4E0F0", -"f c #F1FFFF", -"g c #B9C4D0", -"h c #868E98", -"i c #B0BBC6", -"j c #46484B", -"k c #1E1E1D", -"l c #C7C7C7", -"m c #8D8D8D", -"n c #818181", -"o c #A1A1A1", -"p c #5E5E5E", -"q c #343433", -"r c #777A7F", -"s c #B3BDC6", -"t c #959AA2", -"u c #DEE9F2", -"v c #F7FFFF", -"w c #B8C2CE", -"x c #363636", -"y c #030303", -"z c #8F8F8F", -"A c #BDBDBD", -"B c #999999", -"C c #AAAAAA", -"D c #E1E1E1", -"E c #F6F6F6", -"F c #EBEBEB", -"G c #7E7E7E", -"H c #3F3E3E", -"I c #6E6F6F", -"J c #D9DFE7", -"K c #FDFFFF", -"L c #EDF4F9", -"M c #7A7D81", -"N c #0C0B0B", -"O c #A7A7A7", -"P c #C4C4C4", -"Q c #B5B5B5", -"R c #C2C2C2", -"S c #D6D6D6", -"T c #D5D5D5", -"U c #CDCDCD", -"V c #C5C5C5", -"W c #727272", -"X c #5D5C5C", -"Y c #AEAFB0", -"Z c #F0F1F1", -"` c #929394", -" . c #0B0B0A", -".. c #868686", -"+. c #D9D9D9", -"@. c #D3D3D3", -"#. c #B8B8B8", -"$. c #9B9B9B", -"%. c #969696", -"&. c #A0A0A0", -"*. c #D1D1D1", -"=. c #919192", -"-. c #111111", -";. c #3E3E3E", -">. c #BEBEBE", -",. c #EFEFEF", -"'. c #E7E7E7", -"). c #B0B0B0", -"!. c #CFCFCF", -"~. c #F4F4F4", -"{. c #DFDFDF", -"]. c #5D5D5D", -"^. c #0C0C0C", -"/. c #585858", -"(. c #FFFFFF", -"_. c #FDFDFD", -":. c #FBFBFB", -"<. c #8E8E8E", -"[. c #252525", -"}. c #424242", -"|. c #7F7F7F", -"1. c #A8A8A8", -"2. c #939393", -"3. c #6D6D6D", -"4. c #191919", -"5. c #4C4C4C", -"6. c #6B6B6B", -"7. c #8B8B8B", -"8. c #ADADAD", -"9. c #B4B4B4", -"0. c #333333", -"a. c #6C6C6C", -" . ", -" + @ # ", -" $ % & * = ", -" - ; > , ' ) ! ", -" ~ { ] ^ / ( _ : < ", -" [ } | 1 2 3 4 5 6 7 . ", -" 8 9 0 a b c d e f g h i j k ", -" l m n m 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 ` . ", -"..+.@.#.[ $.%.&.*...G =.-. ", -";.>.,.'.).z B !.~.{.].^. ", -" /.9 ,.(._.(.:.T <.[. ", -" }.|.$.1.&.2.3.4. ", -" 5.6.7.8.9.$ ", -" 0.# a. "}; diff --git a/modules/gui/qt4/pixmaps/vlc_advprefs_audio.png b/modules/gui/qt4/pixmaps/vlc_advprefs_audio.png index 2beb8f6501..181b15400f 100644 Binary files a/modules/gui/qt4/pixmaps/vlc_advprefs_audio.png and b/modules/gui/qt4/pixmaps/vlc_advprefs_audio.png differ diff --git a/modules/gui/qt4/pixmaps/vlc_advprefs_codec.png b/modules/gui/qt4/pixmaps/vlc_advprefs_codec.png new file mode 100644 index 0000000000..0f8b6d8838 Binary files /dev/null and b/modules/gui/qt4/pixmaps/vlc_advprefs_codec.png differ diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc index 7c252c1cac..d26b798f37 100644 --- a/modules/gui/qt4/res.qrc +++ b/modules/gui/qt4/res.qrc @@ -49,6 +49,7 @@ pixmaps/vlc_playlist_shuffle_on.png pixmaps/vlc_advprefs_audio.png pixmaps/vlc_advprefs_video.png + pixmaps/vlc_advprefs_codec.png pixmaps/vlc_advprefs_intf.png pixmaps/vlc_advprefs_sout.png pixmaps/vlc_advprefs_extended.png