aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2021-04-16 15:57:30 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2021-04-21 15:13:40 +0000
commit554eac53825004fe8157ba5b39976aef043201ab (patch)
treea4b3c676a220fc1a3edd80cabc0020125a68c074
parent1ba196a6daaded4c4704a134ccf132aa7a5fe268 (diff)
Doc: Fix text about radio buttons in Timeline Settings dialogqds/v2.1.0-rc1
Fixes: QDS-4116 Change-Id: I4761211fc5af1c0f6f0839087b7d46ca90490163 Reviewed-by: Tanja Remes <tanja.remes@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-timeline.qdoc14
1 files changed, 5 insertions, 9 deletions
diff --git a/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc b/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc
index 156d15be92..b7a82dde79 100644
--- a/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc
@@ -43,8 +43,8 @@
Sometimes you don't want linear movement but would rather like the rectangle
to move faster at the beginning and slower at the end of the animation.
- To achieve this effect, you could insert a lot keyframes between the start
- frame and the end frame. To avoid this effort, you can use the
+ To achieve this effect, you could insert a lot of keyframes between the
+ start frame and the end frame. To avoid this effort, you can use the
\l{Editing Easing Curves}{Easing Curve Editor} to specify \e {easing curves}
for nonlinear interpolation between keyframes. The easing curves can make
components appear to pick up speed, slow down, or bounce back at the end of
@@ -88,7 +88,9 @@
\section1 Creating Timelines
You specify settings for the timeline and for running the animation in the
- \uicontrol {Timeline Settings} dialog.
+ \uicontrol {Timeline Settings} dialog. The \uicontrol Animation radio button
+ is selected for a timeline animation and the \uicontrol {Expression binding}
+ radio button for a \l{Setting Bindings}{property animation}.
\image studio-timeline-settings.png "Timeline Settings dialog"
@@ -105,12 +107,6 @@
timeline. Negative values are allowed.
\li In the \uicontrol {End frame} field, set the last frame of the
timeline.
- \li To use bindings to specify the properties, select the
- \uicontrol {Expression binding} radio button and enter the binding
- in the \uicontrol {Expression binding} field. For more information
- about property binding, see \l{Setting Bindings}.
- \li To create a timeline animation, select the \uicontrol Animation
- radio button.
\li In the \uicontrol {Animation ID} field, enter an ID for the
animation.
\li Select the \uicontrol {Running in Base State} check box to run the