diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index 6f702042270..5914017666f 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -16,6 +16,7 @@ imagedirs = ../images \ ../../src/plugins/diffeditor/images \ ../../src/plugins/help/images \ ../../src/plugins/projectexplorer/images \ + ../../src/plugins/qmldesigner/components/componentcore/images \ ../../src/plugins/qmldesigner/components/formeditor \ ../../src/plugins/qmldesigner/components/navigator \ ../../src/plugins/scxmleditor/common/images \ diff --git a/doc/images/qtcreator-anchors-reset-icon.png b/doc/images/qtcreator-anchors-reset-icon.png new file mode 100644 index 00000000000..41ca745f9c6 Binary files /dev/null and b/doc/images/qtcreator-anchors-reset-icon.png differ diff --git a/doc/images/qtcreator-reset-position-icon.png b/doc/images/qtcreator-reset-position-icon.png new file mode 100644 index 00000000000..e7dd76eda49 Binary files /dev/null and b/doc/images/qtcreator-reset-position-icon.png differ diff --git a/doc/images/qtcreator-reset-size-icon.png b/doc/images/qtcreator-reset-size-icon.png new file mode 100644 index 00000000000..d447a24c8f8 Binary files /dev/null and b/doc/images/qtcreator-reset-size-icon.png differ diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index 2effe872945..dfccf27f7f8 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -153,11 +153,14 @@ stacking value are drawn in the order they are listed, from the last item up. - To change the stacking order of an item, right-click it in the navigator or - the \uicontrol {Form Editor} and select \uicontrol {Stack (z)}. You - can raise or lower the stack value of an item - or move the item to the front or back of all its siblings. To remove the - \c z property, select \uicontrol {Reset z Property}. + To raise or lower the stack value of an item, select \inlineimage raise.png + (\uicontrol Raise) or \inlineimage lower.png + (\uicontrol Lower) on the toolbar. + + To move an item to the front or back of all its siblings, right-click it in + the navigator or the \uicontrol {Form Editor} and select + \uicontrol {Stack (z)}. To remove the \c z property, select + \uicontrol {Reset z Property}. You can also use a \uicontrol StackLayout item (Qt Quick Controls 2) to create a stacked view. For more information, see \l {Using Layouts}. @@ -216,10 +219,13 @@ \image qmldesigner-element-properties.png - You can use a context-menu to reset some item properties. To reset the - position or size property of an item, right-click the item and select - \uicontrol {Edit > Reset Position} or \uicontrol {Reset Size} in the context menu. To - set the visibility of the item, select \uicontrol {Edit > Visibility}. + To return an item to its implicit position after moving it, select the + \inlineimage qtcreator-reset-position-icon.png + (\uicontrol {Reset Position}) button on the toolbar. To return it to its + implicit size, select \inlineimage qtcreator-reset-size-icon.png + (\uicontrol {Reset Size}) button. + + To set the visibility of the item, select \uicontrol {Edit > Visibility} in the context menu. To specify the color of the selected item in the \uicontrol {Select Color} dialog, select \uicontrol {Edit Color} in the context menu. diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc index 49bc878a27b..77d00151bc1 100644 --- a/doc/src/qtquick/qtquick-screens.qdoc +++ b/doc/src/qtquick/qtquick-screens.qdoc @@ -172,6 +172,12 @@ \image qmldesigner-anchor-buttons.png "Anchor buttons" + For convenience, you can click the \inlineimage anchor_fill.png + (\uicontrol {Fill to Parent}) toolbar button to apply fill anchors to an + item and the \inlineimage qtcreator-anchors-reset-icon.png + (\uicontrol {Reset Anchors}) button to reset the anchors to their saved + state. + Specifying the baseline anchor in \QMLD is not supported. You can specify it in the \uicontrol {Text Editor}. @@ -270,6 +276,12 @@ the \uicontrol {Form Editor}, and then select \uicontrol Layout in the context menu. + You can also click the \inlineimage column.png + (\uicontrol {Column Layout}), \inlineimage row.png + (\uicontrol {Row Layout}), and \inlineimage grid.png + (\uicontrol {Grid Layout}) toolbar buttons to apply layouts to the selected + items. + To make an item within a layout as wide as possible while respecting the given constraints, select the item on the canvas and then select \uicontrol Layout > \uicontrol {Fill Width} in the context menu. To make the item as