diff --git a/doc/images/qmldesigner-boolean-false-blue.png b/doc/images/qmldesigner-boolean-false-blue.png new file mode 100644 index 00000000000..43bf1175116 Binary files /dev/null and b/doc/images/qmldesigner-boolean-false-blue.png differ diff --git a/doc/images/qmldesigner-boolean-false.png b/doc/images/qmldesigner-boolean-false.png new file mode 100644 index 00000000000..9226583632f Binary files /dev/null and b/doc/images/qmldesigner-boolean-false.png differ diff --git a/doc/images/qmldesigner-boolean-true-blue.png b/doc/images/qmldesigner-boolean-true-blue.png new file mode 100644 index 00000000000..c7f667d1c5f Binary files /dev/null and b/doc/images/qmldesigner-boolean-true-blue.png differ diff --git a/doc/images/qmldesigner-boolean-true.png b/doc/images/qmldesigner-boolean-true.png new file mode 100644 index 00000000000..e2817922ec0 Binary files /dev/null and b/doc/images/qmldesigner-boolean-true.png differ diff --git a/doc/images/qmldesigner-properties-explicit-base.png b/doc/images/qmldesigner-properties-explicit-base.png new file mode 100644 index 00000000000..4833624639d Binary files /dev/null and b/doc/images/qmldesigner-properties-explicit-base.png differ diff --git a/doc/images/qmldesigner-properties-explicit-state1.png b/doc/images/qmldesigner-properties-explicit-state1.png new file mode 100644 index 00000000000..2a58312204b Binary files /dev/null and b/doc/images/qmldesigner-properties-explicit-state1.png differ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 2e704b23fbc..694f09db141 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -1319,10 +1319,6 @@ \image qmldesigner-element-properties.png - 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 states are highlighted with blue. - You can use a context-menu to reset some element properties. To reset the position or size property of an element, right-click the element and select \gui {Edit > Reset Position} or \gui {Reset Size} in the context menu. To @@ -1330,6 +1326,56 @@ For more information on the properties available for an element, press \key {F1}. + \section2 Viewing Changes in Properties + + 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 states are highlighted with blue. + + This allows you to easily see which values are set in the .qml file and + which values are default characteristics of an element or a component. + + When editing states, you can easily see which values are explicitly set in + the current state and which values are derived from the base state. + + The following images illustrate this. In the base state, the \gui Position, + \gui Size, and \gui Colors values are explicitly set and highlighted. + + \image qmldesigner-properties-explicit-base.png "Explicitly set properties" + + In \gui State1, only the color is explicitly set and highlighted. + + \image qmldesigner-properties-explicit-state1.png "Explicitly set properties" + + Resetting a property sets it back to the default value and removes the value + from the .qml file. + + \note As a result, all boolean values can be visualized in four different + ways. + + For example, visibility can be visualized as follows: + + \table + \row + \i \image qmldesigner-boolean-true.png + \i TRUE + \i The element is visible by default. The visibility might be + overridden by the visibility set in the base state. + \row + \i \image qmldesigner-boolean-true-blue.png + \i TRUE (highlighted) + \i The element is explicitly set to visible. + \row + \i \image qmldesigner-boolean-false.png + \i FALSE + \i The element is hidden by default. The visibility might be + overridden by the visibility set in the base state. + \row + \i \image qmldesigner-boolean-false-blue.png + \i FALSE (hightlighted) + \i The item is explicitly set to hidden. + \endtable + \section2 Setting Expressions \l{http://doc.qt.nokia.com/4.7/propertybinding.html}{Property binding}