diff options
Diffstat (limited to 'doc')
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 Binary files differindex f25290fa4b..5d1ebaf1ad 100644 --- a/doc/qtcreator/images/qmldesigner-borderimage-states.png +++ b/doc/qtcreator/images/qmldesigner-borderimage-states.png diff --git a/doc/qtcreator/images/qmldesigner-borderimage-type.png b/doc/qtcreator/images/qmldesigner-borderimage-type.png Binary files differindex cf287390c5..840708f202 100644 --- a/doc/qtcreator/images/qmldesigner-borderimage-type.png +++ b/doc/qtcreator/images/qmldesigner-borderimage-type.png diff --git a/doc/qtcreator/images/qmldesigner-screen-design.png b/doc/qtcreator/images/qmldesigner-screen-design.png Binary files differindex ff19977a0f..dcf5a485dc 100644 --- a/doc/qtcreator/images/qmldesigner-screen-design.png +++ b/doc/qtcreator/images/qmldesigner-screen-design.png diff --git a/doc/qtcreator/images/qmldesigner-states-when-condition.png b/doc/qtcreator/images/qmldesigner-states-when-condition.png Binary files differindex 7a1530efb0..ddd080c315 100644 --- a/doc/qtcreator/images/qmldesigner-states-when-condition.png +++ b/doc/qtcreator/images/qmldesigner-states-when-condition.png diff --git a/doc/qtcreator/images/qmldesigner-states.png b/doc/qtcreator/images/qmldesigner-states.png Binary files differindex 4f1193bfba..e1cea9fda5 100644 --- a/doc/qtcreator/images/qmldesigner-states.png +++ b/doc/qtcreator/images/qmldesigner-states.png diff --git a/doc/qtcreator/images/qmldesigner-transitions.png b/doc/qtcreator/images/qmldesigner-transitions.png Binary files differindex 8791133a87..005178481e 100644 --- a/doc/qtcreator/images/qmldesigner-transitions.png +++ b/doc/qtcreator/images/qmldesigner-transitions.png diff --git a/doc/qtcreator/images/qmldesigner-tutorial-states.png b/doc/qtcreator/images/qmldesigner-tutorial-states.png Binary files differindex decec3cb77..4ae34eeed6 100644 --- a/doc/qtcreator/images/qmldesigner-tutorial-states.png +++ b/doc/qtcreator/images/qmldesigner-tutorial-states.png 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 8faa7f8b32..06444edf82 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 367843d918..578f5dfb84 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 967555f1ad..7e5acb6673 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 a6d95b07b0..43d70b09fc 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 Binary files differindex a215700d6b..92ea40a073 100644 --- a/doc/qtdesignstudio/examples/doc/images/ebikedesign-states.png +++ b/doc/qtdesignstudio/examples/doc/images/ebikedesign-states.png diff --git a/doc/qtdesignstudio/examples/doc/images/loginui1-button-styled.png b/doc/qtdesignstudio/examples/doc/images/loginui1-button-styled.png Binary files differindex 0449e31505..5adf709f57 100644 --- a/doc/qtdesignstudio/examples/doc/images/loginui1-button-styled.png +++ b/doc/qtdesignstudio/examples/doc/images/loginui1-button-styled.png diff --git a/doc/qtdesignstudio/examples/doc/images/loginui1-button.png b/doc/qtdesignstudio/examples/doc/images/loginui1-button.png Binary files differindex ea4796fa09..c0b0cc87d6 100644 --- a/doc/qtdesignstudio/examples/doc/images/loginui1-button.png +++ b/doc/qtdesignstudio/examples/doc/images/loginui1-button.png diff --git a/doc/qtdesignstudio/examples/doc/images/loginui1-project.png b/doc/qtdesignstudio/examples/doc/images/loginui1-project.png Binary files differindex 1fe1ff3c1f..6e3073805a 100644 --- a/doc/qtdesignstudio/examples/doc/images/loginui1-project.png +++ b/doc/qtdesignstudio/examples/doc/images/loginui1-project.png diff --git a/doc/qtdesignstudio/examples/doc/images/loginui3-login-state.png b/doc/qtdesignstudio/examples/doc/images/loginui3-login-state.png Binary files differindex 4b00084e3c..d738ed3f0f 100644 --- a/doc/qtdesignstudio/examples/doc/images/loginui3-login-state.png +++ b/doc/qtdesignstudio/examples/doc/images/loginui3-login-state.png diff --git a/doc/qtdesignstudio/examples/doc/images/loginui3-states.png b/doc/qtdesignstudio/examples/doc/images/loginui3-states.png Binary files differindex bc0e5f7239..372c60d6b0 100644 --- a/doc/qtdesignstudio/examples/doc/images/loginui3-states.png +++ b/doc/qtdesignstudio/examples/doc/images/loginui3-states.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png Binary files differindex 950058c5d8..b6801cfb15 100644 --- a/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png Binary files differindex 6a8adb64aa..b83ff8882e 100644 --- a/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png diff --git a/doc/qtdesignstudio/examples/doc/loginui3.qdoc b/doc/qtdesignstudio/examples/doc/loginui3.qdoc index d618223243..ffdd0546c6 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 62db589dc7..c057558d0c 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 498b017ca3..06131795b5 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" |