From d1912784c82d0012a86cc1bc8a9303d879d7e4c0 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 25 Oct 2019 10:53:53 +0200 Subject: Doc: Update info about Easing Curve Editor and Curve Editor Check the terminology and update the screenshots. Change-Id: I60427ac822065c10eac5133dab7530d4ad885bed Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann --- doc/images/studio-curve-editor.png | Bin 18457 -> 10352 bytes doc/images/studio-curve-picker.png | Bin 144647 -> 0 bytes doc/images/studio-easing-curve-editor.png | Bin 0 -> 29814 bytes doc/src/qtquick/qtquick-timeline.qdoc | 28 ++++++++++++++-------------- 4 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 doc/images/studio-curve-picker.png create mode 100644 doc/images/studio-easing-curve-editor.png diff --git a/doc/images/studio-curve-editor.png b/doc/images/studio-curve-editor.png index f1f82e0abe..cdb675c881 100644 Binary files a/doc/images/studio-curve-editor.png and b/doc/images/studio-curve-editor.png differ diff --git a/doc/images/studio-curve-picker.png b/doc/images/studio-curve-picker.png deleted file mode 100644 index 37f1af0a39..0000000000 Binary files a/doc/images/studio-curve-picker.png and /dev/null differ diff --git a/doc/images/studio-easing-curve-editor.png b/doc/images/studio-easing-curve-editor.png new file mode 100644 index 0000000000..57d70f86cd Binary files /dev/null and b/doc/images/studio-easing-curve-editor.png differ diff --git a/doc/src/qtquick/qtquick-timeline.qdoc b/doc/src/qtquick/qtquick-timeline.qdoc index 9beb3df36f..59eda721c0 100644 --- a/doc/src/qtquick/qtquick-timeline.qdoc +++ b/doc/src/qtquick/qtquick-timeline.qdoc @@ -244,13 +244,14 @@ 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 \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. + the end at a constant speed. You can use the \uicontrol {Easing Curve Editor} + to edit the easing curve between two keyframes. You can also use the more + advanced \uicontrol {Curve Editor (C)} to edit the curves for the whole + animation. \section2 Attaching Easing Curves to Keyframes - \image studio-curve-picker.png + \image studio-easing-curve-editor.png "Easing Curve Editor" You can use the preset curves or modify them by dragging the curve handlers around. You can add points to the curve and drag them and the point handlers @@ -258,22 +259,21 @@ 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 picker, use the mouse roller. To + To zoom into and out of the easing curve editor, use the mouse roller. To reset the zoom factor, right-click in the picker and select \uicontrol {Reset Zoom}. 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 curve picker. + \li Right-click a keyframe on the timeline and select + \uicontrol {Easing Curve Editor} in the context menu. \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. \li Select \uicontrol Preview to preview the curve. \li Select \uicontrol OK to attach the easing curve to the keyframe - and to close the curve picker. + and to close the easing curve editor. \endlist When you attach easing curves to keyframes, the shape of the keyframe @@ -286,8 +286,8 @@ To customize easing curves: \list 1 - \li In the curve picker, select an easing curve in the - \uicontrol Presets tab. + \li In the \uicontrol {Easing Curve Editor}, 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. @@ -300,7 +300,7 @@ \uicontrol Custom tab. \endlist - To paste easing curve definitions to the curve picker as text, select + To paste easing curve definitions to the easing curve editor as text, select the \uicontrol Text tab. \section1 Editing Animation Curves @@ -310,9 +310,9 @@ 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. + You can also edit easing curves that you added with the easing curve editor. - \image studio-curve-editor.png + \image studio-curve-editor.png "Curve Editor" To edit animation curves: -- cgit v1.2.1