From d4f0a1e140b0c0e0d5f8d95a9988a63bc84be30b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 1 Oct 2007 10:08:30 +0000
Subject: [PATCH] Qt4 - Prefs: Change audio icon and modify the codec one.

---
 modules/gui/qt4/Modules.am                    |   9 +-
 .../qt4/components/complete_preferences.cpp   |   4 +-
 modules/gui/qt4/pixmaps/codec.xpm             | 151 ------------------
 .../gui/qt4/pixmaps/vlc_advprefs_audio.png    | Bin 428 -> 464 bytes
 .../gui/qt4/pixmaps/vlc_advprefs_codec.png    | Bin 0 -> 784 bytes
 modules/gui/qt4/res.qrc                       |   1 +
 6 files changed, 7 insertions(+), 158 deletions(-)
 delete mode 100644 modules/gui/qt4/pixmaps/codec.xpm
 create mode 100644 modules/gui/qt4/pixmaps/vlc_advprefs_codec.png

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 <vlc_intf_strings.h>
 #include <assert.h>
 
-#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 2beb8f6501995cad545c4b0d84f024b3a0f7ed48..181b15400fbbb71773806b49e46c62e2e3682158 100644
GIT binary patch
delta 384
zcmV-`0e}9i1JDDIS$|?lL_t(|+N4v<PQpMGJ#A?rl!^wlO+XhW>cX{K^#}AnhMyq*
z1SEcpTV0r#Xkv(uppgVxkR}w1Q0zEEz(A!G<4w-y-Z|&oduK*CJy-Cb5SKWkGn5$U
z6iSm~YypWd95Wp0+dAU;b$FB_EsLmJ-0@l=On|EsPLi}FXn!h+PoHAo`J<u?KXL@J
zd$^B&W(`hEL2vK{RiIEBE!da$P^H<!b4PF)i4J|F<03q>jat>>=`t6Wg(a4lU|FSY
zqjpt+S+zLPn9Mv{VN?eRNx;)<6Jw$|Q=~MygQ=t$xJnG!c#$0hU04*2tt^qW6kOK}
z?I6^JFHg&?pn2!?A&Ww&K+)LDlH5)nZg&tAC_AkVj13i!H_wwB`85L3R#SMlKA`Gq
zP~fcb)&c_=lMC}YC_A<TBd6iv_GQLpyi86KrpY{{y_27(b=~ds)Mnj22)Zna*c_L_
eU%vCV00RIqzjx@eA>Kd$0000<MNUMnLSTZu(62lI

delta 348
zcmV-i0i*uV1FQp(S${rBL_t(|+G6yZ#l}DhU?M_|I1o<*;{Ql^8cdP}kETo@b^u~~
zITdjR5Qc#xJ1&9bvTzvyGCdQdfnSK5flrVdZ0Z01|De*0D2lNekZJ9%1Jv*z;$DzO
zMn;AwcV9C+y7Q93+Fh5R0Sy1Zn*RaqVq$o552W!GNO(HLTYvuv8vs)D^zK`R$9Lfx
z8-e&G$bkQ7DscrOOtS=3Ba+$wNs7joXi*9D-ao=F`2Qc>p$zph%A%R#@_Y<`|NX}4
z0-Uyh{4S{=!0_kqFN|npLbXLC)6hX4st^TCfBxV-13L>R!|A=ZVF8Qb1+Wu;{{GIu
z&dP;uK;x6UZ&iS4;Y}t~a~3uiOn>p<69WeuH^bR|cTsGC24)u2{aMH+GpqYD!`Np&
uzyHSl?EX7bbX)KN7A&@8k&>MO0t^6x8+7}|19unz0000<MNUMnLSTZE=%WSz

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 0000000000000000000000000000000000000000..0f8b6d8838f797cb2dbfa6ebbd5942213501180e
GIT binary patch
literal 784
zcmV+r1MmEaP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!qDe$SRCwBS
zQ(Z_DQ561Wue&?0KZBv}tQML<YP-0W*%FjUXn`VvQbI2gQLz!dnNSbXOAx;2L(og$
zLl7jG4?XBZC7LaklC@G;W}2(3>&&|2&dly~=WfROci?d5-g~}tzw_NQoM9N)Y2I4j
z?#+EHW50uo9SxYto5gza#s59Q(vAXhmwgv552EjRKe%)TtxxPu8vL7!+1<P=3TK%U
z_Jak`XpUgD;Oo#7iuE@%#lX9#ceXR2;KwG|1QD+TMs^7{lLk~R$<D1v#dSFbjsq@V
zYGn-4Tks#Pb0efAkf1=KCXj9Ape=^6G#i3g?@kqvHcSHOd)?30mh`@36lCa0N|%Fu
zWfk)yUoaP_N-^M4Ig+eEjw+17E)jWJF21^k`Jc;>r}GgBc#u$5P<n&4onkQ3!(!iF
zufP)y-zfOkGY>ji+7a?L!Ky_NR=Z#e9>GcJ0=!pippzU3Qh;f&t%a>cLdjr<dh|Pv
z@v~?xy^o?$J#Js?ggakFO~E?K4ws?G<=im`X-{hQIGucnq)`u_&j(%85Rb=k_Dmi4
z%uEaq4}n-L$oTj6-6lw<B5s+<;Pe$6O(Kva84C-)G4_58)!yT%tf+*hYY>E7#-Lj~
zl<y}zk62XQ#$ZE<;apn-c;1dzg9G@WeFQfNxZQ3vHZ&p_41$!mkO5aoA*59WIk`53
zmm*Ys5mTRobW9V7D+)x>1(!>NZH?emtq%@|gB1)+Ofubi<uw^%aSmoCf0&o|ei|R+
zOh4hNJ}(FYva+%msI9FXc?a@92w_F5JQX+179RYW4}-ej1ovN$-%68pPL`t>qJqh?
zjOM0hjE;^%RpYD(wFz#o-#OhL^*k)6L8NZZGP{KOTk7_%&U@p31sDKEvkPL#FxQ^|
O0000<MNUMnLSTZ~>|9&`

literal 0
HcmV?d00001

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 @@
   <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_codec.png</file>
   <file>pixmaps/vlc_advprefs_intf.png</file>
   <file>pixmaps/vlc_advprefs_sout.png</file>
   <file>pixmaps/vlc_advprefs_extended.png</file>
-- 
2.39.2