From b4d9e3c9caeec35aa8c063979c9a07f90e12b7cd Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 18 Dec 2013 00:01:55 -0300
Subject: [PATCH] Timeline: Add button and handles to configure onionskin range

---
 data/skins/default/sheet.png             | Bin 11059 -> 11209 bytes
 data/skins/default/skin.xml              |  26 ++++
 data/widgets/tools_configuration.xml     |   1 -
 src/app/commands/cmd_configure_tools.cpp |  10 --
 src/app/settings/ui_settings_impl.cpp    |   5 +
 src/app/ui/skin/style_sheet.cpp          |   2 +-
 src/app/ui/timeline.cpp                  | 174 ++++++++++++++++++-----
 src/app/ui/timeline.h                    |   7 +-
 8 files changed, 173 insertions(+), 52 deletions(-)

diff --git a/data/skins/default/sheet.png b/data/skins/default/sheet.png
index 8817f04b74c47842e17aa7fde1f1f9dca142c465..d9ee401d18c6b34a283e7c95dab8a22b02a29d81 100644
GIT binary patch
literal 11209
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
WD>-4}0p=H7z)KZvaE+2x@c#fL1hY*5

literal 11059
zcmX|Hby!p1{~uk_(jX;0QVEf6Nf9<iGs;N_2uO$I1`G)qDBTDnrBh&x6hx%E1*Jhk
z;=9lDd!FAP=a1dp=iGbGd7tyDgLrPJO-as54gdfspXq44008iSxCS64#$6$!*OLPP
zxB$;IR89S}_Oi#~IkZs+Mvu=(+WYRE+RHq6utljT!>py%q!Jm1Hl28+<8J;X@Hr^u
ztVTmm;)CKu(yJC9`UH1LE=s-$6o{@J)U<&LShTiKaHF>NG=UHhS8ytf6y7j?kr?^&
zGQipEQ60~^mIk)Eo#o?sFjvdDGqyTYxiesGnhXFqopGsS^Gkq!Ve^v!Gd~Z9hr?G)
z-aZi;yU4%Hd84DgWT*)@x|cEQ79+MHd!F6nm)+^=PYi&=4=V(g8*;L8*@K9g9RL9R
z8RVDQd;F<`Y8Q1tXh=wQ?hG?DBlsTeJINB!NGEyjBiivIZ9qVdy7B#?<M}Oj!T7)J
z=2){d1T!fd?qqHeo2$=%II6tZKoz!EYI(TVv}_R@_ILK>>iROfMQqpMI=!d!?*iWo
zX+XHG;w4q5SXX`G=?^{Sp0L~PJCo&Kse^>f4icH)b|rrQ{>`N{kUCfts)O-di^TR0
zWIWI^M$d^YI7+>nbtA_8PpVB_-e3n?J9z_J=jLGoy0?nSa=b6R+NTc#I-19noMbt%
z+}F%+d%o3VNKbc}bD@fkDkot9*r|SS^p~6P>YTOv_ch(=bMSNP2TPJlzi5*yzLp<|
z_1JMJ4NE;pWRa1~A~#u(ryQ=!;}K84GZcjLLjc+ZPIMxPmCTe3=(#Bx+GB--Ho0Mq
z;2PiM`J_JWh0-EH^3*d-uS6;lBRP{WfX0<c5FteS)nWwG44H+akY$uCSY{8~3coY+
z9K71+i&b_p4$q$7*DPdll+W(*k#~R0WI8$Jc&EOr@ufy1nXV#M*bS55p|0KzZGlzN
z$WYr`GEaEz)dGiicXO(AQBEw*=FY|%+vTp-#Iv79PuTr)+L4vT7P`!EduW<d%b^{Q
zeW5j?iF0t(6l%IdO*URf2dpfrjMSOA);3{2xX?6~5HoF`GYctTui|r`@Zbf_4O9x}
ze~CsoJ){`U6^!up^aPNQkm!*;BHY+ri9>)rJh@jG6M*+b_so#_!YcvUbwF3E^YWK<
zhVL=L33lD`Va^l&yjjX$$N*cJeKI2g)ccqBYrT&ZsztSJ_#npP<dt;TvKODQ?U!7Z
z=9QHHet7((jOJb-V?=Z2$l+~UCK9M*NxULw6p2%NaQBGQdYD<4^1wl$UU%m0!ft-`
zT*C9Rh$Hn*rk?WB7b-vjOIurk@i>hdI|j4SkK*CT0S!`zr=F(KReSnO;CK7%5@HsB
z8kb(S;PEqJ3*|rdL8zn>6V{dSUt(O_-BZ)kUPQn@qX>C)zWA|1?2eBMpS<w+%AT`~
ziMPVs48%8es>_-l)~o5+C&$4Z7q#0)S*N)!6+;0?EO#a!p4O5G7FBWh^dp3ZXsY&7
zsiS@GeyB|5YBXnV4Y?(X?}HN=_5M;Fm9l^L-2CD@J+nO$0!B^azLtIVyOk9??oK{z
zrm(4J=k0RWo4DU>{SidNJ)R>19n4WhEEYNAmSC}okqgBGy3U;I>(fD|O4^*Kf5|1V
zE5+%dglkqkowM_cs+M@4F)`2nMXZs$AqPAN#41{c#9;159*Na{dc3t7@vuiMwKjy%
z^^lPf@U^&NdUk0)F|DPNF7x}vyI^ANo^^UA9*h7s(xkfNj|-+QZg&3bv|abm>xJ&M
zp(hhw005j8`}6AoL^GZ-*VePvcd^#`9T3RFs7=rOKCraG{dEDP<HX2sb<U^>Kx^!M
zx2xgu`Q%|_>DGO-(QY>xSN*@6^KLScYeOwC=)F9#sw^s4)?qZJ8Vkw4UQCIV32+@c
zmQV|}XV06-$4HmXHF+xY@Wh3dRo(bd005(I);|}!-UK<q{uMDv&eiPJYLy50Tw{(L
z$}fH2FgvL-age-m2?Hz7OHC&%wf%d(*<6*FySyNa&9zywf!lT@?;h(dSB|&_u%=Qj
zkg$wZRQ{2g7@jZjo+J6W$oWoT%u7D|_&_4t5V?KY@J%-P{73d|D{1c1zX9jnlyWA&
zP6t7ENCB+D;Hu$?SjjvwQ$<(HVWZ^2SfgQYkRKD0oUIlgFyOIo>38x*FW!uyZ9mkI
zJ<}z!j@v9lLVv;nNJA7yk&ZAr2*J#Bymw2{`sQ~VBs5*Zh~7@@pv%fYLcGA;sqeTf
zN*dqQMn?F$KZ@(%wpwr+cFAci`i}f-yBlpz0BH8zs}w}cT0j7AQ4`Ebql4uLlpwf0
z&i>ess7BB#@?@$Ozu6EJr}a1tQlQh&LF<m&H5^nJD?5k3JT$d;x@Q|AQyvM>UV1h7
z-jwe2$IPfX0VyY)%5BY@xul++2sp<0hGM%=Fm4XPo9m=fg#6uZHO=zC74X$2a7SC!
zL+m)VSnH)e(yD$AGqj@|FZ-Bms`=1dH0~Pet6|vyaZBQ)g`oHpLa+UoPFMxO3J(AY
zyP7i2!5Rb6(g4y=OggtUTkxq53rAdGOg+tkk~%r-{qK8mjcu#58iJP;t@)S*sf<3~
zSE^@~D=z@*W!Nk=K9Cdc?IYP{o}lS%B4+1mXB{A;6^Te<>Dzc|bM~Dqg&iDYCObzQ
zU49Kk^zeqJR|J*N9_H^mHLqM@-y6WBpF0+{8v0B5cgO8e50_+PrZ`a&JsnG>U(jk#
z*@D;J{^b98;Xw-?<Zq}W!TTxhIC;u$!$7l5|Hh(Z`&74%$eY_K4AP_HXDyx7E=|+D
z5s(Pj-H|JQ5?$@yi2&rC{(U7``aFKvO3kd9pv#zMcdT4548o|+Y}is_-rdLlSV<DU
z95JSUOZd&IYg%R*^Is8cj3sf)4pM-HZ)?7GHhp`X{!QTa#SI><#t_h;X0EmAUR?b4
znA?;(y+)_90=nN&le|!rz>k)fN7h-yY8V5zZJU<-@Sd3&ht$*4)A<%T@l_Rk))Z6J
z{`^f<9YhI|n{R*5S!${NTSd@QbeQ5wo$_dPdDF98qWqNdr+u&4>dJg~x9a-2qm=QJ
zRg*Y|ulBw5{I?3pmpd$z8Rdkk8Mfk?Ckdavkt>BIhta)yeokl88pu%xj6@=lTH%qA
z1kFAT;qeE-Fn##HI67tD8Fr=#_ujWYm9H<t^*m5QK>o&kD|3`wf#mZBK38rY%F>jS
zM}t$pd4aymkPp&5Va$q3>ONLKUf*+lekP&MPyd@1D`OAZc4B!AD|%?r|DN-pjg*2B
ziDc534Bc#|t^>wP@eglZk*;Z|ZR$)<Zo~GS0C`YogQQmNTG4Yw;4od^*aMYu1Df+C
z=sJ-}xYv8iI3nYQ%fPfLF)`3(5dSAT1fxkNtN{TE_3m1V8LHE)0P1aga6&A!%7<QG
z^wjd*f0;jca<tyB6bYiG-4xC<M&mCaXSMWg>dPg~2l|~Gx(|?v@eI+h2)_7uL$?^9
zT9r=0=EC9c9!IGsA*+9``MAx9E)OVPHbJF6UQ|J0dZx8>A(f!LXH$oV$E7@3f2yt8
z4JoEYowOr*W<;D#&bAz?Vx*cH#$$?IB)+^FxxGE~d<7+r8+xUzvhcQQ?DcY25bJ19
z?_O8icbZDvnDpK%hu&*CSl$bCY%@leOngRekIQp}DobH6c<zIv2kOwqH}{o6=ibKm
z6U5)*{YYZC^xKVx%7I&A$$0Fge^|Ec?d`)1uqQ8N8jkFgv?v^+CGT^-{4(2va+>Yw
z+zrcPx79>B4c*8bZ63S+_3IX@y%N~?{gicy2sr!(>Wwb=Ih~p-P7<#bB>H4BiPR}D
zF1TjX-$jmc^Lut7U)p56ba)}6wIrWHJ~jCo%8_pw9C=`p)$^+Z;bg8vC|6g$a<Kar
z9UDUFMFSM6xMo15`L=)}L)@pkT!#gmhRFe}QzCb->tJJU)`VULJtTe}LIUdaUa#5}
z4H!|QYIN@rWkBFJw!rQby5m>DX4i?KQcM0J@s_5gfR&$Y)gGdo-v&j60=~Fk6YVVc
zTRhfv&GfMI8m$OcA08(;e$v!fV>2J@O~W|F{2jb#s`hXp0eMkgbF3s5Vb{6CL`Y$0
z{5_ALyF3uk@*I(cA8w*Z<yFInQpxzlgkG5rP_Zu#hGy6>7U&>)8qmjAN%aU<0zXQJ
z`N)SCU+mum2Yl$dXWLTT*QbAzl2Q>KcT+odCnO<T-ozn5SRQkss>oZXG7AKW-x|&`
zO~E95nFlh5kovG-qP2O23wI+LOxAeWtD)N(Va%zv_Y#@?$H(QG{63Rhy`BUjN&%kY
zQ@yU1i8Hq~q!AE0<rVwrAMN4+Z9ZqM4GcdB<TAf84gn7)T4E41xm<9*8f@S0R6|oe
zg~*@1{d%!`yR8F4whGet4ay<`AH@T9s&Sj_2GuO)$jCQ1U@qy8v3+2GC4;Sb32MCp
zpUF?2X}E8v{lun#TYv2HHr;Vf-K^Wx436YkbH_|L7axhrSfOvXdgjmgd(Lm%e%IqR
z)o<+m*IS*)YR=G`peBsxa^SUz4`xX?)(fJ+HQC|}`06(LbZy*9?a$h3g1%`OM8n<<
zFMR$@^f=8yaazVQiqt{*!1xAAyYscOLJ19=%*;lki@B(aY0pK8w?OX-yGK-S15kKm
zV5^Pzj`~`&=3HL;hP`c4%gJ}5eYJ_k9kcxxjYgDSw4ht-h8kh*EZKpsQl<1HLXig)
z;sUppSAR4lX8xX@hJX=0D4&|EkX(az?nZ5YV~GIYpIP!jv1gk378;-iaX!|F;!od}
zCQ}q0w0XhS$Ft_)EwIJ3#D(nm$yvUtQ{Y><k4wiI3YZgMp!;`j3zLHBm=B-X7SG@M
z)mJ3rh8tL^qCu0JO(ci3ocwX-2Yqerj+eE#|I$2AFE&Jj@WN&6Sjqb0KO7j<VGP^#
zCY%2I*3U)RQ1rIu0(Q>F=;05i&$^tEKKgQUeSTtr-uEzC^&JR!I;Gy|-eF-N7#!eZ
zj7|xq!AA7PX#kQsRR+=4t%2FNwQV<_QOih8)WJ(l$8c%O8TLHZ*ceqjS?7R5fE}~s
zCe}&i@I9gHH*60&6EEvx<sJrA(}*M>gB&LLF%*1!VUVFWaOSm`TzCL=-W2DQRID5h
z?$#R7!3Zz<YsQU&le^m+gh~6|m3BXXEBM%3KMbOD!~lz}GX=Y)qew1$d9(~3cOUb`
zG!e6T(5uZ5)si8rRs0OgK56(+HNo8HzckZ#ao4{@s?`99SE=K<<h3E`HAmL{xOK|I
zBz*J_cDYqCmh2&qk$4l#=8@}eU)R(YdCYj1o5+Ugd&@tmG!a^0YgMZ8`MRlef1=|-
zY_YrltJR%UaR6YY#i1G&^qoJ|Y}ZpNy~-x`50(SRAHc#vq28S0)=x^mg?adqh<Bdk
z3yaBHs2|@^hfH7$tG#Kw9o=rVwhA8Z)1T98aH8=>`gU<0t{jf@ZW9`2DVWEnjh+o%
zXV}#H*!R81=?mYhq(hfIim@A703i70bQupIk=HsTkP^3EBY&RkB*I?+m@QJ}(JWGP
zhjJ(dZb%EBW~K@hGM0&pb=@rgJ`ga(U$|ZgyW)?wDl_fR;~jrP%P{L=!3fGESDAUj
zwG9{17lq(HU|TGl<MKVck41L4uKq<-JcGgH4waI0f8+SgL=b0fzI3ZB`-Qpxgq4cf
zH#RyPEJVxNEL+T+leJA7z0-<$2!5taqpqE01oN(HfgK%Kr;C4R_{;UmL>et_8f(S6
z0NRHt-dIxCRrZ%6hZ-$d%+X1}`nOnxT+hP@BAS<Ori3KdC5;u1WUrok&{rm6Tp$7&
za9uj8>*LISbFo+-pp)n2ZB4tKTkE{0m2GW#`6CK81Or}DxE-z%RlGLYC9uyMaO0J%
zT=hC&TD!hn?w~v|8lLt&er84oO&VU_L{2+CZJWCIb^IB}{w0$w$8Y2`jCkU*ch?2K
z-gVNjYA71JO$a71t0R%-kN9P29hrM~<>$ZJFMykEoSV>dck#PR|LR)XwKwo;gCaxU
zX8Zv!mimnNZ@eHF;Ju9~$)_xU-~p^Ij>y7o@2E@|D`TSj%v9d$+QBME7Jtb1epY9C
zbilJ^=8j)p?wt%oe{bZktLgDPrYmSOHwi6q?f$P{|Jy#ZjtMT8tK-<S*E;@Ukak7A
z`^vS*_=5w7B8BmxUqr5yD=_vHBQ|i)U8Oig`jd44x;J>4C}{je485p0wj?~mHmy>!
zQ#mh-P?e^;-L++`KKB<>c09kYT?gBN<Ev(}w@$d)G$c*U^#u)ibY5BA>n(Dq6ez2F
zX}oz?ex(d%MDE_ri?w!(dk#52u4NrS?oTSYXBI5{qLK*DQQKD;BLUEGoUFRZn7n?`
zOkCityf_68)gbg*zas&b48iYg#l9eURdS4WJ^1aVX-JmlfVW2{ws%#bIbpZIm-)h|
zAC={_SWYj!c_aR%sf~bX`I5%pq2qIGEl>|)Ya5GurQmLhwF1wzjlnt2^y@`OsMl{&
z+HKLf$$AwiM<4j^H;#%@QBkozm6egX=&8eAw8u7F8KM|feRO&|^ifVVwY5+NuaJ<%
z=EHJP`?MG5iyD031$PR$I1s_@veQvrF)Mpq9qjX8TEbOB2bWPF`RGAM`-b9(<~I$3
zU?p~TcK>*W*m%afZ=yAzGO67yytvHIpXgYZKO_#%!Sjz0uRqTRS<P3|)Q*Q1tGo5b
zS^F==5cNbbz+oNaR35!A8roXwp@W(JIhYWeus3ou*UBat;BKkD^eC;5f29ahf1y+<
z7{6Ni+(J+8-}Y_^ZG*g{4w2tvII`_jzpRFVG%94f=`bbIVZFOjU`zXgO;f{(M~Y=y
ze$#_v3c;|#Ao5>PgKr^`p96H2ntC4o+89+Qq?wCN$>^C`3Lko<${3K@)2f92Y^Chb
zvI(Vh7a!S(mHtW!L@Om%3Qn}p^)@cb5fqOJ=MP{01hWtfe<v|?Y6xyjE%pn8IN*!8
z>MjBDj<W9zZ?>4}0&)mu%*cF?tdDsD?YqfqOraW>m3M{e+6qi-9sr1(nIp6zhOF*2
zxPCmO7zhm4iRjbRYnV;6;N&TfN7D&i28l=SF|$s6r>GEtl)M$pwmY-FFkRi&S^AYl
zo9sn*(YPH*su&H24^@RsfRTQ>w_|4rpoLE-oXWFKD^?7rRdfG|h3zIu>(V59HB_n8
z)CCG1e&wp=fy)V+8T{4hWm}>NyZB|Sxca28yO>b*bc_|?FMj-Fw0q7b!;mZcVFX-b
z&j#x&RJEP>IsNpwZz@~Ayi6mPFdHHxTwO?q%zUxwTTd%jn<@7(d4B=AoRqBHR4s3g
zn%v8t^s8=G$$kp1N2DpJbs3<QZofh6>-u<Dx_PkL#`l9i2MEUDe^vD_Ka3&}MNQ)K
z*XpJ@61x5Zsj+mc_v%`b)HyjhylSy<!0aX^*dg<E;o9+bfUhp`jMYB|Q7OnxjVXqF
zUY2fFdHa8p<#DK){S6U$M{8RC6k7B<GqR7(4e%*Jwv;cx6GkCgb=E>fzgkb<pj7+9
zK(>Z{<6I~u$b;Dz@mUpp?LhW)_kdTy56qL|#Nv@)#_@%rLo&OmEFlC!Kn89C!odyR
z3EQJnyOK9AGaqApMoG0(KGP+Bh~8a=4AzZo`IpTkK`P}QLNxBj71#-nuc;MR5bM^U
zaBjh_aK72b5y-VwB_MQXfi~)?D*%8~ev^Jrv<&R`P?%=VIvFcu>QB~1JcVmJJYR8o
z4Pl6KML^EeC%^Q^33ldWZ9|r3j;`aY8?{o_^4t|b*S4s;W%-;$oZnOJKZ|_&-0I2n
zCR>#4;l|PnLP?D&45zz@9Knd0SLkiuS<EkmyS0j>#byF=eVf<c4u2o({kKaxjS~RE
z52*Ku>uwG)<ITyqz6M?|yxZAyuV~J~k;A6%<}aG8C9yO*^`tx*7Bw2R!ox4vaBAtR
zn@ojfeEj6;u?)_fwtTeF!xKMs9vgc&7#RePR-!f-|75cigM+ua_hHWTI9)VfY$uJi
z1uZ|T$1fvJle(St3xJ2hAP{$ZB8jG&W+JQruuCFfRu>J}LQyths5lkzFT}%$ac>(l
zU6n<kQQu0-;&8DufADpBGySa7=)r<_To~KFMcQ;^baz28kP(4Wwkl%B=qgP6ENSB-
zdw0VX#@IR};X1>aK|KQM!?}zS-_AE!Q^<mJYSwy9PgcuAPEmeb!%|s>rAU{&=x9C)
zI+wrI><*rXO;Zn|xKPwhMdgF-_qN1b-L!`Z*g*uBD=?WK!Yvbb&paV%^o~&4LGB>;
zfs+L=+QqfpWo#pUMhctJ{GM45H~%hn#`hN}DFJfQ^}|#5;mg`C(8~L`>$*Ru-g8-q
z;qzLWaFLsB)X^!bL})&YAM+O({A4jhZOX^~_#xy-H8PVS5OPmv8wupGf48Egqr|7p
zj+rH<9xI(}mk4072|6-bBu)%Hi<PHTdOpDy8f&9$HaIM(3QTJ->bg?*<Po#)>&1;H
zOY<+lNVJj6y04?`KJd>|oXIPHd-*7ns@ON?S%i+gCQUNLn;{bdzl_7*qF3%}p~kTi
zqVye^MiYd>XU&Q$JQdtM-8Fx(+1*VQNkJ?T5XwL%bRtnC7o1kr#JjcsRE?{apOgd!
z>7`S_L?dA-+byXT%bi2dPANcSZQ3pPrvq$jAa_6a345!OZ{P1{GDPESNEyKp0arMj
z7`LbdNs<#kWULkG#zwslm!6O2Bz^e-q*}l*tHzryp<zHS+spio+N3RQfcfsJia#4l
z7<dU2u%rCd)1SwEB{DOx6!S}{d(b+;!QX!4IUD#PhMVFc*x&-6{Q-p+`p*+yxLCK#
znw<mv-%8fwJFPw?5PSM5f*}fsPUISn<62XX(DX?(NUM=|e)^+h;+Sqn&Erlk&t(AL
z970IT6qvE5LZ3wz!9^OO1MgVm_-%f5+=wH%`A4}*m-zoR>(wKaH;VY3fsvi1LckZ~
zvOwqNR55Ru0O3aRK&O}bTH%m(8|A`8S+(uew9U1NKaQVVoOJoKytWRa5VP)h&ESC}
z5@MYv+}F3Zol!V<Q4OSY*5G&4p6Bp!iOo%G&6{-$ITN}w`&vjm?#CvNP-M*0!`}a+
z$}zY+W|VnVpg-r`^_CLOxs@)_9dUk?q0bNgh;kys#VyZ}_MJGv`NoUFX+~swW$h{F
zTdRWZJo+pr8(XD5U<_<<r~DX!(9Oa`>!$=7UX}cnyXx6+s)%N}h@h3iB{`r!a>}*$
zWg<Mkn$_2%Ogs_5amb62w+v;V2&;$vn$kPdn{u=<?_mh~@(x0t?;%M-Qi}p~k3Anh
zfWz0w$0#gOP78e_8B1BMvE|jVqD6DqB4p$zBM>_$#h7X3gNY8hd*%?YvUzSATAV#1
z!$s`?%dBZpZJ_RRlTkOZw4V$uL*_b}yWVOV*Ej5)y0cttcsT6%{KzS4;RFv}7D_up
zqbHhcnH{jm*l}}<wCIxJy$hUE_T4LWrjh-;LBf<V&PZN8T4<kSm+z-aL>e<LJINMw
zGB2rn&A9e^Yi=`Oi8WUe>r?PJ+i=?`9p5YAlTe6>0?Yh`*d@`AG=E?gm`+6cA!HTq
zp|hD{vxe=>c&(ELn}w$_+cJu>)zaN10WI9^ovs%7eDCfKX)A|7brRWJ-Er!o76Cb~
z6_EismTlRzn!}oC%mprlGe;TP^WEknk(2<y%*;#;V@2bQwFJ*Nk3|{VqVIZzX|Q!@
zOHDOU@AnZ17tS$yJcqA4`=IC<HS-m#NXN>Js__{#yMx#9RTkwqQ?PX_1;zAWd-k6Z
zXE&?d!8aan36#6;y6#$QJnlG^V<PXIUw@bG<0NyZrcl)9P%DrQZMMt4-RSO!P4qH~
zUnW>TA6?p~vMS%=pNrz#`c>`_f*?jrHPedk3iUVVKI`gOJJ{RL+beQl5o6~*x~p?3
zy*%lvsi5)>y%Rriku(U+;f+JZLo()abbLrZE_uLl%#)p(Q}H-1Xl>&e06>c1ywXpy
zqs7qe%yWX4k18fShj=?HG@rcPI9X>kYRHA_%{M#?6{aEZ^rr0nT;dM^sKBlp$LHn!
z4?uRequVNRdS#{PW_^d`AhV|*@xSoEhy;eElyaz4ygDvwvQRdwHr0B2z>$JH=^vc2
z-!IHjc-KddUh~~G9qeAyjL$VtZsXR6xo3v+(*=8}kKc7Rc$=FCsN*WO2|>X<$f;FW
zj};iOO2j=H?H*69Xp<SZ0yDn<A5y|eb3@NaHe=wpABFcz3Iy$BG8+<4bG|u8GEb|^
zaa-u<&%LCW2p0HLrrGZ$Rxx2U)7gQ1+%8@J<j9rH%4Hqnu`&8Dfk0a{k(%MP!QcZn
ztNA+2fx}a6>$=BdRE$en^3f$*m_m^-NQX?sTyy4UIFvgY0*eaowE|bP)O=QnV2Hh<
zl+8A5V9IWqe*$OJ%?%|wiHZls!w{$sKsm8JGgH2Vs45p&#_*gxlMKT+Pd9o0XUg!{
zS{l*Ij1!LDz9H>;$K<;EqFyHqB9aC?2{B={1%mp>tprKp9;@kxHz~<>#Rx-obhH3w
zGu|*uzhKicx~ykH4!!xEUuBT&!@U+As?r?8m-C_vTlUz;V&6()CpV7!oLl2Z-`Sd@
zhOR+7b6b5zIm|g*_;m6(WPKiwdZobX;p4$Jytdn>3(9cn+g{^|FB*R6Xj~sWqz6Nc
zr>6gu&KHI%=(_`C+({#&DJUyw&S!bZ+04xh^M-iNvlR<^l5T(Wp`p-Oxg(P&2kSF(
zM|zV1xaS#~ct1uLDFf4@i@cu}s^8NCsmWr@c>&trsA`E}xP+Xd!OqE?IJ#I_FnjH|
z<(<+|_m6-)awd;bd-mkW$jB)MCsM@%mCHCJ%p{ct7oL;v|92K3I~is^0aGV}FuzO-
zyc%7>Z9QhrU(6SyIp}iRrSEa3@ol<VUt$CRD>~boEF|jBmg5?5Xy7`m6Z7;t1tJVr
z=`$yBAsf^pg0~Bo%P&{<@j!3wn(KbCF1oMn0)^_TvY==ugLjyTCJ_x=7QF%Q?<kI3
z(%33hi(lxxM%Q&V51}FnG~UZE<~I&F$<-jzc=YDL^+n0MM%pz86{T&Z>2N}EsW+8#
zQ?N5+)4ddysg>Pu4;{On)Mvc34(RuCgpNJ}W#Ski=rDX*S_lI1J;?G9=ip39+D#%0
z-?DUZjBxs-<>=l2o8Q0GS%{hp<3i&t*c0`t^#Mbvozlg(rt>|;vOwXAivvwDTS5CV
za^0@VH9xSFo&~>B{GGvB8}j>wMk@9O<@C|@z=p%dpFik;L!VL!{nfARYmfv@Eq+rx
z=O#ZH3r~_0ONt#O@x<`>Sq??W_**qPkXi;cEvckz7}#CtonXK_pPxuUS*<cipCCc)
z{SW7v{Qx7cI8$B&=vt`9WUnLZqIS&Rty;Gc_7uoqM`ZbpHCEuhe_WdW-i$Z{uEMx7
zM@wX_D;(;X>CM!&<9=I>!0cX7m;F{R_yjbhp-8gRR13CK|8`s;2q}a0c}hBnSOnM0
z_iF>A%`JD@M@bTj&E{noZ8|Y>r0!N`Jf}aR7=S8-QA<3fa@?!W>f2dD3ZK%(j*7ib
zh&gzUR~C~1o0x)HHYQzQ@R32uG14@`;J@w<DfHoXxQh4?MVk2H5V-!93S_vR7u<>c
zWo@c;z5eE3n!!^GSg;yJK`yn(vcDd8ninK8Hb<04GnjJHl+r422ySP(Rs36xk^6{@
zPri?(K8Phb+NLV831r7`Td}J=)deyMy2n8#7%Ub=YgWMcLn6mE-jG64+$l#?#P0Xs
zSL+acKc2^j!rad0f8VX!sdg4k&R2O=_>+>AztwQ*h2qxeKXM)TA@i6A%IQ~)&nF`b
z$rFKlXjK#R?GoRyk9<g%Ah{><X|~}qNjS9@(4stMxc1g8SqY=7AE{Ac{vg?SAxIej
zc-f8ky4+^rO;ErM28?TQlp5yRr|IJQqQ>(Yhi(Y&D}MSkfw!>3Lb90s`7F>oKna4C
zZSHP8M5f#0?m90Hg~ny7*1OGTq{8C)yW^-$L?wjKr0((O-)J1ZZvr&qF}l!2Z~cPe
z8mtfEe19vGP{duQer`P)i%bUR+Jh{g)<Fh)co5)TwYsy_oQP^a4a~XIS^dHiHT+H~
zp~$8(PqL%i!9_i3mP5WH+ON&z{2y0Yb%V2T;+t}Vc`w+KU&(1Yxj6(uzw6BZ^T*uG
z49viGv{%;X!I-9-`dw~Dx{*b>9Je@yEwjV(`$UfBjVobDORzag)%d<H#WN)_3ws4c
z$r~kZ3K1n^Akg+VKPuXZ-gdNK*4A9kicmy@J@`a=v&*r&u4CF~wf<k!9W<`Vbf8D~
z!>&8ipQtg}eII$>#DjlHSpQ}R@~G++?9ejFYf}HHijMZ7{iMym!WzZf3&oK-j9~qZ
zw*U>dpLdpI?y}?|{#I*+#LE|JO3N2wWyh4?mYaY%GgPuQR02zFfJ)T-k0S<lI-vBR
z?P12R2mZN_gCAVb)TW#qKhtA)IT$fXBuIc*Xu~1ISi~!22FfVE>aa2bdpJTf(H3cB
z!FwXsz45LzX`n+dVv@1}Rv8EJx}p)Kt1#4g!%!$4ercNGqE<&A+=?&??*A;T9tEP$
z!J}(ksWnza=ND|!DPwn4xL@^M-)TI(cU7JFqmK_R=W`SB=Z0tma2*WAyZF~jx85U1
zIQ;O+;UY}q>gV1yhqS6scBhGIS-M0*v`yNFKrnoqcge$gA;`MagHpOxTVof*4R;Dx
z>!$)}oOez6UK#$!9KIq}!YZdvt#OzkN14h(Cy|XvQ!{glw}-O)u$6a&YDUFNzSOkh
zrQe||bm#f}my!;xBe*a=_3s%@v{F5Uc)=3LU(;4DS$Wfl7|n;IUxz%yeX+%ON(GW|
zoEynhv=VHzUHtB8g8tvWR-E)ZjFQB%TKBBUM-z@S91p+n)wdA%(rH9XYa030gr%I<
z0y64NMgVcP38}MtMT?P2>JWvm6ZncH&94=Q%U!a3HP(S0KT>_z9U;BUp!T4nY=#w(
zB^I~F4G5-5NvZ&VPDqVnH=aBk7~+vHVXQ={P!#aSWg7(l@-9;ceKpDR%b%Nk>p~VL
zPNcsb&ShWNvHV!ifAWYXQ!n6EqYc!`n8jh3F=-5y#i@#xci)Ew`f*NRSpkO+2wu|E
z$_Oc*Yztuhjyn3JS7WtDGBy5Ok{OWj6l)f#&!6ev23AXACEC15O47T$<1&_mOBjXQ
zQ}MDgnm2<X_)pEa02`f`OlG4_68PhEtsn8OJy=bB%$}BVf9QXNNaJ@-8{Eb}%?{g^
z0H|Q@E&1QruBMWlqj|D%=Z2aN?#Lu$rpd4WHXRPXyd%GzlA5pue4X_Oqxdu1g*$CQ
zaKhPchX<6?Ch+WnO5~B0GM3AGH`wt7&<kkjQ%sxH=pV5<RNsR-+`RwwlR#TJz_Yq)
zt)ZK_cm9Rwz6V~`T5j53(4{4U+5wn)!buU~*|PAsVI=@!K9s{Z*{Sjy`HSRI?bvmI
z3kv<A%DdR6-46AU)h^Tv9Gt8TtW6kT1TRmfcAil8ZFQ18Ycr^C9a(0hL+`^BBpOlg
z9~)wYIcHgqYwB3D1=IrbWnD(7!e=hqOy6Ir04>vBx!M+RY#mS<gzhI|k#^iFXS>g<
z#9nQ@V&c}jMr<;3AN%vv7V>^3dBk%(7a?Px26Tk_#*Ueic_9_%ZImZ7C5VP$f|%D6
zJ8BnJRqmFzWtR^`?hLuRcZpkQvkv@PW=2%&NyF?d*zK<~rbikBr~GcS)j>TMc?Cyv
z=U8afq<YUlS-ExvDNZd(B0z8$B?x^b=EpQym~rW6uzaZ<i;K-9MMYRLeIWLr{?6g#
z7q=l+>76GBgynSDe7)K?(EGA{s=vxa(YP?VQb00S`AbX90h66F*%i~L$1D!u-f7Tf
zsoKG91l)9|?Z4+6X9Tf#T;5ygq+XF)<m<W|8GqkPHyZlSGO2W)`3aEi718Fh`0*hT
zorqe=K~TZLbs_DXHH*k?(&BKE2qP}?JWVRrt7&6d4H~dgXw`;0=4DEXnx0T!8kHjY
z@v;GRM!;5W;49y<{qV8tvd$A*;>T!ij)d1Xz!>1+I)zC@(fBcT_A;d({?KFY1L7zz
zmh`<)n1)8E)%Al%cU9cox&+0pEYuWwI~b!+YlRLY^x<ZV=E2R+j{<BzTfD%rQ93m`
zR-c+Tj@_y21GkN)VDQhS(as8ikZsO5$nDJKJRF>U8H>||V%)L_piZTU>BC{*P_N-6
zZy2V|_haLJnBT`R(ua_nLT{)m$8wL<Cz0fpJR`S>7pA<a0fkscw@F?$%$=ji4<Yr4
zGytpF<0&~)4z?am3{#~TkS=}K-12tKYrd|;RPkZ=F6a0GLwK9-x;Fvk{<k>>Nl~h7
zY5F+#GxWiAI-Wr&KeOd&%j7@gERlZr9WnFkGZ+I7a40iMwqJj~w7eJMS#Tix=KrUg
zUSpbzM9anLOcl6#Xi$1^?Vtuyi<tQLO^3$)d0Ns+MvM~8yHoe<(`;o`A4(9#e-=hh
c`W@kiW_ibZY=55P4#NVTX&P!&so6#R5Ay3`xBvhE

diff --git a/data/skins/default/skin.xml b/data/skins/default/skin.xml
index 78dfe8b48..7ace8eada 100644
--- a/data/skins/default/skin.xml
+++ b/data/skins/default/skin.xml
@@ -294,6 +294,10 @@
     <part id="timeline_fromboth_normal"         x="240" y="108" w="12" h="12" />
     <part id="timeline_fromboth_active"         x="252" y="108" w="12" h="12" />
     <part id="timeline_gear"                    x="264" y="12" w="12" h="12" />
+    <part id="timeline_gear_active"             x="264" y="24" w="12" h="12" />
+    <part id="timeline_onionskin"               x="264" y="36" w="12" h="12" />
+    <part id="timeline_onionskin_active"        x="264" y="48" w="12" h="12" />
+    <part id="timeline_onionskin_range"         x="240" y="120" w1="3" w2="6" w3="3" h1="3" h2="6" h3="3" />
     <part id="timeline_padding"                 x="276" y="12" w1="1" w2="10" w3="1" h1="1" h2="10" h3="1" />
     <part id="timeline_padding_tr"              x="288" y="12" w1="1" w2="10" w3="1" h1="1" h2="10" h3="1" />
     <part id="timeline_padding_bl"              x="276" y="24" w1="1" w2="10" w3="1" h1="1" h2="10" h3="1" />
@@ -409,6 +413,28 @@
     <style id="timeline_gear" base="timeline_box">
       <icon part="timeline_gear" />
     </style>
+    <style id="timeline_gear:active">
+      <icon part="timeline_gear_active" />
+    </style>
+    <style id="timeline_gear:clicked">
+      <icon part="timeline_gear_active" />
+    </style>
+
+    <!-- timeline_onionskin -->
+    <style id="timeline_onionskin" base="timeline_box">
+      <icon part="timeline_onionskin" />
+    </style>
+    <style id="timeline_onionskin:active">
+      <icon part="timeline_onionskin_active" />
+    </style>
+    <style id="timeline_onionskin:clicked">
+      <icon part="timeline_onionskin_active" />
+    </style>
+
+    <!-- timeline_onionskin_range -->
+    <style id="timeline_onionskin_range">
+      <background part="timeline_onionskin_range" />
+    </style>
 
     <!-- paddings -->
     <style id="timeline_padding">
diff --git a/data/widgets/tools_configuration.xml b/data/widgets/tools_configuration.xml
index 6b7b81d09..fcce211ee 100644
--- a/data/widgets/tools_configuration.xml
+++ b/data/widgets/tools_configuration.xml
@@ -10,7 +10,6 @@
             <check text="x" id="tiled_x" />
             <check text="y" id="tiled_y" />
         </box>
-        <check text="Onionskin" id="onionskin" />
         <separator text="Grid:" horizontal="true" left="true" />
         <check text="Snap to Grid" id="snap_to_grid" />
         <check text="View Grid" id="view_grid" />
diff --git a/src/app/commands/cmd_configure_tools.cpp b/src/app/commands/cmd_configure_tools.cpp
index fa31b0acd..12ca05531 100644
--- a/src/app/commands/cmd_configure_tools.cpp
+++ b/src/app/commands/cmd_configure_tools.cpp
@@ -71,7 +71,6 @@ private:
   CheckBox* m_tiledY;
   CheckBox* m_pixelGrid;
   CheckBox* m_snapToGrid;
-  CheckBox* m_onionSkin;
   CheckBox* m_viewGrid;
   ISettings* m_settings;
   IDocumentSettings* m_docSettings;
@@ -83,7 +82,6 @@ private:
   void onPixelGridClick();
   void onSetGridClick();
   void onSnapToGridClick();
-  void onOnionSkinClick();
 };
 
 ConfigureTools::ConfigureTools()
@@ -121,7 +119,6 @@ void ConfigureTools::onExecute(Context* context)
     m_viewGrid = app::find_widget<CheckBox>(window, "view_grid");
     m_pixelGrid = app::find_widget<CheckBox>(window, "pixel_grid");
     set_grid = app::find_widget<Button>(window, "set_grid");
-    m_onionSkin = app::find_widget<CheckBox>(window, "onionskin");
   }
   catch (...) {
     delete window;
@@ -142,7 +139,6 @@ void ConfigureTools::onExecute(Context* context)
   if (m_docSettings->getSnapToGrid()) m_snapToGrid->setSelected(true);
   if (m_docSettings->getGridVisible()) m_viewGrid->setSelected(true);
   if (m_docSettings->getPixelGridVisible()) m_pixelGrid->setSelected(true);
-  if (m_docSettings->getUseOnionskin()) m_onionSkin->setSelected(true);
 
   if (first_time) {
     // Slots
@@ -154,7 +150,6 @@ void ConfigureTools::onExecute(Context* context)
     m_pixelGrid->Click.connect(Bind<void>(&ConfigureTools::onPixelGridClick, this));
     set_grid->Click.connect(Bind<void>(&ConfigureTools::onSetGridClick, this));
     m_snapToGrid->Click.connect(Bind<void>(&ConfigureTools::onSnapToGridClick, this));
-    m_onionSkin->Click.connect(Bind<void>(&ConfigureTools::onOnionSkinClick, this));
 
     App::instance()->Exit.connect(&on_exit_delete_this_widget);
   }
@@ -238,11 +233,6 @@ void ConfigureTools::onSetGridClick()
   }
 }
 
-void ConfigureTools::onOnionSkinClick()
-{
-  m_docSettings->setUseOnionskin(m_onionSkin->isSelected());
-}
-
 Command* CommandFactory::createConfigureToolsCommand()
 {
   return new ConfigureTools;
diff --git a/src/app/settings/ui_settings_impl.cpp b/src/app/settings/ui_settings_impl.cpp
index fac6ccbc2..b5dfbe236 100644
--- a/src/app/settings/ui_settings_impl.cpp
+++ b/src/app/settings/ui_settings_impl.cpp
@@ -418,26 +418,31 @@ int UIDocumentSettingsImpl::getOnionskinOpacityStep()
 void UIDocumentSettingsImpl::setUseOnionskin(bool state)
 {
   m_use_onionskin = state;
+  redrawDocumentViews();
 }
 
 void UIDocumentSettingsImpl::setOnionskinPrevFrames(int frames)
 {
   m_prev_frames_onionskin = frames;
+  redrawDocumentViews();
 }
 
 void UIDocumentSettingsImpl::setOnionskinNextFrames(int frames)
 {
   m_next_frames_onionskin = frames;
+  redrawDocumentViews();
 }
 
 void UIDocumentSettingsImpl::setOnionskinOpacityBase(int base)
 {
   m_onionskin_opacity_base = base;
+  redrawDocumentViews();
 }
 
 void UIDocumentSettingsImpl::setOnionskinOpacityStep(int step)
 {
   m_onionskin_opacity_step = step;
+  redrawDocumentViews();
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/app/ui/skin/style_sheet.cpp b/src/app/ui/skin/style_sheet.cpp
index 026eb37dd..9f62023b7 100644
--- a/src/app/ui/skin/style_sheet.cpp
+++ b/src/app/ui/skin/style_sheet.cpp
@@ -102,7 +102,7 @@ SkinPartPtr StyleSheet::convertPart(const css::Value& value)
 // static
 ui::Color StyleSheet::convertColor(const css::Value& value)
 {
-  ui::Color color;
+  ui::Color color = ui::ColorNone;
   if (value.type() == css::Value::String) {
     const std::string& color_id = value.string();
     color = get_color_by_id(color_id);
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 81ae89335..44aae321b 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -35,6 +35,8 @@
 #include "app/modules/editors.h"
 #include "app/modules/gfx.h"
 #include "app/modules/gui.h"
+#include "app/settings/document_settings.h"
+#include "app/settings/settings.h"
 #include "app/ui/document_view.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/skin/skin_theme.h"
@@ -91,6 +93,8 @@ static const char* kTimelineFromLeft = "timeline_fromleft";
 static const char* kTimelineFromRight = "timeline_fromright";
 static const char* kTimelineFromBoth = "timeline_fromboth";
 static const char* kTimelineGear = "timeline_gear";
+static const char* kTimelineOnionskin = "timeline_onionskin";
+static const char* kTimelineOnionskinRange = "timeline_onionskin_range";
 static const char* kTimelinePadding = "timeline_padding";
 static const char* kTimelinePaddingTr = "timeline_padding_tr";
 static const char* kTimelinePaddingBl = "timeline_padding_bl";
@@ -103,6 +107,9 @@ enum {
   A_PART_NOTHING,
   A_PART_SEPARATOR,
   A_PART_HEADER_GEAR,
+  A_PART_HEADER_ONIONSKIN,
+  A_PART_HEADER_ONIONSKIN_RANGE_LEFT,
+  A_PART_HEADER_ONIONSKIN_RANGE_RIGHT,
   A_PART_HEADER_LAYER,
   A_PART_HEADER_FRAME,
   A_PART_LAYER,
@@ -127,6 +134,8 @@ Timeline::Timeline()
   , m_timelineFromRightStyle(get_style(kTimelineFromRight))
   , m_timelineFromBothStyle(get_style(kTimelineFromBoth))
   , m_timelineGearStyle(get_style(kTimelineGear))
+  , m_timelineOnionskinStyle(get_style(kTimelineOnionskin))
+  , m_timelineOnionskinRangeStyle(get_style(kTimelineOnionskinRange))
   , m_timelinePaddingStyle(get_style(kTimelinePadding))
   , m_timelinePaddingTrStyle(get_style(kTimelinePaddingTr))
   , m_timelinePaddingBlStyle(get_style(kTimelinePaddingBl))
@@ -273,18 +282,23 @@ bool Timeline::onProcessMessage(Message* msg)
       captureMouse();
 
       switch (m_hot_part) {
-        case A_PART_NOTHING:
-          // Do nothing.
-          break;
         case A_PART_SEPARATOR:
           m_state = STATE_MOVING_SEPARATOR;
           break;
-        case A_PART_HEADER_GEAR:
-          // TODO show config.
+        case A_PART_HEADER_ONIONSKIN_RANGE_LEFT: {
+          ISettings* m_settings = UIContext::instance()->getSettings();
+          IDocumentSettings* docSettings = m_settings->getDocumentSettings(m_document);
+          m_state = STATE_MOVING_ONIONSKIN_RANGE_LEFT;
+          m_origFrames = docSettings->getOnionskinPrevFrames();
           break;
-        case A_PART_HEADER_LAYER:
-          // Do nothing.
+        }
+        case A_PART_HEADER_ONIONSKIN_RANGE_RIGHT: {
+          ISettings* m_settings = UIContext::instance()->getSettings();
+          IDocumentSettings* docSettings = m_settings->getDocumentSettings(m_document);
+          m_state = STATE_MOVING_ONIONSKIN_RANGE_RIGHT;
+          m_origFrames = docSettings->getOnionskinNextFrames();
           break;
+        }
         case A_PART_HEADER_FRAME: {
           bool selectFrame = (mouseMsg->left() || !isFrameActive(m_clk_frame));
 
@@ -378,22 +392,48 @@ bool Timeline::onProcessMessage(Message* msg)
 
       int hot_part = A_PART_NOTHING;
       int hot_layer = -1;
-      FrameNumber hot_frame(-1);
       gfx::Point mousePos = static_cast<MouseMessage*>(msg)->position()
         - getBounds().getOrigin();
 
-      if (hasCapture()) {
-        if (m_state == STATE_SCROLLING) {
-          setScroll(m_scroll_x+jmouse_x(1)-jmouse_x(0),
-                    m_scroll_y+jmouse_y(1)-jmouse_y(0));
+      FrameNumber hot_frame =
+        FrameNumber((mousePos.x
+            - m_separator_x
+            - m_separator_w
+            + m_scroll_x) / FRMSIZE);
 
-          jmouse_control_infinite_scroll(getBounds());
-          return true;
+      if (hasCapture()) {
+        switch (m_state) {
+
+          case STATE_SCROLLING:
+            setScroll(
+              m_scroll_x+jmouse_x(1)-jmouse_x(0),
+              m_scroll_y+jmouse_y(1)-jmouse_y(0));
+
+            jmouse_control_infinite_scroll(getBounds());
+            return true;
+
+          case STATE_MOVING_ONIONSKIN_RANGE_LEFT: {
+            ISettings* m_settings = UIContext::instance()->getSettings();
+            IDocumentSettings* docSettings = m_settings->getDocumentSettings(m_document);
+            int newValue = m_origFrames + (m_clk_frame - hot_frame);
+            docSettings->setOnionskinPrevFrames(MAX(0, newValue));
+            invalidate();
+            return true;
+          }
+
+          case STATE_MOVING_ONIONSKIN_RANGE_RIGHT:
+            ISettings* m_settings = UIContext::instance()->getSettings();
+            IDocumentSettings* docSettings = m_settings->getDocumentSettings(m_document);
+            int newValue = m_origFrames - (m_clk_frame - hot_frame);
+            docSettings->setOnionskinNextFrames(MAX(0, newValue));
+            invalidate();
+            return true;
         }
+
         // If the mouse pressed the mouse's button in the separator,
         // we shouldn't change the hot (so the separator can be
         // tracked to the mouse's released).
-        else if (m_clk_part == A_PART_SEPARATOR) {
+        if (m_clk_part == A_PART_SEPARATOR) {
           hot_part = m_clk_part;
           m_separator_x = mousePos.x;
           invalidate();
@@ -401,24 +441,34 @@ bool Timeline::onProcessMessage(Message* msg)
         }
       }
 
+      // Is the mouse over onionskin handles?
+      gfx::Rect bounds = getOnionskinFramesBounds();
+      if (!bounds.isEmpty() && gfx::Rect(bounds.x, bounds.y, 3, bounds.h).contains(mousePos)) {
+        hot_part = A_PART_HEADER_ONIONSKIN_RANGE_LEFT;
+      }
+      else if (!bounds.isEmpty() && gfx::Rect(bounds.x+bounds.w-3, bounds.y, 3, bounds.h).contains(mousePos)) {
+        hot_part = A_PART_HEADER_ONIONSKIN_RANGE_RIGHT;
+      }
       // Is the mouse on the separator.
-      if (mousePos.x > m_separator_x-4 &&
-          mousePos.x < m_separator_x+4)  {
+      else if (mousePos.x > m_separator_x-4
+        && mousePos.x < m_separator_x+4)  {
         hot_part = A_PART_SEPARATOR;
       }
       // Is the mouse on the headers?
       else if (mousePos.y < HDRSIZE) {
         if (getPartBounds(A_PART_HEADER_GEAR).contains(mousePos))
           hot_part = A_PART_HEADER_GEAR;
+        else if (getPartBounds(A_PART_HEADER_ONIONSKIN).contains(mousePos))
+          hot_part = A_PART_HEADER_ONIONSKIN;
         else if (getPartBounds(A_PART_HEADER_LAYER).contains(mousePos))
           hot_part = A_PART_HEADER_LAYER;
         // Is on a frame header?
         else {
           hot_part = A_PART_HEADER_FRAME;
           hot_frame = FrameNumber((mousePos.x
-                                   - m_separator_x
-                                   - m_separator_w
-                                   + m_scroll_x) / FRMSIZE);
+              - m_separator_x
+              - m_separator_w
+              + m_scroll_x) / FRMSIZE);
         }
       }
       else {
@@ -448,10 +498,6 @@ bool Timeline::onProcessMessage(Message* msg)
         }
         else {
           hot_part = A_PART_CEL;
-          hot_frame = FrameNumber((mousePos.x
-                                   - m_separator_x
-                                   - m_separator_w
-                                   + m_scroll_x) / FRMSIZE);
         }
       }
 
@@ -513,6 +559,14 @@ bool Timeline::onProcessMessage(Message* msg)
           case A_PART_HEADER_GEAR:
             // Do nothing.
             break;
+          case A_PART_HEADER_ONIONSKIN: {
+            ISettings* m_settings = UIContext::instance()->getSettings();
+            IDocumentSettings* docSettings =
+              m_settings->getDocumentSettings(m_document);
+            if (docSettings)
+              docSettings->setUseOnionskin(!docSettings->getUseOnionskin());
+            break;
+          }
           case A_PART_HEADER_LAYER:
             // Do nothing.
             break;
@@ -784,6 +838,14 @@ void Timeline::onPaint(ui::PaintEvent& ev)
     if (clip) {
       for (frame=first_frame; frame<=last_frame; ++frame)
         drawHeaderFrame(g, frame);
+
+      // Draw onionskin indicators.
+      gfx::Rect bounds = getOnionskinFramesBounds();
+      if (!bounds.isEmpty()) {
+        drawPart(g, bounds,
+          NULL, m_timelineOnionskinRangeStyle,
+          false, false, false);
+      }
     }
   }
 
@@ -928,13 +990,9 @@ void Timeline::setCursor(int x, int y)
   int mx = x - getBounds().x;
 //int my = y - getBounds().y;
 
-  // Is the mouse in the separator.
-  if (mx > m_separator_x-2 && mx < m_separator_x+2)  {
-    jmouse_set_cursor(kSizeLCursor);
-  }
   // Scrolling.
-  else if (m_state == STATE_SCROLLING ||
-           m_space_pressed) {
+  if (m_state == STATE_SCROLLING ||
+      m_space_pressed) {
     jmouse_set_cursor(kScrollCursor);
   }
   // Moving a frame.
@@ -963,6 +1021,18 @@ void Timeline::setCursor(int x, int y)
     jmouse_set_cursor(kMoveCursor);
   }
   // Normal state.
+  else if (mx > m_separator_x-2 && mx < m_separator_x+2)  {
+      // Is the mouse in the separator.
+    jmouse_set_cursor(kSizeLCursor);
+  }
+  else if (m_hot_part == A_PART_HEADER_ONIONSKIN_RANGE_LEFT
+    || m_state == STATE_MOVING_ONIONSKIN_RANGE_LEFT) {
+    jmouse_set_cursor(kSizeLCursor);
+  }
+  else if (m_hot_part == A_PART_HEADER_ONIONSKIN_RANGE_RIGHT
+    || m_state == STATE_MOVING_ONIONSKIN_RANGE_RIGHT) {
+    jmouse_set_cursor(kSizeRCursor);
+  }
   else {
     jmouse_set_cursor(kArrowCursor);
   }
@@ -1001,12 +1071,21 @@ void Timeline::drawPart(ui::Graphics* g, const gfx::Rect& bounds,
 
 void Timeline::drawHeader(ui::Graphics* g)
 {
+  ISettings* m_settings = UIContext::instance()->getSettings();
+  IDocumentSettings* docSettings = m_settings->getDocumentSettings(m_document);
+
   drawPart(g, getPartBounds(A_PART_HEADER_GEAR),
     NULL, m_timelineGearStyle,
     false,
     m_hot_part == A_PART_HEADER_GEAR,
     m_clk_part == A_PART_HEADER_GEAR);
 
+  drawPart(g, getPartBounds(A_PART_HEADER_ONIONSKIN),
+    NULL, m_timelineOnionskinStyle,
+    docSettings->getUseOnionskin(),
+    m_hot_part == A_PART_HEADER_ONIONSKIN,
+    m_clk_part == A_PART_HEADER_ONIONSKIN);
+
   // Empty header space.
   drawPart(g, getPartBounds(A_PART_HEADER_LAYER),
     NULL, m_timelineBoxStyle, false, false, false);
@@ -1167,6 +1246,23 @@ gfx::Rect Timeline::getFrameHeadersBounds() const
   return rc;
 }
 
+gfx::Rect Timeline::getOnionskinFramesBounds() const
+{
+  ISettings* m_settings = UIContext::instance()->getSettings();
+  IDocumentSettings* docSettings = m_settings->getDocumentSettings(m_document);
+  if (docSettings->getUseOnionskin()) {
+    FrameNumber firstFrame = m_frame.previous(docSettings->getOnionskinPrevFrames());
+    FrameNumber lastFrame = m_frame.next(docSettings->getOnionskinNextFrames());
+
+    if (firstFrame < 0) firstFrame = FrameNumber(0);
+    if (lastFrame > m_sprite->getLastFrame()) lastFrame = m_sprite->getLastFrame();
+
+    return getPartBounds(A_PART_HEADER_FRAME, 0, firstFrame)
+      .createUnion(getPartBounds(A_PART_HEADER_FRAME, 0, lastFrame));
+  }
+  return gfx::Rect();
+}
+
 gfx::Rect Timeline::getCelsBounds() const
 {
   gfx::Rect rc = getClientBounds();
@@ -1196,9 +1292,14 @@ gfx::Rect Timeline::getPartBounds(int part, int layer, FrameNumber frame) const
                        FRMSIZE,
                        HDRSIZE);
 
-    case A_PART_HEADER_LAYER:
+    case A_PART_HEADER_ONIONSKIN:
       return gfx::Rect(FRMSIZE, 0,
-                       m_separator_x - FRMSIZE,
+                       FRMSIZE,
+                       HDRSIZE);
+
+    case A_PART_HEADER_LAYER:
+      return gfx::Rect(FRMSIZE*2, 0,
+                       m_separator_x - FRMSIZE*2,
                        HDRSIZE);
 
     case A_PART_HEADER_FRAME:
@@ -1304,8 +1405,10 @@ void Timeline::hotThis(int hot_part, int hot_layer, FrameNumber hot_frame)
                    m_hot_layer,
                    m_hot_frame);
 
+#if 0                           // TODO remove these lines
     if (getPartBounds(hot_part, hot_layer, hot_frame).isEmpty())
       m_hot_part = A_PART_NOTHING;
+#endif
   }
 }
 
@@ -1351,13 +1454,6 @@ void Timeline::showCel(int layer, FrameNumber frame)
     setScroll(scroll_x, scroll_y);
 }
 
-void Timeline::centerCurrentCel()
-{
-  int layer = getLayerIndex(m_layer);
-  if (layer >= 0)
-    centerCel(layer, m_frame);
-}
-
 void Timeline::showCurrentCel()
 {
   int layer = getLayerIndex(m_layer);
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index 1df526def..5f902a380 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -61,6 +61,8 @@ namespace app {
       STATE_MOVING_LAYER,
       STATE_MOVING_CEL,
       STATE_MOVING_FRAME,
+      STATE_MOVING_ONIONSKIN_RANGE_LEFT,
+      STATE_MOVING_ONIONSKIN_RANGE_RIGHT
     };
 
     struct Range {
@@ -100,7 +102,6 @@ namespace app {
     void setLayer(Layer* layer);
     void setFrame(FrameNumber frame);
 
-    void centerCurrentCel();
     State getState() const { return m_state; }
     bool isMovingCel() const;
 
@@ -144,6 +145,7 @@ namespace app {
     bool drawPart(ui::Graphics* g, int part, int layer, FrameNumber frame);
     gfx::Rect getLayerHeadersBounds() const;
     gfx::Rect getFrameHeadersBounds() const;
+    gfx::Rect getOnionskinFramesBounds() const;
     gfx::Rect getCelsBounds() const;
     gfx::Rect getPartBounds(int part, int layer = 0, FrameNumber frame = FrameNumber(0)) const;
     void invalidatePart(int part, int layer, FrameNumber frame);
@@ -171,6 +173,8 @@ namespace app {
     skin::Style* m_timelineFromRightStyle;
     skin::Style* m_timelineFromBothStyle;
     skin::Style* m_timelineGearStyle;
+    skin::Style* m_timelineOnionskinStyle;
+    skin::Style* m_timelineOnionskinRangeStyle;
     skin::Style* m_timelinePaddingStyle;
     skin::Style* m_timelinePaddingTrStyle;
     skin::Style* m_timelinePaddingBlStyle;
@@ -189,6 +193,7 @@ namespace app {
     int m_scroll_y;
     int m_separator_x;
     int m_separator_w;
+    int m_origFrames;
     // The 'hot' part is where the mouse is on top of
     int m_hot_part;
     int m_hot_layer;