From e3696c57690283b356d57e2b91f71a85db519502 Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Wed, 21 May 2008 05:04:47 +0000 Subject: [PATCH] Knob enhancements and missing AFP logo git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1006 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 9 +++++++++ plugins/audio_file_processor/logo.png | Bin 2250 -> 6645 bytes src/gui/widgets/knob.cpp | 2 +- src/gui/widgets/volume_knob.cpp | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd4532f14..8e30a61d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * plugins/audio_file_processor/audio_file_processor.cpp: * plugins/audio_file_processor/select_file.png: + * plugins/audio_file_processor/logo.png: * plugins/audio_file_processor/loop_off.png: * plugins/audio_file_processor/loop_on.png: * plugins/audio_file_processor/reverse_off.png: @@ -19,6 +20,14 @@ * data/themes/default/style.css: Integrate new audio file processor artwork + * src/gui/widgets/volume_knob.cpp: + Fix placement of tooltop in styled knobs + + * src/gui/widgets/knob.cpp: + Minor graphical enhacement for styled knobs + + + 2008-05-21 Tobias Doerffel * src/core/main.cpp: diff --git a/plugins/audio_file_processor/logo.png b/plugins/audio_file_processor/logo.png index 375921f6470ef163778c62076b393b9c9d579a06..8401d9b88c41e18ed2ac2329e119f9e3f9a76999 100644 GIT binary patch literal 6645 zcmVnW{<@l@~)u^4@ObTx$2O zPc+7d6#!a>`KueN2Vm?GLXy!sJ3y_hqw^rvI~BkF0?w9lT>b7Z`riv=dNOT#x&_xd ziLOv8Ne}X0D}+^5z}{#B9gjPzn;TtpV;dq9oxipuTBCU65dZ$??{rt@3cZ#DU{s zT^HP+8R~UG*Sm^qa0nW4HrWC zjPAlkX-SUwNJ1&%Zt$ElbKyxY+p3;yFR(d0e+V~U@>_VeVH1=%+GIrrhGkIUvP z@Y-BSGgGuCbJFjnsAn40LxnHrNgV&*Jp<9+y-Nn;!)k17M6IS8RxbwZgrHrM{{A+5 zpR+a`vY>-g60W+;9IzI}!6&+yb5G-@Z6kQsM>Z-4S^FQpkbmf&Nq@OxS?586UYkat z^Z-Y$*Q=z)lvi}LP&yV`(NE*tZrQR=0V4{dtD}b14T8fB@q1%&E@oFm!9=Pkhzf0$ zTR*5CdFmn0N3(qh5^&R&-@*I;@M_iAqHACNpYEUk#W&qZ$78*tur6q6WY21)3NqJ zbi)F2?%>MiE%?yy{TBV^yQ?($c)0dcf0F*e&mYBQ4p>)cHRu?Pf~4Ow^)4#Zx_MrX z8c95jnP~m`L<8f?5Kbdqt{wmp8JQfDG~Fk8USVb6O-VZ{$N?(9;X3U;KLdzOUYzzs-r9<&_MkB27nXfJOB>lG^NosUSt^ zSZGDhs~Pa>An0AYcC8u%43FaR$F~u4S2+#MK^dF(;6q}V`F-P z*OfrJ6h$s_E;3uT>{BO{K(8PstS$foFft}vo70>m^?(ds!8@fT10#LIRneoBGPU>Y zK8{XUc;@Q*XRkbTamCsj@cEB_O1IE%-~Qwt zJaTw9o=zXbd~p;@ei=j-TDW5E4t)8K|Gm2O>a(kV{;ljoU-@ovizga@K_4kqM}#VD zDKULX)a}CT-J57&ghoekO6hTRgCGFVDB+uvXtnAT$9+myL@haInJ6M~X z>yniE&k5+Zf!n@#9QWUO9QWR}pC5euVH|8dNh--uEmxt*plW+@!xcNIReg+Z|K7}n z({rq@yio5aB33LM3eR4M3v%pxs(e=MfXvKXkL}-_l$Q&LtFM3+H)yZ8L7MwefpJzO zH;gpa)H!#(-o5{!5P}q_HZy2L^42%nhu^fr?yd)V>fRq5>wNO#Kg1vX>1XBtJn>~5 zPM-h(eE6o1;UB;6HFWob;mzOpVX;Gmdp%PfL{()t@nm8gPVLlGO*a}dG&%};xq!I( z3IG6%(tY<`Mdz}j+;kKt+NfX*X^9Y|B&0C@)8hKALk3X-9DY1VnP~R6Z??OyyG%cJ z(`%#q2iMU4$%lRa9p67%n>_r0Y}i_(M)@pUx$$*4W*?;6zc+tLxug!Bw?WNlP2LK7 zqpa5@4!#qGTJ5NejC_E1?Hb3)RB*-sY~MbKr&in`FT4)gTfjt0Bib-X?g#f2J4}g6 z&5at1vqDFnV!7p7eZK~^4A9yzs1D!wT61r$N(XoE&d>hQoez};FIiG&*S6x)E!#1< za2M_vFRr+Fle)jzqm}?&s6d6LP;jn8eLmp_r>11nrm2&pI)1tPM2V zU)G0rzNhqAQ{dQF|LddS?xVNj{MvPR?M;JbazDR*p(Q=SC@G>?gzbPex|)@Al4LYC zcJh>XMgTlBMz)J{2PAa~S2K8VR79e42(lZ8%;VKEElxe`5tj+|0p%au%j>luw}jLL z>DYo>7Bp{!=Nff7yz{;BXC#&B&;99-!xOE0@P@00pe^)Y-0pW6frY?Y1LK_5OQlRj z(FPhB89C_^&lms#Fgm&m)6)&ErESh)A7Z5nMsTDh*M#icb?W{Ddx8gm=4R4Q9p=qO zBxs_-YGjesomhodNnxR+Y3`gp_4Fs+6@O-Nn%$TF`a7saz1Vi0)w}nG8x66FNGa_L zZ40djbd8KjX?%RD%HE2i7izdjzwzKqsw_Ibt@W9`8<<3WcgbOYhM7t~fRx7qah{zHt zCZ#w33 zM4OhoN52LDvQiYKX-U$w%~_EIrQiW76qFkrP_3RS%^g3;=vhOE6NI}b!+Bm{0I=%s($uJwDYCccxHp( z%4oN1GB8l%q{zAO9Bj0lufg!mI_;e~$P56@jT-x&4(CB&ATU8`Wg{iZz{hdO6YaZY zi?(KJZCxWr-#%nMee5X)032HoslepM!%HZbgONiAfuW(AVD#4vV0gG8Q&T{tQetC6 z@GODIcp~xVtWo=B53bY$o0LAXAln!c1&C#>v@g68R^lA{M55djx*J<+mz7%l=$q94 z+uT&&0Dz-&#GX0#xhqN*z9&!F=dob?$SiYWRBBnfkc#h5>S0r}!5D4`cH$*F1givK+2GMpTItk|sPXY(Juxw)w{M@+ z0|PZ(ugBWCuGYC#q=W!K3FLK`n5VTyIQ}$a;A{nBAh-Q2yhfPf0FFdp3gcB9K#_%z zE$Jc(oRP}AG4aynYt8Hp7tz0(PsLeA7Kg~yBk_kiZAQ9JFn02lo6|RZ`Ni1S2<_N0 zLzuXY_STy!j&n6@2h@5vnw>Q|RK)07969eJFquMN6p=1l;=VdfA3wKWii4Q%E7~w!WXccLnlm5c*mhKVO;&UJB^}?gVetl>K zOg980V<+toy($GPA2EqWM?qs_BWfJOYWwy{y=fE79y<`tVlECWg>m;Li#eT>II>eF{+-CoV#94&m3Hi=4WqH z2m$u?yTYYRR4ORM#9})hrZwQ{@L?cp%rIK5fU@>eM{LnQm^d7<1on;g2JS1FJm5}?MR-oP`aDTg?HL0OSVbE-g z8eEbvm}+ijf<_u>AS3E^L_HUtrx((W=+2_R#)NfSwLI`dxS|kA0;80B6@y`1rnR*N zITs728;nC~*aUcNg2ymC4y6G@TNuN`jLET;;CJ#C=_`l<&l- zaj>y6RO055K0UcgCt_&2uzU^i9A!;Wue+zQC0-Cb2n>_B81}ySy$>B z8@Frq!1s$wiog{^s>Ft)kdyV!X=C~cm;r_x0=&S#hXITN*f}Q4#m~$4hffUv5ka0c z-nqye^Qq--6iYQqB$#prU-3azJ%wr@ss^IUp2xzbyYDNmIdG7NvK+M#phFOS!YeCP zm2TOfj%+_q&G+?E_xK^MZM<0HoC`I6@*S7_-2-yr4Ohw>1uEG{tY|Wam)d$$eFFi@ zJ%^nyOmU}Z_$veO0^?PKZRqM!NOYOSRa4>~R_Mu@>W@9;H~siNfBlmO_}YbeS<~B4 z;r#22Zmdw4k<*rvyMiIMIiERfAsse`%$wGOWg@V3K2L6cSxpf~l~QniJ|xA$>uk z?|*$azxgNkg?~_~E1Y||)>mHBkBirzhq6&n6p)8QC}akf0HXj6pydhEsbKPnfP?!O zmke6~z~tQ?kKS1SB#ww3hSMhKn@r`x{ri_hEnTRonHfQYud2 zqk>_Y<&G+sn`&%qgh%A$dHys30KhJqn7B>hENJJV$T^!(6e<}^-LW6|`IB_v*Zw;D zkP{5N?+-7dw_p0t&|{m(!UEE;2*)ktya>mO@Un=49TfE;@C--P@Z|qmiE32P8&ELF41&s@<+>-!Udf9QnYB z^Qd_Vy$fBn_DkQ${&jhP)_m;Wy;1-ERi8%9G|}~o%h$@izjOsg8Wxd-MR?BO1qgx{ z&1)iHM*}EpVC`0=pE}5w2BuO7Ar3|?Jj|@?>e<=08Xg8tcGf>l07N@?0<~J3YTMds z$%|!DF)Ww8Lak8f{n~f(x3NOyUwq&<)LS-w7+F|CH!PwX7SUOmQ{O@-w4Q;Ih8DVE z>3K#60r)v{Sp%2%0ex!~78bex(I@#VKt(KKbIwg4xZ(A0>(#fce?RiDgl=e|>swelp#a~)QdmUCF9YeU zyk?Q-8SP(i1pyinaMh58QjniN=Fb-mOF~Ax(vfw_7)MExy`pCUUNM02@fk7~rj*83 zJ7(*Yii2=D5La*go_l9=lfqkH_a+E<#rS7;z7rOgZ*uyD6(uYiUkLwFgMZn)u})Zb zuIB0EytWV+QKW;?N~wgjE@=P$4Kz0P$eD40(a~L0tF>u%wyj*IH5dla5fe&>4omaM zQ9l2Q8za>hty?j2;TidN{UX|a5lf+kr4>cA!y*diW#bsn%=}AS-~@zT3sn0_cT?&C zvnm2BrGzpHw6NgmywkCKWxQk-*tyb2+p}kYx+Yb^T8AJukcu99%$=_d$-vo)x_)7K z*L~}moj&3F-LQy^7vXskL;(>k8>aB=>}5F%5CA2B2S5yvTK=83fcH`&MWPf0yb4x7 zXZ&&ntlUwZoXp4=M=o>9D6h0)MF{5j92)gC6i5LR^S5Ea9Ytp)%0D*60uBM2n zkN{8M5XGKd9tp7gh%R2P?Q=Q+rU4|07IvByfhjOo%d*t%$nx`f1mxVs;qPz8Y?gA^d zb()r>-$xQ!T6FLX=0Kq0nj!P3&!MIdoSH)lUM&3=y2K0Xf&KHqkG`Grm6z%7pVh>) zVWc9QX9c{8d~j38rQNQ*Y{%!-0l@Noy`iC+6veEV*av9%2+CP4S+iHqH5zLFFMd{> za!6u%ahiLnI>0e->$jX#Dm42K-x~eU3fg3K#~8^Xr3#9~HyXV>Jlr_#81Rw+cJ73X zj|1(28b_r{h!qup+2Y@9E|nqHjc+ z=B=WZ4WWya^BB1+_4J3u#c6&~Lu54p0Km*lLz>+gZf8EQRs}fZCWNjMw6D3;KC=A+ zeb@NcolNaHbqLQ$pI9JPg0qeCu^XYIjVS2hc{Ly0J|%)n;Gs_|R_G zWONib-LKi5q#v-{2bh=`(rz#^iI3wsmsfIc>dx~(rgWo#41V=H?k)G-?{B*34Ti3` zF*>EHToYgjuqedg?vzivP#D0Xi6q%v#V~OuV2$?H(0(x<^CaY&P6Q z7a;&+e7fDBQv?7SA0JkmHo+Y8X|$9ff!IoiRo$D=n+Me&H2NMt5VqX{}YtHpXXFAxuo{Qv(AvJ=KLV!P}gQC?Jl+6)~4gBnVLuYgxpCgC?sf zcp+^_f-ocKU=+Njq9ACepq++y2FAt69cxvn3j2C%eVCq};o;$B*{`7asAWT_w~D@s@jA!7q+4k~bvTzsjf z3QEP>ZV`;}zFu#J#l>kJ8rpKA*f}G{1Hk_W`b}vmc{T~(00000NkvXXu0mjfu1>E+ literal 2250 zcmV;*2sQVKP)}2Q4miR)zoo2vJ(fp+LcccBGc@7^fX;i%gxW#DYA8 zL8f#x(sAqqEfz-{hmKOPGd>vvrIuO=A;yG|kN^pJk>t|*$j!aEkKOeT8VHx0`$}+d zXU^>IIlE`Szw`b5&hPizbKw8{5F%BsSg}G>6eSZdJqRFWSq?ZHj_#_esz7*~I=o`} z^5r^UpXZpv|bQ|nD1m{WUyw<8g*S=-74U9pdq3Fp-@OrsZ>^j!7%FJMM z0YCH{iGh1mXy`+U2w^cAnU`D0tgJlrPxyG@wOw4i+KeCwqXIsXO+;iMS=|*ykwt}b z8MvgdclBoEr4H8ZE$7^&+NeUrYkP64P_l-sC<-M7v+!IG5b*gqzWyL{%E$7hAAX(v zM}C3F>x~E`k?##1;8CB26h&cds*Q=-9RAgQ0jpr-%?10|`05iJXgb96`*%=%x&9s% zO{D+(Y6Ac|jfMr2i}~nMH6Eo85ry(;&-3=49XRH8u>Qa|dGq+MaeCY%8m#+b1A}3~ zy!;}rHg@u{?;OY7zsE;E^Grn?DEl58wmixkO$T}5wVhnM(Vj5qxEUCU5CxO-(DfLp zbk(ruowr$cw4B3j@8QMErkU$_V`n)%#VxG;!ApEtcYZ{kd00O%k}x1EErY3s$+UNM zlW9w%@o+B{+uvnv#a4D#{{)NPz|S^p$F@e~r9-=^ZoY_s5Oacvi-B+}Peus6R>y+r z#njidP%w7_-N`Fw53*(1SIBwV%;rOTx!&6u7Xt|y@krEY zUcqd7nw(6?%AkWz+&&NASp5vgcK?(gE!;)>5f9%v_&T3`Xgb|F9sKI#F(g@v$v{Fz zoGf@nQ7D)=4TIZ^&=1m-0OuO3Z+UBznX<>e$gyn)S=6_PcMtsyONpM}{pU~gI&O~K z2EvUvSs|>Z6pGSkQh&9DX@yyQ+*m~@6uR9$#+<^wXScG#u#DE)9y)Y4sJ+$@bIMHE zktM4}0`SPpd0ePzX3oq!YVDV>JMSK0qt3vV)tks|pNJ%esBLYCI`Rq6Ldh~PcwIcT z5Z{#mmUJCXy_5R3CWNr(GsmR!WWnPoz0l?CMv|ncu}@q^97)Wh{M^T8H;3s6nBLzQrU0Sq|>vi2^QoKh0WT(lDJk$V|4IxOiADl1$r7h8o}v8ccH}&T zr^*+zBzqoXwQ2YT4_AVP>& z4QJW>{&r@p%4Wx-FH&Tf3y6dW5X6s7Gme1%DB}us^v{@p!|UhoVOlVbfX0PqkuJLFLVpWazUosV(^B0UUuIJV7Ut61rz4#cb5z z3H9Oed9bCV-9HARbtcIYo`46fRz)Znq%RnxZ=jyr)6y{OAqvpl*AQ&9J3lf#~3G-RGrGVb8Md?E32~oO1ao zm|`K-B%%@SsEc0$N590St9|q~xmcV!pKmYy7CBitBg*!Yjz+`pSI%0AMVCUwsr{U8 zzJfVjkHM@%trqb6L-f1+3^@Eu(@f&IqGwq(dll)a>2dw+P2|UxdboTbRvaPm<%Kmg#x4)QdnBB zgvVwqCKw7LOEQ8epb}MxqBv^nW=T7;XdZcJy&wo^HChz){ay5n6-p>RpReETb|Z@7 zu=8-N`FXU#YqeT>dU}u~DWoXMT{Nh|{f*b_)w*1+&o5lKP^;Byqk5x_Open().brush().color() ); + gradient.setColorAt(0.4, _p->pen().brush().color() ); gradient.setColorAt(1, *m_outerColor ); _p->setPen( QPen( gradient, lineWidth(), Qt::SolidLine, Qt::RoundCap ) ); diff --git a/src/gui/widgets/volume_knob.cpp b/src/gui/widgets/volume_knob.cpp index 66d990595..cf310a67b 100644 --- a/src/gui/widgets/volume_knob.cpp +++ b/src/gui/widgets/volume_knob.cpp @@ -95,7 +95,7 @@ void volumeKnob::mousePressEvent( QMouseEvent * _me ) s_textFloat->setText( m_hintTextBeforeValue + val ); s_textFloat->moveGlobal( this, - QPoint( m_knobPixmap->width() + 2, 0 ) ); + QPoint( width() + 2, 0 ) ); s_textFloat->show(); m_buttonPressed = TRUE; } @@ -167,7 +167,7 @@ void volumeKnob::wheelEvent( QWheelEvent * _we ) } s_textFloat->setText( m_hintTextBeforeValue + val ); - s_textFloat->moveGlobal( this, QPoint( m_knobPixmap->width() + 2, 0 ) ); + s_textFloat->moveGlobal( this, QPoint( width() + 2, 0 ) ); s_textFloat->setVisibilityTimeOut( 1000 ); emit sliderMoved( model()->value() );