From 742396c9137a3a0827d21b91e02953d6ce1f66d3 Mon Sep 17 00:00:00 2001
From: Christian Schirmer <christian.schirmer@uconn.edu>
Date: Wed, 18 Nov 2015 00:28:35 -0500
Subject: [PATCH] Modified HomePrint to contain array members Modified
 HomePrint constructor for arrays Modified get methods in HomePrint

Modified PageSetupPanel for checkbox components
Modified PageSetupPanel to create new checkbox components
Modified PageSetupPanel to add item listeners
Modified PageSetupPanel to update from HomePrint
Modified PageSetupPanel to update to HomePrint
Modified PageSetupPanel to add components graphically
---
 .../model/HomePrint$PaperOrientation.class    | Bin 1321 -> 1321 bytes
 .../eteks/sweethome3d/model/HomePrint.class   | Bin 2606 -> 3210 bytes
 .../swing/HomePrintableComponent.class        | Bin 15051 -> 15295 bytes
 .../sweethome3d/swing/PageSetupPanel$1.class  | Bin 1669 -> 1669 bytes
 .../sweethome3d/swing/PageSetupPanel$2.class  | Bin 1317 -> 1317 bytes
 .../sweethome3d/swing/PageSetupPanel$3.class  | Bin 1608 -> 1608 bytes
 .../sweethome3d/swing/PageSetupPanel$4.class  | Bin 1154 -> 1154 bytes
 .../sweethome3d/swing/PageSetupPanel$5.class  | Bin 1165 -> 1165 bytes
 .../sweethome3d/swing/PageSetupPanel$6.class  | Bin 1159 -> 1159 bytes
 .../sweethome3d/swing/PageSetupPanel$7.class  | Bin 1889 -> 1889 bytes
 .../sweethome3d/swing/PageSetupPanel$8.class  | Bin 1949 -> 1949 bytes
 .../sweethome3d/swing/PageSetupPanel$9.class  | Bin 1665 -> 1665 bytes
 .../sweethome3d/swing/PageSetupPanel.class    | Bin 15656 -> 17336 bytes
 ...er$HomePrintModificationUndoableEdit.class | Bin 2120 -> 2120 bytes
 .../PageSetupController$Property.class        | Bin 1293 -> 1293 bytes
 .../viewcontroller/PageSetupController.class  | Bin 4037 -> 4603 bytes
 .../eteks/sweethome3d/model/HomePrint.java    |  41 +++++--
 .../swing/HomePrintableComponent.java         |  11 ++
 .../sweethome3d/swing/PageSetupPanel.java     | 112 ++++++++++++++----
 .../viewcontroller/PageSetupController.java   |  25 +++-
 20 files changed, 160 insertions(+), 29 deletions(-)

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/model/HomePrint$PaperOrientation.class b/SweetHome3D/classes/com/eteks/sweethome3d/model/HomePrint$PaperOrientation.class
index 94b50f1ef82a03fc35749a1e5902d52425027fc5..58b3845e3eb3500c2b922910ac51a9b1a2d1a41f 100644
GIT binary patch
delta 19
ZcmZ3<wUTRtGYg~QWEU0_AX&+>0RT6c1#tiX

delta 19
ZcmZ3<wUTRtGYg}_WEU0_AX&+>0RT6M1#bWV

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/model/HomePrint.class b/SweetHome3D/classes/com/eteks/sweethome3d/model/HomePrint.class
index 285a064b38ce2a48fd53e34c1bd33866508b3974..c34e2c9254640dee3fad5ffb9f7971eba247516d 100644
GIT binary patch
literal 3210
zcmb_e-%le|6#k~P6v~tzg<UMJuB#w0Al-$PWr0NmtiTqil<m6sYX`WLS=$*hGu@5G
zHxpk>j1MM0`RJS3XyRyMqKS!#iO)Xxr}$(%_YTvY4mXAnN#LA&dcJed{qFrv`Qx9T
zegSX|`$@zU4DDOB9CO+GPR@D6n0sW^*wjI;W*x9<Zj}~A+c4cE;tIMS=nwT=RW~cS
zt-S|qpQ5b_`b5;QawTRPde!()->Wi8cEqyGY{#(7J8LTnlywE^Wy^G2-E_-(wayZM
zO@998-@hk5q5Nb0nAuyl!Aw_o38G-8aHie{ixK3Uf|RIs*En#GXy3eo4iQ*oM&-y=
z&?#0s*71gJR}9*!O9Tq+&<!FzBC=$;u2l<SevjL{Mi5FrG}xo56+sd^puKh#v>y{k
zrG1^#&{KFqTE1%OE;XkfG5vtqdCRWp)J!InQgVsy3eP#TEcZ!H`mk=BhFiB;!EgxE
z?PKb$QO)rPA=*nu#ngEUU25dx`Op?imQ`iCIk&)f;hmQ01b)@ld4o1tQ1Io*d8yBf
zpUC!e(e-YqAD@*_;Dm$Ik<qe(U;p3E<iteUl_#D54Dn?WR|+k7QN<MuD`*)REw@9#
zs0tNn?v1JFL>Kp7Qqk>uITby=cTGjc_oh_z`rgYb`h4$(ic5HgV{fW>&iCe2T);&h
zyQQKZPjT-R6<G{$?^P8~V}MjpFif^tukA5=$5(NtV9`4+>!fT_^+_=99vO~;;j_IF
zdS(}!t9)=ARO+oTw-`~cg4vPLvz3-9zb`1+EM20Qra))#VK4|XK_D#sMpsQr?+H>v
zV<R2JP9{ypaPomr8zX_XrlF8FoFa*>5$z^uBiEN-hR!XfMOfCur-Jh5NVmtEY0`6-
z;c#(>#*=!Ib26QJgW?3M<bwIc3#~SdsJ^DW#*pHP`KCFQDp_@VpXCic`#Kw69~1mo
zG;Y>RliABv-Eo+c1VyILH{odjMxPBSiG)PI2~y4gl4v8poxbQ|NRe7dSLA27s)Qv?
z2}_C+mh>bnsYzJUlCY#2VM#N>l467<y$DN6qkWzwKZeUxpY#@5cawhw&(mjq#tRq(
zlp?J=2~pI3#E>@TVMH7BplL%M#<l*qhY77e;o+**-|Asf>rZ;Pu4UUiOl#S84>Q_@
zl!sX@+u>ne%c>q0v~1eL;&)WD1xxgIL3Do;apZ}E*J-y^niFfJ_jT&>Hil5Z7&hpi
zfKA-M7H*-4WxPQd+q5c?4}9kLh!wm>E9zEos0fd<7!w}nu|;^C$++-1mkHr<Hd}?q
z`AiCrGu9?N&K19*BA-okOWfl;cL<L&tqPBGou-q3viw~y(J6u&m#KzAXI!Pf#4d7V
zd6x<8dyITbPE1hJDuVaK(NsU-<Y)>Vdz~Ut@Z{qN_`Vc;TM8bJf-6#RK?=Sa1)Eav
zh7^1~3a(4Rn^N#Z6#S7Cyd?!|QSir7aFHIG&-OT3epRvfHxa5o4IyKVd)ht&@(U@l
zgdKVZz6kG}y6NfYGx;i1B+=Nu{GUZ;qD8)z7P;FvL-?W2MhSQ<1;2@Vl7~7U-T4P8
pco%O;zzb3E&r<N)Qt)CF{F?+E!#m=3-^F`mQ`EzK`rTX1{tL}ZkBk5S

literal 2606
zcmbVNO>Y}j6g}hkBXPz~<0KfDQd&rgGbwSKgfygSXq(h^QYSHW>VhQ}llaA+)}D!G
z#;wYV73?ZDEZMOGp&~ItV$m%UYZm+zR*3uF#Ew0Fi>S8jd*;qP?_QsG-uSQo{&)@G
zI;t^*6wDl2tsHaNQzz#<XUuI_Ew)(8wX7Oz<_dICvJKOXA*|rs6aAT<YwBh_w|DS_
z9a1)`U{YiaD_3T=p*M}M^n)g&Vn<w7nC%#r`DklXfwHY2v0<5xtD9~`Z?;+FpM~%K
z{`b$wH&lPDA2WN;Hkj$^E>RS$6wfr<bSc2RsUR*^du-I)2KCJ=7!`>EGwKajK~h}p
zTgN-PT{o!Jm`D`ak=x0Pi_Bfib*)w>=g;_%uhC5%wQbXI+qSP0t5LfuZ$~l-<#;CX
z%wW$KH@nv({BHSB=Q@oSPgTt~E#0N*)dtgR%+6bOOQ&g5JtbwAwxiB#jx5VPt%<G~
zG{(Au7uh#eEiYcxYPF}GKT%KOr2k-MwxS@sL9U5o2=A-7hz}GDWoIiRAd{(3k>Kb<
z6-kV7G^^sAkLFa2`{*MTDIeujO!(-!ib)?Ws+huCocpngw2yA6c-u#xsL0?vzk5@~
zJGj8nEfw$L0&Q>6FxhUqb-?U>-=3+WMfz8CvMky4BpG%ahC?%+O+ng(i8^yj0rx3b
z&CZ@}1(|avJ4^OkkCY@ACp$MgMox7Sz1Hnc)#udlPHB(r6P?`2Nl6(_e!$PvnjD=l
zoKml+#|)>^?`oAVc53ViQen{AV^mb=bN6IlUDw~dFyCkKc-d;(hb(XKW0UMYn&x>E
zIuBc>$?T1$?l{be;d2GcZ}#+{M^SJ~ahbd{M4t$m_dH@4COkq9(GcQfSh6<Z6gRer
zWNQ)0)FP6lMI=LuNOl&H%q${VSwu3jh-70C$;2X(g()Vf=S93n-<JSoiFzj~The~V
zWo^#Gv^MSGiZ<gRtEIypG%X$Ra8*l3J<MzAn1^fH)UbyIZED2Bk~S6hu&iZ9J*;RM
z)x)ZmNqAWMmDUVloxaz_l*<TXgMRBKb-PDLGEax>K21@;47M<bZTcg5fEy^{7Ivs|
zm$G~GF5y#J<E1|%ZsQJJ(X>J<MIf$LNFc7)kU(6qus~e1h(KJms6bq|m_S^)VS%`I
zd?!l$F+jV)5!Y{2Ag-V)5Z5q4+TEoYg@VXY<da0S-!T1(fd8|jB3TjRtA4@B_zH<|
zk2062wwFBrOMv{Pl$@86vq5rAO1>{8Uk#F<O34K&`C5={OUYYOvKA!2kdn8h<SRk)
z*HZEWGS#5k3qJ?c{#Hufk&>5!<d;(Nu9UnSB!4d@bMFt1y%KcT4^r}Hcqk#S2FX84
e$z>^dElB=JLJnbH$odEsigB9ZF@3(co%tW5Rq!ML

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/HomePrintableComponent.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/HomePrintableComponent.class
index 8612a36b309d6057f8adffacd729b97da2e0a81e..9649db65202e0e9e005d6bd698dfa544fd5c3e89 100644
GIT binary patch
delta 3041
zcmZuzd3Y3660iEDyXQ#fJ|;s*LK2QJBnFUM)FcF9B;g1VHsS&!nLs4T#K~~Dt~(xR
zKsKN@ilQQjfT$plIAMthh(uICL3eRIarN_9aoKe}aRIA4iTcOR_sx5Cb-k)zRlV-l
z7VTdW|LTRkFA&iXd}Jdq4K=b|sm6y{nlU>ibyvy0USS7)%%AK01^<&NDzGTTlu~ws
zZ?UhiHc&V<SlbYq9t!$>^_SWC43neM-xTVzz#sHG`Ct5R8=qxL`ajk>|A*?CY>lRa
zx&|lh<NxaX4S&m|H~B-AL0>~tO&};HMz8b%`QPjO1HCKuq8nFN+vuQ!d`{<|=rEI7
zQdT@}lIh{R&KLNiQJ?OL2J7@JB%jng<6w4@K5&K@K+&N>Gj^os0ru9n(*ue&PDd%m
z8|8gwWlqpB5nf5M-nUfT=9QKXEOioNl8!Qz8=ZX$W>3R(8!DLMtdx99LWSN238_g(
zB_%K^b^e-=1Jf`=$4pb825aXpuq0JFt~Di5p+KW)ah;Ceo4j^?AQTGJJ2@6}jA_~9
zvTCrvhWShhzZ@|k=xbb1J5LU&#SKPlcE2m?bb5oD&5Rm!1o)yH)HKgm=XXf7H|i8m
z2@*G-Gz~&J7E!h!S6$oG7-;g_u*68s$+9oTO*$3g560y=l^J0jw^~L)f1^(dBIfh`
zp{c(4Vt$9QBPaWk+i|C9ewPHC=k<C8PTY>=I#%EYrf4zl3DSuggpBh!MUK_D*M@tT
z+{TH1ZdJ#9FpTQlq4w3dU&jMjYpl;5=~|~#CLR{#@&?ZGI=Kjs>R6A*j5E2{I5uLF
z4UaR8uv&6%-<&B=P_u*<2v*lN`0AW=3|n+;#Vt&+QiLhNT7N^x7pe_NJDsJWrnjeb
zJk3`##aQVy`hzoTt3wM+&2}9-j1zrb;hj2d=8L9iw~kiRII+jLOsZM#3(l`?FxAiL
zh?wex9(84)@mK909e**kNj=&Mv+}>{J9Ip6>XUo)C05<b<GTD~HD1uM9|w%Z{cehX
zNl>9ICpMx}$ICckT<qtyZ^WxQUc*siYJcyrjX193bsS}~Pn}XxSyAk*bcp#09Vbm;
zLdEzQ<140*pHo&mxpext;;G|pc*{7}zfO6FX-xNs_cfLbDBurUHxE#voY4y@nsSJ=
zwXLn5Rcgs@{w#^VjPO^UHX0k@(-Hn;Oj?SjY@kYaS|?3$+d3)QZHw^1byVU`J3y*i
z$<Oe#@dwqiyjQKvHC%&-hrf0!?&Ju6=T^kegb3|-E4%r}2z3fOtCRY=6<17)E4C%V
z|1%|SB?2;Ki$%EDl)9ar6e~`gu4tDYL6keLi;r`~yAp(#r{;9|No;W?b^Dpq<EJoD
z93@$f^4)5LzD?1dAy6?br<HWh+V6+ldsIM#52(HM+~5Ghcc^Q5nYxMZRJZY6>JDyJ
zJ9xQzidU%b@!jefUa6krd(?}3ucq;RS_~UnDzDKp`F^b*KcEffwc2QYP`irPX_NS2
zZ3aK8&EoZ14R6rud84+JAJ=Z<P1-8nqOIYrbO{k3H&<;f&7*3fut~xJnPH2HhAt7B
zY8h;bqGat3#2}UwD%NHo4)LUtm##ztJxLnPq5>q6oowWz0Z0<9om#|VJCa4aPCbtl
z@uJZt^&6zZC3a7#Um;Db?6gb$6mAOJ$w6)E$LJ*voz$+LM!G1YX|MV|dJCn~KJ^`B
z2o*yI)Kkb5DwYnZZy`&bh@(#R1p0_9o?cOpBU`8hI;y^g9HA2Fb@d2xg-YUj)q}q1
zN68#gbI~6ID1~oTU18*5Af@sqJ^~L0k&B<>2=e8TG~Ua*P$2Hye1M-8X9?7c5AzmW
zA_u4Q*HnQ*45r?=j^i*yWWBMF2}6a-z#2M*ONGkB%k%_>VK`;sI6aCHBI^^CLtcy&
zDm!Z2jr0^o32-iD02(nGV}u$@YjGLIQkv38$+#R>NSiiOSvPgPxVjQW)Jq-Bvr&vO
z#<Jnr;gYgJ5jraWlY4NL*Av0jW0Ve#tum!~fn-cxxXP`xVd`9Sy=Jay_#5%>Eb*+l
z?U=n&UeH#LQZK0-@lJ~7U4qMQ%HUQS#cec2c4;B<NLLU|w;D<MD4Hh1Y#$~Ujm2E}
z#7zc`!1b6Xh6<_y(aG4;=h7lJ*=G!jz<+@DmCIm_iO_{TD4E<9xvUGVaI39wtD6fX
zjlgI%KTS<jBdGV}7kJvx7(sAmegsWh$r)4LfyGt%?O1ATAK?z~BRlVxvLBG@9i$=r
zB8}!lRLU>WL_SPq+)3B)5i5&{U7>W1gBeu!G}x)g>U>ZV4Yv}DBDcJjy3!d!E(9b+
zmCB@nx8r6>mhng2(v{*Ust|z;5+#~(rawlyC;d4zN?w23CDJZ{6HNeR9_{=(#qb;Q
ziau%FGBPXgHfruhs!(<rOj1oR&;0VBW(xUj<E4?K6H3ZDaC?=aDD7BQE?_hpv7>ss
zf)8Chvz6kc2Lu(j=$7s;h~RFccvSE3hjQR)!R8~%<bO~ue?ocuDGlP!Xt?Yp`~^+m
zFKHToB^aHxFd8O#5?$MkQ4*DO7dn$hVkQ18>EzN-w8$+IMH6I<O*|BGm|r_xiSRH%
z$?TR5dyuiJ%=0qYrS@xfcF?h^c05?V2M-A}k3_J+_;FNrc=J|@&yR{gc6+|mdvgb!
z6}u-V7l_ri7FnKYiQrk2+huZX=CaM?YGi4zu`Eov$?mObiO|>i(m~%25`6ZR=l|N`
z6_hMMen$#_FQEJ&RX8X2Lii_{{-0<ppQmEJK&4VguYBH>A&RC!qbj+@=fh4xIOsOX
z`5vJSMAL)P{Ob|(o7vc4-FhUMKZ1jJQLsp%l@@lODw<#oepI~O{4D9hi53ZhEW<>X
z@5Z63PEvNx+=Ig}Jnx+3*^O5OA9c!BQf3NsOc<qyc|#bji>YeGp`GF-Ub?k6-josS
zPXlH5(4{hrZ+5qy)j@Qn6|32%z+bKPZ#YFXjE0hijq)Axc99!@=jZXR=8$o*e!M~&
W{k<YLFXEf=evzAA#RoV|j-LSujmg^p

delta 2794
zcmYjT3sh9+5uW+>-hFX-3al&m0AIL3EcgJdNdP6f5!B!-1goyHAPR!8YGT?DTN5+}
zquz+d7^5|c@sSAPf*^`j(HJ#}&EquoG(9~%r-{*OjV7t7rgIlfvghpo&&)q}cIKOJ
z{=3JQy}u;v+`YDAM3jP0Ed-`ieaGNfeO6R-V|GU`yPZ1tOO3zcD|&fMdeT*muhC^D
zOSRWGrmVEmMkn~X#y99RlbW5IHD-eGz)g+6;amDgF%AoVtI@msoqjzg*24eQ_zwS|
zN5m$8?;aW*TcMcKHDq9v-q^3O&u9$~;}IrPx#ww#mN0hgkg;}RWNOGlw(g2cp7j{U
zTQH6(bb)87XQ*eHZ>W2bWKylcP2o&RnYY+y!(*7BA=fadRi!2K1D1&zCK(o!ucFfM
zctS(Ip_}Jc_<R-Rb`HT*{czkEb0L0X!A$*LT(oHxX6uglfsc4J`jBd+FwE0X#J41F
z^*m3R*CxpoYZOM|k|tj=97;7Tpg6&&sI<DWqS|XgnZ7)}uXQ07X*3iS`i}UiWj+l{
z0!~%lN>Aw`pSYKJeUm*U;x3iP{#0CPx!8tgFDWkeR(XruhGxeyEH^?uE4e4Q-R>dN
z4b$&5Jcrp#K@w<Om8Wuk>AY$?3Q?+i`e)i!;zbKyU~=l6@zHu`f7MirRr=Zfsn(Tv
zNy8evtYbi$;}wniV4c92Fr?6J=S*zSpyO42@_=c!dTh2}6VpgN&JnGb_YT#+8Wir-
z@EX-h`W010rHedecDjJqHEczdes@5xF>h+v&W|$%2db;|R?R3a^368_|53wE<0Rz4
z$#}2PC_7!pE{%5aEyJln!yf&qfid2_8ul69;Sap0R#fJBs!B>18EywOykng9cyO9;
zg!=jXpoT`{Jo3SLcA(?;9k3FIG&JL|{`tUX!j1?6)Yp!Bv}-tu4t?Grx3wO}HFV;H
z-aN=XydEbtoWcnv>*PuKQ}eUjQ*GkjrQwWW4A0M*o|8W%XLfGZ#IaMxWKGVo;5|KM
za2bD~ZyUUTKR#qjP)v6FWeTErB6H#)N8(zwCd#~pHaHb$l%M}4Tcn@Ab}FuB8t13u
zPNj+e?WZnL3%h85Q*i{>IYR3E{2#;ORQ!C~uq_qiQp4)BcTtE0u{(ksnxDUShIZ?r
zjxa~K=<?L;?l=*3jvj$Hqr~(eP=o~P5eSszRQ+^2%DkUIS+t7Q(4D}(k^d)_WFoZD
zJBQAtRG{VsRp%GgEnKVa;8p5gUadCqOX?9`qn_fI)eBswe$KC`U+_Bh3U5%av##FZ
zjb`S0v&NguQM}n4&##*kcq=_b#21a#oJjMiNbV((_#XdAY)CL}C<IPr?8rosW(QCM
z6DgFXUV#FYRC3d!Fw-6~Qz0e8LRPYnhX%tcr&g*Hj{~sD=@xZ8>=MRIJJnSPf+l`@
z)fEU9FDo^w%Ml{GjhfYE2$gttYEgX%6I&3qsf!UVl13eB%_2mI7)+h&Li7+RgifmS
z5h;&^QkUvQl-R=PJ#{XkMGB|$>TEbfil7hFndm7}4=z`Z!HHfJ$v&k8F^HuoeqPy!
z-snToypzwOFZz*#53?U}@<dN=<3_|wG-nNW@;(U`PQCav??!+5;TXP2`51tK6pNW0
zia}zF#X>=Eut>e}Dt(3ok^0~ay@ergQD0o7H;^c{ex`VGBT1w<(_-3-WWmj$3>I`B
z!cdV$(<b~1Db!P`q)4Qq?=W&IwUjHOA<dOg!!d$-sTp(=BQaEedSqNpT5h7B&dc{w
zD}L>E`SIu|rJX|x3~NF~B*rXU>r|SNGsjpTpJO=w!kiZ{PoC3)DF=lU0sc`h=^XJc
z3gX=YOat}iJ(SLG(<Ir2LgW%w5KRdXsfMI!;{*I*a?of@!*mJLn?_;=o)kv~1^k_`
zOvaMF6pC16pPuN)Q=Qb2CqpyJPxo4pHnBT%Spym66a~^Ps!f(MDl*iho@!6kkGZa-
zWLGo1ew55e@?(Aj*@N@iv9KVi1?BpVH0Qu3vU0Pu{V+M%Pbu6&8Qe-^`3Q~YHp=C8
zn#LXa7irNo_t|fyOhAYZ>Oms{b(qL0FM{suQ^<iLsYs<<A?yKEiXUS!s_s{mFS^VP
zMHpGdyh)lX<}kccMRlWCyWxy5;Np{#*eMF;)AD*eBQWZ|^jKc1uTPJP@b3S~*KEuq
zU(j3AGo-WaSXQ7YLfdEZq}tz3beRs*um%ct6*SW@WsWGW<V3-6nBei+k5?NgRC+IH
zIOUP@<H>&17>D~MW&&kX4mI7+C{@Ob_+!cF6M^be>cgK=fBp+4@MTKmztRZVvqSiA
zG>-pHPw+nkvw!N(WjLNRt_haAJPprdg#_zQsrbEIA|@IqQ*6Makj?n#(G3p|7tjo@
zY;VOMa$RT0Dve)#u$?Xxw4g4p6>9~l^?q#BuVuv5Y-ymdB$FSqTa%>OTiWTm_`NYP
zS-iH@$+Dx)kGBkMx1qglEZYpNSeE_80T07&sP7in`RQho(C2odVAqtF^fSNnDN@S+
zniRe&5L}a{T$f9s=7!Av4H_*2p2gn?Wp0z3zZJ@SFA)4d1#&%?@Lj6nd$dAIUMI3H
zt=}w=Yy*BV7~2C^9!cR_;YW)=5k+eP%mNkAxWL$(!mP%hf^L{-i2%qlN%U|NS_`^J
zIXI&gZO4w<C%Bq$Oz=@BHIOnxls}20JWx)HV(wN74x#m+L<tk_#^S8Z-yj+yyNia&
zB%ZzB_W---(Lk;SYk_lt^?jTt8cwNXM!mfHFJwA#k&og-vyIP+gM4_k(Eg)LCokb=
PaVgVD=kRBILbm?{nJ<h2

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$1.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$1.class
index a7a303a05045afdcd7ab725917dc68a85920e855..e35ff62ef463d2afd015d4a89e80fafc90f78a1c 100644
GIT binary patch
delta 23
ecmZqWZROo?kd?7~@*&nT)+z=*hU&?-Y#sny;|B=<

delta 23
ecmZqWZROo?kd?7$@*&nT)=~yOhO)`FY#snyQU>|}

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$2.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$2.class
index 43284c4c8c4cda6f1bddd1c0384cdb98797b21d9..632577d0c84d935c920d0352719c693879bf00fa 100644
GIT binary patch
delta 23
fcmZ3=wUleaOcus#lV`EGvEE?dW4Jl_DT@ODXMqTM

delta 23
fcmZ3=wUleaOcurylV`EGv7Tb!V>mteDT@ODW$Oq~

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$3.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$3.class
index be5b5939bc2b9b34fad43bfb93011444b0819c68..6342425e6d70268c4b8051864f3c42167273cb71 100644
GIT binary patch
delta 31
ncmX@XbAo5XbXLaOlV`9-^4?=$VYtsA#_)hak>TOwf2>{rw&x1~

delta 31
ncmX@XbAo5XbXLZ*lV`9-@?KzIVYtX3#&C&2k>T>>f2>{rvpovB

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$4.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$4.class
index d96cf82de0b4d455c0171e9489d791ff52faa686..04341f859c503bf9aac2766b0dadff37b5113842 100644
GIT binary patch
delta 23
fcmZqTY~tMTlbP}H<X_CrtWO!Z8J<mcVsQWfY%mCJ

delta 23
fcmZqTY~tMTlbP}A<X_Crtk)U18E#B=VsQWfYMKZ{

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$5.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$5.class
index ccef4cfbafecd8997a62ba94d6e7190a4798a05f..a0221c04b2b4b051c65be968f7626781b9e26e78 100644
GIT binary patch
delta 23
ecmeC>?B(3R!ov7vGAoNS>o*2&hVPSoSsVaTlm^-W

delta 23
ecmeC>?B(3R!oqlGGAoNS>pcc;hWnF!SsVaQ+y;^W

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$6.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$6.class
index d0894f8c57c0a04ce12f6511b18b1a3a10722cd4..ca69d53b7cb7b1370b46f77737228b061d1db451 100644
GIT binary patch
delta 23
fcmZqYZ0FqYkD2l3<p0dhtiKt!8U9RmXK?@ka5M<X

delta 23
fcmZqYZ0FqYkD2k|<p0dhtdAME8J<jbXK?@kZF~rU

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$7.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$7.class
index f1a5f49da226b5739cf17e1063e7b145c9b70349..da5d1a88379a8fb41229e268ca4e94459a54dea5 100644
GIT binary patch
delta 40
wcmaFJ_mFSHEH=h}lV`JKh%quS@G>$oh%+)VC^IrMs4=oI7&5X=mSpz;0M&yBj{pDw

delta 40
wcmaFJ_mFSHEH=hxlV`JKh%vli;AMEpAkOfLL7Cw-gBrsd21AB-lO@?b03*T-;Q#;t

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$8.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$8.class
index df305d07d0e41c2039512661005692f52ed502df..59c0b77670f69dfdf787988ec30bd513fe42b1a2 100644
GIT binary patch
delta 59
zcmbQsKbL=lKN}Mx_vApfI6g*R20lhU21!PK26aY($$Qz{*cgQwSQ$kobFu@O;y|VZ
LkSRO4h+P{1E8Gb>

delta 59
zcmbQsKbL=lKN}On=gEO=aeNG48Tc5!F-S6eXHaMOF?lbW8ymxK23CeYlR4Re%>N9m
Nj0`}g?BpVLZ2%D@5Ly5L

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$9.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel$9.class
index 68cba51ab1f85292e5ccc09fac565de653c3d8e0..da346b34fdef62039fb920dc2ca9aacf07d40a93 100644
GIT binary patch
delta 61
zcmZqVZRFh`z{)5+S&%hLP?mv%QI0{DQJz5qNE<OKPVQmt5L5w*sscsTfTF5EQ4OG|
J;p8wjZ2&6738?@8

delta 61
zcmZqVZRFh`z{<!xS&%hLkd=Xhk&Qu?k)1&UNE<P7PVQmt5aa=h@&ZNqfTFxWQ30T+
J;p8wjZ2$|52%!J~

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel.class
index 06c170bec846efb69a4e324c32df6226bf285c19..390b45bebe73aa45f72ebd9508e1794e23317b56 100644
GIT binary patch
literal 17336
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

literal 15656
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
B(6s;n

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/viewcontroller/PageSetupController$HomePrintModificationUndoableEdit.class b/SweetHome3D/classes/com/eteks/sweethome3d/viewcontroller/PageSetupController$HomePrintModificationUndoableEdit.class
index e0351e47fe7208f8bfbc02d1dc8c8673ecf1c2f6..ba8a8b04c0f387294d471e745cf2e1796af0dd2b 100644
GIT binary patch
delta 73
zcmX>ha6(|iYBtfO3@i*Q88{hMG4L_0W)Nmr!yw79cJcwXO3sZynN1A*44WrAu?KQ)
b2l93Rc{?Z1VRvWTJNXH_BjeJ^Y8*-c=cp87

delta 73
zcmX>ha6(|iYBte61{Q`%44e#;8Tc5cFbFeDWsqc;Hu(TsCFd-l%xngJhB=d+*aJBi
b0C@|6yhW4eu)8xZoBV{`k+E;G8ix`9xq1^I

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/viewcontroller/PageSetupController$Property.class b/SweetHome3D/classes/com/eteks/sweethome3d/viewcontroller/PageSetupController$Property.class
index 78635135371008d85371fc6dac1ec2d658772fab..39ba2ed923289751ca1c2d01fbe0329fdfdbb37f 100644
GIT binary patch
delta 19
ZcmeC>>gC#?&cdiWS%bv{NXD{k001$N1pNR2

delta 19
ZcmeC>>gC#?&cdiYS%bv{NXD{k001#?1o;2}

diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/viewcontroller/PageSetupController.class b/SweetHome3D/classes/com/eteks/sweethome3d/viewcontroller/PageSetupController.class
index 2b4fbd6a517d655065fbbddb187bb1f985b100a3..3244cf297c372e0673fbb181baa249c5427ca766 100644
GIT binary patch
delta 749
zcmZXROHUI~6vzK}+A?%Hono6}NNorq>J&p-O%;-&mV$;RwU7`ZD@`F|ZRsP@X-z<A
zE%?F*)awKN1|}{fF(gQ0+_+)K2k<+%ab=>OnHJ+?bI-Zw{Qtjma_{Hv@4X#+KR$c}
za1yUY2n>Ub{Z9VX>f&cb&(_!%Y1En4^s!=IOK24>S7LChfkZY{Nd?P#CKpU(N_vFB
zKAA}uQhIq_V;J~PFvPbk{;COxoQp^}fvSue7Rg8O1F)1cCX5uz1)ag72I3MJR%I+;
z(Sf_TFXA49^7m*N4^U^YmNE-8S^jfXhGS|xkeDszgPN|*mH4j36K?Kc;2z6(f^`~1
z9tN)=HPN|LAsrl_$!fEDL_~w3r?G#;XZjc%=8DO3eny*TU~z_im2cRN^IDt8ryOsX
z%zrv2{SjDk9(F{bU>F|6(1j5k#Rc@^A}`8I_Dc|vr0N9!CdX`-Az_*iIg_?4ka3l-
zJEv_LW!ESRaIZ3YD2I0B;Y0y$6w!klJgZEwn|xQf?q8-}m3lRJahsTR^iou@f)G}D
z)D^1IJJKUUz%BY{0ZTYc@f1}V#rD4U@NHxHo!JZ1*=E+)aGG+tslgcx(2WtePN(4y
zQ#AZi-!@iuaEIY7-2|#15E?B)%9Q;^tl?n`5hJ-ka>YRScJN5RCv5z?$fk+uY${t6
m^57{rSjR91@r+koq3-AA_!oFd(M{?(nzBhRJ5KRcwCfkRCY$&G

delta 233
zcmeyZd{kcG)W2Q(7#J7~85-Cbm>3x>CSDYq{DFmkvMsytMvuE(lN)(%GICCi<_(s$
zWME;iW#DA6W8h=3XAov^V31^RWKd;rX3%ADnS7eJmeZSooxukv>Nh!%&xtjZfr}w*
z@(eyd)))pJhS<rk`65`8fvglDOLKA|zl&fN0|!Gk1201kgAhY5gCaxz<YW8+jHQ#s
z1u|r7fO54!xjF_>hI*ix4GhXaT7#jH!GNJ@@*DvJHUUQl3x=x6YXlACtARdXVyFRX
WU;rA$1T>TpsF91oA4u0bNCE&Y^D%P(

diff --git a/SweetHome3D/src/com/eteks/sweethome3d/model/HomePrint.java b/SweetHome3D/src/com/eteks/sweethome3d/model/HomePrint.java
index eed5c74..00ec54e 100644
--- a/SweetHome3D/src/com/eteks/sweethome3d/model/HomePrint.java
+++ b/SweetHome3D/src/com/eteks/sweethome3d/model/HomePrint.java
@@ -20,6 +20,7 @@
 package com.eteks.sweethome3d.model;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * The print attributes for a home.
@@ -40,12 +41,14 @@ public class HomePrint implements Serializable {
   private final float            paperLeftMargin;
   private final float            paperBottomMargin;
   private final float            paperRightMargin;
-  private final boolean          furniturePrinted;
-  private final boolean          planPrinted;
+  //private final boolean          furniturePrinted;
+  //private final boolean          planPrinted;
   private final boolean          view3DPrinted;
   private final Float            planScale;
   private final String           headerFormat;
   private final String           footerFormat;
+  private final List<Boolean>   furnitureList;
+  private final List<Boolean>   planViewList;
 
   
   /**
@@ -58,8 +61,8 @@ public class HomePrint implements Serializable {
                    float paperLeftMargin,
                    float paperBottomMargin,
                    float paperRightMargin,
-                   boolean furniturePrinted,
-                   boolean planPrinted,
+                   List<Boolean> furnitureList,
+                   List<Boolean> planViewList,
                    boolean view3DPrinted,
                    Float planScale,
                    String headerFormat,
@@ -71,8 +74,8 @@ public class HomePrint implements Serializable {
     this.paperLeftMargin = paperLeftMargin;
     this.paperBottomMargin = paperBottomMargin;
     this.paperRightMargin = paperRightMargin;
-    this.furniturePrinted = furniturePrinted;
-    this.planPrinted = planPrinted;
+    this.furnitureList = furnitureList;
+    this.planViewList = planViewList;
     this.view3DPrinted = view3DPrinted;
     this.planScale = planScale;
     this.headerFormat = headerFormat;
@@ -132,15 +135,37 @@ public class HomePrint implements Serializable {
    * Returns whether home furniture should be printed or not.
    */
   public boolean isFurniturePrinted() {
-    return this.furniturePrinted;
+    /* TODO: Remove this method and dependencies */
+    return true;
+    //return this.furniturePrinted;
   }
 
   /**
    * Returns whether home plan should be printed or not.
    */
   public boolean isPlanPrinted() {
-    return this.planPrinted;
+    /* TODO: Remove this method and dependencies */
+    return true;
+    //return this.planPrinted;
   }
+  
+  /**
+   * Gets the Boolean list determining which levels
+   * should have furniture lists printed.
+   */
+  public List<Boolean> getFurnitureList() {
+    return this.furnitureList;
+  }
+  
+  /**
+   * Gets the Boolean list determining which levels
+   * should have plan views printed.
+   */
+  public List<Boolean> getPlanViewList() {
+    return this.planViewList;
+  }
+  
+  
 
   /**
    * Returns whether home 3D view should be printed or not.
diff --git a/SweetHome3D/src/com/eteks/sweethome3d/swing/HomePrintableComponent.java b/SweetHome3D/src/com/eteks/sweethome3d/swing/HomePrintableComponent.java
index c33faa4..dcaf0bc 100644
--- a/SweetHome3D/src/com/eteks/sweethome3d/swing/HomePrintableComponent.java
+++ b/SweetHome3D/src/com/eteks/sweethome3d/swing/HomePrintableComponent.java
@@ -384,6 +384,17 @@ public class HomePrintableComponent extends JComponent implements Printable {
         this.printablePages.add(page);
       }
     }
+    System.out.println("Test here");
+    view3D = this.controller.getHomeController3D().getView();
+    if (pageExists == NO_SUCH_PAGE
+       && view3D != null
+        && (homePrint == null || !homePrint.isView3DPrinted())) {
+      pageExists = ((Printable)view3D).print(g2D, pageFormat, page - this.planPageCount - this.furniturePageCount + 1);
+      if (pageExists == PAGE_EXISTS
+          && !this.printablePages.contains(page)) {
+        this.printablePages.add(page);
+      }
+    }
     
     // Print header and footer
     if (pageExists == PAGE_EXISTS) {
diff --git a/SweetHome3D/src/com/eteks/sweethome3d/swing/PageSetupPanel.java b/SweetHome3D/src/com/eteks/sweethome3d/swing/PageSetupPanel.java
index 84beccb..221d676 100644
--- a/SweetHome3D/src/com/eteks/sweethome3d/swing/PageSetupPanel.java
+++ b/SweetHome3D/src/com/eteks/sweethome3d/swing/PageSetupPanel.java
@@ -36,6 +36,8 @@ import java.awt.print.PrinterJob;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.security.AccessControlException;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.ActionMap;
 import javax.swing.ButtonGroup;
@@ -58,6 +60,7 @@ import javax.swing.event.DocumentListener;
 
 import com.eteks.sweethome3d.j3d.Component3DManager;
 import com.eteks.sweethome3d.model.HomePrint;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.UserPreferences;
 import com.eteks.sweethome3d.swing.NullableSpinner.NullableSpinnerNumberModel;
 import com.eteks.sweethome3d.tools.OperatingSystem;
@@ -75,7 +78,7 @@ public class PageSetupPanel extends JPanel implements DialogView {
   private final PageSetupController controller;
   private PageFormat          pageFormat;
   private JButton             pageFormatButton;
-  private JCheckBox           furniturePrintedCheckBox;
+  //private JCheckBox           furniturePrintedCheckBox;
   private JCheckBox           planPrintedCheckBox;
   private JRadioButton        bestFitPlanScaleRadioButton;
   private JRadioButton        userPlanScaleRadioButton;
@@ -88,6 +91,8 @@ public class PageSetupPanel extends JPanel implements DialogView {
   private JLabel              variablesLabel;
   private JToolBar            variableButtonsToolBar;
   private String              dialogTitle;
+  private List<JCheckBox>     furnitureBoxes;
+  private List<JCheckBox>     planViewBoxes;
 
   /**
    * Creates a panel that displays page setup.
@@ -141,10 +146,19 @@ public class PageSetupPanel extends JPanel implements DialogView {
                                 final PageSetupController controller) {
     this.pageFormatButton = new JButton(SwingTools.getLocalizedLabelText(preferences, 
         PageSetupPanel.class, "pageFormatButton.text"));
-    this.furniturePrintedCheckBox = new JCheckBox(SwingTools.getLocalizedLabelText(preferences, 
-        PageSetupPanel.class, "furniturePrintedCheckBox.text"));
+    //this.furniturePrintedCheckBox = new JCheckBox(SwingTools.getLocalizedLabelText(preferences, 
+     //   PageSetupPanel.class, "furniturePrintedCheckBox.text"));
     this.planPrintedCheckBox = new JCheckBox(SwingTools.getLocalizedLabelText(preferences, 
-        PageSetupPanel.class, "planPrintedCheckBox.text")); 
+        PageSetupPanel.class, "planPrintedCheckBox.text"));
+    
+    // Create Lists for Furniture and PlanView Check Boxes
+    this.furnitureBoxes = new ArrayList<JCheckBox>();
+    this.planViewBoxes = new ArrayList<JCheckBox>();
+    for(Level curLvl : controller.getHomeLevels())
+    {
+      furnitureBoxes.add(new JCheckBox(curLvl.getName()));
+      planViewBoxes.add(new JCheckBox(curLvl.getName()));
+    }    
 
     // Create scale radio buttons and user's scale spinner
     this.bestFitPlanScaleRadioButton = new JRadioButton(SwingTools.getLocalizedLabelText(preferences, 
@@ -215,8 +229,18 @@ public class PageSetupPanel extends JPanel implements DialogView {
           updateController(controller);
         }
       };
-    this.furniturePrintedCheckBox.addItemListener(itemListener);
-    this.planPrintedCheckBox.addItemListener(itemListener);
+
+    for(JCheckBox chBx : this.furnitureBoxes)
+    {
+      chBx.addItemListener(itemListener);
+    }
+    for(JCheckBox chBx : this.planViewBoxes)
+    {
+      chBx.addItemListener(itemListener);
+    }
+      
+    //this.furniturePrintedCheckBox.addItemListener(itemListener);
+    //this.planPrintedCheckBox.addItemListener(itemListener);
     userPlanScaleSpinnerModel.addChangeListener(new ChangeListener() {
         public void stateChanged(ChangeEvent ev) {
           updateController(controller);
@@ -301,8 +325,13 @@ public class PageSetupPanel extends JPanel implements DialogView {
     final NullableSpinnerNumberModel userPlanScaleSpinnerModel = 
         (NullableSpinner.NullableSpinnerNumberModel)this.userPlanScaleSpinner.getModel();
     if (homePrint != null) {
-      this.furniturePrintedCheckBox.setSelected(homePrint.isFurniturePrinted());
-      this.planPrintedCheckBox.setSelected(homePrint.isPlanPrinted());
+      //this.furniturePrintedCheckBox.setSelected(homePrint.isFurniturePrinted());
+      //this.planPrintedCheckBox.setSelected(homePrint.isPlanPrinted());
+      for(int i = 0; i<homePrint.getFurnitureList().size() && i<furnitureBoxes.size(); i++)
+      {
+        furnitureBoxes.get(i).setSelected(homePrint.getFurnitureList().get(i).booleanValue());
+        planViewBoxes.get(i).setSelected(homePrint.getPlanViewList().get(i).booleanValue());
+      }
       this.bestFitPlanScaleRadioButton.setEnabled(homePrint.isPlanPrinted());      
       this.userPlanScaleRadioButton.setEnabled(homePrint.isPlanPrinted());
       if (homePrint.getPlanScale() == null) {
@@ -321,8 +350,8 @@ public class PageSetupPanel extends JPanel implements DialogView {
       String footerFormat = homePrint.getFooterFormat();
       this.footerFormatTextField.setText(footerFormat != null ? footerFormat : "");
     } else {
-      this.furniturePrintedCheckBox.setSelected(true);
-      this.planPrintedCheckBox.setSelected(true);
+      //this.furniturePrintedCheckBox.setSelected(true);
+      //this.planPrintedCheckBox.setSelected(true);
       this.bestFitPlanScaleRadioButton.setEnabled(true);
       this.bestFitPlanScaleRadioButton.setSelected(true);
       this.userPlanScaleRadioButton.setEnabled(true);
@@ -355,12 +384,25 @@ public class PageSetupPanel extends JPanel implements DialogView {
         break;
     }
     Paper paper = this.pageFormat.getPaper();
+    // Build the Boolean arrays from the check box lists:
+    List<Boolean> furnList = new ArrayList<Boolean>();
+    List<Boolean> planList = new ArrayList<Boolean>();
+    for(JCheckBox chBx : furnitureBoxes)
+    {
+      furnList.add(new Boolean(chBx.isSelected()));
+    }
+    for(JCheckBox chBx : planViewBoxes)
+    {
+      planList.add(new Boolean(chBx.isSelected()));
+    }
+    
+    
     HomePrint homePrint = new HomePrint(paperOrientation, (float)paper.getWidth(), (float)paper.getHeight(),
         (float)paper.getImageableY(), (float)paper.getImageableX(),
         (float)(paper.getHeight() - paper.getImageableHeight() - paper.getImageableY()),
         (float)(paper.getWidth() - paper.getImageableWidth() - paper.getImageableX()),
-        this.furniturePrintedCheckBox.isSelected(),
-        this.planPrintedCheckBox.isSelected(),
+        furnList,
+        planList,
         this.view3DPrintedCheckBox.isSelected(),
         this.userPlanScaleRadioButton.isSelected() && this.userPlanScaleSpinner.getValue() != null
             ? 1f / ((Number)this.userPlanScaleSpinner.getValue()).intValue()
@@ -377,10 +419,10 @@ public class PageSetupPanel extends JPanel implements DialogView {
     if (!OperatingSystem.isMacOSX()) {
       this.pageFormatButton.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
           PageSetupPanel.class, "pageFormatButton.mnemonic")).getKeyCode());
-      this.furniturePrintedCheckBox.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
-          PageSetupPanel.class, "furniturePrintedCheckBox.mnemonic")).getKeyCode());
-      this.planPrintedCheckBox.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
-          PageSetupPanel.class, "planPrintedCheckBox.mnemonic")).getKeyCode());
+      //this.furniturePrintedCheckBox.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
+      //    PageSetupPanel.class, "furniturePrintedCheckBox.mnemonic")).getKeyCode());
+      //this.planPrintedCheckBox.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
+      //    PageSetupPanel.class, "planPrintedCheckBox.mnemonic")).getKeyCode());
       this.view3DPrintedCheckBox.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
           PageSetupPanel.class, "view3DPrintedCheckBox.mnemonic")).getKeyCode());
       this.bestFitPlanScaleRadioButton.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
@@ -405,18 +447,48 @@ public class PageSetupPanel extends JPanel implements DialogView {
         : GridBagConstraints.LINE_START;
     // First row
     JPanel topPanel = new JPanel(new GridBagLayout());
+    JPanel checkListPanel = new JPanel(new GridBagLayout());
     topPanel.add(this.pageFormatButton, new GridBagConstraints(
         0, 0, 2, 1, 0, 0, GridBagConstraints.CENTER, 
         GridBagConstraints.NONE, new Insets(0, 0, 10, 0) , 0, 0));
     Insets lastComponentInsets = new Insets(0, 0, 5, 0);
+    
+    System.out.println("Hello, world.");
+    for(Level curLvl : controller.getHomeLevels())
+    {
+      System.out.println(curLvl.getName());
+    }
+    checkListPanel.add(new JLabel("Plan Views:"), new GridBagConstraints(
+        0,0,2,1,0,0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0,0,0,20),0,0));
+    checkListPanel.add(new JLabel("Furniture Tables:"), new GridBagConstraints(
+        2,0,2,1,0,0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0,0,0,0),0,0));
+    int i = 1;
+    for(JCheckBox chBx : this.planViewBoxes)
+    {
+      checkListPanel.add(chBx, new GridBagConstraints(
+            0,0+i,2,1,0,0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0,0,0,0),0,0));
+      i++;
+    }
+    
+    i = 1;
+    for(JCheckBox chBx : this.furnitureBoxes)
+    {
+      checkListPanel.add(chBx, new GridBagConstraints(
+            2,0+i,2,1,0,0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0,0,0,0),0,0));
+      i++;
+    }
+    
+    topPanel.add(checkListPanel, new GridBagConstraints(
+      0,1,2,1,0,0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0,0,0,0),0,0));
     // Furniture component
-    topPanel.add(this.furniturePrintedCheckBox, new GridBagConstraints(
+    /*topPanel.add(this.furniturePrintedCheckBox, new GridBagConstraints(
         0, 1, 2, 1, 0, 0, GridBagConstraints.LINE_START, 
-        GridBagConstraints.NONE, lastComponentInsets , 0, 0));
+        GridBagConstraints.NONE, lastComponentInsets , 0, 0));*/
     // Plan components
-    topPanel.add(this.planPrintedCheckBox, new GridBagConstraints(
+    //topPanel.add(this.planPrintedCheckBox, new GridBagConstraints(
+      topPanel.add(new JLabel("Plan View:"), new GridBagConstraints(
         0, 2, 2, 1, 0, 0, GridBagConstraints.LINE_START, 
-        GridBagConstraints.NONE, new Insets(0, 0, 2, 0), 0, 0));
+        GridBagConstraints.NONE, new Insets(10, 0, 2, 0), 0, 0));
     topPanel.add(this.bestFitPlanScaleRadioButton, new GridBagConstraints(
         0, 3, 2, 1, 0, 0, GridBagConstraints.LINE_START, 
         GridBagConstraints.NONE, new Insets(0, 20, 2, 0), 0, 0));
diff --git a/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/PageSetupController.java b/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/PageSetupController.java
index 8246007..7e905da 100644
--- a/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/PageSetupController.java
+++ b/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/PageSetupController.java
@@ -21,6 +21,7 @@ package com.eteks.sweethome3d.viewcontroller;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
+import java.util.List;
 
 import javax.swing.undo.AbstractUndoableEdit;
 import javax.swing.undo.CannotRedoException;
@@ -30,6 +31,7 @@ import javax.swing.undo.UndoableEditSupport;
 
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomePrint;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.UserPreferences;
 
 /**
@@ -84,7 +86,7 @@ public class PageSetupController implements Controller {
   public void displayView(View parentView) {
     getView().displayView(parentView);
   }
-
+  
   /**
    * Adds the property change <code>listener</code> in parameter to this controller.
    */
@@ -129,6 +131,27 @@ public class PageSetupController implements Controller {
     this.undoSupport.postEdit(undoableEdit);
   }
 
+  /**
+   * Returns a list of the levels in home
+   */
+  public List<Level> getHomeLevels() {
+    return home.getLevels();
+  }
+  
+  /**
+   * Returns the number of levels
+   */
+  public int levelCount() {
+    return getHomeLevels().size();
+  }
+  
+  /**
+   * Return the level at the specified index
+   */
+  public Level getHomeLevel(int levelNumber) {
+    return getHomeLevels().get(levelNumber);
+  }
+  
   /**
    * Undoable edit for home print modification. This class isn't anonymous to avoid
    * being bound to controller and its view.