From 3379987a74f424196dd20fb61d27738d99d85870 Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Thu, 10 Jan 2019 11:26:34 +0100 Subject: [PATCH] Project font gets reverted to "Square721 BT" on Undo --- .../src/org/diylc/core/Project.java | 5 +++-- diylc/diylc-library/lib/diylc-core.jar | Bin 250178 -> 250178 bytes diylc/diylc-swing/lib/diylc-core.jar | Bin 250178 -> 250178 bytes diylc/diylc-swing/update.xml | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/core/Project.java b/diylc/diylc-core/src/org/diylc/core/Project.java index 44d1e5f6..dabc54a2 100644 --- a/diylc/diylc-core/src/org/diylc/core/Project.java +++ b/diylc/diylc-core/src/org/diylc/core/Project.java @@ -286,11 +286,12 @@ public class Project implements Serializable { project.setAuthor(this.getAuthor()); project.setDescription(this.getDescription()); project.setFileVersion(this.getFileVersion()); - project.setGridSpacing(this.getGridSpacing()); + project.setGridSpacing(this.getGridSpacing()); project.setHeight(this.getHeight()); project.setWidth(this.getWidth()); project.getLockedLayers().addAll(this.getLockedLayers()); - project.getHiddenLayers().addAll(this.getHiddenLayers()); + project.getHiddenLayers().addAll(this.getHiddenLayers()); + project.setFont(this.getFont()); Map, IDIYComponent> cloneMap = new HashMap, IDIYComponent>(); diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index de1686d2e682b8b2aff2245aa499717b15f6f701..c2149c84919cf5154ac7c9455b5f6b822abae257 100644 GIT binary patch delta 4266 zcmY*cdsvRy7H{vJlA{YnHIgDKVaB+Q$R!+HfTY$Sj+cLi9)T>!%QH~&BnKT5r<8029m{^a0B)B2jnmn~zzYRw0P1`^^yGKWA%)dW&5lV&tG%7~kyRhG;fq z4WM?1<1Lf!8fP!R)l>9lFg?AQT)W)QJn^tFDGYN8z|h~Ftr0&DwZjzKVShq}uZGtf z06rOY6WwKFED>*x^+Fst{v%@l39;Bg{=^i-`IFaShn3Uba4cQuZ}4Ub*VBvE*XqnH zrPMfKUif@QAO_E!wF0qV&Py0dq0V~AbndaN?rK@XXn8oAL+&}LPgoD2fG3msgE%`4Tf@KhCRr;da1D^E!b~8jSZEB zoa9s)v{C5kt(9~OnU$21DU9UF_H4UQ9;{sMzvG zL$;@z*%Y)mZDpU(GI%>nMd8{G<_Ygq?i0=qU`%QxyN|+-DE0+oemTTE&{7w}WE3>< zY$yu3659cS^vH(~lD(4HCN$TaWcX0zwlo%vmY@vQh{AW-$^oF@lU&w`^bhjcEVK+M zVm@fuUc#Jl`so)~e|;Qaz{F_tI5R!HLuQiBhgr(cF0pjHj>Ao?8IuBTvOiGp{FNCa z-}iT!8wyEnuoy~B%YQOA%v$`Kxf_Ay#0Q3ZEC+mMu^99AzpRo*U+3wX^-#IiyL7F0 z1aHRz%7<+UMZB*bnBP~qgI-dHEw_@IONE)ds0YW7kNmSS--(Rx&G?Tf_*rm!6n0y3 zXLt?rSu6fES|0S{-BEaI%V~y72l6>+$r#LYQCR5AZ=v8aocBXv);D|)3O7daT_|{t z<7Frqy7G1uKDu#N6vj^D=dkEAcOHNTnLU$lL09E$UWG1=2hT#wuz5Tm1?6HBQ21#P zk3`{%FAqjxouA6n=+E8JV!nb)DCDf-hfr``!^a`>mbKgjg@|=rABCu3o{TZhA$&3l zYqoHK%eY}X4@67rPCgleC5tfL0t0&%#&^RfSq{>2d!&hu=R;8_P2dAixR=OV@qBs5 zcpX}PPU7BZX-MYyC6@1}@IGki(D5V`4xi>VDEOS==_q{6;uhG2X)c$Mr!J3|!4HQV zev#*+WlSY+P_9lRvo_w<3x${b4Z1pCal_t-(4I)A+v|T zZ@4_hSO}~+!AuziuKtMKW(E$*8kP%bszuVPh{SO~i1LE>F;P|O9r;GpnSFfp1MpBqiI>Cs|6xceLus{z9f2_L{#6&(+Y zC7^2#Q<>Jo7P zn?(9b6|YF*M~HJdDpml-sMvW_tOY&r81+$dOw0q_@HpX;< zhjcpUwsh*ZC7tpdGt_;_p!u|9(EJ9UA^oQ_RIly~@easT)>Cob*kC|HuIJPQRs zXDa)kpjQ^{MQRr1z0D#X_iW(~=h~mGd}5{kQ3LXUKyO!@|yc*|t68Hk=Vdv?O{yT?$O?*UtRR1% zi`19Didh$FE}a+2Kk*V__$8{}tm>APl&1_GzuMWA6xX5JU8|_>!7B3Ks-k$?YFdJz zYT_%YrhdArX|6ss^f=Ggi0|PZO=?LGuBFFVUn>H^KK!y+4j6Np^#5F@kCp!wu?pbm#=?4j4G-<#Jd&+!Ju?Yu$v+N|QBe~=!kV!etsjbz`@NPSl|Qr)kb=zdl; Y(H<3%p4d#|oZC!e)HPGun`YttKXrRlT>t<8 delta 4266 zcmY*cd0da_7XLlZlfuCF` zM<)MAtbNTf&rXblkog2*f;hz_FuoBk0AmbB0jx9_u0XNYAb|r8HoDja%#V9K0=Q=U z39NdP1_qd7W^Vvk*(VZp*M3Eq)oBroxY}x_0RL$lThv=@ixDFS&Bpj}U9T3D;<14755kb15T9 z^e%ojGXR4oA`GZBm3Ub+M07y9-yf%u@crl{`< z+KBP(8+ARvuH9*f_OwvT-k_Hyy+yq+#T>_b^^gPV?P-URHzs{7=GSIepnhNHg#K

_HM;0+O5BS1~uds-Anv!GbGX7 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 Y(H<3%p4d#|oZC!e)HPGun`YttKXrRlT>t<8 delta 4266 zcmY*cd0da_7XLlZlfuCF` zM<)MAtbNTf&rXblkog2*f;hz_FuoBk0AmbB0jx9_u0XNYAb|r8HoDja%#V9K0=Q=U z39NdP1_qd7W^Vvk*(VZp*M3Eq)oBroxY}x_0RL$lThv=@ixDFS&Bpj}U9T3D;<14755kb15T9 z^e%ojGXR4oA`GZBm3Ub+M07y9-yf%u@crl{`< z+KBP(8+ARvuH9*f_OwvT-k_Hyy+yq+#T>_b^^gPV?P-URHzs{7=GSIepnhNHg#K

_HM;0+O5BS1~uds-Anv!GbGX7 zor6bw{-6fQPXFG4_RL2Quz1)L+L-arYSI7a^OxxVjhj%B@-~8br z+KWC8Gg9ix_c=QQ4mrLHy8sns&+hCpSfswj>;xDpjT!bJ@9L?>j_$*L>tPHF`Q6Z} zH5-LSvsThAWERq~9MMglV#l^aO}WyZ^+KV^fqjF5aAJc|7&el16Ub0#)qb-{*{cSr zW3$2#nkx+DWuw_6Y-+|>W{FMtO=JtuQZk8^n*sTHH+B%Iy3S+KMDO%HW;1W+R`(|5|((Ya%brdjjX-&Q`mg{_2GBWx2s{ID}vlz_$7{F!` zcdP$aFG=^^6~{WFl*b3M{m51w#1c^O4rWQn_GB}gik6{U z*+;Yt-p(>mxVnS6!#kDxhO+}0lM%`8p|B&0ea4tyVwoFS>JylZLRc~zhC+eFc7Px~ z^yY(P&os6P&9z4vJ`}kvlf|HAO*U&p;oCgr08sF80qaEi`$cRvT85M`Z?tSLV~#le ztaGft0S?fAa!l_eGmR$JOwxHXbNT5-mW9_5*TkAJ$^QoX0|obAnKANxe}}oCkk+Oy zhWS643uY~T#az2V7f0SR++*4Q6HCP4H~(c-H2QjX=iCR%wcep?y)Ae<7EnHHODN)9 z&A_65${qBSI&8Rw)Lbsi%ethJgjrmSwd}qdgM8UTYw?kpKId_EDAfK|}U!&!| z74M3|6B|x5Tsn}?MN9TzUVy?vM}89prxDx=h1sL{9u%&R;k!_9pTH|nFmmSYD130? z&M1tZ&QD{}r>@)|4>D&K--52HIlLNOVQxGZEyL&WA{3O1O+n$OMLZIP&ptc|g>}9v zPop1qMN97$TtXp#6^}*1Ign34<}GWv2?`PGxB&`LK|CE}9E1536au$!fy=mII}boh z>rOref~7v8yafjKG?ed#PqMs5%k7XRCYcXIp*)2TK;dpGZ^iQ!9^&zcZ~N%ONWl9p%8b1*P`Hkl4qgtA(!{TE=&u!j6C&)yaIkWJ+aG)^6>}^4UK82kd#bx+u zl+TBVyOHE zcvnOV575s>3wH%mW2kYD7^2OJ5$nO-H&(0$42>1ufUPPz#EB)Khs9Bu);RJz#1sAI zcxt;Yp7^X1#B7LPnIJX+-c1mH1N=IX^1~9b4XG)S@&+UkZb%}3O%nBIqNO?kTFNii z3SZzcPbNJmS%O)P-8j5IL|@Ly@d2hjBh%_a7T zfCZNB93j7LI-MsZo$~eRG)KFm)NlAvy3Tt?>3n04(HykLi1($6b24ZSSt>Fe>ApI# z66#&jQT%{R;tR*yLoS<{Js%W1@=iHV>{kCLLozx6cbRjb&oi1@vVXl}Y9n%CPR;&VAe7MR}Z{aI>iMloSRF*WmBF_8@|p(Wc?LZlTXWM`$6?^#Nhky%QY^}dw+Q_CoR zUm3;SETcy{P$qqYOuQ8`*^SC6Z(cdoKUPkCzAUF9OsJsCimIT)w^b0&&~v13J4bo? zbChRMNqqj5bnfg*>gPoz#eH|4cq7kKT;qB2_q{-U`Kg$Df#%YAf&7y%5{6%-`pv3t zUPXDz(DAFCS4D9hs@=Jo>PAuLE)_4GJR8-yR!+1NmPaHWABnZ-5n1K2~ZQNK5?QJ%wfiraae z?zLIPLH{5IMPROVEMENT Render resistor color bands and capacitor polarity markings properly when zommed in + + BUG_FIX + Project font gets reverted to "Square721 BT" on Undo + https://github.com/bancika/diy-layout-creator/releases