aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc/src/appdevguide/usecases
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/doc/src/appdevguide/usecases')
-rw-r--r--src/quick/doc/src/appdevguide/usecases/animations.qdoc9
-rw-r--r--src/quick/doc/src/appdevguide/usecases/layouts.qdoc4
-rw-r--r--src/quick/doc/src/appdevguide/usecases/styling.qdoc12
-rw-r--r--src/quick/doc/src/appdevguide/usecases/userinput.qdoc8
4 files changed, 16 insertions, 17 deletions
diff --git a/src/quick/doc/src/appdevguide/usecases/animations.qdoc b/src/quick/doc/src/appdevguide/usecases/animations.qdoc
index 3e87bae81d..b237849caf 100644
--- a/src/quick/doc/src/appdevguide/usecases/animations.qdoc
+++ b/src/quick/doc/src/appdevguide/usecases/animations.qdoc
@@ -31,18 +31,17 @@
QtQuick provides the ability to animate properties. Animating properties allows property values to move through
intermediate values instead of immediately changing to the target value. To animate the position of an item, you can
-animate the properties that controle the item's position, x and y for example, so that the item's position
+animate the properties that controle the item's position, x and y for example, so that the item's position
changes each frame on the way to the target position.
\section1 Fluid UIs
-QML was designed to facilitate the creation of fluid UIs. These are user interfaces where the UI elements animate when
-they move instead of elements appearing, disappearing, or jumping. Qt Quick provides two simple ways to have UI
-elements move with animation instead of instantly appearing at their new location.
+QML was designed to facilitate the creation of fluid UIs. These are user interfaces where the UI components animate instead of appearing, disappearing, or jumping abruptly. Qt Quick provides two simple ways to have UI
+components move with animation instead of instantly appearing at their new location.
\section2 States and Transitions
-QtQuick allows you to declare various UI states in \l State objects. These states are comprised of property changes from a
+Qt Quick allows you to declare various UI states in \l State objects. These states are comprised of property changes from a
base state, and can be a useful way of organizing your UI logic. Transitions are objects you can associate with an item
to define how its properties will animate when they change due to a state change.
diff --git a/src/quick/doc/src/appdevguide/usecases/layouts.qdoc b/src/quick/doc/src/appdevguide/usecases/layouts.qdoc
index 2c6f4d0dd8..e8e35a93e7 100644
--- a/src/quick/doc/src/appdevguide/usecases/layouts.qdoc
+++ b/src/quick/doc/src/appdevguide/usecases/layouts.qdoc
@@ -27,7 +27,7 @@
/*!
\page qtquick-usecase-layouts.html
\title Use Case - Layouts In QML
-\brief Example of how to create layouts for visual elements in a QML application
+\brief Example of how to create layouts for visual components in a QML application
There are several ways to position items in QML.
@@ -65,7 +65,7 @@ For full details, see \l {Positioning with Anchors} and the documentation of the
\section1 Positioners
-For the common case of wanting to position a set of elements in a regular pattern, QtQuick provides some positioner
+For the common case of wanting to position a set of types in a regular pattern, Qt Quick provides some positioner
types. Items placed in a positioner are automatically positioned in some way; for example, a \l Row positions items to be
horizontally adjacent (forming a row).
diff --git a/src/quick/doc/src/appdevguide/usecases/styling.qdoc b/src/quick/doc/src/appdevguide/usecases/styling.qdoc
index 7da230b1a0..68b8d0302c 100644
--- a/src/quick/doc/src/appdevguide/usecases/styling.qdoc
+++ b/src/quick/doc/src/appdevguide/usecases/styling.qdoc
@@ -27,15 +27,15 @@
/*!
\page qtquick-usecase-styling.html
\title Use Case - Style And Theme Support
-\brief Example of how to style user interface elements in QML
+\brief Example of how to style user interface components in QML
-The types provided in the QtQuick module are not complete user interface elements on their own. A common use case is to
-develop a set of custom styled user interface elements out of the types in the QtQuick module. This is easily
+The types provided in the QtQuick module are not complete user interface components on their own. A common use case is to
+develop a set of custom styled user interface components out of the types in the QtQuick module. This is easily
accomplished by creating your own reusable components.
With the reusable components approach, you define your own type with the appearance you want to have in your
application and style that type directly. You then use that type in your application instead of the unstyled type. For
-example, you could create a MyText.qml which is a Text element with certain properties set by default, and use MyText
+example, you could create a MyText.qml which is a Text type with certain properties set by default, and use MyText
instead of Text elsewhere in your application.
\section1 Example Themed Text
@@ -49,8 +49,8 @@ Because the root item in MyText.qml is a Text item it will behave as a
Text item, and the properties can be overriden in specific uses. However, the properties will be set to the values
specified in MyText when the item is first generated, thus applying your style by default.
-For pre-styled user interface elements, see the \c{Qt Components} add-on which provides a set of components.
-For accessing the system theme, see the \l{SystemPalette} element documentation.
+For pre-styled user interface components, see the \c{Qt Components} add-on which provides a set of components.
+For accessing the system theme, see the \l{SystemPalette} type documentation.
\section1 Example Themed Button
\section2 Button Definition
diff --git a/src/quick/doc/src/appdevguide/usecases/userinput.qdoc b/src/quick/doc/src/appdevguide/usecases/userinput.qdoc
index b31fcc4d5f..1e20f9d275 100644
--- a/src/quick/doc/src/appdevguide/usecases/userinput.qdoc
+++ b/src/quick/doc/src/appdevguide/usecases/userinput.qdoc
@@ -49,9 +49,9 @@ application. A \l MouseArea can be combined with either an \l Image or a
\snippet qml/usecases/userinput.qml 0
For more advanced use cases requiring multiple touch points, please read the
-documentation for the \l MultiPointTouchArea element and the \l PinchArea element.
+documentation for the \l MultiPointTouchArea type and the \l PinchArea type.
-Note that some elements have their own built in input handling. For example,
+Note that some types have their own built in input handling. For example,
\l Flickable responds to mouse dragging, mouse wheel scrolling, touch dragging,
and touch flicking by default.
@@ -59,8 +59,8 @@ and touch flicking by default.
Button and key presses, from buttons on a device, a keypad, or a keyboard,
can all be handled using the \l Keys attached property. This attached property
-is available on all \l Item derived elements, and works with the \l Item::focus property
-to determine which element receives the key event. For simple key handling, you can set the focus
+is available on all \l Item derived types, and works with the \l Item::focus property
+to determine which type receives the key event. For simple key handling, you can set the focus
to true on a single \l Item and do all your key handling there.
\snippet qml/usecases/userinput-keys.qml 0