From c128bd727e6cfe6cf4630a1ffec589fc850dda68 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Fri, 19 Sep 2008 15:22:17 +0000
Subject: [PATCH] improved visual appearence of timeline

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1634 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 data/themes/default/autoscroll_off.png      | Bin 711 -> 559 bytes
 data/themes/default/autoscroll_on.png       | Bin 1193 -> 977 bytes
 data/themes/default/loop_point.png          | Bin 786 -> 275 bytes
 data/themes/default/loop_point_disabled.png | Bin 412 -> 0 bytes
 data/themes/default/loop_points_off.png     | Bin 609 -> 270 bytes
 data/themes/default/loop_points_on.png      | Bin 1092 -> 314 bytes
 data/themes/default/playpos_marker.png      | Bin 756 -> 208 bytes
 data/themes/default/style.css               |   4 ++
 src/core/timeline.cpp                       |  50 ++++++++++----------
 src/core/track.cpp                          |  17 +++----
 10 files changed, 38 insertions(+), 33 deletions(-)
 delete mode 100644 data/themes/default/loop_point_disabled.png

diff --git a/data/themes/default/autoscroll_off.png b/data/themes/default/autoscroll_off.png
index fdce09fcfa2208640b670a45c1cca17622581c1b..2942c9a72cad1653a75fac9df12a38c66a2eacf6 100644
GIT binary patch
delta 534
zcmV+x0_pw71+N5<B!2;OQb$4nuFf3k00002VoOIv08G{AE{OmD010qNS#tmY34{Ou
z34{Tv;$wLL000McNliru*a;I3H6@;|l^Fm40kcU&K~y-))ssC)l~EYSf9HMQ`(8h@
zaM7v3u|XrG5EKGSTm(g%T(XuRmk=C+JGg{_gG+-AIki=EBY#1}txJO+IJDd-iMWuG
zLpSfe@7Fo+)1b+{yj{{MddBmA{^$4n56^*rP-2TZOS_xTP31<f*3%Pr3Ad%6T(qCD
zA7|rJF>cBS*^rD3uZ?shRV#UPNC}S{j1RgyV?%XEx@IXfnpkPQh(>@4>$10?9=-?@
zgiN-@7^6*KDu3FejE7GJ;kxRc;oVqQf-oS{gxDuQ0b*hdnjdWc^zOZUUSsHyJ1ATn
zY%Ek&yC%Z0g}2P~tI~<#vP_UBjf-<UWsJd4qR0W?C}Po+XYftI`3=g`&N&)MVIdeI
zLdtk}R1g~QiNvmcRv!<afRGSPjG##2;*g@5P<W!Rynii#a};rcHqO&VBQ6#pF*b@A
zO*19F?90^qm737Quk#~v9P$D)Xd(gv44V|P_TA0zb$1Ca$t)28hCNox{sU)er%H8_
zh7@TOHtXaztjSLwYt=s(T+$SIX1+dh=60jM?y9lw%PqP1xwG%oU#RzK=X^&i|4;n_
YKJv38p$|=>G5`Po07*qoM6N<$f<uPzO#lD@

delta 687
zcmV;g0#N<01jhxCB!2>8OGiWi|A&vvzW@LNfJsC_R2Ug`!Od<PRTzNb_dDl!Jo#}Q
zNDWPb2&5{h+70RkkPsqJeuQ8HqRX;kQHeX?9=HJ3Y`6y&bWy452HJ`$K}}NHv?1Wc
zPR91knd3Ph#^Oh+ljpIV=!|P#Ykt@GX1bvd!+?r0!-?dSUVrAC)XJC3Rhn4F3@6G%
zJkSzkg(Xr9V~%4j+tAXtIFE_G%wpg_j$<sQ;i6oV&twjY&0;gQ@kGWP6BZI)=WE^;
z$4Ii2B*UYWx;u<Sa7>VA`CQ(?$0&(lQ`d5H&G)4AKNLp<%Y>wEE}2VVUooi&RKDiw
zpRzi*Q)QHv34i%8QFB3NrEaJBTg}c7@At0z4jl%TV+^~=Y5SU;7o!@o@MrN;_G7ul
z6WSDxNwJ>Wt{@hwL4SR4Q*U#h$F%7a9mi;#lXs=XNV)It=`HTEOGZfq!-O+4@`1c5
zjuAVR*6cpN)5Q}RaZHe9-jF%Ql6kY1^zwF|(?=PxJb&dG<JQboX)-2a8g?aFWjh=Y
zP;fjYU6GGjRH}Y?P-O&T(q*?Mx8x7qqCg%0lUB{0l`rKZ%y6&2U2NzB4n=BTn2T|d
z7CU&<F|tsjq0gC5SmQ-mVkZ37TQ6?MpV{URF_&45QR^5+94t(kuehqI%<3R^sym^V
z@0P#nU4J%c<FV4!f#w915eIR`UWupujpD(uAA|as#Ws(4L<djA(bYZ$Lm~?9CGpSe
z3%&1qdvS+7G6od%$S4RXpd3iuS_DB**OBR3_%_?nBerOhQ&CY7iTp$N#h&^w-t(K9
zQ(CX(QGYXLJmd)(o<K!J`Ik)9<yG^_^!u!rk0|j17*ZT1C6P(OEN8jEEIa(d?q5R7
VC=lM^+zkK#002ovPDHLkV1jfGQ2YP@

diff --git a/data/themes/default/autoscroll_on.png b/data/themes/default/autoscroll_on.png
index 627ecd953fb06f3c3b76f2b5876571ea029efe2e..fd87c92481a5ea7d5bfd4a504021b0433d68aade 100644
GIT binary patch
delta 955
zcmV;s14R6(3DF0TB!2;OQb$4nuFf3k00006VoOIv07w8#09cLi1(g5*010qNS#tmY
z34{Ou34{Tv;$wLL000McNliru*a;I3H5swN>7D=p15rstK~zY`?UhStT~!o@zkSX<
z=iZy-wi*Kw<DjNS!Gc07K3YYKK~a2AgI1y9gBEE;2PM*hAb&-WqG$yNC8PsILFzzg
zLtChi4q{VjRT>IK)5gY-NAqY>lbdt*Is54#4va>VVjSs$&1MbO`q#hKzt@KUgn92n
z@4fi9lE>X=N4nO%xUcK_CqKCTa^uA!09e0euW!D46`vnJrw2x7UJt{<+r6J{c8dWB
z7OX%BhKC2a^M8&eTDLYw_pEN%Wp#3-v8Da$B>@0Pr^hIlB^9Z7@cvtPzGZcDbxe2D
z#*ZGj>=xDEwLK6bz!{0x8Qv)&Ok#Gw|0dcxya$g*CMgGwp7;GD@?Avm+PQt3)PfAQ
z?fkG~c}?CrtE|(~+HA_2WZbCABr_F-lnR+DWF^CScz@*H6=L1Zb*%z>tZC!ND;H$Y
zxc(L2`tnmq?FhmUL<j`<*<s+lpJm`3&RVRs7-N|HC8hJ!#p!8jxAuPe>?gm^8P0L)
zZra&&!%8ZtK^ZU(tOMr+&Uvf@YaGTnw6-XvQObZfTvs3GN5{)8RX1)}QM+oxSCeP<
zt3S0Uz<*LMOVZ4ultXKeHlQsi1KP~qnf55{D3=u%MyB|&XNaSnr@1uLgPrPs&YA4H
z#>d;Q1<1_-5RNlFL)2bXM`_tIibcppjvxr|9;|g}ZOD`+NhGP1NLfKvQapk}u|Sd<
zoR(gM(L6F0j!J4sq$No`mCTVUPo`$8w@%=E0DmGR7sce_m|QL*iXy72izEuKiS{@x
z*YxdwX>bk$?>%du-a+*hHPl>LqO`n3Rk1)mjtGMgof({SgrPwQaL!>&j$%!LnVC!U
z{X8)0efYwKuirWRmnvHG@U{azJwH8)_jr^3b|j_RWo&u14Pz`?Ytl@SW*N#WPM`dS
z;eUa_jv$OSkDX{6|D#Oj%;5Wjdmful%cc7Jd_Er&1_tjvQ2-OuBOE*2k;qhU4|4hT
zu@i0czU17ZR$^Qr&c`4GA{KOiafDNyUw%uN-!$EG=<MHxE(##XS0RddE+!KkY=6&=
z^!M!wa``uAdJpM;ysi`PgNJtPwsLraA2hl;&ugWgNrz4zU(!#fVeJ!piw(EEmA~fJ
d693y$+pk03%V*?J&v*a;002ovPDHLkV1j`X#`gdK

delta 1173
zcmV;G1Zw-y2dN2=B!32COGiWi{{a60|De66lK=n!32;bRa{vGh*8l(w*8xH(n|J^K
z00(qQO+^RR0TmT7D<T*~<^TW$Hc3Q5R7l62mdkHcRUF4Z=iYgBro&8`J}9lyPG17@
zaAAZ<j792$s4+3PB9M@1Y$9M{;=+|XU8sM93tZsJ#JDigh<_RrX&~BSOADpXX@}{w
z^X%Nm+_~qt;I<B^apbP<z2}_o_xygp@A>|Y&O<!<sq;Q{VQ7@m_Dftye8%3#qudQI
zky$eUw|=hgVF*;rzk~jn6U5vB1cKYyUY1vefFj@kwXM0@!w|4M?ywTcVfv~72wxJv
z)&+zf#Qa|o=zkx4q|3IeZ4&Jnf`!KrXcU#rO0i7EbpB~g!vx~piy^o3+J0KAqwFfY
zPSlPA@U?b_vFsfxm36=dWc|8^QY79!A5a6UN9fu3nBMH!ZE%36gI(+m2M}6GBnJ`4
zMtt?SjYZ)1@1$$}6z!YGF*O^dNg^_U26R~=c7@w$X@7~Uw|YhhX;sY5@3@{W0Zu~%
zDxG%7sUmURU{cTFm(3iOEr0-^J>Jc$(Gm8jC#k3nD)s_!3n=OhMKJY8jYOZKS?vSW
z%nm0=E8*>NC+sH{NibiX<#Ognrqg+(%maqru!I&X1^N=L^!lEn+fCq88jes**2>Hp
zS-vm*#(!5gudui}hm@<pI$$-bA}P9)riwNd2pbS`?`>?>XYhG$nyah7Vq4?DEU@B%
zR{+_tOx5Y+0Lk=oB&u!OKd)OG+$>CCTVuctAPtm(>Xuv^lj*sO5xTQ4kg$&7uiMms
zXyQPtpLl!&xC;~>JPVDfsMFX(uy&MaHGbc~A%9<jSag`Zt(*LuU1#F9>7_<(pZ@=}
zha)F7b-Xl8!ahU9iQVr5O0ZK!*`+1vjSgXI^DGu~p5dv6B5+^qND@uGOx)a!1ZD#j
zu30&XW*JR6gn}9)+8z!v%(wa&{=gbebq=rq^=|}1f9<qi_J{ja&+40WmQJEcjR}$A
z%YXHG#&a_m&H_Rd2?hj117|tx?5Aq)M#?rI<<;UZ0^jNP{AgBG#+-K9UwXyuUmPZ4
zK8mJwp@|4%`XXPfO*5Vu$25Nj<~{!x=m$>V$RP|<BHiHMz39VpO||y5cQ`b4hMEXr
z2b;-83}(W4vd#oc`Ax2;(##caQLWwpW`8`b+klQQP@v=**vdpHr@qMd2$~imBqDE6
zZffNl?H8sO7DyWv$~c(P#<0s&jCGV+29|+*og95wp#qg!1y@*JH<Q~%_Pzg!aK)7l
z)v?yir}8pCOlB~w6jElqLt}Ua+w{JzdX)f*&0vn6jUcg*j?e^33eO0Yu7s-*?0?(M
zf@W~(rwJ^38KtIxIbh3E@*cQd-*2~j%F!ndGMIgqcy|XWcba@9g_I`X>MYGGQY$5{
z-n@fhmVqS?cni?+ZVIwKxAlq>j~oorEDzIb4)Rj;c`_~2Eag^^t}W_1Tga<Pwcbk_
naT1^z=mYk7?<rssNdE~dE!tceUJi2Z00000NkvXXu0mjf#NIUd

diff --git a/data/themes/default/loop_point.png b/data/themes/default/loop_point.png
index 64e748dd10c12578a55841405f3316330255e693..2f60a2297d0299033be43c24034f58c40b41f95e 100644
GIT binary patch
delta 236
zcmbQlHknDWGr-TCmrII^fq{Y7)59eQM1wE~8;~q|{iJ51q8O(KgAYSQ?+4bY6CLF1
zIfeOzc{7ggI}TJZ+0(@_MB{w#BtxNQ1p!z25SgPqy4MX@mpv^jlCGNh&|ry2flKVy
z@B{CX?GJ~Cy!s#|Vt&f<zu44OjGrdG4rXvz&&qg*nIUU8V@BBZXR-xcfBmPjlzg+=
zdTcZIQBU(rNvYW%1+OqL+BjTJ54!jJbm!gKrpLao@X}<6$TmDCkUZtTXV;|SzRG$1
iojXp&d36dnrGMq-e`L?gGL0GJ4F*qFKbLh*2~7Yb7*|68

delta 751
zcmV<L0ucR^0+I$HiBL{Q4GJ0x0000DNk~Le0000I0000D2nGNE0HjVn8Id6t3I729
z0RN!9r<0LDAAbc66%0CfXOwCH000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dak
zSAh-}0007QNkl<ZD9?@4Pe>I(9KiAK?9R^azCR+-UqXly-4gplg@=NOpi3YjiiZe^
zf<!9JLtQ+S)uBstswkp5bS)yRLzhm$J4DA;2q93i1b>z1?(^;JzYgz}dI*}+%=~6P
z{APYL0-*nS|K!`{x38l#dg?v$a{i<F!@jviY`NaIv2WAEGY_vC0L#|$zVVLn$8A>I
zV}IB${s+?9X?4CF+dFo9Dw^s5FaUxqz-e{F#oZS#bQiln`osRNe<CA(=fU#94?|r;
zgQjbWC4ZIxkN}|_G9S((4N33L-b1CC(x=L3<$R{IN$)}9sQ!pA3}u`=>KuJ`Z2Pfo
z0ReFsQ!mt4p<1CPX2mQrmDs7xflUWCt7Y}75>{^cSNywVWRBxpK3qP0XHRL5JD1Io
zCMl5_t%p|J75r8oJGN0;VMP{2idIk7Gx3?vJ%72#tNZ2t!LnO6rqwjs(L{DcWJTyy
zuR@FNqNughFtmXgnn*1h{kqBSyz5k4i}@jcFr#M3?2OooN!^s(&C%f+C@2IXa03uP
z)GR>;LJ7WGv+s?fQB8DxfD{AK++_m=5Jkn`s)?c!Y-j{<00op}oR`g;S(2SjlKNR%
z<bO3|gIYl~p#snXQpr`ww9IC1jTwnMPr?9m$xT25F*WXGS=NuTe*Rr6!H~upC^7{L
zAYy@9D11q(@e$w+kb4vDc(*-(9C$}HKW?oQzK{S5Ahle*BP*0bqz*|{ywJb&B@}@-
z*1ql`dJ~PYfB)Opcu}8FY2k?|r+s#06FC0KXlqic)R)9aQjO06fj8Rz&+pNUE$Ux-
hFsWKMc2M*Iegk2?_)g!G6LSCn002ovPDHLkV1j<3Rk8p8

diff --git a/data/themes/default/loop_point_disabled.png b/data/themes/default/loop_point_disabled.png
deleted file mode 100644
index 4ab9f0d78aed9e7f363af0b182b213d1ec4e3f2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq000sI000dL1ONa44oCKq00002VoOIv0RM-N
z%)bBt0aZyvK~xx5Wzow@0s$1p@iSO%YEjP+(exx~HAGIgK_?_F$7&p#u?te7ZrY@^
z?MhKZNV~F^5PS+N>j7E>`EQ{@A!qx8^PTUANVclQ1BxoW6Y$Mt506DeWT$b}GR^}7
zJ!EM4;jWdgiin8QsBlBP78v<Uf@4<gmI_uI*^M(UxxoI=rh|$qsst5nBK3C8C8s1i
z=(R+d6Hdr{>jzW*$-dB*_f@7$nIqP_s6de-1@d^zKhNJgKRNOgD3E8fjgoJB?BHUP
zAWD)IOyX>iCc|ELo%QbFU=d{zorRZ$huI$;lQnF-ZtzrdpA4JCFu#qw?ho}ZdFEFX
z3zsZ*8@bIK8EjTR!!w$qOGtDjJQ-`Q<FZeur}W1*E{S?%G%T8^qKYnIiHuwIG#*ap
zx=)9-Yhy6-ukVPM!->aKtAo6!SkhFCp3j+L_*QefC6Qkk;lvJ!MckbL0000<MNUMn
GLSTX>q_yz?

diff --git a/data/themes/default/loop_points_off.png b/data/themes/default/loop_points_off.png
index b65c6f33dd21d9bb3b255c2110bedd4def221445..6d2ea290b2c281ace240659868eacf7819a0d7d8 100644
GIT binary patch
delta 242
zcmV<O01f})1dalbB!2;OQb$4nuFf3k00002VoOIv08G{AE{OmD010qNS#tmY3ljhU
z3ljkVnw%H_000McNliru*a;I3CM1YP<Q)J20Fp^WK~y-)-IK8mfG`XM-xkwRLJ2Iv
zAhcAh!4yz}EHO+dpa{VZp+mUy`!9|@3h>n$UFw`u5Pz2Wa%)SWRc=SI-*oQD9spNF
z)QfT`9Eccp1pqoHkr>!Y#Y&CezKa3m^a{wyMigM6BC_QM^t50_iON6%prs7}uwX{5
sB7C*`-GoL#vRE>5>PpDz|KSg{0|1sYZZxV&W&i*H07*qoM6N<$g6T?H&j0`b

delta 584
zcmV-O0=NB+0^tOZB!2>8OGiWi|A&vvzW@LN8c9S!R2UiM!Ou&RVF1AK@AE#-yUpol
zTDrqB=knJIal$GnBB)3xD1z!g@KSW>(xr|;9=dev7M(hU=ZYxk5EMpBA<G!kInCN|
zxgTxweV?Z(n$f9i^!dPlNbt*9C7Oz=W@(HtIPPM7X$=>R;eR)ZO@nIebl*h4Vw2W|
z<>bV~gGVz|a4~F>Y-m+Y-EHR+NBlw}kw}zi2}BaUeWfKk;&sbaqcJoH8WN(nzx&}p
zJS&21QFIeQ>-+Cx;i=iDH)oQp;((%IxT9<Q<cQy-R_><CtD=U6Chwu%3*o3b9*@x9
zQMpkV|MHdsT7Saj=E(JfV|7wu#A9l6Z${;w!sL_Ot70k<ZEe>iX{W#EyUcv7t>VZl
zDtd9~j!%5T;IRgSNB75vt7d+h*{eg*!>)fGhwpTWy|HY5A?=pL?E|rA!9W&+KoY{w
z8g=6ui7m7!@D&d>iZFA<Ti0eD%S-om41Gi5p_wo?b$?uJ5fDD1M3FRJ0w|!&PH&}c
za#CeNMQl7MJovF#!@&gvD`b#J3V@44jvt-u7Q2p#6S|KUgt7)Y&J6SfV7mG;m(S-*
zrLyH(nhge{i)rVD%DrQS5MC@;_NDtyol6Xti=UI3*DO$?j%JId!lFRp#e>B<o1onj
zA8n0&m_f=uC&elbnr$w1!8*Y@0Vta3B!nT$GF1%Q3=M)mS=jiHRH>r*O9BhQzv3s?
WPs~J2cD29&0000<MNUMnLSTYG%pOeu

diff --git a/data/themes/default/loop_points_on.png b/data/themes/default/loop_points_on.png
index 5185b1f1c9ff27353cc68806815e4b23fa7016a2..9d4fb72834492fa9c2b72d709cf98077f37790c7 100644
GIT binary patch
delta 287
zcmV+)0pR|`2)Y80B!2;OQb$4nuFf3k00006VoOIv07w8#09cLi1(g5*010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru*a;I3CN<*r#P0wA0J=#;K~zY`?UgYO!ypVrKd1vo
zNyW-F(t&j4c5oZ^B5@eHG*w##FodW}%*y`{Y-4~knj#^M)_?P1kc{q<+dN$-R`U!Y
zR1d|o;zvk(&5M8%glY}|jFQJSU2o%(Is5ix<N|*Rsrzav+JrZD89(}+v;lsuKNhf>
zH$q5&<-Rbjb=OU*T{Pcj7GneeNGTzNfO9Tila@BkjSHm|thL(^YMYj3k@p_Pn2y4y
l*Xo_7RqX-)!5A6;k0%DzQwNv@rak}w002ovPDHLkV1jKpal-%r

delta 1044
zcmV+v1nc{{0>lWABo78+OGiWi{{a60|De66laW9kf7SsN6)+&I(X1~300YrUL_t(Y
z$L*9$Oq^91hM)6a=E5)o4ln}+3d4Qca!a7LN<t7TNmE<9sL_RSV;4qJ7fnpGtuaQM
zE?nrwxU(i2jftrhVibd|(TY~Bfnq{iG9dSBVTPIEXJ-EMyI?dxrRm0v>6@Iz`A%}a
z^L{z+e*^dRznA#8;@MU-Mc|x^qeT-a(gM>$SQZ#5%)tc`gYzT-6Oe$lT?1`v;jsYP
z<DIV_EU&J)pk);)ThA?N%IMPU?9jC<7e2lC%?Iyv4GjVDbhA4eshf8CNiD8FQj(LC
zakQn`_pqMn6{@DOWeKM{%Uu+xXv(t7UCEXCf9VDDM5(G(nZ|0!0ArJ*e@0|$>J|?M
z%&Nf7{EyqJZa0+PJR@o{Zr)*8(H*!d_T#K>!<3eM{ru#BxAv*RzJaA%eZB9Up1AQ@
zKM(;@n?}^wY|ASs-f`}Uw!%iYQ&=C)ys~uV{EHzgG9D3vHL*TxvK$fn(+%AfPaaDZ
zf96-#X@}Z(HfWW(6znd`o41ahT8<8%i%#}m1C{})0@S{I$>pmod#Pn_(eX*uLC>rv
z_Scu##%+PMSm=jeUTCwa!6JRRYhbNsWQo4{xD{$?$}TJPguO9g=j>!7PM@EWV0B<J
zW~xgggEyqH5&=?b#cMrUZq2S^&3ksde<eM3@yWc(vQ0&C>Pkl->3MFivHMW1S+B+x
zt)VevPzr9n-I-lmSHAX;Qx0czEtd1Gr=8!-2dFF1g)dki9GjY2jE)SBTB&4IbCp*&
z1}pO3wLGfQy#jhJXwtwL{+W*C=W4NUAp>ibeFtRYR|iCcstGhbA`~+$64Nm3f2tvw
z=Rr82+kmz_r{2<e>cp2L{Uedzzl$n<Pu3Y>*W8z*kaU389^o0Ii#Np=6l=F(Z3fJF
zG*?_W3oOOvmx_`tMJi^|JKN0loK~dQgO&kt8+;!Juixh`Jb3(Bpi~PFFZzF4brQ?8
zp*kT!0^8y^nm!8Z3YZgE%#n&De~~lmA0jrV^7YI<-Y<TGakCL+Zv8V#6QXO7NJ^3`
ziVr9fs=vNfC}z858I=N=2?&>xP>z%=<(+&~RPQN^yQL!O8^HMJM;6AGSqz2s=%1_J
zSW?e0g(BppAX<QFNi#e%N^<qG0J4A*zz^7gztihzD5UcFHjW%_p#IlkdcvnKa<zY&
ztH1;h1rljgY?Vx>drG9!YzJ%`E(g#7k3%DHI7mmnn_zE<>wnB}2?%WnliUVFCXf)@
zfKO~-l?(8t9a_L7Fbf!Wft+<$nr@{-+KnUa)<`e;U!YyN$4A}Qz3VT$fqb*#5+N@D
O0000<MNUMnLSTX)K=$SU

diff --git a/data/themes/default/playpos_marker.png b/data/themes/default/playpos_marker.png
index cc47800d6aa1afa0d5f828f51f3cd54c6496aadd..157b2b978dfda0e1090001111ded80b3d4137313 100644
GIT binary patch
delta 155
zcmeyudVx`~Gr-TCmrII^fq{Y7)59eQNDBfnCkGplyz=5W&qPJLLQY{mcCH)ze++?Q
z0iG_7AsXkGo{#2gaNu#icsoz|cYOLEfke5!sO9mhQ=Fw5ZqC^vYu)hnMD|Z^h9?ps
zj15y<M6=$j%=Oi}z)|wPrtw_^UuARHftEE3)EOQyL|rzK*4(%97|?76Pgg&ebxsLQ
E077duV*mgE

delta 708
zcmV;#0z3WC0rUkSiBL{Q4GJ0x0000DNk~Le0000J0000D2nGNE085NjCy^mOe+3N{
z6*vuPTwVYG0(414K~yNumD0^?RYx4g@$Z~Dxi3k^m`IEsi;zW8d<hh32_@hnLTDE*
zghDBG-L<%J(;!{A=|)Qb0sRLA_ky5Mu(qa95aFgZp@?4N&AoT-nKN_FoEaC_O6yCZ
z5B&J;KAYzebE{XrEPYt9J`sV0f0#6hvJFW(K9Pb*piag=NqH+tBQlZPO+Ps@_r>zb
z!{>sWL>q@T6}=+mg>BMzDSg*qr)ZED4$?_z?17{KwS{sBwdI4ouv6MYvJ;nn`tzw?
zTV7h6Z%s~vND+V!f>GTh_Y)MMO;rm>+mJRPnE(NV5|Wf*PjC9&o%53Ye;*GA#{b&w
z>9a={7p6iKxT?l^&}EAC0#gY}SAY-@;~4P<VvR6^9>Zr};kGtpmTaM?m!5R{?ujei
zXN!mSO;mNjmVvyKSP!|aDXj$}gldchPhyRW=II6e;AZy6l_-@`sL^jxtEGp3JvX9}
ziqi}Gl(1!uDFv<y<j!Nwe+UQ=Jk$<Rg%FEp-{W?#W}WpKKq{pGP<kWi>67;#cZ<bY
z)jlyZ)exf+tgFzbq{uZy55bKKFwbw`b}wd~b^CXzud!EPrKgVH+1|0A&d;jDQYJX-
z(0M^V(oj2)O|a%3uK#t`S>OHVLjHxl0!_bt?0$Dptz~nq*%&?je__r@4?s4cmRq>q
z`E2uY=gqmjg^j@n-51RhouLt*&nwaH4K$<NfSeiNN8e<d-`(aNc_#*-TOW3e$5dXf
zw$QR)@2T+RxA@*QHTaqTg{k~^wEF0QiLC?6M;A^RC$DR**R$;(YTlFgVgPFROE_@+
q%&pnUbmQF0!5<&p8oX5SA9)FK6H4)Hdk1U)0000<MNUMnLSTXeo=^b*

diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index e6215d8ac..2634ff90f 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -132,6 +132,10 @@ fxMixerView QPushButton, effectRackView QPushButton, controllerRackView QPushBut
 	font-size: 10px;
 }
 
+timeLine {
+	font-size: 8px;
+}
+
 /* Plugins */
 
 tripleOscillatorView knob {
diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp
index 742c7e200..3e0025829 100644
--- a/src/core/timeline.cpp
+++ b/src/core/timeline.cpp
@@ -46,7 +46,6 @@
 QPixmap * timeLine::s_timeLinePixmap = NULL;
 QPixmap * timeLine::s_posMarkerPixmap = NULL;
 QPixmap * timeLine::s_loopPointPixmap = NULL;
-QPixmap * timeLine::s_loopPointDisabledPixmap = NULL;
 
 
 timeLine::timeLine( const int _xoff, const int _yoff, const float _ppt,
@@ -86,12 +85,6 @@ timeLine::timeLine( const int _xoff, const int _yoff, const float _ppt,
 							"loop_point" ) );
 	}
 
-	if( s_loopPointDisabledPixmap == NULL )
-	{
-		s_loopPointDisabledPixmap = new QPixmap( embed::getIconPixmap(
-						"loop_point_disabled" ) );
-	}
-
 	move( 0, _yoff );
 	setFixedHeight( s_timeLinePixmap->height() );
 
@@ -231,18 +224,23 @@ void timeLine::paintEvent( QPaintEvent * )
 {
 	QPainter p( this );
 
-	for( int x = 0; x < width(); x += s_timeLinePixmap->width() )
-	{
-		p.drawPixmap( x, 0, *s_timeLinePixmap );
-	}
+	QColor bg_color = QApplication::palette().color( QPalette::Active,
+							QPalette::Background );
+	QLinearGradient g( 0, 0, 0, height() );
+//	g.setColorAt( 0, bg_color.darker( 250 ) );
+	g.setColorAt( 0, bg_color.lighter( 150 ) );
+	g.setColorAt( 1, bg_color.darker( 150 ) );
+	p.fillRect( 0, 0, width(), height(), g );
+
 	p.setClipRect( m_xOffset, 0, width() - m_xOffset, height() );
 	p.setPen( QColor( 0, 0, 0 ) );
 
-	const QPixmap & lpoint = loopPointsEnabled() ?
-						*s_loopPointPixmap :
-						*s_loopPointDisabledPixmap;
-	p.drawPixmap( markerX( loopBegin() ), 4, lpoint );
-	p.drawPixmap( markerX( loopEnd() ), 4, lpoint );
+	const QPixmap & lpoint = *s_loopPointPixmap;
+	
+	p.setOpacity( loopPointsEnabled() ? 0.9 : 0.2 );
+	p.drawPixmap( markerX( loopBegin() )+2, 2, lpoint );
+	p.drawPixmap( markerX( loopEnd() )+2, 2, lpoint );
+	p.setOpacity( 1.0 );
 
 
 	tact tact_num = m_begin.getTact();
@@ -251,24 +249,26 @@ void timeLine::paintEvent( QPaintEvent * )
 						midiTime::ticksPerTact() ) %
 						static_cast<int>( m_ppt ) );
 
+	p.setPen( QColor( 192, 192, 192 ) );
 	for( int i = 0; x + i * m_ppt < width(); ++i )
 	{
+		const int cx = x + qRound( i * m_ppt );
+		p.drawLine( cx, 5, cx, height() - 6 );
 		++tact_num;
 		if( ( tact_num - 1 ) %
-			tMax( 1, static_cast<int>(
-					(float) midiTime::ticksPerTact() /
+			tMax( 1, qRound( 1.0f / 3.0f * midiTime::ticksPerTact() /
 								m_ppt ) ) == 0 )
 		{
-			p.setPen( QColor( 224, 224, 224 ) );
-			p.drawText( x + static_cast<int>( i * m_ppt ) + 1, 15,
-						QString::number( tact_num ) );
-			p.setPen( QColor( 0, 0, 0 ) );
-			p.drawText( x + static_cast<int>( i * m_ppt ), 14,
-						QString::number( tact_num ) );
+			const QString s = QString::number( tact_num );
+			p.drawText( cx + qRound( ( m_ppt - p.fontMetrics().
+							width( s ) ) / 2 ),
+				height() - p.fontMetrics().height() / 2, s );
 		}
 	}
 
-	p.drawPixmap( m_posMarkerX, 4, *s_posMarkerPixmap );
+	p.setOpacity( 0.75 );
+	p.drawImage( m_posMarkerX, height() - s_posMarkerPixmap->height(),
+						s_posMarkerPixmap->toImage() );
 }
 
 
diff --git a/src/core/track.cpp b/src/core/track.cpp
index 064fff713..ec1366a49 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -1150,9 +1150,10 @@ void trackContentWidget::paintEvent( QPaintEvent * _pe )
 		backgrnd = QPixmap( w * 2, height() );
 		QPainter pmp( &backgrnd );
 		//pmp.setRenderHint( QPainter::Antialiasing );
-		
-		QLinearGradient grad( 0,1, 0,h-2 );
-		pmp.fillRect( 0, 0, w, h, QColor(128, 128, 128) );
+
+		QLinearGradient grad( 0, 1, 0, h-2 );
+		pmp.fillRect( 0, 0, 1, h, QColor( 96, 96, 96 ) );
+		pmp.fillRect( 1, 0, w+1, h, QColor( 128, 128, 128 ) );
 		grad.setColorAt( 0.0, QColor( 64, 64, 64 ) );
 		grad.setColorAt( 0.3, QColor( 128, 128, 128 ) );
 		grad.setColorAt( 0.5, QColor( 128, 128, 128 ) );
@@ -1162,7 +1163,7 @@ void trackContentWidget::paintEvent( QPaintEvent * _pe )
 		pmp.fillRect( 0, 1, w, h-2, grad );
 
 		QLinearGradient grad2( 0,1, 0, h-2 );
-		pmp.fillRect( w, 0, w , h, QColor(96, 96, 96) );
+		pmp.fillRect( w+1, 0, w , h, QColor( 96, 96, 96 ) );
 		grad2.setColorAt( 0.0, QColor( 48, 48, 48 ) );
 		grad2.setColorAt( 0.3, QColor( 96, 96, 96 ) );
 		grad2.setColorAt( 0.5, QColor( 96, 96, 96 ) );
@@ -1170,10 +1171,10 @@ void trackContentWidget::paintEvent( QPaintEvent * _pe )
 		//grad2.setColorAt( 1.0, QColor( 96, 96, 96 ) );
 		//grad2.setColorAt( 1.0, QColor( 48, 48, 48 ) );
 		pmp.fillRect( w, 1, w , h-2, grad2 );
-		
+
 		// draw vertical lines
 		//pmp.setPen( QPen( QBrush( QColor( 80, 84, 96, 192 ) ), 1 ) );
-		pmp.setPen( QPen( QColor( 0,0,0, 112 ), 1 ) );
+		pmp.setPen( QPen( QColor( 0, 0, 0, 112 ), 1 ) );
 		for( float x = 0.5; x < w * 2; x += ppt )
 		{
 			pmp.drawLine( QLineF( x, 1.0, x, h-2.0 ) );
@@ -1181,7 +1182,7 @@ void trackContentWidget::paintEvent( QPaintEvent * _pe )
 		//pmp.setPen( QPen( QColor( 255,0,0, 128 ), 1 ) );
 		pmp.drawLine( 0, 1, w*2, 1 );
 
-		pmp.setPen( QPen( QColor( 255,255,255, 32 ), 1 ) );
+		pmp.setPen( QPen( QColor( 255, 255, 255, 32 ), 1 ) );
 		for( float x = 1.5; x < w * 2; x += ppt )
 		{
 			pmp.drawLine( QLineF( x, 1.0, x, h-2.0 ) );
@@ -1193,7 +1194,7 @@ void trackContentWidget::paintEvent( QPaintEvent * _pe )
 
 		last_geometry = ppt*h;
 	}
-		
+
 	// Don't draw background on BB-Editor
 	if( m_trackView->getTrackContainerView() != engine::getBBEditor() )
 	{