From e45ddaa40f9f6734ea8ab8dc11ed3c952692e247 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 11 Aug 2020 17:02:49 +0200 Subject: [PATCH] Doc: Describe the Transition Editor view in Design Mode Fixes: QDS-2183 Change-Id: I1dac82af6b7d831d23fc7c93fa7750719f1578d1 Reviewed-by: Thomas Hartmann --- .../qtquick-transition-editor-settings.png | Bin 0 -> 8446 bytes .../images/qtquick-transition-editor-view.png | Bin 0 -> 8771 bytes .../qtquick/qtquick-animation-types.qdocinc | 70 +++++++++++++++++ .../src/qtquick/qtquick-components.qdoc | 2 + doc/qtcreator/src/qtquick/qtquick-states.qdoc | 50 +----------- .../qtquick/qtquick-transition-editor.qdocinc | 73 ++++++++++++++++++ 6 files changed, 146 insertions(+), 49 deletions(-) create mode 100644 doc/qtcreator/images/qtquick-transition-editor-settings.png create mode 100644 doc/qtcreator/images/qtquick-transition-editor-view.png create mode 100644 doc/qtcreator/src/qtquick/qtquick-animation-types.qdocinc create mode 100644 doc/qtcreator/src/qtquick/qtquick-transition-editor.qdocinc diff --git a/doc/qtcreator/images/qtquick-transition-editor-settings.png b/doc/qtcreator/images/qtquick-transition-editor-settings.png new file mode 100644 index 0000000000000000000000000000000000000000..6fb417161277a717ccbf0e569d148c0a277df078 GIT binary patch literal 8446 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 F2>^D6R)_!q literal 0 HcmV?d00001 diff --git a/doc/qtcreator/images/qtquick-transition-editor-view.png b/doc/qtcreator/images/qtquick-transition-editor-view.png new file mode 100644 index 0000000000000000000000000000000000000000..406b540135f66dca4ba7832fa6ebb88b9547de14 GIT binary patch literal 8771 zcmeAS@N?(olHy`uVBq!ia0y~yVEWI%!0?!Zje&tdsG#~a0|NtRfk$L90|Va?5N4dJ z%_q&kz`$PO>Fdh=goB$$in+}%_ag&?0)wZEV@SoEw|A>cLcZR8|M9$!nxYCz&mB*v zpcAgn0@~9(gdCvc%R20#F8#qx+c#1$%*NO?VIZmGWsXWtS=Xt+0BhPQYw}y$mvE6U`+j_I{%=7m? z->uf^7S}I3$@1^t_x-CEEi$^0%D}+DAggC%a+L$-K&28b5Gv-L;t(g|M$zhY|AEI^ z$!$T_lg%^JKdFJ3wav=2_xc~dw9MS=*D|O3Hk;bG%r);$TBr7Y-_qN+jx1ctD|bD} zz4&p~_1B-J_Jr@y-21OAW7myo?;K}evYqCCe+h#P4+BF&lHT;yN9Uh=aku>b)gNDa z)XEv|Rlm3G^*?`M_xpXXFPBz{{yQIUw|-Ia^Dm1(cuL(;j`FYn6|MXG`u_{!*Y{m% zZhroXEjr(KXW^tIC${X`i=V4LT;ck=>_z>`HM{oQ{JkZ=G{1-WRM0Flu`53E(Sq+c zvxoct;gT(u4L*Cfy5*hQ_MfM|_n&-Pl(~AZ?AM=x50{mwrYwKaaJ>6*!?MaZ3|oS{ zAF3^l7Akqg*)M)W@1?)ncllXY3ePh$FgUnN+g5GqlRurkh4}&BzvKN+GrzpJXcxQu zy6u14=IX47iZ!3?tD}FmzF)OwQ_TObX9K@-aa}$z;h)r{~pW}bj9q#c6f4c4lX&cHFVx@wQp-#Z&iE>k8647lp8f;?G$F-vb;y(8LrvZ)(i{` z8C#eioPVG%$?-qYap9}$o7eCA^G&-pI&xw0^RCi&-Q1h3mi{|fd-b%~x~^4RvE^Y~ zH!qpBc(3>LWv7!Owc4e&aG2UC?aj;-)^+}RJ0MG}P~NpHV`b{BqN(fOuzde(YH=uL zhv!S*ZEv=0@zbxoQ~qmNzqIYUWv{dMs-1s+I-7O*l=-IKy~R~~gn~b9eeOSd*1Dzd zHvaLf{HfcXC zvaAi6sG=FKKDqp4Xtm3(xbA>;&jnxBq|ToeT70`v=V|)?WokZFb&KCjVLrR%&W){C zH(y;5Xy51TEu7VtwmU{|Czsi)CtJQ;yMFUX@(I5TiK5r{zw5mX%v=0))~fYiXW7ix z&ljz$*>v-^(4@;MzWGmgPMR`pO^ev|N0GCgy@kKMuq(H|!uT?LEB~U8W_kBNGcYjR zI#&B-=T`X=-?;Ywr(Uhz_2q5&tNWYt@9w#$C^%`!ByI68sW+#u`nAsM>h;yN0b#S= z&3<>W;eCO8=KO04I?FR3pU-AqSvzf0Nszp_mzPIa)VnR)=Gw&k*ywlaaYor6F58Jy z*9Wt%U9-9K_=no_^|>1QeR@aXKV+jag= z;fj)Z5E%XNxYf&@!6v%lKi{!md}H?Q!nNm&3=9>yUtU~{`+K0=Cc1W(75jndd-(p} zkNY1se~PGP>4A*9A~P3!cwlh$&q0&g+P7Wjrp&u~b5pU`KE=R?;Z9%A9@T!8$r;*V zy5p~?SYFUCldJP4L@nsejMEX`?{qvy@9m{SV(YdfGi^QZyjNDhpYx>G>DslO{(4+r zm)mC9dK~w^UYohI>g8|@0{FFd-U~(_mjMD`@Ow( zeERtp_5MG~W#{a3mux=vvVZ=Y>*3-1FTS_CxA=eg%O(Gww|uSo+c!7L{Ev9o+OCVd z)9$@pz2U)>Pj}ayYoS&^+(jw`@n$ zwN&k+_pi*3{~!9;>vkE!)NIFJiV^{<;d-9u*{L`@2`PmE1v0};*h((kL#`db+=UQgGm!pA8IbG zC=R*t@h|62&YPN5ivqj0W`~6tt8YBDZY`^HX;D;ew$~xKyWt6IrtfP@KfnL?k%Zmb zv8P3CHE*6(juR@Ui?Me1;#I`=&zH|yihNh$ZEZdboA zJoL^fvug6ut2TV8>R0S{Zoip(2V6S6xV7t+c#Y?!8HUNTYWD%bO}b zCSBi_dpk--!6@A%|3J$Q%bOU|38!e^O@ z{rL48RO1M6cu&)rsA_0n=VJukOm`bpKm*Am(ONa}O2#DBl@VWHq;~E=F&WHnMe)9C`%ij8XpL{iPNPk*l z_4N?9{)>n0^3$$nO+EcI>s$Z%4ngHD1rMD(FTJn(Zavqkbd|CD5}Rp_Rums^;vq?cb_`Qt~$(W6H_C)xe|5hpQ~>kW*| zCExFsXaD)}@z#dK=6(Nuy>^&>D^xh|J!uWBC7s^U{P`L)TvXSe*d~7M(^xwbN|I|y+&Jj8qTTO*u4;l(hHf z|6kYlZz+8p78(}zD<}5d_X{&-NZiaZtNr)$`PshSo}LgNpB}q^KOXOT%3$o}<8$TD z&(EQekt@aHYXbB4|J|mdsiWh=Ev6F?6*a5w*X8-IRxY3SsP>w7+oAo@m6bcayuDRD zpP!o>Tv=IpS6*%U>7}Qq>zhll|A@}Z%e%Y(-#x~HoiS3DMN3p(PIQ;MXnw!ua>g0m z?ROR(?H2c*RQBe^!P({)I8)Qpvp+mI`0KFzzXgwv_j^yebm@{w`Z<}k5gVP(+kEah zAGcd?y7$$qSGl;kFN??5Tzqt6{r-PZ%g{QWj75|)6nDn^3S(k;+lQ-+O`k>pG@|@_V<3$#w))wt|V=| zvem7kubE#(=i0W=OTScahdy}!JOADPe-Z2XcQo&RUgBQEq~Lk*;6W~4-dvOa^Z)-@ zzG?I3*T=S8lVVx$ct?z0ue7-vk?`TJI8UtgE`@KCFiaazy4 z+V8RR*}3xj19rveMXn8tV!NoiwIpti`JuyyO>=G-#O^Bbl&|}dc=xB#q?D~uqB1gT z?En8fFJ+k2lDG4z*wg3F%jbQVzr|;F@pH{(Wt)CH)j4~=C~8t{HoyHc6VIT1*LR_&LI?zc83x37!a`)Yd>gT&*aoh6^ony=oqE9&RZpIm%=>$rIj9z1AO z_GZSj^Yhm~d6KgC^EqofUXgojO5bP1?X4<2C$nqGr%#{C=5CP_6jb#5_35;J>eeXf zy?nZ2-FmURR8}r~x+i$+U!LyJkGni)y`PZ9^hZkf_v;!_+aEKwzsc@Bo8NENT7N$7pK12B3RAwfQx_av{Y*p4>(-kYizhj^FL|PERae*dY{|R} zY}I||^zJP?Tf8Xi`1FkT%HCUIP2JySAG>;|D5*KtvV955`H!mAUr$tJUe(I{J4t!g zjU&5W*|FZRaX0n8y5@U;)92SOINoW$GFj^0FIN}2{Akj}cXxM-N=dDnGDU=yo!#8> zT-xT$D=PwLndi%`wRcb#77_|7-+5q}-N7=exm=u_AAeT$w$*nZJ#?S1#Pcoh<9F9S zzIgE>?f8)+S7f5gx6dh;>bn{hYyPpbt4sCdy3Wj>RzcN=U+#alvch-GB%brr{kAXO zQuh7N?YUHF65qDsh1^1U-(|QoSSdIeq-`+Emc)l z`PwgmdyB8T^~tP!@E~EXef_=XuT}pX*17e&Iyx?HopJiPj2|B!o;q{pO8mc1)7`9J zmEW)3uJZEl_xtbnte?E(H78F;lCF? zzklBA+pF*M+^@fuojN@vXiZDo<8xxGT_$mzd%5RX#!_YXP0wEh`1MWM5K$Z*6@Mte zb^4pDzi$23vM7pCoqgH#>Gz|)>lZhhT>qwga(%A7rlw}phJ;3y%zA*OtlPR%^3>^B>o0F&-zDK`_u^;%%PjjB4xHUvb3a$e)*o5-mUWeN z<@U<~#Tw98t`{~B)2nb&8clFB3;Mct?*R2b4acQah^H@In{=V9| zZ(i(=&E~(qe$kqrw=P{-_-jeTQ4#T%!k)ss=koi_-YVtZ*syS2|NYvn^52h7nx~#p z(bwGXa#Um8&f8vnuRU_-`yM*-@qRtig()pZPesmIFl%mu`eET}(nm))V|Nz0hK7djDtOrR?d|R5@qZqP z@2dE?=uO$~XJ=+!t}L52d0J-q;s@_9O#EZwyXG&0LS|80Qdf7$tq*^`WtN|ZCfMU# z+g?u<=3850Ve~Yj@Zo{Gf>@NUG`=LH}5;|>~-<`<5q{QU6uX*^y$;t;R5B` z9j8p0l5t{!qLf8J!sg`Dr%#tYJk+}DDZ}PX5jtFaeAk}OuV1Gdz3ob@?TMs~8X6iN zV%@HwT2-$8&&OTGetPD=SEaKmer({gSGyXs zYxA>HwtUT>Zy%mCW5$atiF>nyLqnJ5-rgqp&-qD-)z=S)`HSZk|F~OzzxI08hxwMp z%i`+)el@#W9~wG!TmJoZpqwVw4T^$ES?gY1zIAd><3DGX685*1f2E$5Sb=K0tET}F?XB9XrKNSNcE8zdU(jHM@|1V`#ozAqQA!ZIdiCn7ySul`)&D8{`u28s{h!D3 zr5_$R&VOT3{^b6gJ^?|X7QA5FSAQQ6%j@es@U=AO$huRJ{5ZdugGcQG*hU**T6 z;=KBwKOE-Y%*;@t7`8eTl>K*=zBZ}&kT7-Hv|mrUV&65h=_-CVP zdNOY5uV!DcVnv7dSEjiU0Ra2DQ{1)@dp!Ey@l54H`wd z@D+9JDRFYvuX=`x=UG?I?)q~$bC=lz_ElW3gU$c9>+A9-gfcK3kk?bYzjD&W?;ewM z^p-d6*9trTs9)sgxBpYW{<_K#9)9}K(~mXNH|NHGVx4jIsbTr+*SFvEmPmre=wifH zulw44b!*+mRXzS!A6&nFs_bXC!}L^+T>FOU>)h_HSs(nIWfuKy zD~r6iE>u^*VS2rV@1xVN7#JMZu5K18DJ=+EaN3~d1AoQKTMhCoyI2?)E}X2nZm)Mi zRl@1K{R7qWldE5IU!2wxpxRRvCLUKEBK^r~i%!Xuo~c!3*CyQREdO$Av8vSfH#)o% zv$j{ag@LO)K)rO^uWo@=wudfd7I32O_>DJpjSHAsq z#cwy!G z7dZ>Mo9g#`-XmB0bd8E;-n-3G-)}9hGST-do?ZwBuUclLpsdw8o%{8!yPnZGAiy}oF5$+D1d=bN@@DTf$W zw_cgOFY?k+275N;jNgp6G#5_)lDV^5%j;sJ4qKgR#haY9F_z(yg+V1#LW=IydQZvA zGdTO+QM}yDe|=7cuXvVv^zC~&|MM0dESp|&ceYo|l(ra+iE9s*?Oi(m`R|$uZr@kg z+wNKXI!C?l4|9Y0C$ks-Y_4u$(V4&6SUf70$szps>w7LnTZ$^D#8rP0&3wAXLHu#J z%un`PD;MnfYWTwK+`RD4MN20A+Pq&cv&v#u`{%Ve`P=HvkH6kGyZiE;sgJ*W`z$?W z`LXriy{EtOkAL&%{qJcaFemQSUa!iq{mb-*(nJEYNjA(rN9K|27eQfsUn@|L2~s`)d2GC_%oZ zG5?3^ALh6$vp?5=J@h_py+VkA;X)uZ{hL%*&##wx5%h5WHc%J$fC|U|hJKsRXN(*5 z7#Tl&p8r2);>3xKdd#vp7ZPr!%Dtv$k6W))YR1enXMDcC zyL+9!Ve|-4x;Vi4tRSQdd zBn+KAJw4l|?R>p%_m#!%-`^TFv+)K+Ma^1RdZ+I9TPdTIj_Z$|ot#Rp$CgV*xkvlV zx4V1cee(Z*e|h)E-v_BM%b9WU6373B?KxA!YpUuC3k!F>-FBM??CZl1?Tw8uU$6o- zS6fL*A}t$HNcx&*zrEYLm|UP*pSEu9oM&-My;UYugV0xBY%6d4;I9 zl~vT^W4*>(_!i$1+BRwO1%15w`%^m zUvyfxZQ98*XF}%N)$WnIzdb+Rcb?773s$$1zP-8GcI^1EV_9!*Y;2o0)1q(@8;`_; zuRr4UR!RP=_3`w~4E|yM>7GHx1%<==`!h2$rEDrTfCI`T`52G$>x|yDkBSyo8mFBx z5c&7}>+9w6e_yz_UGx6I{zvD@qvefyj0_AVMz;HGq+bZ}DE?uN+x1YMT}3>;n~{Mb ztEDb(!G-gF?7MiJIsP|Hck=$XQriDbDrhF-L|B<8^SxVImUA2RjtcC1D4uatI)9Jg z3n9?B?b~&`->uqtu0Ap{azQqu)!M!tTA<_~-7EL{uPb*3xI%+Xo8TRILap;q=UYh7 zn8;ni=#U;B7A6LEUro~o{w+#MN{3b#ra${Ld%m_~x=GD@edbsu28OuBZ$aL}F%b5{ z{*Suu<#%^aPkHiP6jUu|bpBuet+=ZD+4=9k!Q*UO7M=WHU-~NK>^$4uCt1I}zrWu6 zUd7?xrYgFZ-VpRT8_eDN>lEQsZMDXV?TmYnTH&yQZwi&!&# z^Rw*JFK_)mF<1S&u2x-SN~%uR_|7s}`7Awl<1^cg=_%K5-Ko@y3%9m^ohs_R^>gyq z>hC|+*rcvmxR(Pof#J6~*PfkUZpxBf{tUNd|ER9C@UOSk^>o$J)BE-B|GV4LvJdrx zf+mRs|JgLJ%w)&!zY6)#ioytV(gmWP3X;e}Y#-dpGY{r$bQ{{O$e6-OUW zX4K3qayzTe(5HN=|Kx=yZGUZ+cZbLr`}5zjUS`6;z_4KT=l@sh_LNq2*TvUF>}-GT zIjQUO=j_{!GEsZ;7V$loyJqwK#-r)k&(e=(mA^}rt$XwPXALM(GMJnNHBGg&wYf`V z?`>Xx^= zb8-I{oe*Cg(Z6)(@=sgygbsqL5`$IVE%nD=c`CgF`TgzXSDgDn1EIUx^$MTJbExE> z@09%T$jd&w>D&tLxrVF^4!%FWe``5*Zr!e3Ru@zk%wD->&6i(aKc4(F{Z9<9)#AkS z_5z^v`9UfdGzg1-w$a6$@BhqGg%)29E&4I*)r#v5>%IPQzTFzx*2Z<*3=9k$J$W+!R7Kxi_!YkRi}CULj6Wa0vVewrXGDGH z`#*{6{8Vr=jbTCXi)Rn*gDveR&)aOjd{TAz#rL3A>E%_cR=qk0lIWZ7dH(4O-Mvfa zJohSjU;jkI_(Ccufifm>moWbOJgw+Wex=W|6UCs=H<+DQ^8^%T4eD4&m`hd**J*2O zGsiORTDWPG(fVUwAhpSr;K)4T1=3=QWNMz{XouwjG4^oG1;n>Gar3JS*c{!RJm zUAK;H?%55`=WOjVK>1P#LBQay^`FiVOo)XR%ZKqD1+9P$n{;duu;T_w3pNE0L zihuT#+8vB%G?bK-E~qjvF#KR4B8ibuz!Fn3=QQduym)i!)G4OB1`YKL42;)6YXLxI zZiD{~70pHE^Bt~(qT#@Kh~MZ^L2U4x6myPYI%7%P;^TeXphU!AcW@#oh(YZ{P \uicontrol {QML Types} > \uicontrol {Qt Quick - Animation} to + \uicontrol Navigator or \uicontrol {Form Editor}: + + \list + \li \l [QML] {ColorAnimation}{Color Animation} is a specialized + property animation that defines an animation to be applied when a + color value changes. + \li \l [QML] {NumberAnimation}{Number Animation} is a specialized + property animation that defines an animation to be applied when a + numerical value changes. + \li \l [QML] {ParallelAnimation}{Parallel Animation} enables + animations to be run in parallel. + \li \l [QML] {PauseAnimation}{Pause Animation} is used in a + sequential animation to create a step where nothing happens, for + a specified duration. + \li \l [QML] {PropertyAction}{Property Action} immediately changes + a property value during an animation, without animating the + property change. + \li \l [QML] {PropertyAnimation}{Property Animation} animates + changes in the value of a property. + \li \l [QML] {ScriptAction}{Script Action} defines scripts to be + run during an animation. + \li \l [QML] {SequentialAnimation}{Sequential Animation} enables + animations to be run sequentially. + \endlist + + For more information about using the QML types, see + \l{Animation and Transitions in Qt Quick}. + + For more information about animating properties in the \uicontrol Timeline + view, see \l{Creating Animations}. For more information about animating + property changes in states, see \l{Animating Transitions Between States}. + +//! [qtquick animation types] +*/ diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index b601b96a281..cdd21da1074 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -497,6 +497,8 @@ {Dialog} type in the Qt Quick Dialogs module to wrap arbitrary content into a dialog window including a row of platform-tailored buttons. + \include qtquick-animation-types.qdocinc qtquick animation types + \if defined(qtdesignstudio) \include qtdesignstudio-visual-effects.qdocinc qml visual effects \include qtdesignstudio-components.qdocinc creating studio components diff --git a/doc/qtcreator/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc index de25e02fcd0..967555f1ad7 100644 --- a/doc/qtcreator/src/qtquick/qtquick-states.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-states.qdoc @@ -249,53 +249,5 @@ \include qtquick-states-scxml.qdocinc scxml state machines \endif - \section1 Animating Transitions Between States - - To make movement between states smooth, you can animate transitions. - Animations are created by applying animation types to property values. - Animation types interpolate property values to create smooth transitions. - As well, state transitions may assign animations to state changes. - - To create an animation, use an appropriate animation type for the type of - the property that is to be animated, and apply the animation depending on - the type of behavior that is required. - - You can drag and drop the following QML types from \uicontrol Library - > \uicontrol {QML Types} > \uicontrol {Qt Quick - Animation} to - \uicontrol Navigator or \uicontrol {Form Editor}: - - \list - \li \l [QML] {ColorAnimation}{Color Animation} is a specialized - property animation that defines an animation to be applied when a - color value changes. - \li \l [QML] {NumberAnimation}{Number Animation} is a specialized - property animation that defines an animation to be applied when a - numerical value changes. - \li \l [QML] {ParallelAnimation}{Parallel Animation} enables - animations to be run in parallel. - \li \l [QML] {PauseAnimation}{Pause Animation} is used in a - sequential animation to create a step where nothing happens, for - a specified duration. - \li \l [QML] {PropertyAction}{Property Action} immediately changes - a property value during an animation, without animating the - property change. - \li \l [QML] {PropertyAnimation}{Property Animation} animates - changes in the value of a property. - \li \l [QML] {ScriptAction}{Script Action} defines scripts to be - run during an animation. - \li \l [QML] {SequentialAnimation}{Sequential Animation} enables - animations to be run sequentially. - \endlist - - For more information, see \l{Animation and Transitions in Qt Quick}. - - \if defined(qtcreator) - For an example of assigning number animations to states, see - \l {Creating a Qt Quick Application}. - \endif - - - Alternatively, you can use the \uicontrol Timeline view to animate the - properties of UI components and to bind the animations to states. For more - information, see \l {Binding Animations to States}. + \include qtquick-transition-editor.qdocinc transition editor */ diff --git a/doc/qtcreator/src/qtquick/qtquick-transition-editor.qdocinc b/doc/qtcreator/src/qtquick/qtquick-transition-editor.qdocinc new file mode 100644 index 00000000000..38eac9d512d --- /dev/null +++ b/doc/qtcreator/src/qtquick/qtquick-transition-editor.qdocinc @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator documentation. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! +//! [transition editor] + + \section1 Animating Transitions Between States + + To make movement between states smooth, you can use + \uicontrol {Transition Editor} to animate the changes between + states. First, you need to \l{Creating States}{add states} in + the \uicontrol States view and \l{Specifying Item Properties} + {edit some properties} that can be animated, such as colors or + numbers, in the \uicontrol Properties view. For example, you + can animate the changes in the position of an object. + + In \uicontrol {Transition Editor}, you can set the start frame, end + frame, and duration for the transition of each property. You can also + set an easing curve for each transition. + + Use the slider on the menu bar to the zooming level in the view. + + To add transitions: + + \list 1 + \li Select \uicontrol View > \uicontrol Views > + \uicontrol {Transition Editor} to display the view. + \li Select the \inlineimage plus.png + (\uicontrol {Add Transition}) button to add a transition. This + works only if you have added at least one state and modified at + least one property in it. + \image qtquick-transition-editor-view.png "Transition Editor view" + \li Move the blue bar next to the component or property name to set + the start and end frame of the animation of the property. Pull its + left and right edges to set the duration of the animation. + \li To attach an easing curve to a transition, select + \inlineimage curve_editor.png + (\uicontrol {Easing Curve Editor (C)}) on the toolbar. For more + information, see \l{Editing Easing Curves}. + \li To modify transition settings, select the \inlineimage animation.png + (\uicontrol {Transition Settings (S)}) button on the toolbar. + \image qtquick-transition-editor-settings.png "Transition settings" + \endlist + + \if defined(qtcreator) + For an example of animating transitions between states, see + \l {Creating a Qt Quick Application}. + \endif + +//! [transition editor] +*/