From 772491b9fb1d770d8f5843a795337c1946db53ba Mon Sep 17 00:00:00 2001 From: Vesa Date: Fri, 24 Jan 2014 01:58:51 +0200 Subject: [PATCH] Revert knob dots, make knob arc use palette, remove bb-editor image... bye bye TR-808 :( --- data/themes/default/knob01.png | Bin 2354 -> 2293 bytes data/themes/default/knob02.png | Bin 1956 -> 1913 bytes data/themes/default/knob03.png | Bin 1167 -> 1120 bytes src/gui/bb_editor.cpp | 4 ---- src/gui/widgets/knob.cpp | 7 +++++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/data/themes/default/knob01.png b/data/themes/default/knob01.png index f8108ff147a145f1c6b4e4b0c7615bed62c7433c..b19b2529c3ccb89266165b40af9d161c695d5313 100644 GIT binary patch delta 2162 zcmV-&2#xo$67>;~ntw(~L_t(YiIta2kX%(6$N%S?@7!1S?MJ2`Gn2^>AUF^R6p=s* zOGHIe7DX)Fu(4#L?!(UG9VWM(?k zJ(KC~d;8wo_nwD~o*6O7Z_tr#=rouah7`HeC+F@@Pw3^>$s`w`56Ff zEv&V+XRTR!_0KQm9~k=Kqj$6z;|tarZ)>wR!(m&sM(bFmQoY*qyfWk5wZ@FIEQ^Q3 z!JGY!?nwjIt$$B7JB;znTC?=ZsTaEM3wq@CI~~UP0%xo>8bx6?iVq$(5F@ zLXrbP0>)Z!#-No(p>h;?f$=z9JGc1ilU}KOu2c#mV{O+OvvlUA-{eh6iJdG&kHz?M1K$j@O&R7&xcF_rgV{=gyq1WqS(C>o_0Y^G; zTo;wFiY(8NCMgDk0gTqD)@o=rn_^F+d2fBHab)q;vrn{U_P$0!EC5*iFQp&5>+Tj8 z{7`3Qd4Jz^H{AHB(PpmS@1wV|0bM9m>vim#pT~5&je27Wfgd1A6Krj4;^O)`E-Wu& zu(bst3C%_WwOS2a@Rh&+?X`zz=H@RLZ5IFVo9DW_(2pOx#}QoI77hASr7-+Lxg6fR zwY7!y^)84Ad*}Aznrl9UsYU}~7@|}vLrMolk$+<}iV;N-Ha9l##vA{{>dGpVQfRkZ zsMqU=KbzZ5|YcCU*3jh|y zpMPFi6hw4zeQjm${sY&1D@)UAx7)=y&(Lm9&(su15G(*|4U93+T0?6M zSPRE>0BgY*kR&OF!#-3|z;hkmoNis)S-Eh!R^Owa{`oJKiAaV*2xbggMWJTnI6*v$ zQS!@}nVm)u1n`4k(i$jWi~-{ui~-gHc7F%1^h9+KU}kn2gRMT|QH(ea!3E74gBFoo zWsHX;i9*gfYfiV1DW#C42>_s0uflhI1f>vKYZOHRV-18BV4Q)0!NS5C3vDJ)tu=yD z2;c3aR`0w_Zgvl5tp?*9eh>g)NYfNX8#sjh~^^gQnP~^EM zrQ<54VT=K|n5Zxod0xO63#|!)Pk*57GN|2wnh8`X1#9fK;gdrtrD3#ki#+!PQ9vXp z3CiWnT8tSGG7BiJk>z8gSpvs%cZ0$O2WK3NGXMNF+ogh^#J(lT66F9O(eC7!HOA zN&z@$s8p&DMB6GSJ<1r{et&9THY}9Fa5z9TiZC1u0a!TF0W6?ZaZ*ZYwNeoYK@kbE zVWrYdlCnyqj7AAAZEiv^4hz8dgKf1FKX;S@b~|VqX_{aZ$GEh)iE*BzR0`m_ z5}ctER4QE(WML7B(=WYXfAjo{7+IR__J5*MIT)}V7!AFh zR8=VC`4~|&z$hMJ(C=d~h(IJ!t5xB-jxk0(e)BE2E(t;FPki^0iv$2dh$Yu^Yu8?P z!|VSzckYBk^0Vb~3H`wUmo9A~8|MfsWu!?4B7z_R!Nu+*Qc7W5j1diEB%=|S5Ga>R za7e-$d*a%IH@qGMrGHcvYUv%%)9*a?y%tG%=*+1l`=|x2~yHptJQe;$kC6yrHW$lk%zw7eFqc( z9((+Uhml0|Ak0)9(wSryPLy1))mhAk{^_+pZd)4vuDqo{`T_n^5+<{cZ*7ud#;DP z$Wi19g_=w$As8e{NQdA^2d?Xah#N`t-2D9fFApENZIug=YBjmm|GAg}z~evoi9CXfXS&br(Uf-dHBe!ukX9!sz@u< zRZ1;A__Z&+`!;xa{phDZYmuM@rL}kV%&D36jc#k>;`*^%sRP#7va!bHjE@;-u|sse zG2K4dZnV0Gj~wlg5Sh|y=__CS{QKK`FRvdz^^8L#7i$DjlLRr&80+>fdcE$tKj`=U zYOR(wTkW*foX(83R%vCmQaz=Lr7z!q-v{6DFR!PbIU$HBB%+WcRY*|Cg$Rt+iP9=k og&HcQBBfMx|9$to=ex{*0M`MqRa%9qd;kCd07*qoM6N<$f|<<;Z2$lO delta 2199 zcmV;I2x#~95wa4Hnty{yL_t(YiItaIj9pb3$Ny`sZ|&Q;cg|&IIvolW2MUEyDKsQ1 zM6^aj0}qB50x{8Og0}~GFoF-jllXua5{)JXf{DZjO^Jz(7!;D)QYgY$bfl6vo#}MW zndzK!_Vw(&E5V8XdF0rSbqShFvcnXssJhg0ssks z5Wvt{8v+RD&z#gBv>y9!(3@_#-C>N+F~(YqfdOEnEcHhD$k#>T2`MwzaZ}gxGXU0F zSZi(1TC?!xYbWym8~WkHA8j+n=d3l}#(Hmx!?x?q_K|9}y3h6eGH1*+){aJ58V!fT zbN#jMaRb(EOnX5sadFL(bZ=%L&1a2V%voUwKshm|aj_U}J%(?hQ7PfJHa zk^?~k##(U3pp{0Uauj)i(I~y}_WYYqd!_Q*rBWp{)^@Ei3#U)~A%9=!;g5XW;hf)U z0dH+}WoBk(_Go8%_fe&kNaF-?mLf}2#BqY6C?KUosecr}^L>;&AATtS5$V+n%g2_M z7LPSMQ%elUj4`jCeC7AsVA{C@l5);k>-SccZ#;0*!LKvMX2LK;uh+w%-v<{0j&$I9 zE^5^pvOGhYq!!;Oy{ZD#uYK6-0w(1k*+(ZHVBSxk01Xf!7f_yLkM!N%G;F0QWP{Nf@8 z8ygUk&}ueOuh+o^U;67`-guYOx=bgV}d1)C+DReq* zG#U*=QTVGk44g(F*Q!gEVAtwMJl5>FZ;xM{?YG%*T@sX~93xTVzz6w|Dy%H16 zCR*(df*=6r0*o;@t_wdXAt;r>IS1z)p6lYBbN@iEw+6>`QLWXFb}y{FUTxH0B`)Ux z%zukNy*@99X#eVkrQLh??fYhyrnPRji&37T)0xDTSM5cs)yA%g36LOI0M;59W1zK$ z)*7%Dj_Ux{f-xXTQVfTEsG@-9I=nU6zIJ8l{Hc0lmwxu=zgQ$9SrI}oW6&-NJsm{} zqBugyFJo$Y5+_otTov=qLf0CCIEnXqXysg5tJ&>TB9fm7;7N30OJe{3>FsFSZFhb zYON8JD)8Mt>Wv!WG(wUl2ueO$lbs_Z#Gg516(XW)97mob<-R;uNYfMmgC7K7oPWbw zjXcj`t%WfHnsYG5uqAaoZ?-pPtp?*9eh>g)NYfNX8#s>Km!^qVDwV55QdY7w@m(({ zE3J@a8Au37DZv;vfegkN2qCr&vo(yl9ABjriXsPN82=9-%Q7gfAgwHqvc#{|8x;~n zL6PU4l#Z*EhA{@<0&n1vO)+QVP~sz#71gH>H$@(aJ6I z+!I6rk)R|fmosZIVnBsiKxvIE&yi*c9M9c03KtxlaWKvRFkmyL#u^xHp!67;W(l%9 zhte9%ZheVSP%dXAC?O&d)*HLhwO%g*LsL2qM)?Ry6vOv?`2N_rN~ke(D}Sb2N;hL_ z^i~QfBuR=SilL2$>$m^|wAN9x)k=v(NP=j%YoeL0Tv$G5E%r)BBF!>{QHUT2koZ0v z$Jvf2;~Wg^a>~G7K4LvKU792aqY%beNJqk2i=xQS?V4z2#+V_I5TPKlx+sn_A@6de z1HfW97$PVI;GCgatw9iNs(&2kC}V8%*4|Mpl)`X0Kp2M@4u$|M9O(cS(5g5trL~t{?MkGS!l)P_97agu z7)%J1%O$u{0!AOZb|wD}XM>=WszNQi=RW=R6W?uiq0MG!iu~X>-0O|lnPk#R=KO>?!LDW9~&vz?lPQQA6 ze>ixkD9jX?g*6ygAPaDY%?bs;GDyi+>ebrQ2M^tPcFz@8g<7euQflGhuYTck09*in zeE`ogYb^oz5`bNslg|OT^uwP%*Cs)8N^9@T>625dYu)zR#nmIZQv0m2Wn+!Y86Ppu zB8TW)bFy>1(`3LwMY=-jInO-qSx!L`h$Mouhr{jX{+5y+pWpWSZkG5Rx8z0s#y5qgZJ(1bsxm| zDY6RSmphFl0TlQTlAsC~A~0GfN~=&6YN(V7l~Un@_uc(|Z<+1& Z{{?suy?M&ejxqoM002ovPDHLkV1kl!4i*3a diff --git a/data/themes/default/knob02.png b/data/themes/default/knob02.png index 4913ed2cd5fa57454fd0536dd22f27d57238be83..c4e84a314122ac491a80c59a9eedbdf1d653eede 100644 GIT binary patch delta 1779 zcmVdXczzD$b z?Kl47AB08!i|oWlpC%$&2GI%u?3`0Yp4H2;s9R&IItcPgB}~I=EmcZ60X#&mh{)Po ze|z=5p!X#^`Q$SVB036@W`FbUo+8iML})b{@!tB}+)^bB7s{g8NXO&rNiw`4fJqNZFIme6qnrPu*R=y;Q5$p5DLz&=mSdZL(9(eu{|bV|kYD-Wv3t zIQrPhuYXr6mB={<@eWb5g~i2PXv{?jDH`)S&mlU zdGiO&R`-o+t$tfX{(AA{KL`T=E455S&EDPhefw7qonhw4niAF;G+S-7T5Tw$;Jt$} zC5p0uF(tfrP)ecIYNOd|!&(DtN-%S@f924b-hbWoeMHpcNqV3z{OQlEm>=(L+}Yb{ zcR$f;cRvjXN^1}|o2b?6P+EhS0Rg;tIOkxUg|pMy*=bUMBu$}+p><^!L^ihu{X26} ztbX?MU#+oXj+IiJ=V`m$nLq8lM^Toj1Oc=T;Jt^l4#pUiWr4CNQ5Ms=EMSa*vku;S zXn!4`5(Fs965e~XJM*XWJZ&qbSTV<%m5RLgN-?)csjl-5-dR+_7~XqWYe7U15qPCQ zOdt>h0`W3YX$`Ek@ZO^mR*|JC91%#Vu3~O^5yeVHS~17zcvNr1&As9sdG8@paOWI| z2ms){2P*|8n)n5Q7lC&UZpRQ22oapMV1H(6#Lc~Vn$)AX8EaN5E{eQf3u{ZxdwA!d zw4Q)Wi9`h6d(c$nOzCWR@3+akb083$vk(Bau(p&JdA+GRv1aC)HDy&bq6NQAHYsfo z0aHLG0x^Std;0*y`+Ewfq`+hiA}Ad!*zvH+%r&i;voNd{rYtssN(CMQV+?|dn}2{Y zgT0>+O;yceTb=h4byG593_Jwz9;Pfd!mwH>=1ep5un|ScaL~VA^$mD0aL&M4JF$ov z%sf#>G*NYrZSv35%9%697!WZ4kFw0K$E|k4%tOu0!)CLc-no72MkHP!Le>}agCM9t#D7bc=Qkd1w$mBeNC$yaL<4JWkBH}mfGkT)5T1|dxLtm`SFK_v{GcW$JKdC1H@YPR}$mR_jV>Yrm`6lDn_Mi2zs zxtiHXQ&reeks^~^&n^TJk335+M9o&8nZ1Y%)qC&0CBHfUTWPjCmG#><3x85-iHLSV z1f?kf!S=b^sbE$Rv)Pm-@-l~-+HIYE+Z6fl4jy^*Did8k|Lb247yyWQEeL|GeJcmA z{~qJMWt2n-!)SZ6UFjgX8-NYey)o+C{YB;ygrqYtjS+P2N_41`Xo4wuvQtGn;dJGVVOb)P! zKp-GY^T<3s4FrO`BhH=cbi0@LA2@W&dH2CDe){9>m-@fj0%l%QT7Tn_W5?Z~zd88l zrS~>VV^4|TGXT0EBIcddIIT%Rk4P>AfxdX~=&`GMtLaGAgtg+r&d&OF_ z_M`8A_y6x3cgAzyex7v@#9He}>mb%z$4aT1b1t*i4y`pqYwgGyGkpF#&pogs{tt8Z VS?{p|ExrH%002ovPDHLkV1f~VX`uiB delta 1823 zcmV+)2jKYm4x|r|nt%04L_t(YiG7w!j9f<*hW~S_Za=5{_U)b-+wo)=k6(!$TTUQ0 zks~1xV2P#K1teB%U;{z|Wq}Z45rKqY0~=7p!?I9>Ex`f_3jvFmUVGhsB}~gB|_oGeks-AX+AXopUPB(ppjEHET>o2SHXUm6LL%nkc2503IUO zL}c}if4=g8K|c_7?CFzrB02<-u(xr4SDvL25nA%DIzPczj`r#DD27O&w_{+iD++@CNsV6`qKQ)M@~Gt_>ogHjYg+Z zu22vJ&|1S<3u6qjJd@FI*!|z?fB(34_x7czGk2p>t&K$Fs)(%q>+;K6@%47HQfd*v zfsOlXyPUVnhmRgR9YyV%lpLYNZPA1$mwiuV24%CQZ^;X6JX_^dgsEz4(`S3wGk!PZ1G)EK8G} zoBi%nhku?p_Ki}h)Nsy0yh9^wVSauG>N5?LOJyjf;G9EV3`0pX{#R z+ue>jpJ+v$&j5nL8Z^TY)mjZoYY;OafEN$v9IUf&cCtDG^yKmWzAS6MMPl~SB#NffnbPkHZ=7X?Z|0IdUf@8PV2F$P7EqsR*s`D86}7-Qh9 zgMarPS_dcv0rH}N_a0Gu_EeT7ky45kb5pZY4ez~D%q>!?ie zcg}%`007>5uu@>6v0o5)5qRg|woMU%5P!j03udNzGu)jeajnq|o0^qs=6P1Dma7ZS zdwA!dv>peUfJ6k|d(cGXROxhj@3&yyIS>fWSqOk?xw??$SuIrUre@} z){ZS=1~ZS95sg(nppD;|SUGjZ7y}{(;87IW&1Nf#nR%d@c@TzCa_{b)TMh975wga> z7y~8p05ny$?OQ5SbyF+7hqD&e7=Hvo2_jz7EW7n+7$sBKPzQliM15;*mxyPDfHX}| zsZ_ztpa~EkU?V2VrdDQI3L%Wotm`VGeyLn`-npSB<^ePNM%e0QX>y@btv$!Y$cq9* zj35ZMay7M)CaSQlB1Oizo_-KSJhC*o&nujYA>z>xNfIN=G9*cicr?UlID~Z; zI?y06yhCjB>}+SYbFJN(9TCyWOJ`n`_q7FI`tny76{`c+uU^@;(e3Ufr9Lm9Cjf!S z_yUUv1Omb&kIa+XKp@Cl;@r7*r*n1B-u-u+ckli3XFu8cQ%~E1d4B*)%zRmCjmHij zasA##|36pW*(i)XA%f2W=zxfrw^!q&CIww0xex^U(!N87ueYN1$Xa_t%E}Zgzx_Q?MDWi{Z?*@miMw-#4m`$94V|5@l9sBRSru1 zX4vWW_c$y=iXd0el)jAHW|zv`L+g z=fCp;>mX=qts7bgO|5lPDOGjOrPkVkwPs+g9a>`sFMRj;hZuIm{|DXeWDQW42iX7s N002ovPDHLkV1kkfXtMwS diff --git a/data/themes/default/knob03.png b/data/themes/default/knob03.png index c6676c4cbe1a85ae2461d9913e7b64787231a68b..d620272bf7c294f57971652fc3ee25216affb976 100644 GIT binary patch delta 980 zcmV;_11tQG3E&8jnt!oLL_t(IjdhgIYhzUu$G_*i``%6RnxyTUq)jq)I&FvAj>h7& z;8d6aw*!i}apy)599;Q#xDo`xjXO6Y6=pWGRs^k9#MWV)QkYAfaY&M|Ij~wkIuth zSzWIft(Q9OL%7~?T>>+gHJgn`t*4F6e13Az&*pZmwcA@ieis9P7*d&e zxz((%7^UZyu76kGnl6>9D8Bu3QlBS~Tq0aB(A1VMGVTD_|hJ$v%J zJGXlCRs{gW+WPI3F=naLKAN3dSiB>IJ4r+^S|g5Q7=L3x#IV*tDFvf7hzLTslUL{G z@9h5hu#*`Z>#VKcZV6_maNK%2ou3F^%=rE)04Oy8S!kW&h8IFgP4le8ez1~3Qx+e!;Vt1YA`ty!%N0k5D^9}0$~5Ovm-;T z4OFZe4m-+|vMZRm<4GCDalhsWv1qLYvjy|e>VMR1030M5+Qo6d=1Cbcb4M_9H=WLe zy)fMMWcrQM%sjFh*6h^IjDWo`+)bx5Av1TGh?>QzQay@#J5j&CskMSq8cGf3!CK*> z{ixsHjH2F7ajH}&q9#AMztQ)k+?gts_uB2&J(cLT)@lS90Q3knI!koB-EQ5RDwX#< zDSvk!+~4SrKKh&Qyt}gh*WSwWFq}{O*|!~buAdhFY|Q{|^zXf}`^}i|Kfe6J?AEtm zf3Pa2zKKr-u~Zy z_TKv+R;;y42el{D{a(+Hqn@vnafRT-lTGO`l}?A{%1oVzcE0@Lvy1!L+3~?gAE!J| z7NnF}Ps&^pCt25XyKxkCqA2Rdan$_$(@*}>Y5xJc`&-+jSeBpw0000 zmcnkQ+-@Jt2gh^gvf13p((GI*Uo7S7d$mSw_inA(Y}{_$Z){FZPVe~X%r-Oswe`!7 zF#yORRS2=vYJb*OtTyGv<;pAhLZNc(*fb_4(vYr1u{2lAOdcy19vrOI_xDfVx%Kx( z6!kJeHV*(>03ZNh_56j>qlewHPR#sLrE)n4f{IdOAOeykM%3>kNn#KIN{t~1g33~* za#<&4{?Ws3dG-8-5&+1x^^0TH+Qm-$V7|O?>XMZ1G=CAn8iP2FVXXy`0JDYG8rB#P z5u|jdpFMHn()K^MI^z=)owfCgEh&VPJ#5|2Pfi8Tjr;y80BAh`F*CH3AR;g`jMhk! z1X>#az_{OM~22&=vX%#;b>2(t`tIaJf*@o?$;bCPk%8pgkT6Uv^p{y00)VNc5&RVc}j&s zh>jFObW^GEuos5go=UxRlv#|dhBZ5~vm;7Q{-!Y+ zS{rCRSO>Qs=1j$ors#^+SQG|r&M*OP~2&^TUT^q+Q#S+WB@QD(C98P z?SFQ=b!Dbd-0_sEUc0){AAR(fUwdO^_urkBhhcak<)>eDgtL59{Ksns7;A3!!tQqy zzJF)-nfa~nzx{e^*fm@LXa4x}=I%!ye^NYbwaWFq-Fc96&XMj(03`-;1T+BDj81NY z&1SwhyE7F8+aG@L{$Azu@+^QG#LRO5UVI1e1AyyqzV%LtnHTqJck}&T&yS;?ueEih z6p5!&;aDma7E5z=BC3A%<>xg3X8~LU@C`9D0hk4F4?qk6Z@>HAnCGdiQY!5!l}X|x x?RsuEj-pN!Mcp`#nqPeO>9Es!0A>K}{s)I0W;Osf;FsetPixmap( embed::getIconPixmap( "drum" ) ); - m_bbComboBox = new comboBox( m_toolBar ); m_bbComboBox->setFixedSize( 200, 22 ); m_bbComboBox->setModel( &tc->m_bbComboBoxModel ); @@ -134,7 +131,6 @@ bbEditor::bbEditor( bbTrackContainer* tc ) : tb_layout->addStretch(); tb_layout->addWidget( remove_bar ); tb_layout->addWidget( add_bar ); - tb_layout->addWidget( l ); tb_layout->addSpacing( 15 ); engine::mainWindow()->workspace()->addSubWindow( this ); diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp index 208338663..1c8dc9eaf 100644 --- a/src/gui/widgets/knob.cpp +++ b/src/gui/widgets/knob.cpp @@ -328,8 +328,11 @@ void knob::drawKnob( QPainter * _p ) const int arcLineWidth = 2; const int arcRectSize = m_knobPixmap->width() - arcLineWidth; - - p.setPen( QPen( QColor( 255, 255, 255, 70 ), 2 ) ); + + QColor col = QApplication::palette().color( QPalette::Active, QPalette::WindowText ); + col.setAlpha( 70 ); + + p.setPen( QPen( col, 2 ) ); p.drawArc( mid.x() - arcRectSize/2, 1, arcRectSize, arcRectSize, 315*16, 16*m_totalAngle ); switch( m_knobNum )