From b7c15f7f24c1f0afcea87b31d3b4e096149c9e7d Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 16 May 2023 15:32:28 +0200 Subject: [PATCH] Remove the "classwizard" example It adds nothing new to what the trivial and license wizard examples show, other than a bunch of somewhat messy and outdated code to generate C++ code files based on the input. The example is referenced in a few parts of the documentation, but there are equivalent snippets in the trivial and license wizard examples, so point at those instead, and add some relevant API usage where needed. Pick-to: 6.5 Change-Id: If1ff57e775bad28920d9e019aeccae69d1f4d127 Reviewed-by: Axel Spoerl --- doc/global/manifest-meta.qdocconf | 1 - doc/src/images/classwizard-flow.png | Bin 9745 -> 0 bytes doc/src/images/classwizard.png | Bin 8348 -> 0 bytes examples/widgets/dialogs/CMakeLists.txt | 7 +- examples/widgets/dialogs/dialogs.pro | 3 +- .../dialogs/licensewizard/licensewizard.cpp | 5 +- .../dialogs/trivialwizard/trivialwizard.cpp | 2 + examples/widgets/doc/src/classwizard.qdoc | 167 ------------------ examples/widgets/doc/src/licensewizard.qdoc | 4 +- examples/widgets/doc/src/trivialwizard.qdoc | 2 +- src/widgets/dialogs/qwizard.cpp | 34 ++-- .../dialogs/classwizard/CMakeLists.txt | 0 .../dialogs/classwizard/classwizard.cpp | 0 .../widgets/dialogs/classwizard/classwizard.h | 0 .../dialogs/classwizard/classwizard.pro | 0 .../dialogs/classwizard/classwizard.qrc | 0 .../dialogs/classwizard/images/background.png | Bin .../dialogs/classwizard/images/banner.png | Bin .../dialogs/classwizard/images/logo1.png | Bin .../dialogs/classwizard/images/logo2.png | Bin .../dialogs/classwizard/images/logo3.png | Bin .../dialogs/classwizard/images/watermark1.png | Bin .../dialogs/classwizard/images/watermark2.png | Bin .../widgets/dialogs/classwizard/main.cpp | 0 24 files changed, 26 insertions(+), 199 deletions(-) delete mode 100644 doc/src/images/classwizard-flow.png delete mode 100644 doc/src/images/classwizard.png delete mode 100644 examples/widgets/doc/src/classwizard.qdoc rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/classwizard.cpp (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/classwizard.h (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/classwizard.pro (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/classwizard.qrc (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/images/background.png (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/images/banner.png (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/images/logo1.png (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/images/logo2.png (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/images/logo3.png (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/images/watermark1.png (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/images/watermark2.png (100%) rename {examples => tests/manual/examples}/widgets/dialogs/classwizard/main.cpp (100%) diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index 84b70dbe2b2..27cf547734c 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -121,7 +121,6 @@ manifestmeta.ios.names = "QtCore/Contiguous Cache Example" \ "QtWidgets/Easing Curves Example" \ "QtWidgets/Move Blocks Example" \ "QtWidgets/States Example" \ - "QtWidgets/Class Wizard Example" \ "QtWidgets/Find Files Example" \ "QtWidgets/License Wizard Example" \ "QtWidgets/Standard Dialogs Example" \ diff --git a/doc/src/images/classwizard-flow.png b/doc/src/images/classwizard-flow.png deleted file mode 100644 index ad9446c4309e3905ee1fb5315f6368be2c957bc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9745 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 XtOY(bp8n(EZx46^SM24O5A!ekv= zGj>_WK9ga->3QDg{e9p2z2|r4zVErtwVdm^{^z>SePT_Gby?0_I0FCxSnld+-va>X zD74=Yke)`_3$SSe08Sj48s5LNytYiDkVN80@JKjq2{VIhvz2m~-R5t4$2!{G$NGOcxYcY}mLSy@@#-?7A9B8fx-0)g!8 z?1(r7Zi>cE5D^i9_(9NUbocjeB9TZ_0Rn-5%s?y_D8%1RUhb$4Si-QActgsHZvm8lg0hl3*! z*eL=cF%i?z?FNBhafHIs%I@5(EIqwS4>xRSAqIh{EUhdAgQXP|3azY=($a|_5bkp& z?h6_Xg?10)png!KtTZMi5nEY_0D%%kM9_W^1#tzi6}ZsOs<5)s3Jk^#!eozvT$iojxOhhIkk;}u_N-(&x5{<)PtnORs8JcEg6=G=gDI7XF5?ff< zosQH{(ZKa|XK8C-KUZSDbkp*RfFp=&%X+4!g{G#+^en;@4ymC*=)fpwXcW>S;snOh zyhbEqzo4-+gmiQxgg|gO!p+G|L|od+4y>WAN3#ufb0f|ZAZ`%scN~JB2Zu%@*x8q9 za7|3??!Y1y6rfNz0gFY$pvyR1R(fIKeN$6IQ{oyC1BavkK&u<~XWk^@E(!641XO`* z&uEDQ02giUYHQwyK3v1lou#dS2#w#CE<4OQCTm9CkntN4qu0Vk;*~=e36^fgC!2s; zm61TL-g8=4i=56kc-fe1N+20FSDr{IUK99Ow?CV`bV>C&Cxdr59`pEXoeW=Qd&gNv z?#qWEjWP*!&+7!dmz>SaB2jhaRWrcL4$$MZ=|dq!)nL9ZVd10Wv@zY77^wt@CUny! z1M<@NxEfP;ZRHyTWd?%$Jn4Bw-DoK7O+rbG!>R~+O7kr{nRHC>ouN2#k7&(5ZW&nt zElHjb39mKPtU_pfTLihP`Ka^R!3$B( zAtdCmwKBy!pbk-aHV>3h;lCm8hMI2N{;@p8i^*Yb$X|Z8;0u1UHuMCNrdad!`f0_T zafxi^6llxgcG{07@rXPZV7H|ryab=xLiw>s6>*q1FA$d9>S}seVba@OfNqoMU1C(> zAZ@$aW(X*sWuDMF{`GsuJ+vnHq4*aV`7%m+L-7jfG~3B$3YiXzSQKbY42-z7&e#u2 zBl_MF-TTf>_IT$rU6Hxp$WpCd|I!M+*S~#n=UT&1vy_8RnGE1vSUNe|CjrlN{J8~s zrrr6-W05+5=XaVANa)&fy7|kbVCbW)QNokofxG2fZwf{tA8k(V3sbxiFc%hb*~v4t z>ch=h`Ur|76E0Xq!#UCW@PW=e)iHrp9{>Qe16W&+W8XFzW?Rl!xg}B8(v95h#x8cE zijKcZ^M|<#mTyRZ2<(%Vy6{>y$z@lP$;rJGDi~3_&keL0XX53Xe5C;HzFB3YcY*Ok zZj?vT9WEC8Tu(iH(L9OIpZ%=e3`FxdY|cpREu_DXd9OTIB_|WFtHg$wdoe&=pAtw~ zFVSr)N`4#VJ!4DaYNp+tXKbxW7XR_6KKO}PCQj+lypz`k(8k)YAEt3yYj{5@=>MK- z#1%5gY2rI@+Tm`Src~4Xlmz9oxbr#N*{8nv9v73vCGTMi4*F!Xb1icj)ws0qAqb`p=A0 zPM7zFI6ADryLBKem(!fzKp${0#Uc&Q_nuRA+S^Bu?m4isG(U}UP(p2w2ETDsYJE!- zor!1*wRWyn0iQ#6CUTw{UHIn0&Q7azGvM z{4V$&y+02|%MdKSsq(&v zC`nH%vTEQAeg&~B;1olzUL~H{{{-~&&OUuhkxmJSqNz+G> zzHlT*n}Z0bR5q`wO1P>7E)OWXCROwrY*iJ#%yF^vK3uRt;<4;@?EvL1bK6T-0F)Jv zaiLR+1A;?Nr8+UES{OaZObo^d56N2?oXiYMn1>QK`ha{ z6Ww%P?65DsVt@-M;USGrh1D17uBRzsbJ;_p{qCIxnYmAiVcxKVN*@tqm|fBY^Cccr zh(?zN{^dDIcb7vQ(>balFaMmKYYw*fjnw(HC`(yp6Gz;#m@5gX6(9}o&c16nfzUOk z)7S2>y?Yk&)H&teV*E$?8yT4cry&+ovVa?+hI7S%Dc?9lkQWw{9(8dcSGOLLQShF=aXo_DQ`5UX1ylcmNcAc6c&l?wQgD@RX`&^WnL` z$nE#AK}gw3i@>%Z!LS{`j4qHJSV_Zis>IXL1nveY#XY>?Ogo^_~YPYXn^vZP$w(E+J>qBAwwru zMC;d+VEMI3`+MmQxR`gtw_DeP!OuHI3m70v>6Ovh<`aY+2XilF*eJsIn&8DY%%2Ee zkNd`%d}jH<(iSsdV1^GT4yReaBNu%m_B^kN9*LH$t`lOF)%|ndGj?r;zLJ+GuzmcK ziVqYw0XNNKFA4#^cMe+sfz3Jh9^4a`V>vpPaEE&oo{|2{l>r&B7aD1(uS>ET=vtIn zCt6>*_*zRTGVBj5+w`Y=uW^D;1OGvZA5WFfY;n5a%}ngnqx4Ym$`i_~D*aP;y$3tV zsl5?l_=6Ykv{)>p=D$&1?ou;?MG4BQ)s;blCX0cQq3$brZ~^<%Z7WeK?-?VhWDP<> zT&dUEU=x+(*IL)`(?lqyX9?2uHKkIRQ6rUB0rszlPb*GZ?N6+^# z!Y1RPIFPg~8bm*+q<&LxxXWm>R2Yo}aW+YIyH6K$=!$ z4wQF%Yp|yEm<^Yvs>6F+6CJj*S9DA`G!oC09}s4`lg-qxF=4@6FX8)?_3zDtxn{M^dTf|5BTD1#GzL{r~B zqS}CNf=GVZ&9K)sxa!R=q?MM2mC>j!z69BwdU%FM{e;m{;%i?zRKM;XS;VbUpj5t>V2%5avb*M zT;P&4WzZ2))-M^!_E(^e$AWe&!0hspkKs2YIef2J)aQI~;ki8fZw2LC@7p{A9y?$A zy(XNdRuISw}0BT%q=Np_T!S{(|sEI^EA97*AmoT`;liT%Ic`L*hueCyjqKQ^4=zX zE8zHR#`)9uEQ;s*}M@!cCHbIHbhhy>E#op0-GXyGf;S@kpRYt`okw$A>y zZn?ia#Q*?A<{*JwEdl*?)FO106_PXDLS~wV^i{$Z*|zVXz1@n*Du6vx%c^;pQN>xvu4`-Uo`}Y=PZAa zBd4HHmko2i$(AKXoz-Gw;r4p=Be$C2hg^gdYWwWfXL|Whq71JQPHjbrIe!wdcQIC5 zK;2eLdSW9uw1p;JzHgW)DI$vio=f|3Kgn9^d{u|V&$b_zd>f_sm7&QyALT>}6> z>>b(=YOF(go22#3ii{_b=YJ(9K~<@k4gd#;xP5OqSAjTwi{x5tf1u#;b?%`Wuh_$z zYm?uK+oU-8|C zjvZn)E%ob}lhtft%p@M-jsWqi`?u0#)?#oh8_ec&lK>Z|04dWjU0%Ipqi?t&yHOh> zMVh5opBPJ*$Cq!+z4<+KA2YxqKytAx=&LJvAyEWJ$*D;?czqsPoE!<(I7#`k6}DM~ zd9t&<@{@3$PTdto&@Gx?R2~U-xN!e6!SxjzMMO=>v)O*yM2qt&jS!c>=n#}_oQ8UE z;Ie(r?;Xt`JYmy5pM;^B=Ci@<)K2|1QzmJG`gqvm6SVUthDR-`;#ySGTB74sZpXC@ zBNIOB3p)7BhL3ObYv3n~aoad>@?zYk{_3K4Curg%g>P#K-TxRzKY}1k9urQd08b~0Kt-C_4n{l3=M$6FiTQlOf zQq&CDjX`+msQUC@4cym1*L#+2AbF=Z0J1uWKa&J;U378lv9CK`0#Q+yw>Q%KWhPhG zCs(`O^-a8f|N6a{us>w0eDpau@CR!$q=4JK#~!tPq}hxboSd{MSZ5seZ^A1*|6Vg4 z30nS%t`bdCK1X~Kuo_e-WVhWedXNq?syRH^X+^6?u-Nv!YUZThUbynNTrg)sO}^J7 ztSZlB$}vWzp{DFVMQ(E#Z3NfmXf`W(s%Kq#=x$`srq-u4l+PgRZ*Uh%3JghV7IH9O z4{EU~H9J_Bs4kOv!Po5#{5Fv5c5xbi)4m|zZnBBruPb5OU(6^aaw&A_)>1dhUX;yJ zCS9%B(lIKW0=YQdhs|l>Waf=0eFg9g~Cm09P4I# z?@`o)3na)5@(UAvZ0n$9W0MdY>WgY#1C8IFk3H7$A0@8NM7$#Hkl_1o4zze|TMv-7y3+9RH#p$`z(u{#ts)9`(%kp%;!i2XZcAx7 zwp#}w-!z-UMFljA20yU4Hk`H=lB-^aDZHH?GstgwD4$pX?$I?Z{!D@7%Lv?kPPUmC zHu&Tq#oKKO%?4f<%lVA@Wmxx}!?>P!HID{Ek=v~)mqnz;*<6FjMe`*YKMY(1E$^Qq zwRi0z*V3mZ<5}88o8~Wu74neJBS^bn=K~}R9N&oP3%%F#Ho6}GD(Hiy<64&LdFzZ4#GHS|4A+}%#*FDFgAJCRdMB}dUqkB7g# zejNP~nO3&w=J5f?{MfS^v{D-!__Vd%<@jVTN5oEWb6_Z6(^LMT@seefwJ1RtHjX0y zaNidn3UaIvY~r{1MMLQ;-fR9ZSo&V!;BNH)Ej!$QirHUyMVY4R*Nw_mHZ`-qnc@fe+?dzU)fWi9Hd!LRaSk+`t~!%zu`(hGSt1ymVCQ0 z({!VbZ+W;G|k$&z49vwudhqi{-VE%)GTC&^9E~vwCD_l#_Pz? ztB>{>7YKB@6zD@rcvkNHnutjI88_Ab9W!9EMM{%tY>w*^)`y7k(uVe@W5nNW9%}EH zm((a8F0PXV&B7bc(JYtalqxJ}Q|Ft_bZoPUdGZ2Uul0vaQq_xZ$&YN%=KJ?jW}KHg z`+wp7XSEC5FaMG^=x?6X5F2!}62Qqha^1Vg&wjB{^e{gvN~5{N?zutUD$JWt2R*&n zl)Hb&D5}>hwTUJ(?bE+rIOzZG%_|6Fn$H&>aq@d=QfeKCviZULqe&4db%B|DN#T~Y z1&OlEv>$Gf+dF5yT$kK#Nwu^sNNk%=kC%FG1p01^+5EiRk{Nl{%RAU{=*5bD$jM&Y z2VFjrEnRuU0uZU%Q#S z*Kp#er(6!p+4rK@>D6^^YQ^u2PY)0B18+BnuQhp=5q=X#9S(~}0~@{CX6vWsem*!9 zNSJIm>DoloBs@G(v0x&7ush>w|Ac&9#L>Ay?aSU+bMb?^MyO;U_H|(Sr8v%hQ*tl4Gz_voESa=dNqzBDUTuG}AM=S?4v^Q3bC!jm0HF?xJr*)B88EmL8=H?iSVO* zG1Uf(y0nGbSBuXM;%yIX7wi0A^#%C@UF&Nc{&I8=w9V9c)Kcf~u$h8dS2l}-d9Id! zfaS0hcup7h=>EMq`HzG#&U3SED_^Z;Gh6c9c5W$!Pf4XXc>a~(=6`Kx{-4CZtHFN( zz<)67s%^hv>!wP*@Pp7cVc`Jj2sdijTb*U8pJ(ctPnf91eXTNQ6r$~E0qxq-h$ETn zr+g};NvrEj&4l(CHV5L#fBHz*rHdsXX8K3`+#mf5bDi|MC$yx|D@?l?_Aq{7RBN^) zyX@^mj>Boc0|77euLxAv7?WCg7B8gAtQ`mWEuD`gHE*XAqP{ zFtIFR)3dC=PLjm*DuwjsocfvLLFTK?*&Vm0h>Qv$sav#*tLn@%HBz_~iFF!Ja=E0o z_pEim^Iq4^M@pl>uj|dzP2O8-!(09=)DY!$sj*pA_vXcDs^eI^W*TBv8r}jm;s5C~ z!Z`EnNqJTMXkhA2Pu@L8`g|je~Q!U20K5gZPLNi^G z>cbN(!?x>$TnutSG-MMLu43Ma4s8^7=Zvd+w^Ul7iJyAUs&08TY;W+xXI71$rwBGz z4d|`-Uj$LSnbyi3mV9Rxucw#{xXxubl7T)H4hQW}>>R15?M!F1tW5R24s^}yh7b6I zc%mPPS9fpAK6Sa4N#9tr$!4&6W^-{}|7#`}eueQQibQj9L-Wdg$! zFArJWlew(#5)O(z)u)tWn~`AYoI#+j|A)5O+{=K0nUmBe%eM{b~w zzc5e~<2MIb-jY3d2P>6ap8xJon7xwxvaW0&^O_L4ZJdc9uHPjZus$LMMW2Mj$}}#M zYUk{-%Rm7qnr}E+{)+ZJNorhsxwX!L+VO>Lp3+*dj^z54oEP_d|Havm$LC-~6@9^2^)L8QgX%;6mpiniiU!Om*7eDPi06mJsZ&i8?>rqRcdUI76Pyt}_b z#@1{!sgCRk37vB#{y`-h-u_i>YDCTzd{}NVJZh+G_KKNH*;?uLC){6p4wtHO`0-~} zIPiwRTv4@c!=2YB%UETNHp5EShcb^hBLtzXP9zX_$Ve}}s`o0UKl$q2Gv5`Pfa)RS z#tLV0uT=6tROv!>-@qO6I@<&=mFkS&c)$*H6p6cbd_UarEbzPGBSEzo@47>**rztQ z{mXA%V_PR`l?5)_)Udayb zbr!;vcOSQ61$1Gs4&h_D#*?uvNczJu+J9Qxk$y1tkY89!3@Oj%o7 z?_StxcHgpJ?QOo8LOVYIu&XdAlbVisIemdLocm2WMjsbv{&f)X?-L1+7k;L+5^_Sr wkl|3+f`YiZVetqx@Ud6-oC==OI(TB_wZ67V*ro&RQx9hasVisitedPage(LicenseWizard::Page_Details)) { +//! [accessField] + const QString emailAddress = field("details.email").toString(); licenseText = tr("First-Time License Agreement: " "You can use this software subject to the license " - "you will receive by email."); + "you will receive by email sent to %1.").arg(emailAddress); +//! [accessField] } else { licenseText = tr("Upgrade License Agreement: " "This software is licensed under the terms of your " diff --git a/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp index 83de13f0466..b9321338a47 100644 --- a/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp +++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp @@ -86,10 +86,12 @@ int main(int argc, char *argv[]) app.installTranslator(translator); #endif +//! [linearAddPage] QWizard wizard; wizard.addPage(createIntroPage()); wizard.addPage(createRegistrationPage()); wizard.addPage(createConclusionPage()); +//! [linearAddPage] wizard.setWindowTitle("Trivial Wizard"); wizard.show(); diff --git a/examples/widgets/doc/src/classwizard.qdoc b/examples/widgets/doc/src/classwizard.qdoc deleted file mode 100644 index 8494a3c7fbe..00000000000 --- a/examples/widgets/doc/src/classwizard.qdoc +++ /dev/null @@ -1,167 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example dialogs/classwizard - \title Class Wizard Example - \ingroup examples-dialogs - - \brief The Class Wizard example shows how to implement linear - wizards using QWizard. - - \image classwizard.png Screenshot of the Class Wizard example - - Most wizards have a linear structure, with page 1 followed by - page 2 and so on until the last page. Some wizards are more - complex in that they allow different traversal paths based on the - information provided by the user. The - \l{dialogs/licensewizard}{License Wizard} example shows how to - create such wizards. - - The Class Wizard example consists of the following classes: - - \list - \li \c ClassWizard inherits QWizard and provides a - three-step wizard that generates the skeleton of a C++ class - based on the user's input. - \li \c IntroPage, \c ClassInfoPage, \c CodeStylePage, \c - OutputFilesPage, and \c ConclusionPage are QWizardPage - subclasses that implement the wizard pages. - \endlist - - \section1 ClassWizard Class Definition - - \image classwizard-flow.png The Class Wizard pages - - We will see how to subclass QWizard to implement our own wizard. - The concrete wizard class is called \c ClassWizard and provides - five pages: - - \list - \li The first page is an introduction page, telling the user what - the wizard is going to do. - \li The second page asks for a class name and a base class, and - allows the user to specify whether the class should have a \c - Q_OBJECT macro and what constructors it should provide. - \li The third page allows the user to set some options related to the code - style, such as the macro used to protect the header file from - multiple inclusion (e.g., \c MYDIALOG_H). - \li The fourth page allows the user to specify the names of the - output files. - \li The fifth page is a conclusion page. - \endlist - - Although the program is just an example, if you press \uicontrol Finish - (\uicontrol Done on \macos), actual C++ source files will actually be - generated. - - \section1 The ClassWizard Class - - Here's the \c ClassWizard definition: - - \snippet dialogs/classwizard/classwizard.h 0 - - The class reimplements QDialog's \l{QDialog::}{accept()} slot. - This slot is called when the user clicks \uicontrol{Finish}. - - Here's the constructor: - - \snippet dialogs/classwizard/classwizard.cpp 1 - - We instantiate the five pages and insert them into the wizard - using QWizard::addPage(). The order in which they are inserted - is also the order in which they will be shown later on. - - We call QWizard::setPixmap() to set the banner and the - background pixmaps for all pages. The banner is used as a - background for the page header when the wizard's style is - \l{QWizard::}{ModernStyle}; the background is used as the - dialog's background in \l{QWizard::}{MacStyle}. (See \l{Elements - of a Wizard Page} for more information.) - - \snippet dialogs/classwizard/classwizard.cpp 3 - \snippet dialogs/classwizard/classwizard.cpp 4 - \dots - \snippet dialogs/classwizard/classwizard.cpp 5 - \snippet dialogs/classwizard/classwizard.cpp 6 - - If the user clicks \uicontrol Finish, we extract the information from - the various pages using QWizard::field() and generate the files. - The code is long and tedious (and has barely anything to do with - noble art of designing wizards), so most of it is skipped here. - See the actual example in the Qt distribution for the details if - you're curious. - - \section1 The IntroPage Class - - The pages are defined in \c classwizard.h and implemented in \c - classwizard.cpp, together with \c ClassWizard. We will start with - the easiest page: - - \snippet dialogs/classwizard/classwizard.h 1 - \codeline - \snippet dialogs/classwizard/classwizard.cpp 7 - - A page inherits from QWizardPage. We set a - \l{QWizardPage::}{title} and a - \l{QWizard::WatermarkPixmap}{watermark pixmap}. By not setting - any \l{QWizardPage::}{subTitle}, we ensure that no header is - displayed for this page. (On Windows, it is customary for wizards - to display a watermark pixmap on the first and last pages, and to - have a header on the other pages.) - - Then we create a QLabel and add it to a layout. - - \section1 The ClassInfoPage Class - - The second page is defined and implemented as follows: - - \snippet dialogs/classwizard/classwizard.h 2 - \codeline - \snippet dialogs/classwizard/classwizard.cpp 9 - \dots - \snippet dialogs/classwizard/classwizard.cpp 12 - \dots - \snippet dialogs/classwizard/classwizard.cpp 13 - - First, we set the page's \l{QWizardPage::}{title}, - \l{QWizardPage::}{subTitle}, and \l{QWizard::LogoPixmap}{logo - pixmap}. The logo pixmap is displayed in the page's header in - \l{QWizard::}{ClassicStyle} and \l{QWizard::}{ModernStyle}. - - Then we create the child widgets, create \l{Registering and Using - Fields}{wizard fields} associated with them, and put them into - layouts. The \c className field is created with an asterisk (\c - *) next to its name. This makes it a \l{mandatory fields}{mandatory field}, that - is, a field that must be filled before the user can press the - \uicontrol Next button (\uicontrol Continue on \macos). The fields' values - can be accessed from any other page using QWizardPage::field(), - or from the wizard code using QWizard::field(). - - \section1 The CodeStylePage Class - - The third page is defined and implemented as follows: - - \snippet dialogs/classwizard/classwizard.h 3 - \codeline - \snippet dialogs/classwizard/classwizard.cpp 14 - \dots - \snippet dialogs/classwizard/classwizard.cpp 15 - \codeline - \snippet dialogs/classwizard/classwizard.cpp 16 - - The code in the constructor is very similar to what we did for \c - ClassInfoPage, so we skipped most of it. - - The \c initializePage() function is what makes this class - interesting. It is reimplemented from QWizardPage and is used to - initialize some of the page's fields with values from the - previous page (namely, \c className and \c baseClass). For - example, if the class name on page 2 is \c SuperDuperWidget, the - default macro name on page 3 is \c SUPERDUPERWIDGET_H. - - The \c OutputFilesPage and \c ConclusionPage classes are very - similar to \c CodeStylePage, so we won't review them here. - - \sa QWizard, {License Wizard Example}, {Trivial Wizard Example} -*/ diff --git a/examples/widgets/doc/src/licensewizard.qdoc b/examples/widgets/doc/src/licensewizard.qdoc index 2770a38ae29..036572d6795 100644 --- a/examples/widgets/doc/src/licensewizard.qdoc +++ b/examples/widgets/doc/src/licensewizard.qdoc @@ -13,7 +13,7 @@ Most wizards have a linear structure, with page 1 followed by page 2 and so on until the last page. The - \l{dialogs/classwizard}{Class Wizard} example shows how to create + \l{dialogs/trivialwizard}{Trivial Wizard} example shows how to create such wizards. Some wizards are more complex in that they allow different @@ -191,5 +191,5 @@ option and disconnect the \c printButtonClicked() slot. \endlist - \sa QWizard, {Class Wizard Example}, {Trivial Wizard Example} + \sa QWizard, {Trivial Wizard Example} */ diff --git a/examples/widgets/doc/src/trivialwizard.qdoc b/examples/widgets/doc/src/trivialwizard.qdoc index f62e9174013..9ce22ec3834 100644 --- a/examples/widgets/doc/src/trivialwizard.qdoc +++ b/examples/widgets/doc/src/trivialwizard.qdoc @@ -55,5 +55,5 @@ \snippet dialogs/trivialwizard/trivialwizard.cpp 10 - \sa QWizard, {Class Wizard Example}, {License Wizard Example} + \sa QWizard, {License Wizard Example} */ diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index d6287717d97..27c0a12f71d 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -1761,9 +1761,8 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) \section1 A Trivial Example The following example illustrates how to create wizard pages and - add them to a wizard. For more advanced examples, see - \l{dialogs/classwizard}{Class Wizard} and \l{dialogs/licensewizard}{License - Wizard}. + add them to a wizard. For more advanced examples, see the + \l{dialogs/licensewizard}{License Wizard}. \snippet dialogs/trivialwizard/trivialwizard.cpp 1 \snippet dialogs/trivialwizard/trivialwizard.cpp 3 @@ -1892,12 +1891,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) To register a field, call QWizardPage::registerField() field. For example: - \snippet dialogs/classwizard/classwizard.cpp 8 - \dots - \snippet dialogs/classwizard/classwizard.cpp 10 - \snippet dialogs/classwizard/classwizard.cpp 11 - \dots - \snippet dialogs/classwizard/classwizard.cpp 13 + \snippet dialogs/licensewizard/licensewizard.cpp 21 The above code registers three fields, \c className, \c baseClass, and \c qobjectMacro, which are associated with three @@ -1908,11 +1902,11 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) The fields of any page are accessible from any other page. For example: - \snippet dialogs/classwizard/classwizard.cpp 17 + \snippet dialogs/licensewizard/licensewizard.cpp 27 Here, we call QWizardPage::field() to access the contents of the - \c className field (which was defined in the \c ClassInfoPage) - and use it to initialize the \c OutputFilePage. The field's + \c details.email field (which was defined in the \c DetailsPage) + and use it to initialize the \c ConclusionPage. The field's contents is returned as a QVariant. When we create a field using QWizardPage::registerField(), we @@ -1955,15 +1949,13 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) \section1 Creating Linear Wizards Most wizards have a linear structure, with page 1 followed by - page 2 and so on until the last page. The \l{dialogs/classwizard}{Class - Wizard} example is such a wizard. With QWizard, linear wizards + page 2 and so on until the last page. The \l{dialogs/trivialwizard} + {Trivial Wizard} example is such a wizard. With QWizard, linear wizards are created by instantiating the \l{QWizardPage}s and inserting them using addPage(). By default, the pages are shown in the order in which they were added. For example: - \snippet dialogs/classwizard/classwizard.cpp 0 - \dots - \snippet dialogs/classwizard/classwizard.cpp 2 + \snippet dialogs/trivialwizard/trivialwizard.cpp linearAddPage When a page is about to be shown, QWizard calls initializePage() (which in turn calls QWizardPage::initializePage()) to fill the @@ -2033,7 +2025,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) \snippet dialogs/licensewizard/licensewizard.cpp 27 - \sa QWizardPage, {Class Wizard Example}, {License Wizard Example} + \sa QWizardPage, {Trivial Wizard Example}, {License Wizard Example} */ /*! @@ -3407,7 +3399,7 @@ int QWizard::nextId() const using registerField() and can be accessed at any time using field() and setField(). - \sa QWizard, {Class Wizard Example}, {License Wizard Example} + \sa QWizard, {Trivial Wizard Example}, {License Wizard Example} */ /*! @@ -3550,7 +3542,7 @@ QPixmap QWizardPage::pixmap(QWizard::WizardPixmap which) const fields are properly initialized based on fields from previous pages. For example: - \snippet dialogs/classwizard/classwizard.cpp 17 + \snippet dialogs/licensewizard/licensewizard.cpp 27 The default implementation does nothing. @@ -3854,7 +3846,7 @@ void QWizardPage::setField(const QString &name, const QVariant &value) Example: - \snippet dialogs/classwizard/classwizard.cpp 17 + \snippet dialogs/licensewizard/licensewizard.cpp accessField \sa QWizard::field(), setField(), registerField() */ diff --git a/examples/widgets/dialogs/classwizard/CMakeLists.txt b/tests/manual/examples/widgets/dialogs/classwizard/CMakeLists.txt similarity index 100% rename from examples/widgets/dialogs/classwizard/CMakeLists.txt rename to tests/manual/examples/widgets/dialogs/classwizard/CMakeLists.txt diff --git a/examples/widgets/dialogs/classwizard/classwizard.cpp b/tests/manual/examples/widgets/dialogs/classwizard/classwizard.cpp similarity index 100% rename from examples/widgets/dialogs/classwizard/classwizard.cpp rename to tests/manual/examples/widgets/dialogs/classwizard/classwizard.cpp diff --git a/examples/widgets/dialogs/classwizard/classwizard.h b/tests/manual/examples/widgets/dialogs/classwizard/classwizard.h similarity index 100% rename from examples/widgets/dialogs/classwizard/classwizard.h rename to tests/manual/examples/widgets/dialogs/classwizard/classwizard.h diff --git a/examples/widgets/dialogs/classwizard/classwizard.pro b/tests/manual/examples/widgets/dialogs/classwizard/classwizard.pro similarity index 100% rename from examples/widgets/dialogs/classwizard/classwizard.pro rename to tests/manual/examples/widgets/dialogs/classwizard/classwizard.pro diff --git a/examples/widgets/dialogs/classwizard/classwizard.qrc b/tests/manual/examples/widgets/dialogs/classwizard/classwizard.qrc similarity index 100% rename from examples/widgets/dialogs/classwizard/classwizard.qrc rename to tests/manual/examples/widgets/dialogs/classwizard/classwizard.qrc diff --git a/examples/widgets/dialogs/classwizard/images/background.png b/tests/manual/examples/widgets/dialogs/classwizard/images/background.png similarity index 100% rename from examples/widgets/dialogs/classwizard/images/background.png rename to tests/manual/examples/widgets/dialogs/classwizard/images/background.png diff --git a/examples/widgets/dialogs/classwizard/images/banner.png b/tests/manual/examples/widgets/dialogs/classwizard/images/banner.png similarity index 100% rename from examples/widgets/dialogs/classwizard/images/banner.png rename to tests/manual/examples/widgets/dialogs/classwizard/images/banner.png diff --git a/examples/widgets/dialogs/classwizard/images/logo1.png b/tests/manual/examples/widgets/dialogs/classwizard/images/logo1.png similarity index 100% rename from examples/widgets/dialogs/classwizard/images/logo1.png rename to tests/manual/examples/widgets/dialogs/classwizard/images/logo1.png diff --git a/examples/widgets/dialogs/classwizard/images/logo2.png b/tests/manual/examples/widgets/dialogs/classwizard/images/logo2.png similarity index 100% rename from examples/widgets/dialogs/classwizard/images/logo2.png rename to tests/manual/examples/widgets/dialogs/classwizard/images/logo2.png diff --git a/examples/widgets/dialogs/classwizard/images/logo3.png b/tests/manual/examples/widgets/dialogs/classwizard/images/logo3.png similarity index 100% rename from examples/widgets/dialogs/classwizard/images/logo3.png rename to tests/manual/examples/widgets/dialogs/classwizard/images/logo3.png diff --git a/examples/widgets/dialogs/classwizard/images/watermark1.png b/tests/manual/examples/widgets/dialogs/classwizard/images/watermark1.png similarity index 100% rename from examples/widgets/dialogs/classwizard/images/watermark1.png rename to tests/manual/examples/widgets/dialogs/classwizard/images/watermark1.png diff --git a/examples/widgets/dialogs/classwizard/images/watermark2.png b/tests/manual/examples/widgets/dialogs/classwizard/images/watermark2.png similarity index 100% rename from examples/widgets/dialogs/classwizard/images/watermark2.png rename to tests/manual/examples/widgets/dialogs/classwizard/images/watermark2.png diff --git a/examples/widgets/dialogs/classwizard/main.cpp b/tests/manual/examples/widgets/dialogs/classwizard/main.cpp similarity index 100% rename from examples/widgets/dialogs/classwizard/main.cpp rename to tests/manual/examples/widgets/dialogs/classwizard/main.cpp