From b4340b336101c6814e19f3d45c9606a8d2940b6e Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 4 Sep 2019 15:33:59 +0200 Subject: [PATCH] Doc: Describe the Curve Editor Modify the curve picker docs to try to make it clearer that the old easing curve editor and the new curve editor are two separate things. Change-Id: I6a57d151c0edef15850cff264a27d519fbe6635b Reviewed-by: Thomas Hartmann --- doc/images/studio-curve-editor.png | Bin 0 -> 18457 bytes doc/src/qtquick/qtquick-timeline.qdoc | 47 +++++++++++++++++++++----- 2 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 doc/images/studio-curve-editor.png diff --git a/doc/images/studio-curve-editor.png b/doc/images/studio-curve-editor.png new file mode 100644 index 0000000000000000000000000000000000000000..f1f82e0abeedd1daf8c6e107058c7885c5eb4f39 GIT binary patch literal 18457 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 Ur+iS!1+DAzboFyt=akR{07rS30{{R3 literal 0 HcmV?d00001 diff --git a/doc/src/qtquick/qtquick-timeline.qdoc b/doc/src/qtquick/qtquick-timeline.qdoc index 3462330208d..de012b94e56 100644 --- a/doc/src/qtquick/qtquick-timeline.qdoc +++ b/doc/src/qtquick/qtquick-timeline.qdoc @@ -245,8 +245,11 @@ components can appear to pick up speed, slow down, or bounce back at the end of the animation. By default, the animations you specify on the timeline are \e linear, which means that they move from the beginning to - the end at a constant speed. You can use the curve picker to edit the - easing curve at a keyframe. + the end at a constant speed. You can use the \e {curve picker} to edit the + easing curve between two keyframes. You can also use the more advanced + \e {curve editor} to edit the curves for the whole animation. + + \section2 Attaching Easing Curves to Keyframes \image studio-curve-picker.png @@ -256,16 +259,16 @@ custom curve. For more information about easing curve types, see the documentation for \l [QML] {PropertyAnimation}{easing curves}. - To zoom into and out of the easing curve editor, use the mouse roller. To - reset the zoom factor, right-click in the editor and select + To zoom into and out of the easing curve picker, use the mouse roller. To + reset the zoom factor, right-click in the picker and select \uicontrol {Reset Zoom}. - To select easing curves: + To attach easing curves to keyframes: \list 1 \li Select a keyframe on the timeline. \li Select \uicontrol {Curve Picker (C)} on the toolbar, or press - \key C to open the \uicontrol {Easing Curve Editor} dialog. + \key C to open the curve picker. \li Select an easing curve in the \uicontrol Presets tab. \li In the \uicontrol {Duration (ms)} field, select the duration of the easing function in milliseconds. @@ -279,11 +282,13 @@ to \inlineimage keyframe_manualbezier_inactive.png . + \section2 Customizing Easing Curves + To customize easing curves: \list 1 - \li In the \uicontrol {Easing Curve Editor} dialog, select an easing - curve in the \uicontrol Presets tab. + \li In the curve picker, select an easing curve in the + \uicontrol Presets tab. \li Drag the curve handlers to modify the curve. \li Right-click in the editor, and select \uicontrol {Add Point} to add points to the curve. @@ -299,6 +304,32 @@ To paste easing curve definitions to the curve picker as text, select the \uicontrol Text tab. + \section1 Editing Animation Curves + + In the curve editor, you can view and modify the whole animation curve. You + can insert keyframes to the curve and drag them and the point handlers to + modify the curve. You can modify the appearance of the curve in the style + editor. + + You can also edit easing curves that you added with the curve picker. + + \image studio-curve-editor.png + + To edit animation curves: + + \list 1 + \li In the \uicontrol Timeline view, insert at least one keyframe. + \li Select \inlineimage curveGraphIcon.png + (\uicontrol {Curve Editor (C)} on the toolbar or press \key C + to open the curve editor. + \li Right-click in the curve editor, and select + \uicontrol {Insert Keyframe} to add a keyframe. + \li Select keyframes to display the easing curves attached to them. + To select multiple keyframes, press and hold \key Ctrl. + \endlist + + Your changes are automatically saved when you close the editor. + \section1 Rotating Items To animate components that rotate around a central point, you can use the