aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-09-04 16:24:51 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-09-04 15:09:24 +0000
commit86da0a006a8bef89f938925a88cb50962473b25f (patch)
tree5a79a10a810ba25ace4a63a4c63136d147c14fbc
parentb74d620bf051aacfba15f962424738b77a36f392 (diff)
Doc: Update change from "+" to "Create New State" label
States view layout was also changed, so update screenshots. Change-Id: I0e4535add8720375e40fcf0e65b20061d94c5150 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--doc/qtcreator/images/qmldesigner-borderimage-states.pngbin8667 -> 16713 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-borderimage-type.pngbin32497 -> 29419 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-screen-design.pngbin54663 -> 83754 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-states-when-condition.pngbin15375 -> 23344 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-states.pngbin34569 -> 76969 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-transitions.pngbin6353 -> 16209 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-tutorial-states.pngbin15924 -> 20618 bytes
-rw-r--r--doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc4
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-buttons.qdoc2
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-states.qdoc6
-rw-r--r--doc/qtdesignstudio/examples/doc/ebikedesign.qdoc2
-rw-r--r--doc/qtdesignstudio/examples/doc/images/ebikedesign-states.pngbin13866 -> 38563 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/loginui1-button-styled.pngbin129971 -> 53170 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/loginui1-button.pngbin124950 -> 57459 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/loginui1-project.pngbin112120 -> 62781 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/loginui3-login-state.pngbin13510 -> 12386 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/loginui3-states.pngbin171016 -> 35310 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.pngbin43371 -> 43899 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/sidemenu-states.pngbin5206 -> 10301 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/loginui3.qdoc3
-rw-r--r--doc/qtdesignstudio/examples/doc/loginui4.qdoc8
-rw-r--r--doc/qtdesignstudio/examples/doc/sidemenu.qdoc4
22 files changed, 14 insertions, 15 deletions
diff --git a/doc/qtcreator/images/qmldesigner-borderimage-states.png b/doc/qtcreator/images/qmldesigner-borderimage-states.png
index f25290fa4bf..5d1ebaf1ad9 100644
--- a/doc/qtcreator/images/qmldesigner-borderimage-states.png
+++ b/doc/qtcreator/images/qmldesigner-borderimage-states.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-borderimage-type.png b/doc/qtcreator/images/qmldesigner-borderimage-type.png
index cf287390c5a..840708f202a 100644
--- a/doc/qtcreator/images/qmldesigner-borderimage-type.png
+++ b/doc/qtcreator/images/qmldesigner-borderimage-type.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-screen-design.png b/doc/qtcreator/images/qmldesigner-screen-design.png
index ff19977a0f1..dcf5a485dca 100644
--- a/doc/qtcreator/images/qmldesigner-screen-design.png
+++ b/doc/qtcreator/images/qmldesigner-screen-design.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-states-when-condition.png b/doc/qtcreator/images/qmldesigner-states-when-condition.png
index 7a1530efb0a..ddd080c315b 100644
--- a/doc/qtcreator/images/qmldesigner-states-when-condition.png
+++ b/doc/qtcreator/images/qmldesigner-states-when-condition.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-states.png b/doc/qtcreator/images/qmldesigner-states.png
index 4f1193bfba6..e1cea9fda5f 100644
--- a/doc/qtcreator/images/qmldesigner-states.png
+++ b/doc/qtcreator/images/qmldesigner-states.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-transitions.png b/doc/qtcreator/images/qmldesigner-transitions.png
index 8791133a87e..005178481ea 100644
--- a/doc/qtcreator/images/qmldesigner-transitions.png
+++ b/doc/qtcreator/images/qmldesigner-transitions.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-tutorial-states.png b/doc/qtcreator/images/qmldesigner-tutorial-states.png
index decec3cb77f..4ae34eeed6c 100644
--- a/doc/qtcreator/images/qmldesigner-tutorial-states.png
+++ b/doc/qtcreator/images/qmldesigner-tutorial-states.png
Binary files differ
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
index 8faa7f8b325..06444edf82d 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
@@ -214,8 +214,8 @@
\c y properties of \e icon to those of the rectangles.
\list 1
- \li In the \uicontrol States view, click the \inlineimage plus.png
- button three times to create \e State1, \e State2, and \e State3.
+ \li In the \uicontrol States view, select \uicontrol {Create New State}
+ three times to create \e State1, \e State2, and \e State3.
\li Select \e State1 in \uicontrol States.
\li Select \inlineimage icons/action-icon.png
to open the \uicontrol Actions menu, and then select
diff --git a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc
index 367843d9188..578f5dfb841 100644
--- a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc
@@ -229,7 +229,7 @@
\section1 Using States to Change Component Property Values
\list 1
- \li In the \uicontrol States view, select \inlineimage plus.png
+ \li In the \uicontrol States view, select \uicontrol {Create New State}
twice to create two new states.
\image qmldesigner-borderimage-states.png "Active and inactive states"
\li Select \uicontrol State1.
diff --git a/doc/qtcreator/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc
index 967555f1ad7..7e5acb6673d 100644
--- a/doc/qtcreator/src/qtquick/qtquick-states.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-states.qdoc
@@ -68,9 +68,9 @@
\image qmldesigner-transitions.png "States view"
- To add states, click the \inlineimage plus.png
- button. Click the new state to switch to it in \uicontrol {Form Editor},
- and then modify the properties of components in \uicontrol Properties.
+ To add states, select \uicontrol {Create New State}. Click the new state to
+ switch to it in \uicontrol {Form Editor}, and then modify the properties of
+ components in \uicontrol Properties.
For example, to change the appearance of a button, you can hide the button
image and show another image in its place. Or, to add movement to the view,
diff --git a/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc b/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc
index a6d95b07b06..43d70b09fc2 100644
--- a/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc
+++ b/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc
@@ -101,7 +101,7 @@
We create the states for displaying the Trip, Standard, and Navigation
screens by moving from viewport to viewport in \e Screen01.ui.qml and
- clicking \inlineimage plus.png "Add button" in the \uicontrol States view
+ selecting \uicontrol {Create New State} in the \uicontrol States view
when the appropriate screen is displayed in the viewport.
We then create states for animations that are run when moving between the
diff --git a/doc/qtdesignstudio/examples/doc/images/ebikedesign-states.png b/doc/qtdesignstudio/examples/doc/images/ebikedesign-states.png
index a215700d6bf..92ea40a0732 100644
--- a/doc/qtdesignstudio/examples/doc/images/ebikedesign-states.png
+++ b/doc/qtdesignstudio/examples/doc/images/ebikedesign-states.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/loginui1-button-styled.png b/doc/qtdesignstudio/examples/doc/images/loginui1-button-styled.png
index 0449e315054..5adf709f57d 100644
--- a/doc/qtdesignstudio/examples/doc/images/loginui1-button-styled.png
+++ b/doc/qtdesignstudio/examples/doc/images/loginui1-button-styled.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/loginui1-button.png b/doc/qtdesignstudio/examples/doc/images/loginui1-button.png
index ea4796fa096..c0b0cc87d63 100644
--- a/doc/qtdesignstudio/examples/doc/images/loginui1-button.png
+++ b/doc/qtdesignstudio/examples/doc/images/loginui1-button.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/loginui1-project.png b/doc/qtdesignstudio/examples/doc/images/loginui1-project.png
index 1fe1ff3c1fe..6e3073805a8 100644
--- a/doc/qtdesignstudio/examples/doc/images/loginui1-project.png
+++ b/doc/qtdesignstudio/examples/doc/images/loginui1-project.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/loginui3-login-state.png b/doc/qtdesignstudio/examples/doc/images/loginui3-login-state.png
index 4b00084e3c0..d738ed3f0fb 100644
--- a/doc/qtdesignstudio/examples/doc/images/loginui3-login-state.png
+++ b/doc/qtdesignstudio/examples/doc/images/loginui3-login-state.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/loginui3-states.png b/doc/qtdesignstudio/examples/doc/images/loginui3-states.png
index bc0e5f7239b..372c60d6b0b 100644
--- a/doc/qtdesignstudio/examples/doc/images/loginui3-states.png
+++ b/doc/qtdesignstudio/examples/doc/images/loginui3-states.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png
index 950058c5d82..b6801cfb159 100644
--- a/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png
+++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png
index 6a8adb64aa7..b83ff8882ef 100644
--- a/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png
+++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/loginui3.qdoc b/doc/qtdesignstudio/examples/doc/loginui3.qdoc
index d6182232436..ffdd0546c61 100644
--- a/doc/qtdesignstudio/examples/doc/loginui3.qdoc
+++ b/doc/qtdesignstudio/examples/doc/loginui3.qdoc
@@ -114,8 +114,7 @@
components in the \uicontrol {Form Editor}:
\list 1
- \li In the \uicontrol States view, select the \inlineimage plus.png
- button.
+ \li In the \uicontrol States view, select \uicontrol {Create New State}.
\image loginui3-login-state.png "States view"
\li Enter \e loginState as the state name.
\li Select \e verifyPasswordField in the \uicontrol Navigator,
diff --git a/doc/qtdesignstudio/examples/doc/loginui4.qdoc b/doc/qtdesignstudio/examples/doc/loginui4.qdoc
index 62db589dc71..c057558d0c6 100644
--- a/doc/qtdesignstudio/examples/doc/loginui4.qdoc
+++ b/doc/qtdesignstudio/examples/doc/loginui4.qdoc
@@ -257,10 +257,10 @@
in \uicontrol Timeline:
\list 1
- \li In \uicontrol States, select the \inlineimage plus.png
- button twice to add two states called \e loginState and
- \e registerState. You don't need to make any property changes this
- time, because you'll bind the states to property animations.
+ \li In \uicontrol States, select \uicontrol {Create New State} twice to
+ add two states called \e loginState and \e registerState. You don't
+ need to make any property changes this time, because you'll bind the
+ states to property animations.
\li In \uicontrol Timeline, select the \inlineimage animation.png
(\uicontrol {Timeline Settings (S)}) button on the toolbar (or press
\key S to open the \uicontrol {Timeline Settings} dialog.
diff --git a/doc/qtdesignstudio/examples/doc/sidemenu.qdoc b/doc/qtdesignstudio/examples/doc/sidemenu.qdoc
index 498b017ca34..06131795b50 100644
--- a/doc/qtdesignstudio/examples/doc/sidemenu.qdoc
+++ b/doc/qtdesignstudio/examples/doc/sidemenu.qdoc
@@ -142,8 +142,8 @@
another animation is run that closes the side menu. When the animation
finishes, the side menu returns to the \e closed state.
- We select the \inlineimage plus.png
- (\uicontrol Add) button in the \uicontrol States view to add the states:
+ We select \uicontrol {Create New State} in the \uicontrol States view to add
+ the states:
\image sidemenu-states.png "Side menu states"