From 66a22bb6088abb87be632cbf9410a716daa8f4fe Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 3 May 2017 16:04:28 +0200 Subject: [PATCH] Doc: Describe the new toolbar in Qt Quick Designer Some regularly used context-menu items can now be selected on the toolbar. Some of the icons are constructed at runtime, so images are needed for them. Some are in a new location that has to be added to the configuration file. Change-Id: Ibfc38ec21ed5526702abf89e64899efa5b978700 Reviewed-by: Thomas Hartmann --- doc/config/qtcreator-project.qdocconf | 1 + doc/images/qtcreator-anchors-reset-icon.png | Bin 0 -> 482 bytes doc/images/qtcreator-reset-position-icon.png | Bin 0 -> 472 bytes doc/images/qtcreator-reset-size-icon.png | Bin 0 -> 379 bytes doc/src/qtquick/qtquick-designer.qdoc | 24 ++++++++++++------- doc/src/qtquick/qtquick-screens.qdoc | 12 ++++++++++ 6 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 doc/images/qtcreator-anchors-reset-icon.png create mode 100644 doc/images/qtcreator-reset-position-icon.png create mode 100644 doc/images/qtcreator-reset-size-icon.png 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 0000000000000000000000000000000000000000..41ca745f9c6169ce9e5d458b39111ecfc81c49c3 GIT binary patch literal 482 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmW!d_r6q7#Iu<4J|D#gMxyR zlasTvv#YDCdwP17E?v5I?b@wdx9;7$_ujpG&!0bk|Ni~||NogQnw1$C7&r?&B8wRq zWZOZQvH$7ER0akH_7YEDSN4aj%-q(Z(-tq&1`D}HlsJ}_WaJkytXy}-gMop8r^Gd) z#3i*jxhS)sBr`vcL6}n!WF!|z+&RCXvM4h>ql94%{~0R=1_nN`Xi;h+NU1_eW^O8j z>34ok1_lOBkW6rXT1k0gQ7S`h!GDl)Zjhi$W^r;(VrFh?5ySQaTlyIo7&t(};fY0g znR)392c)01!<-hJUs{x$%JB7n^J|zg=ltB<)VvagZ)c|MXJBAp18EJ(EXhe_Sn=+X zIs*ekp{I*u2*=FiAN;I5|0Nw7I0OU)BqSsZ z4Gn{Wf{KfatE;PfdU}>FUAlJd+O1o+?%lih*s){x?%n(T{d;v$_ICyb2F?PH$YKTt z*>(_S?0@<(m4ShQy~NYkmHiXn#lXP82No?#O#~@bD9OxC zWib8D&&j~RzzLEG&QB{TPb^Ahh%NXJQqBz$bjd7E&PmM7O)X;Beqc*K$crH1@Wi6L z%)E4l1JcjhVNMIqFD*(=W%&BP`87iBGcYi)fwYEXmgJ-|tax`x zoq>TN-P6S}gkxs%4}Mmj6FvL41sqdd_B-L2eRQ0y!Q;Qx|GvL(?Ac%T|L6akOp?>z z{eS+y{-@pHdS*6(3+){;g_iswi@(or|I2J1A%6PLf8B&)iJSJejI+-idhkaiXFA{i i|5+Vx-9x@HGuTAO_U5=TI5RLXFnGH9xvXFdh=kd>KJL8)bp%muKJYeb1-X-P(Y5yQ%L zXFM1f7i4Ffed}WPoK-VA}NEJ}shta^hdP pwxh8;zh_HGJ(B!q&$fz%A&^5N0A literal 0 HcmV?d00001 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