summaryrefslogtreecommitdiff
path: root/doc/qtdesignstudio
diff options
context:
space:
mode:
authorMats Honkamaa <mats.honkamaa@qt.io>2022-10-13 10:40:05 +0300
committerMats Honkamaa <mats.honkamaa@qt.io>2022-10-13 12:32:58 +0000
commit033ec559b3e73459fb0c2a0d48d5a75dba2ce6d4 (patch)
tree502a3a641967130ba8f4dfee835eb8078a4600a5 /doc/qtdesignstudio
parentb2dbc0965c5a5a49c6770674458273f26e453137 (diff)
downloadqt-creator-033ec559b3e73459fb0c2a0d48d5a75dba2ce6d4.tar.gz
Doc: Improve wording for States and Connections pages
These topic sets cover more than adding so I change "Adding" to "Working with". Task-number: QDS-7995 Change-Id: I240bce10c6cbfc04a686b719bd74cbd353d3de11 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'doc/qtdesignstudio')
-rw-r--r--doc/qtdesignstudio/examples/doc/StateTransitions.qdoc4
-rw-r--r--doc/qtdesignstudio/examples/doc/loginui3.qdoc4
-rw-r--r--doc/qtdesignstudio/examples/doc/loginui4.qdoc2
-rw-r--r--doc/qtdesignstudio/examples/doc/sidemenu.qdoc2
-rw-r--r--doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc2
-rw-r--r--doc/qtdesignstudio/src/components/qtquick-buttons.qdoc2
-rw-r--r--doc/qtdesignstudio/src/components/qtquick-component-instances.qdoc2
-rw-r--r--doc/qtdesignstudio/src/components/qtquick-components.qdoc2
-rw-r--r--doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc4
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc4
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc2
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc4
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc4
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-adding-dynamics.qdoc4
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc2
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-designer.qdoc4
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-navigator.qdoc4
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc2
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-properties.qdoc2
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-states-view.qdoc4
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-states.qdoc2
-rw-r--r--doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc2
22 files changed, 32 insertions, 32 deletions
diff --git a/doc/qtdesignstudio/examples/doc/StateTransitions.qdoc b/doc/qtdesignstudio/examples/doc/StateTransitions.qdoc
index 8c3ad88606..619f51812d 100644
--- a/doc/qtdesignstudio/examples/doc/StateTransitions.qdoc
+++ b/doc/qtdesignstudio/examples/doc/StateTransitions.qdoc
@@ -26,7 +26,7 @@
/*!
\page state-transition-animations.html
\ingroup gstutorials
- \sa States, {Transitions}, {Adding States}
+ \sa States, {Transitions}, {Working with States}
\title Animated State Transitions
\brief Illustrates how to create animated state transitions.
@@ -34,7 +34,7 @@
\image animated-state-transitions.jpg
The \e{Animated State Transitions} tutorial illustrates how you can animate
- the transition between \l{Adding States}{states}.
+ the transition between \l{Working with States}{states}.
The starting point of this tutorial is the Car Demo project, you can
download it from
diff --git a/doc/qtdesignstudio/examples/doc/loginui3.qdoc b/doc/qtdesignstudio/examples/doc/loginui3.qdoc
index d4799d199d..4cdca5f44b 100644
--- a/doc/qtdesignstudio/examples/doc/loginui3.qdoc
+++ b/doc/qtdesignstudio/examples/doc/loginui3.qdoc
@@ -99,7 +99,7 @@
\section1 Using States to Simulate Page Changes
- You will now add \l{Adding States}{states} to the UI to show and hide UI
+ You will now add \l{Working with States}{states} to the UI to show and hide UI
components in the \uicontrol {2D} view, depending on the current page:
\list 1
@@ -177,7 +177,7 @@
\section1 Learn More
\section2 States
- The \l{Adding States}{state} of a particular visual component is the set of
+ The \l{Working with States}{state} of a particular visual component is the set of
information which describes how and where the individual parts of the visual
component are displayed within it, and all the data associated with that
state. Most visual components in a UI will have a limited number of states,
diff --git a/doc/qtdesignstudio/examples/doc/loginui4.qdoc b/doc/qtdesignstudio/examples/doc/loginui4.qdoc
index 35d8c1070e..a82d9f502c 100644
--- a/doc/qtdesignstudio/examples/doc/loginui4.qdoc
+++ b/doc/qtdesignstudio/examples/doc/loginui4.qdoc
@@ -262,7 +262,7 @@
\section1 Binding Animation to States
- You will now bring back the \l{Adding States}{states} in the
+ You will now bring back the \l{Working with States}{states} in the
\uicontrol States view and bind them to the animation settings
in \uicontrol Timeline:
diff --git a/doc/qtdesignstudio/examples/doc/sidemenu.qdoc b/doc/qtdesignstudio/examples/doc/sidemenu.qdoc
index 08c4805deb..c9168844d0 100644
--- a/doc/qtdesignstudio/examples/doc/sidemenu.qdoc
+++ b/doc/qtdesignstudio/examples/doc/sidemenu.qdoc
@@ -53,7 +53,7 @@
The button can have the following states: checked, hover, pressed, and
normal. We construct the button using different images for the button
- background, frame, and front. We then add \l{Adding States}{states} in
+ background, frame, and front. We then add \l{Working with States}{states} in
the \l States view for each of the button states. In each state, we turn
the visibility of the appropriate images on or off in the button properties,
to change the appearance of the button.
diff --git a/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc b/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc
index c08bc016b1..6f96e37076 100644
--- a/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc
+++ b/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc
@@ -188,7 +188,7 @@
in the top-left corner of the root component.
Then, we open the \uicontrol States view to create the \e start,
- \e settings, \e presets, and \e running \l{Adding States}{states} for
+ \e settings, \e presets, and \e running \l{Working with States}{states} for
displaying a particular screen by selecting \uicontrol {Create New State}.
\image washingmachineui-states.png "States view"
diff --git a/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc b/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc
index 54dacf9e62..c5ade1f935 100644
--- a/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc
@@ -139,7 +139,7 @@
PNG file, as a border and a background.
Use two border images and suitable graphics to change the appearance of
- a button when it is clicked. You can use use \l{Adding States}{states}
+ a button when it is clicked. You can use use \l{Working with States}{states}
to determine which image is visible depending on whether the mouse
button is pressed down. You could add more images and states to
change the appearance of the button depending on other mouse events,
diff --git a/doc/qtdesignstudio/src/components/qtquick-component-instances.qdoc b/doc/qtdesignstudio/src/components/qtquick-component-instances.qdoc
index d3a04f89be..195874c3b6 100644
--- a/doc/qtdesignstudio/src/components/qtquick-component-instances.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-component-instances.qdoc
@@ -65,7 +65,7 @@
\image qmldesigner-bindings.png "Connections view Bindings tab"
\li Add states to apply sets of changes to the property values of one
or several component instances in the \uicontrol States view.
- For more information, see \l{Adding States}.
+ For more information, see \l{Working with States}.
\li Animate the properties of component instances in the
\uicontrol Timeline view. For more information, see
\l{Creating Timeline Animations}.
diff --git a/doc/qtdesignstudio/src/components/qtquick-components.qdoc b/doc/qtdesignstudio/src/components/qtquick-components.qdoc
index 7ea137592a..7a8c01faa3 100644
--- a/doc/qtdesignstudio/src/components/qtquick-components.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-components.qdoc
@@ -85,7 +85,7 @@
your UI.
\li Use as few components as necessary. To minimize the number of
components, use \l{Adding Property Aliases}{alias properties} and
- \l{Adding States}{states} to create the differences in your
+ \l{Working with States}{states} to create the differences in your
component instances. We recommend reusing components
instead of duplicating them, so the components do not need to be
processed as completely new component types. This reduces loading
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc
index 561eb8c62c..8774a8ea67 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc
@@ -54,7 +54,7 @@
exported as a public property of the relevant component. For example,
a speedometer should have a property for speed to which the UI is bound.
- You can declare various \l{Adding States}{UI states} that describe how
+ You can declare various \l{Working with States}{UI states} that describe how
property values change from a base state. States can be a useful way of
organizing your UI logic. You can associate transitions with components
to define how their properties will animate when they change due to a
@@ -122,7 +122,7 @@
\li \l{Adding Property Aliases}
\row
\li Referencing a state from within a specific component
- \li \l{Adding States}
+ \li \l{Working with States}
\row
\li Switching to a state when a particular property changes
\li \l{Applying States}
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc
index 4b6cfe1377..f57b587067 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc
@@ -71,7 +71,7 @@
\uicontrol {Flow Decision} components from
\uicontrol Components > \uicontrol {Flow View}, as described in
\l{Simulating Conditions}.
- \li Use \l{Adding States}{states} in flows to modify the appearance
+ \li Use \l{Working with States}{states} in flows to modify the appearance
of components on screens in response to user interaction, as
described in \l{Applying States in Flows}.
\li Use \uicontrol {Flow Wildcard} components from
@@ -642,7 +642,7 @@
\title Applying States in Flows
- You can use \l{Adding States}{states} in flows to modify the appearance
+ You can use \l{Working with States}{states} in flows to modify the appearance
of \l{glossary-component}{components} in flow items in response to user
interaction, for example. For this purpose, you use the
\uicontrol {Flow Item} components available in
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc
index 330b2ee7be..8b378e9095 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc
@@ -50,7 +50,7 @@
\endtable
You can edit the properties of the controls in all the preset
- \l{Adding States}{states} to apply your own style to them.
+ \l{Working with States}{states} to apply your own style to them.
\note For buttons and check boxes, you can disable the misbehaving hover
effects by selecting \l Properties > \uicontrol Control, and then disabling
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
index 15026d2c51..cd9f15bb46 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
@@ -143,7 +143,7 @@
\list
\li \l{Connections}
- \li \l{Adding Connections}
+ \li \l{Working with Connections}
\endlist
\section1 Device
@@ -271,7 +271,7 @@
\list
\li \l{States}
- \li \l{Adding States}
+ \li \l{Working with States}
\endlist
\section1 Transition
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index bcccd0bf39..11ff34f21a 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -140,13 +140,13 @@
\endlist
\li \l{Dynamic Behaviors}
\list
- \li \l{Adding Connections}
+ \li \l{Working with Connections}
\list
\li\l{Connecting Components to Signals}
\li\l{Adding Bindings Between Properties}
\li\l{Specifying Custom Properties}
\endlist
- \li \l{Adding States}
+ \li \l{Working with States}
\endlist
\li \l{Validating with Target Hardware}
\list
diff --git a/doc/qtdesignstudio/src/views/qtquick-adding-dynamics.qdoc b/doc/qtdesignstudio/src/views/qtquick-adding-dynamics.qdoc
index 274c205c60..93fcf16bc3 100644
--- a/doc/qtdesignstudio/src/views/qtquick-adding-dynamics.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-adding-dynamics.qdoc
@@ -35,7 +35,7 @@
when the values of other components or the UI state change.
\list
- \li \l {Adding Connections}
+ \li \l {Working with Connections}
You can create connections between the UI components and
the application to enable them to communicate with each other. For
@@ -47,7 +47,7 @@
binding their properties together. This way, when the value of a
property changes in a parent component, it can be automatically
changed in all the child components, for example.
- \li \l {Adding States}
+ \li \l {Working with States}
You can declare various UI states that describe how component
properties change from a base state. Therefore, states can be
diff --git a/doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc
index 9c8360f565..ce30db368f 100644
--- a/doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc
@@ -28,7 +28,7 @@
\previouspage qtquick-adding-dynamics.html
\nextpage quick-signals.html
- \title Adding Connections
+ \title Working with Connections
\list
\li \l{Connecting Components to Signals}
diff --git a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc
index 3e05138e5e..d1e846a364 100644
--- a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc
@@ -97,14 +97,14 @@
\li \l{Connections}
\li Enables you to add functionality to the UI by creating
connections between components, signals, and component properties.
- \li \l{Adding Connections}
+ \li \l{Working with Connections}
\row
\li \l States
\li Displays the different states that can be applied to a component.
Typically, states describe UI configurations, such as the
visibility and behavior of components and the available user
actions.
- \li \l{Adding States}
+ \li \l{Working with States}
\row
\li \l{Transitions}
\li Enables you to make movement between states smooth by animating
diff --git a/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc b/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc
index c2e40b729a..ce3cb0f27c 100644
--- a/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-navigator.qdoc
@@ -146,7 +146,7 @@
the \l {3D} view nor access their properties in
\uicontrol Properties.
- If you attempt to \l{Adding States}{remove a state} that changes the
+ If you attempt to \l{Working with States}{remove a state} that changes the
properties of a locked component, you are prompted to confirm the removal.
If you have \l{Editing Animation Curves}{added easing curves} to keyframe
@@ -234,7 +234,7 @@
\image qmldesigner-export-item.png
You can then use the property alias in other components to
- \l{Adding Connections}{create connections} to this component.
+ \l{Working with Connections}{create connections} to this component.
\section1 Moving Within Components
diff --git a/doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc
index 8eb86df321..7f5f694063 100644
--- a/doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-properties-view.qdoc
@@ -108,7 +108,7 @@
The default values of properties are displayed in white color, while the
values that you specify explicitly are highlighted with blue color. In
- addition, property changes in \l{Adding States}{states} are highlighted
+ addition, property changes in \l{Working with States}{states} are highlighted
with blue.
This allows you to easily see which values are set in the component
diff --git a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
index a80201ea3a..6b10563cca 100644
--- a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
@@ -175,7 +175,7 @@
If the \uicontrol Clip check box is selected, the component and its children
are clipped to the bounding rectangle of the component.
- in the \uicontrol State field, select the \l{Adding States}{state} to
+ in the \uicontrol State field, select the \l{Working with States}{state} to
change the value of a property in that state.
\section1 Picking Colors
diff --git a/doc/qtdesignstudio/src/views/qtquick-states-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-states-view.qdoc
index d5894641db..fe83102f99 100644
--- a/doc/qtdesignstudio/src/views/qtquick-states-view.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-states-view.qdoc
@@ -30,8 +30,8 @@
\title States
- The \uicontrol States view displays the different \l{Adding States}{states}
- of a UI.
+ The \uicontrol States view displays the different
+ \l{Working with States}{states} of a UI.
\image qmldesigner-transitions.png "States view"
diff --git a/doc/qtdesignstudio/src/views/qtquick-states.qdoc b/doc/qtdesignstudio/src/views/qtquick-states.qdoc
index 0ff4f27105..b92146a792 100644
--- a/doc/qtdesignstudio/src/views/qtquick-states.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-states.qdoc
@@ -33,7 +33,7 @@
\nextpage exporting-3d-assets.html
\endif
- \title Adding States
+ \title Working with States
You can define states for components and component instances in the
\l States view by selecting \inlineimage icons/plus.png
diff --git a/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc
index 72e0217b2b..55b5c58cfd 100644
--- a/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc
@@ -34,7 +34,7 @@
\uicontrol {Transitions} to animate the changes between
states.
- First, you need to \l{Adding States}{add states} in the \l States view
+ First, you need to \l{Working with States}{add states} in the \l States view
and \l{Specifying Component Properties}{edit some properties} that can be
animated, such as colors or numbers, in the \l Properties view. For example,
you can animate the changes in the position of a component.