summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMats Honkamaa <mats.honkamaa@qt.io>2018-08-23 12:14:08 +0300
committerMats Honkamaa <mats.honkamaa@qt.io>2018-08-24 12:50:20 +0000
commiteaa45c050c91390e91917872da4b4df2ef30d37d (patch)
tree75616bd73b198aed29a040bd0671b1dd0a729a62 /doc
parentae39078bc8ea7c9ca6e63e041dbbe8b9582d8698 (diff)
Update data input documentation
Data input documentation needed update. Mainly new screen shots. Task-number: QT3DS-2081 Change-Id: I3b06155f021f00aa9a60a70bdd90ea8ac14f7f28 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/10-best-practices/95-data-input.qdoc34
-rw-r--r--doc/src/images/data-inputs.pngbin22917 -> 22818 bytes
-rw-r--r--doc/src/images/datainput-property-active-icon.pngbin0 -> 3525 bytes
-rw-r--r--doc/src/images/new-data-input.pngbin7152 -> 6914 bytes
-rw-r--r--doc/src/images/slide-palette-data-input-active.pngbin0 -> 11216 bytes
-rw-r--r--doc/src/images/timeline-datainput.pngbin11401 -> 6617 bytes
6 files changed, 15 insertions, 19 deletions
diff --git a/doc/src/10-best-practices/95-data-input.qdoc b/doc/src/10-best-practices/95-data-input.qdoc
index 40b11c7f..57d8c1cc 100644
--- a/doc/src/10-best-practices/95-data-input.qdoc
+++ b/doc/src/10-best-practices/95-data-input.qdoc
@@ -117,8 +117,6 @@ To delete a data input, follow the steps below.
\section1 Control the Timeline with Data Input
-\image timeline-datainput.png
-
\note Only data input of \e {Ranged Number} type can be used to control the timeline.
To add a data input to control the timeline animation, follow the instructions below.
@@ -132,20 +130,17 @@ To add a data input to control the timeline animation, follow the instructions b
\li Press \uicontrol{OK}.
\endlist
+\image timeline-datainput.png
+Once the data input has been added, it is clearly shown in the timeline palette which data input
+is controlling the timeline animation.
+
The \e{minimum range} value of the data input will correspond to the start of the timeline while
the \e{maximum range} value will correspond to the end of the timeline.
-When you have selected a data input for the timeline the data input will turn orange
-\inlineimage datainput-to-timeline-icon-active.png
-to indicate that the timeline is connected to a data input, and the name of the data input is
-shown next to the icon.
-
-To remove the data input, repeat the steps below but select \uicontrol{[No control]} in step 3.
+To remove the data input, repeat step 2 above. Then select \uicontrol{[No control]} in step 3.
\section1 Control Slides with Data Input
-\image slide-palette-data-input-inactive.png
-
\note Only data input of \e {String} type can be used to control slides.
\list 1
@@ -157,12 +152,12 @@ To remove the data input, repeat the steps below but select \uicontrol{[No contr
\li Press \uicontrol{OK}.
\endlist
-When you have selected a data input for the slides data input icon in the inspector palette will
-turn orange \inlineimage datainput-to-timeline-icon-active.png
-to indicate that the slides are connected to a data input, and the name of the data input is
-shown next to the icon.
+\image slide-palette-data-input-active.png
-To remove the data input, repeat the steps below but select \uicontrol{[No control]} in step 3.
+Once the data input has been added, it is clearly shown in the slide palette which data input
+is controlling slide transitions.
+
+To remove the data input, repeat step 2 above. Then select \uicontrol{[No control]} in step 3.
\section1 Control an Object Property with Data Input
@@ -209,10 +204,11 @@ The following data input types can be used to control object properties:
\li Press \uicontrol{OK}.
\endlist
-When you have selected a data input for the property the property name and the
-data input icon in the inspector palette will turn orange to indicate that the property
-is connected to a data input, and the name of the data input is shown next to the icon.
+\image datainput-property-active-icon.png
+
+Once the data input has been added, it is shown in the inspector palette which data input
+is controlling which property.
-To remove the data input, repeat the steps below but select \uicontrol{[No control]} in step 4.
+To remove the data input, repeat step 3 above. Then select \uicontrol{[No control]} in step 4.
*/
diff --git a/doc/src/images/data-inputs.png b/doc/src/images/data-inputs.png
index e31fb19d..f7f879f8 100644
--- a/doc/src/images/data-inputs.png
+++ b/doc/src/images/data-inputs.png
Binary files differ
diff --git a/doc/src/images/datainput-property-active-icon.png b/doc/src/images/datainput-property-active-icon.png
new file mode 100644
index 00000000..20e4550f
--- /dev/null
+++ b/doc/src/images/datainput-property-active-icon.png
Binary files differ
diff --git a/doc/src/images/new-data-input.png b/doc/src/images/new-data-input.png
index 479f1d11..c63e6d8a 100644
--- a/doc/src/images/new-data-input.png
+++ b/doc/src/images/new-data-input.png
Binary files differ
diff --git a/doc/src/images/slide-palette-data-input-active.png b/doc/src/images/slide-palette-data-input-active.png
new file mode 100644
index 00000000..c3db0691
--- /dev/null
+++ b/doc/src/images/slide-palette-data-input-active.png
Binary files differ
diff --git a/doc/src/images/timeline-datainput.png b/doc/src/images/timeline-datainput.png
index b32e787c..438c9f26 100644
--- a/doc/src/images/timeline-datainput.png
+++ b/doc/src/images/timeline-datainput.png
Binary files differ