From 47315c3983f4ca66917befcdb823dd74eb4ecc27 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Wed, 28 Jun 2006 13:16:45 +0000 Subject: [PATCH] Icons --- modules/gui/qt4/Modules.am | 6 ++- modules/gui/qt4/main_interface.cpp | 10 ++++ modules/gui/qt4/pixmaps/next.png | Bin 0 -> 923 bytes modules/gui/qt4/pixmaps/play.png | Bin 0 -> 740 bytes modules/gui/qt4/pixmaps/previous.png | Bin 0 -> 922 bytes modules/gui/qt4/pixmaps/stop.png | Bin 0 -> 450 bytes modules/gui/qt4/pixmaps/volume-high.png | Bin 0 -> 685 bytes modules/gui/qt4/pixmaps/volume-low.png | Bin 0 -> 500 bytes modules/gui/qt4/res.qrc | 9 ++++ modules/gui/qt4/ui/main_interface.ui | 58 ++++++++++++++++++++---- 10 files changed, 74 insertions(+), 9 deletions(-) create mode 100644 modules/gui/qt4/pixmaps/next.png create mode 100644 modules/gui/qt4/pixmaps/play.png create mode 100644 modules/gui/qt4/pixmaps/previous.png create mode 100644 modules/gui/qt4/pixmaps/stop.png create mode 100644 modules/gui/qt4/pixmaps/volume-high.png create mode 100644 modules/gui/qt4/pixmaps/volume-low.png create mode 100644 modules/gui/qt4/res.qrc diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index 32ccad7534..2427acc172 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -42,12 +42,16 @@ nodist_SOURCES_qt4 = \ components/preferences.moc.cpp \ components/open.moc.cpp \ components/playlist/panels.moc.cpp \ - util/input_slider.moc.cpp + util/input_slider.moc.cpp \ + resources.cpp if ENABLE_QT4 BUILT_SOURCES += $(UIH) $(nodist_SOURCES_qt4) endif +resources.cpp: + rm -f resources.cpp + $(RCC) res.qrc > resources.cpp $(MOCCPP): %.moc.cpp: %.hpp @echo "$(MOC) $< -> $@" diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index 8d397996c2..9575fc3853 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -37,12 +37,22 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QMainWindow(), p_intf( setCentralWidget( main ); setWindowTitle( _("VLC media player") ); ui.setupUi( centralWidget() ); + slider = new InputSlider( Qt::Horizontal, ui.sliderBox ); QVBoxLayout *box_layout = new QVBoxLayout(); box_layout->addWidget( slider ); ui.sliderBox->setLayout( box_layout ); + ui.prevButton->setIcon( QIcon( ":/pixmaps/previous.png" ) ); + ui.nextButton->setIcon( QIcon( ":/pixmaps/next.png" ) ); + ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) ); + ui.stopButton->setIcon( QIcon( ":/pixmaps/stop.png" ) ); + ui.volLowLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) ); + ui.volHighLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) ); + resize( QSize( 450, 80 ) ); + //QVLCMenu::createMenuBar(); + /* Init input manager */ MainInputManager::getInstance( p_intf ); diff --git a/modules/gui/qt4/pixmaps/next.png b/modules/gui/qt4/pixmaps/next.png new file mode 100644 index 0000000000000000000000000000000000000000..6b5a1a1d218837ca38058b417dc48ce35b150952 GIT binary patch literal 923 zcmV;M17!S(P);GqK>=IsL%M+lrDbYy&Bpp7hHgkf zTP96(*_BYm7{w}D6O)l96oz7=O$j8{$V|f{LTKkstx0dSGjk7%na&h}xR7Q4o9|1` z@8snFo$nlAMJxKh61lUuq4DMJ+qdpaIF9qr6WIS`_Ovv&ZQEYcQ@ye3Kt*MRh~0=^ zUy2#02T#o%f4?WTYxmB509O4wnRBk6I{oon&+%jN-7oFhC#8IZ33ap$+4elm+w&Ca zXdlW4G)>blMMwX#k~4Je`c?bQx88_6zkXfN=kxI;M%Q)yQgn2#z;s2btE+;6Kp@X_ zbRHa+KDmEH{-)_VbfGe&vGxw~9SW{g7!0mc{rhT5IA#+I#H-ude6*}dn_j~u!C z$Gt0AMuO*<9kn}*O)qSE``p*x>>U{yd5?1e&a;MukjNJ>41<(XkWv94P}UFJMMeD3 zq1S_T_4S{BKRo<{aw+`1V1seCtTzztq4r>1ecfjR0|T=l0%IIPih={b-w&k}7E_Dh zoP%ZG3mM0OWDHVBxZQ4YDHm21xgTMKkPt#bDn(K%aK<5*I|u{<xKN<7vJ%N;0#j45*!}7IUFD_EMB3Y4OD!KF(=^FSCJ>*B#S$|! zUC)}&McNL89%3}Dn6keR(6lv$CYz?YIC1Tl@W!gmA2m0%%s*}on5LQf>F3Mgt(#x` xu(@%M{WwN9^e@g0X9w6Y{9mqY;uSp|Jpc?xM7q!Ud?Ek<002ovPDHLkV1la7t3Ln$ literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/play.png b/modules/gui/qt4/pixmaps/play.png new file mode 100644 index 0000000000000000000000000000000000000000..eac4083227dcbb3bf7d2a96ca64298cf0581266c GIT binary patch literal 740 zcmV}&o9Q03MXl7GHIh(`9UhSE5y)cLPbRyg!BQe+Y}W+ z^hJwk(_YQQl?G-|1|fw-?{7!k6>jJ1s_nVumcIXyJj&g?r)uyZ>|VJqK8i z|1~ylEq7M~u&-4}CRxww?L9lTdCR7K3k!=cBauiLfR#!I>gcnPa3H90|3F`$qx10f z%*@Pu0F+XI_IaKIK|jy=X3g7oZhdTS*?$zkhE$};(baXNN6l6303f9x?{;raLqlVW zGdHItv>2Mwv_JrW@kaos)9L8!?D!4<0A@x;hF#fRQ(IKKx3bh?I z7QpNEI$963_T=T|*@X~@4+$XzKnzt?(;FKbDm;O&ssQ!% z^^TgF>Yjr90=rxhCqXMtESQ!F!;GP%q&Taosd*1zwVS5#!Q-iznVg*bA#F+`Kv`KC zhzR=f5(orA0w4lWJXHjO6cRR@4WY$|VHifp;c!GsOY_a2wGsl{Za1WqNK?`vgoG3V zL;^%{7eoYI*Li4g=+pR%@vD_Psvey`cQKMkE2#q^1f-CVQh}5!vk)*%3lkHsf`d<= zJg(Zg>++$4ZT`BtIy2cNCv`CI_rYR@U<=Ig(@#%Nf9W6S8!aj-zHt25iFYoSOaIj~ zO$aC~EQDX1hhfB^NCnYoG&Vdu^p+Wyx=)`OA)@eVKbn$kg9so9em*`n_kL>X=Bbn2 z4*>*;$Xs)sU}p9HgS*ptXXS6%~dTjUW~27>KQ5Sl6mKY2IC=rc(7n@Us8w z-}C(6_xS?WwXXM~&K(`mSUfr!i$_O0I@@D!U+!#@u_0bl}v003fyT<$qQ z1Y)cdVObWlZL6lGwdGtQ@!c1dm6h&HCbQu8`;pCN0RV_o!wns&CSgxdU|@RJ(`CT5g-9Tf{4K|45jYVkH3ku zv>fm4>8;i@jRSy`1r%hF(RCfOv$I75&beelfF$5?dp_T{_xsLJy+_kIc>y4qHJC}QbrDy+vh)Nt|45n$yQV%%i;EX{QBoswRAvhRuILkS3 zF2ETB5kUe_RTXac2FV2nX97YLUS|{)6%`f5k^?|lS(y}EKqv}S)s;@AQr}*@IDQY3 zmR+g}MNzTA<%Y-YfvT!_Jpb>Wp9Tk`SM|EW(64Zg+*MZmW0)gO4h8l1cXC-1=P)c^no z_8)j!{ozLkr>6dF82#$E9nS5Fm`rzP=8`m2~MlW2Nn}4*z za0G+F)gEY?M=~OS2%6VZ8riqx*F$6bhkaV3_9lUq;RY1ek_-VeN`GHa0o{#%5+_CU4$O?`z!Fv})>AL;rJknkpPf&c&j07*qoM6N<$g2ElDod5s; literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/stop.png b/modules/gui/qt4/pixmaps/stop.png new file mode 100644 index 0000000000000000000000000000000000000000..9ad687337c238bcaf600df20063a4a1d8f469130 GIT binary patch literal 450 zcmV;z0X_bSP)1Oi!P6GQIdNz6jTeLRi}PY`t}h!@f5Ed;|%eHWuK zieu7(8_B0vUG#rlzl#QT`uCCzb=%U%0WcKMIXOMP$n$o*>5`9&r}^dl`uw|M)O0FI z5}O`P4@U>1PV$NVsze;Op!y3yuh)Z$5dhpvRF$uc34kO>LI7l0 z79LT*-=~?m(*X!f6{-T7t;|V6RgqQfEF3!cprE(a}uQ2=1w@h2DIDZfZ=e+ z$P9Z?4ASB5P}Zh&hl@j800^=)4UcF%9ut5^k%2UT4iX@^7EwI}X_|$1Fqurs+q;{q shsAwsZ7$a)>SLoQI`iGPzSH076)y#$v8z5c-2eap07*qoM6N<$f+mx;K>z>% literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/volume-high.png b/modules/gui/qt4/pixmaps/volume-high.png new file mode 100644 index 0000000000000000000000000000000000000000..ec8f00b4ad0c6138d17957a9ba6d8616bb39a6a7 GIT binary patch literal 685 zcmV;e0#f~nP)5 zlg~?3Q51l`bLY)4l3F0T>JKOcNu8G(En2v##EqsSQya-Q6RvELwP{hyD3|3JO@hzD zkW|_T{e%|5%oIVH*{UBPLA#lt=K0=f;fzc%E;?`*=YHJp+w~flY12|jE|2u_H-Y?vMc~%j+^QpbNAZ zQIzK977iY0MOCH!P$$u79U=mN2u;2)1t2O*g7lOHIUr^L-mksm!C=_}`1{x^wm|qrRww06e39#Ft9reZUxiLa{)h zSU^?rN*-Rx+YtyRj_7k$)bc~^Kwh^i#DLcZpja%jxw#3z=dWKVd8O+1TS|Ch`_A>G z!mBcg0Xa)mb#Zag7ZJ~hnO$C9O7!>j*H_kOXHH)O=t|w|0R|D%Rz}Bwn+9l5)%qX^ z>gV12Det#`eC5$fF$jXc9$DZAU7)Gl^vDm}afg8>;Gw80|HjbJ&{0gVx~Hz8DU-?k zs%Ez1wg7K|zHB;?ulW}i78YI-m=lpm#IJ#`0=Kj2L>|DZB`8Z??1HWU-z&)L zld(<|Q51&1bN9|L8oSn&W58bt~;z5s;KEG$FpHo?VgWn$nd%(h~)p;$w<*+6JW zNVM<~ln^?!*az4lk-5x07AR=g37~&_&-u=O@}DcJ%KymZJuIy*&D87l;GY0-T$wH) zhiRG??hT0J%5)G$A62z{TQh)NSzYb}k+t>=)ptP{y{gq}<*oNy*@syu%5geWQ^A^?amnhDL^6#%{- zeYu)=a&k-%1UTogLm>svb|$2;v zH!BVems+jXkG$sJ4n|b9ScOp>bfdr&L@0000 + + + pixmaps/play.png + pixmaps/stop.png + pixmaps/previous.png + pixmaps/next.png + + diff --git a/modules/gui/qt4/ui/main_interface.ui b/modules/gui/qt4/ui/main_interface.ui index dc83d0911e..d7e390e9f0 100644 --- a/modules/gui/qt4/ui/main_interface.ui +++ b/modules/gui/qt4/ui/main_interface.ui @@ -8,8 +8,8 @@ 0 0 - 450 - 80 + 428 + 79 @@ -46,7 +46,7 @@ - + 0 @@ -83,8 +83,11 @@ 0 - - Prev + + + 24 + 24 + @@ -99,7 +102,13 @@ - Play + + + + + 24 + 24 + @@ -114,7 +123,13 @@ - Stop + + + + + 24 + 24 + @@ -129,7 +144,13 @@ - Next + + + + + 24 + 24 + @@ -146,6 +167,27 @@ + + + + + + + + + + + Qt::Horizontal + + + + + + + + + + -- 2.39.2