From 17be75b9cffd74047b4de74e3844d2f58f12781f Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Date: Thu, 12 Apr 2012 15:01:58 +0200
Subject: [PATCH] Doc: update information about creating buttons

Update screen shots

Change-Id: I09e3b3cd496c338ce390c3a82bd7468b7be0b97f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
 doc/images/qmldesigner-borderimage.png    | Bin 949 -> 3108 bytes
 doc/images/qmldesigner-button.png         | Bin 1414 -> 2764 bytes
 doc/images/qmldesigner-center-in.png      | Bin 849 -> 1001 bytes
 doc/snippets/qml/quick-scalable-image.qml |   6 ++++-
 doc/src/qtquick/qtquick-buttons.qdoc      |  31 +++++++++++-----------
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/doc/images/qmldesigner-borderimage.png b/doc/images/qmldesigner-borderimage.png
index c28386bd4727d755839f8a10bc10e6f1d2a1dc14..d766161fb0af15316973cb7d38a1772b404a5ee8 100644
GIT binary patch
literal 3108
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

literal 949
zcmeAS@N?(olHy`uVBq!ia0vp^K0qwZ!2~2D>;4%7Db50q$YKTtz9S&aI8~cZ8YswK
z;_2(kev6Bji&5v{|K5jSA=ii!$I_CF{33>x>&|!pg?LJULN2Mr$wiq3C7Jno48oj>
z%0O{0khpVxL1j^9dPWJu8vZj@Kv6!hXi;h+NU1_eW^O8j>34okpbRHSCOAK>q&%@G
zl_9p^KS((@*znBa<eWsH(jtcK2e$MBg*iaN;fY0gnR)392c)011I5@O`b&$FQyISg
zZ+;C^=A56Ko0?a`@a@dB{Xj7`kg|}>lAKhA74I&oGcYhUc)B=-M6^Dg9-A%fDAIP`
za^{k3yOZsWP7}R0c9`tdSn*@>o<RLC;Tf7v|0lm_y%n}Fq-$?xZnmArF6ozPX?^0G
zt#7Vj6b&+umghKgM#zHy{XApNd2?b9sC0bb4(@x#*7yD~yTYQ`9rtXak9JHwbxdiM
z)ifSn!%v>lJTh0#b|jy7Fv{|1Ia~E_zPN?-Icw*&k_?OI39r{S);H@u8Dg&NV{`x9
z-4`i}yOY|sNJojyKAPdrHtEcq@{C{Rmptz&^0_h_YKAVIbIop!*U~xDgJza0yxjHi
z_9v-?r5p@ft~J-$U#wc!;<$hPRyOUIm3fy`&&r)IK0fJ;&QhOUOKvJJHQAhQ6Dz#-
zxmSn(_5Y5O9^R^Kv*KY;dX;v~;_d#hu8yTg&pdq1Rd{uZ(Zom%)i=ybMcNFCr9PV|
z$t3x+7-z5D$|on`spK_x`NxfF3=2$Wuia3)V#=l@my}@NZC~t<EKAR;pFJ&-o58{5
zc;UVJ8<F{IJ(n6f9oqVzSH>|Vqx}8k#};mm3=D!(Pd_cszrW?$J5AN4R~qB0Y-UOx
zQWI%1Qn7niQ}^M6pde#|fo+6V=(K5hxp}$v)t_c;y7FC5F}J+)<!-M;MnUuK+sw`0
zP4^OYadNS-lg(H=b<*Cv^8Ebo4-)F1#P6&4XVNRqskE==tJUo2h}gZiv(|=ZZ}o8#
z5R{wG=d-`ht#18oTbn;cC118)f8AGe|KEYR^#Xw$6VE<fb@kS#Pj9DAwZ0mqJNqoF
z@RuiV4xLk7y5#k)xqiFv{(Dz>um9nNFU6O*_A?4HesHsk*AS8Fo&B|HafA+=q*RXz
zgM@!tnAfj=9;X5)Jh|gNi&3-Xq|xk?9K}~>&ur?jXLRW7DNeYo_6wLg89ZJ6T-G@y
GGywqHX^o-)

diff --git a/doc/images/qmldesigner-button.png b/doc/images/qmldesigner-button.png
index 21556d56e988dc5e54a5233efaee19ef16f5de8c..faf511fb635aa0bfb4dd879da52d11e6309531ae 100644
GIT binary patch
literal 2764
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
S+!??C0000<MNUMnLSTYF5xUj@

literal 1414
zcmXApdpy&77{|XZwGl%(XdJi1(#u`0r_0vV=D0>K<<iD5W1DSEQtru|+6zbP<}!|Q
zIn|-uV}z3Ht0W>$>?qj@u?WTa&H3Ybp4aRBe4gj~yuPpJ`_1xjJE<s-lm`GP;&Iqh
zP&@~j9$Xso6`S^Vp&&=c`7;4PbV^Jr{~$sWf-n}|)d@BxqoSmG(BGj>w2hqnSm;<*
z1dRbI9`xZLq`-m@mc$HUkm)QkjSBY2>FtBKyo4X8(a$r;;SntGr&6B-L=oGRK_W<`
zx-4=u2^?Bgl7ljGl8hHEjKwA}NFb2DC6VviZcb)~L=hk<1Jt)Y=0X@Q!M+3rl}rr>
zZJHl4AqM-uK9&(e0$;b%B-3uoj?<!}NmLeC>ANm~*iMPeo6L$Lf%5rRMgYiq;<0G&
zh?LK_&^Y6>8qWs<!k@l<*LOqS($}=_uMCwrjD>Hl9LDr9>damqr%l(oB)7)g)<$JV
z*6Zo}Pnx=2>*8hW8k~(iRaA(&6H;laW2nBi#_W*glF5tN8+V?q&eea}KnU%()|dnA
zf!~OTOqs+*3LPZBoK-)2;zw#J*DP2!ogNz-8xx~~Dfc$sSYK~yYC>`J;h2D|)Tc24
z72Z8Fj4Z5vzB3x`YUpLKn~#zQi=Q=p4#6?Abi0UKhIj^x^*Yp&pkY|KWGnqVhEsy#
zyb^t7v)Rqf%|=E>VUO&!x%;?B_#zt{n}}P~sHlK5XDn~`FLV~Dqf|K=85xt4lOhr2
zcK@>&EpUuzjdXO_9W2<yD|deXo_O+P=BPs#RzF8976$|c6&4h{m{}Su;#OK+5jIRs
z5z0;-c+i@VtP5|RxJDT5>5+fW^P^Czh9iGE?e{a^1I2O(toD<Ag7&F8t)FwHva;1&
zLjhHed_6H?Qg|Z)TXu?H+|*xRTRZ&6-_B*zEC(HJ?Qd$i1}#A}CX?y9o@5njxmUi@
zs=V%A`{w56(L$))lqYH=nVr)JBNC_Q=H_T#)$bM848*vEmO^0zhOa9=CY>U9i&N-`
z|D~{^;=t7t9ruJn;e`tqxLhuULV@<)+d0>uXsOpqLqS_dM+S_Ik55o-@wu}iwe0=K
ztI`0TdZVDg>F|geL2=s76nV9BI1=h&-Y43HL?Z9FeWVD#sRCt%oir*{It8GWj}$@E
z4t-*k3_wm-Sr@-FJKMdmy36xlSqqd}b{Ek?wbXxcJn*z}{_^rNpRbo|AO+IW(yU!e
zIhTdsMn^RwM<Q!sFjxj=N<i>PO4{n~hI7)|i+g9*qq&?e{oWcA6BAT^?~E*3Rer}M
zo(i%(Tin(LE)&$%)iFv2%Bh-SGql%-%}wpHE@E|nsh|u<W~U}42`Vb^4@XMR_J>*m
zNdJy%+cf;~^Fyx+@3D!Ai}CS(ro19vBARp*_HjY>ImL%ts7}7`)7;v6jd*Y9Q(SXM
zwFW+SXlTgM(NS`9k@e#(L1vMw2`y%?s;e!E2E*&e+lOp|4;E~J-WpV!79#WI?ADhK
zZcy>X<OYGD=;lqijKb^CDSLc9T5|fsJUtGfa&T9S?rP%=^Po-m-MMUje!g?aEBK$~
zH5bEuyk04qayp&O<~?*-*n6EMlLFG|WU}1i&YLcG15E2%T7C>1Ci=%wD58~>H^gce
zH#h0YVw^#VPnEm7`(f?D=0M6?;-&NF?F-!4adDSB2x3H2!U`W{tj!&ds>{pEYixv4
z;pQ6N#`!LW8%bL=JvC9#GYfn4BGfYP#WA>v+OKw6n<D<m6g?dSFmSz4|2GS(rPE?W
zPVbDhD^m+r1kWf$aEO$uU^-}9UC`M|UfXY%?h&OJ+wV?upTkZ$y|sY88-RCm!#=>A
GOZ^Z1By)}c

diff --git a/doc/images/qmldesigner-center-in.png b/doc/images/qmldesigner-center-in.png
index 5d2213016e17431fe20eef2a7b7150c43b2bb67f..979f9796b671108238bbfae4902e97cbee75cd29 100644
GIT binary patch
delta 774
zcmV+h1Nr>X2I&VOiBL{Q4GJ0x0000DNk~Le0000j0000K2nGNE02yzz|B)dc3fu$?
z2^TY?{IP?PN!Ne0Nkl<ZNQt#q%}(<$5S*lm8dFmGhoDHI2QJ*WAn^uBJQk1B7wM^2
zqzVM&68@w@K!mob?d5<RrKz3riF_+Xm21y<b~Ed`*5&0T&1N%H8Kcn%XJ==q)oPXS
zrD=*Nig0^-i*~yWCyrwzNm2=Uev^-n4-iphoUK+1gTa3QQ53-;qDsjDKyg;dOGIck
zo4C2Tfg`1al(I5%wE+?Rir4pjFvjrm^0INQZQCFs*!ikd_2h+bdV(Op>FMb|aU1RN
z`ud88hX>fUZLDUe(?P%AFRgYlK0iNke}A7f>E7NRf*`=v)m4V`eIJL1helqbXwEr~
zkB@P5bfkX;KR-X?`ubXnE%USx0znYq<m3bZaBy${*L87maRC5Gk_4mCsI(u9qKODX
z2rQRNEl>zi+H7TWQp${1`Cg4V=NZ0Kbg^MP&%@T%7V7o7(H^erVtacVp6B7~>q{$G
z*NCd|^P-7pMRZvc6A_%{a=BK`^Ye4GS}kLy`QU$?V>leH3FDk+RV%KSQX);$Y%PFn
zoTlkYQo5v_#bSZQVzDwY9*@B}2V)HFc3TThk_6M~6u$4T;gu-e#_BuuDTG)VtE7sY
zDu@V<5Mu3Bgkgv{j?rv3vA@5s1;=rWD2lMVySp}LSr$y^zp{g>tm=(orAzH$T0lhL
zoEv{%Q<?W{+cs{jFq;~&?1#xwnd;){=?QOdZ${Cs>uRw|wCPluPN!M(_WOMd1_Mkc
zlNGV0r-#lS0MKYOz!)<E^Wut8tJRE^uGi};mh(Ih0I;*Ovym6b*~65T>9{MB=y1Q~
zeSCcUxla`K+F0qTZ+V+U=OYY5gkktA-t129VY0_xqO1}B60_M19%DcDs5&gms`Twi
zDKVeV@&5jfZnq2P?(Xit{0Xout5QzJ7<#=P8jS|N0qU*MXo=COd;kCd07*qoM6N<$
Ef@HvYi~s-t

delta 621
zcmV-z0+Rjd2hj#0iBL{Q4GJ0x0000DNk~Le0000#0000S2m$~A09gg_5RoAs3fcr6
z4izC;z-KFwN!NcINkl<ZScT=7v5M+I6o&syhFzirM648cg}X`PBZyr(8!g1br|@O0
z#LmLb2e1-_ynuyIpkk%rj)f-KVwOb`Gm~VK%gX($aAwYTe$Jc>AxgDc#gm9qs_XjO
z``hcwtMB^&sA-z*cH42B%!`f3<Kb|aA(=6DI2>%-E|q^uwOY;heG1@sJf2RctZLjV
zbF!}MmSruM%fE~jG>!5oKZrb(E%|o40Wb_>yWN_mNqK>s+~-6tm&@n#8NgGzCxm>x
zwfWUZMDBDt0Os>~BK~i2|GhsEU*dkfUP}?pW>erMCb`?~0$8n9G09w1YHlzX2v(=l
zsgw|(d>?;_LzYjD>$+luAU7#F5Rnd&+&#Zy1xoEcOb$f;5BHwu1s3}KK7d}YC(duR
zTKr))n}t^&lB2waBZ6Em3gB|NFvi6Dq<TmYlcnyZt|$P{^TKB|nM?p|HXF;b1o?}_
zqS0tPTq1-#Bu9A-M`BHmxW@H*6(gc@RaH$&4n%)qxp!SxFk#XgGb&eA)uiM=B-Y#~
zJ>P&*_x@i@j&0jwL{u)NG(MSMZh=~HCnsv3VHo0kK@C1RiO7Lq2E9)$Y45{I^NpF4
zd+FTYYcv|AC?T1gpNLYL6WQ}TMN#m3dY?#+<LJ7MTzgLl$%E{=?tZ`j^YMZ2ue59n
zaH%z_n)&Y##@KGRt5hn*LIHsCM1KMaA;n^`UaxDK#{2RK58n#K8Btf300000NkvXX
Hu0mjfx}PHI

diff --git a/doc/snippets/qml/quick-scalable-image.qml b/doc/snippets/qml/quick-scalable-image.qml
index fe82b298f4d..e4691738768 100644
--- a/doc/snippets/qml/quick-scalable-image.qml
+++ b/doc/snippets/qml/quick-scalable-image.qml
@@ -1,8 +1,12 @@
 Item {
     //! [properties and signal definitions]
     property string text: ""
-    property int fontSize: 44
+    property int fontSize: 10
 
     signal clicked
+
+    width: 60
+    height: 40
+
     //! [properties and signal definitions]
 }
diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc
index 08028fbbc34..ed5c07da44b 100644
--- a/doc/src/qtquick/qtquick-buttons.qdoc
+++ b/doc/src/qtquick/qtquick-buttons.qdoc
@@ -37,7 +37,7 @@
 
     \list 1
 
-        \o  Select \gui {File > New File or Project > QML > QML File > Choose}
+        \o  Select \gui {File > New File or Project > Qt > QML File > Choose}
             to create a QML file called Button.qml (for example).
 
             \note Components are listed in the \gui Library pane only if the
@@ -73,7 +73,8 @@
 
             \o  In the \gui Text field, type \bold Button.
 
-                You can select the text color, font, size, and style in the
+                You can select the text color in the \gui Color section and the
+                font, size, and style in the
                 \gui Font section.
 
             \o  In the \gui Alignment field, select the center buttons to align
@@ -81,7 +82,8 @@
 
             \o  Click \gui {Layout}, and then click the
                 \inlineimage qmldesigner-anchor-fill-screen.png
-                button to anchor the text to the whole button area.
+                (\gui {Fill to Parent}) button to anchor the text to the whole
+                button area.
 
         \endlist
 
@@ -91,9 +93,6 @@
 
     \endlist
 
-    \note To view the button, you must add it to a Qt Quick Application or
-    Qt Quick UI project.
-
     To create a graphical button that scales beautifully without using vector
     graphics, use the \l{http://doc.qt.nokia.com/4.7/qml-borderimage.html}
     {Border Image} element. For more information, see
@@ -120,7 +119,7 @@
     is visible by default. You can specify that it is hidden and the other one
     becomes visible when the mouse is clicked.
 
-    Add a MouseArea that covers the whole area and emits the clicked signal
+    Add a Mouse Area that covers the whole area and emits the clicked signal
     (\c {parent.clicked()}) when it detects a mouse click.
 
     You can add text to the button and set it up as a property. The text can
@@ -135,7 +134,7 @@
 
     \list 1
 
-        \o  Select \gui {File > New File or Project > QML > QML File > Choose}
+        \o  Select \gui {File > New File or Project > Qt > QML File > Choose}
             to create a QML file called Button.qml (for example).
 
         \o  Double-click the file to open it in the code editor.
@@ -158,12 +157,12 @@
 
         \o  Click \gui {Design} to edit the file in the visual editor.
 
-        \o  Drag and drop two \gui BorderImage items from the \gui Library pane
+        \o  Drag and drop two \gui {Border Image} items from the \gui Library pane
             to the scene.
 
         \o  Drag and drop a \gui Text item to the scene.
 
-        \o  Drag and drop a \gui MouseArea to the screen.
+        \o  Drag and drop a \gui {Mouse Area} to the screen.
 
         \o  In the \gui Navigator pane, select \gui border_image1 to specify
             settings for it in the \gui Properties pane:
@@ -182,7 +181,8 @@
 
             \o   Click \gui {Layout}, and then click the
                 \inlineimage qmldesigner-anchor-fill-screen.png
-                button to anchor the border image to the \gui Item.
+                (\gui {Fill to Parent}) button to anchor the border image to the
+                \gui Item.
 
         \endlist
 
@@ -198,7 +198,7 @@
                 when it is clicked, for example button_down.png.
 
             \o  Click \gui {Layout}, and then click the
-                \inlineimage qmldesigner-anchor-fill-screen.png
+                \gui {Fill to Parent}
                 button to anchor the border image to the \gui Item.
 
         \endlist
@@ -215,7 +215,7 @@
                 enter a pointer to the \c {text} property that you specified
                 earlier: \c {parent.txt}.
 
-            \o  Select the \gui Aliasing check box to enable smooth text
+            \o  Select the \gui Smooth check box to enable smooth text
                 rendering.
 
             \o  In the \gui Size field, select \gui {Pixels} to specify the font
@@ -227,6 +227,7 @@
 
             \o  Click \gui {Layout}, and then click the
                 \inlineimage qmldesigner-center-in.png "Anchor buttons"
+                (\gui {Set Vertical Anchor} and \gui {Set Horizontal Anchor})
                 buttons to inherit the vertical and horizontal centering from
                 the parent.
 
@@ -247,8 +248,8 @@
 
     \endlist
 
-    \note To view the button, you must add it to a Qt Quick Application or Qt
-    Quick UI project.
+    \note To test the button, add it to a Qt Quick Application or Qt
+    Quick UI project and run the application.
 
 */
 
-- 
GitLab