summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2019-10-21 15:52:06 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2019-10-25 07:56:58 +0000
commit362d65301d58eb9bcaec4909c876b1590847ebab (patch)
treec99406144d1026664ad93cc3a1a171de9d8c953e /doc
parent999564d3935073ccc412271666c25327c72130e8 (diff)
downloadqt-creator-362d65301d58eb9bcaec4909c876b1590847ebab.tar.gz
Doc: Update info about the binding editor
Change-Id: I78e8a1c090b01f8062109928305f391b1b8b49be Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/images/icons/action-icon-binding.pngbin0 -> 417 bytes
-rw-r--r--doc/images/icons/action-icon.pngbin0 -> 273 bytes
-rw-r--r--doc/images/qmldesigner-binding-editor.pngbin4189 -> 5228 bytes
-rw-r--r--doc/images/qmldesigner-set-expression.pngbin4213 -> 10970 bytes
-rw-r--r--doc/src/qtquick/qtquick-components.qdoc19
-rw-r--r--doc/src/qtquick/qtquick-properties.qdoc6
6 files changed, 16 insertions, 9 deletions
diff --git a/doc/images/icons/action-icon-binding.png b/doc/images/icons/action-icon-binding.png
new file mode 100644
index 0000000000..34b2c6adda
--- /dev/null
+++ b/doc/images/icons/action-icon-binding.png
Binary files differ
diff --git a/doc/images/icons/action-icon.png b/doc/images/icons/action-icon.png
new file mode 100644
index 0000000000..94e95ce8ef
--- /dev/null
+++ b/doc/images/icons/action-icon.png
Binary files differ
diff --git a/doc/images/qmldesigner-binding-editor.png b/doc/images/qmldesigner-binding-editor.png
index 0fd07427b6..fc6650bc5b 100644
--- a/doc/images/qmldesigner-binding-editor.png
+++ b/doc/images/qmldesigner-binding-editor.png
Binary files differ
diff --git a/doc/images/qmldesigner-set-expression.png b/doc/images/qmldesigner-set-expression.png
index da93bd2cc6..a5386d6937 100644
--- a/doc/images/qmldesigner-set-expression.png
+++ b/doc/images/qmldesigner-set-expression.png
Binary files differ
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 9a82fbd44d..d8327fd2f8 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -170,20 +170,27 @@
Property bindings are created implicitly in QML whenever a property is
assigned a JavaScript expression. To set JavaScript expressions as values
- of properties in the Design mode, select the \uicontrol Settings menu next to
- a property, and then select \uicontrol {Set Binding}.
+ of properties in the Design mode, select the
+ \inlineimage icons/action-icon.png
+ (\uicontrol Actions) menu next to a property, and then select
+ \uicontrol {Set Binding}.
\image qmldesigner-set-expression.png "Type properties context menu"
- The \uicontrol {Binding Editor} supports code completion. Start typing a
+ In the \uicontrol {Binding Editor}, select an item and a property from
+ lists of available items and their properties.
+
+ \image qmldesigner-binding-editor.png "Binding Editor"
+
+ Alternatively, start typing a
string and press \key Ctrl+Space to display a list of properties, IDs, and
code snippets. When you enter a period (.) after a property name, a list of
available values is displayed. Press \key Enter to accept the first
suggestion in the list and to complete the code.
- \image qmldesigner-binding-editor.png "Binding Editor"
-
- To remove bindings, select \uicontrol Reset in the context menu.
+ When a binding is set, the \uicontrol Actions menu icon changes to
+ \inlineimage icons/action-icon-binding
+ . To remove bindings, select \uicontrol Reset in the \uicontrol Actions menu.
You can set bindings also in the \uicontrol Connections view. For more
information, see \l {Adding Bindings Between Properties}.
diff --git a/doc/src/qtquick/qtquick-properties.qdoc b/doc/src/qtquick/qtquick-properties.qdoc
index add17138c4..e7ce811e49 100644
--- a/doc/src/qtquick/qtquick-properties.qdoc
+++ b/doc/src/qtquick/qtquick-properties.qdoc
@@ -46,9 +46,9 @@
\uicontrol Properties pane, and enter the name of another QML type in the
field. If you have specified properties for the item that are not supported
for the new type, the type cannot be changed and an error message is
- displayed. Select the \uicontrol Settings menu next to the property name, and
- then select \uicontrol Reset to remove the property values before trying
- again.
+ displayed. Select the \inlineimage icons/action-icon.png
+ (\uicontrol Actions) menu next to the property name, and then select
+ \uicontrol Reset to remove the property values before trying again.
To modify the common properties of multiple items simultaneously, select
them in the \uicontrol Navigator or on the canvas: