summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Honkamaa <mats.honkamaa@qt.io>2018-02-19 12:31:51 +0200
committerMats Honkamaa <mats.honkamaa@qt.io>2018-02-19 10:56:47 +0000
commit9acafd832719197b6597b6a2607e7f63273ce18a (patch)
tree22cb38270d994ac4fa81770b864d395bf811f0c0
parentd454b2630ae3df37599aa1492a976db409e8c1c4 (diff)
Move playback control documentation to correct place
Moved playback control documentation from toolbar section to timeline section. Updated related image. Task-number: QT3DS-1085 Change-Id: I9414a2b48429596c326971f1cd306de841a99665 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--doc/src/03-studio/1-toolbar.qdoc28
-rw-r--r--doc/src/03-studio/5-timeline-palette.qdoc27
-rw-r--r--doc/src/images/Studio-Timeline-Overview.pngbin23743 -> 38567 bytes
3 files changed, 27 insertions, 28 deletions
diff --git a/doc/src/03-studio/1-toolbar.qdoc b/doc/src/03-studio/1-toolbar.qdoc
index bc1e57de..26f2621e 100644
--- a/doc/src/03-studio/1-toolbar.qdoc
+++ b/doc/src/03-studio/1-toolbar.qdoc
@@ -241,34 +241,6 @@ palette.
The show or hide \b{Wireframe} toggles wireframe visibility (for tessellated meshes only).
\endlist
-\section1 Playback Control
-
-\image Studio-Toolbar-Playback.png
-
-These commands control the playhead, making it easier to preview
-animations and slide transitions without leaving Studio.
-
-\list
-\li
- The \b{Rewind} command sets the playhead to time 0.
-\li
- The \b{Stop} command stops any playback.
-\li
- The \b{Play} command starts advancing the playhead in realtime,
- previewing animations on elements. The \b{Play Mode} for the
- current slide is honored, possibly looping or ping-ponging playback,
- or causing Studio to switch to an new slide when the end time for the
- current slide is reached.
-\li
- Holding down the space bar temporarily enables playback while held
- down. Releasing the spacebar returns the playhead to its previous
- time, allowing you to repeatedly hold down space to preview an
- animation.
-\li
- Pressing the Enter key will start playback. Press Enter again to stop
- playback.
-\endlist
-
\section1 Preview
\image Studio-Toolbar-Preview.png
diff --git a/doc/src/03-studio/5-timeline-palette.qdoc b/doc/src/03-studio/5-timeline-palette.qdoc
index 190aed3b..7d7f3b0b 100644
--- a/doc/src/03-studio/5-timeline-palette.qdoc
+++ b/doc/src/03-studio/5-timeline-palette.qdoc
@@ -409,4 +409,31 @@ To help you keep track of your assets, Studio allows you to apply custom
colors and notes to time bars. Right-click on a time bar and choose
either \b {Change Time Bar Color} or \b {Change Time Bar Text}.
+\section2 Playback Control
+
+\image Studio-Toolbar-Playback.png
+
+These commands control the playhead, making it easier to preview
+animations and slide transitions without leaving Studio.
+
+\list
+\li
+ The \b{Rewind} command sets the playhead to time 0.
+\li
+ The \b{Stop} command stops any playback.
+\li
+ The \b{Play} command starts advancing the playhead in realtime,
+ previewing animations on elements. The \b{Play Mode} for the
+ current slide is honored, possibly looping or ping-ponging playback,
+ or causing Studio to switch to an new slide when the end time for the
+ current slide is reached.
+\li
+ Holding down the space bar temporarily enables playback while held
+ down. Releasing the spacebar returns the playhead to its previous
+ time, allowing you to repeatedly hold down space to preview an
+ animation.
+\li
+ Pressing the Enter key will start playback. Press Enter again to stop
+ playback.
+\endlist
*/
diff --git a/doc/src/images/Studio-Timeline-Overview.png b/doc/src/images/Studio-Timeline-Overview.png
index 70ca5118..becb7fb1 100644
--- a/doc/src/images/Studio-Timeline-Overview.png
+++ b/doc/src/images/Studio-Timeline-Overview.png
Binary files differ