From 38911d5d8baa55d63a510f069722f5607b57ee68 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Tue, 9 Dec 2008 06:45:44 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=BF:=20=E3=83=BBShared2=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=AA=E3=81=A9?= =?UTF-8?q?=E3=82=92=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=A7?= =?UTF-8?q?=E9=9D=9E=E8=A1=A8=E7=A4=BA=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?= =?UTF-8?q?=20=E3=83=BB=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=92=E9=80=9A=E5=B8=B8=E8=A8=AD=E5=AE=9A=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=A8=E8=BF=BD=E5=8A=A0=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE2?= =?UTF-8?q?=E3=81=A4=E3=81=AB=E5=88=86=E3=81=91=E3=82=8B=E3=80=82=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=AF=E5=86=85=E9=83=A8=E5=90=91=E3=81=91=E3=80=82=20?= =?UTF-8?q?=E3=83=BB=E8=BF=BD=E5=8A=A0=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=A7=E9=9D=9E=E8=A1=A8=E7=A4=BA=E9=A0=85?= =?UTF-8?q?=E7=9B=AE=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=AEON/OFF=E3=82=92?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=80=82=20=E3=83=BBSDK=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=84Shared2=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=AE=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E6=8C=87=E5=AE=9A=E3=82=92=E9=80=9A?= =?UTF-8?q?=E5=B8=B8=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=8B=E3=82=89=E8=BF=BD=E5=8A=A0=E8=A8=AD=E5=AE=9A=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AB=E7=A7=BB=E5=8B=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@68 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11340800 -> 11340800 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 65024 -> 64000 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 11738 -> 20262 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 124 +- .../MasterEditorTWL/Form1.resX | 2656 +++++++++++++---- .../MasterEditorTWL/Form_deliv.cpp | 6 +- .../MasterEditorTWL/Form_file.cpp | 264 +- .../MasterEditorTWL/Form_init.cpp | 150 + .../MasterEditorTWL/Form_lang.cpp | 11 +- .../MasterEditorTWL/Form_mwlist.cpp | 156 + .../MasterEditorTWL/Form_srl.cpp | 20 +- .../MasterEditorTWL/Form_tmp.cpp | 7 + .../MasterEditorTWL/MasterEditorTWL.vcproj | 8 + .../MasterEditorTWL/deliverable.cpp | 7 - .../MasterEditorTWL/resource/append_ini.xml | 18 + .../MasterEditorTWL/resource/ini.xml | 16 - 16 files changed, 2567 insertions(+), 876 deletions(-) create mode 100644 build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp create mode 100644 build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp create mode 100644 build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 91f6808d9fe92d5b9aa1f15072385f94969de9a7..302b561225e2d6a4c20ef96685ebc324ce8ee0f8 100644 GIT binary patch delta 47218 zcmeFacbpVOv@c#Y)f2jVX324v%q%%BIWHhNgJf7xl%Nt6R1_INK#;7+fDr^y5hTj0 zpn?Gm{>*abobIl4>eNY9GiB)({}g-{ zR&|cwEA+oXl{aSoXf5iNcXLhqfG?i8V|9^@-SSHRm23F-XjT8qvc=|4{ZXI2xOy$w z|H!Cz`5v^x57}Xfj}IS(kA;sPp8!5Vd_wrx_&E5u`0)M+J}KFDIM2n4OG0_ywNK&o zF(E#?mc2KWH$%mHSa~zz8CKp!@!8pxQsOlh%}%X7r8%p}ntXxJJNR7t^V+qOzvBPD z_@()!Yk%{9{)_#66@TOT_Rg+geR=I#@X<2Cve`rYc^CU;hV#x0=bIVMKQmllX1L(Y zaG{yu!ZX7~W`>K-3>TXjERV2ESbJ+Qg-O?@?VzC{{FM2#hPbFzF)gPPxgWPmz}k;cZ`p=h;N+~og`(w_yZ3_ z`$YQ&gm_{}s*q?vaZ&i=G!X(+P1ch4$;on>oGBlc^W%R`h?XfA@ z2VRiFwisxK4An{#+v82|j(#2+FYlK3;`vEkTiNBd-qN$wgM zLZ6huTc7dzFoHJT|i;#a3e zdzKn2??k@}pM!=by0eC_zc=t3;^U@8OUPT}3#LVjsoK7}@t3AW+ZU_htK|#+Xgc$R zEL&9w9~xgy)QCqOjJ9q3n{4O}LM7StCBG)l6prtqWrm%W%Cg?WU&yzMm_gbkY7R{m zD*I|`x@uDFJ`odti@dYV{dIi{y(hQCUwSZFsl;}9q^&9aeOYj9n((9aJiffX{Jw&| zBJpz%MoY;&@qE*x1zP{nb@ucRm`Zd;tHr-$Qn_2tcn z`0(k`3i*!6)80c*h|2W>qGJ4+>Cwz$iSEnoyx&Wuifux~Gw+Um@_(BVD*o4u;OpfL z^Q!pNnbEF!vgG=AiVKC#tRkulH-2(vG%9b5`yYyC4IPg;KMC`FI_COZ%=0Cf<4}4`CjEhB^EV=IdDqKU<{HJJ> z9lRDUjyInb&5+gNcg>1+ja-tqJe;b>y@n_g-#;r_PNv1r&x&S7s`+-jU?{1gT0C=h zv`mRjU5jg}QBnNnap9A)wpYpJ@!7MZB^s`k5pbc6nhX$w#ZBT?F-nXUcZ$2k-Ljh3 zz|-;$j}u#o&K@V;5kEOQTDSODa;wMb>Ec|z61u5}#9z-z*S@A`NTvn9D z*X1vzidOhPBz#l30%gT_8gfNZ5nt~pRw9S&X!1Eju8v_9V)RRCIpnY=msz8$R$J7@ z*TqRsvo2Zj?uJ}X)Wg>R*1tsAY)Mvpsv$QLjqvp{xGX_tKV-!>8gf(76kprz%Ow}o zi zPp4_}3PWxy+T!aC2Xe_JHTj?+w-@d4^*|E2v?j~7x@sLoM||zSJNIc05ysn)yNPc2 z`um|=a(PW2YRC)30({-^ZEnreHF=RCFA|IJbym{T9AJ#MAwMb}#nrR4O$Xr?Rd@t*&{VION*UThx15M5}&p(d6!i9F#$jUwbq6X>u;+ zw;|io26RU4?uD-5}`EDiGUq^AdK@b8gfI~5aju5a-Y6alQ$Z2W7!zwH}A~twegyK%8>iXejpcbl}o-`lk;uS zRU04&fIL2lOv^PZo(Xbx-&N7$zI@Y0*P9+Wl~GmX!1EjUN6^!eB-JARJ_ceK^A^!*iT!_m1a>*ZR z@;O631N~lzhm**AG`Y-nUGq!w63BJ7q=^DRQ~BGc$=wb4vb+rP`Xn+}V90MnwtSXP zh`O)jmVHQ*HyUz^F9qZQN#rA%e9DmX!X6Z2ViNh7Cg*!YS1r|-3UYRK?#qvBa;70y z@Kpf$3>+qj#o>e|k2B;-zDgjc9M2_xrpYS|xr(m}$o><# zljWPbYBhZ|LC#1bf2GN_3^~J>0rICw2s3CXqbprW|q=uc=$8Yhpz|775>O2pV8zpZ|R!%^7R7w1`KGT*M8CD?uOjo z*B|83N#wJdJk^i~`UZmhRucI)P2On8gMEWRKAlAVU6W6N9L$nKd_#O9``Ux)GA-Z! zB#YpJzA4`hUBR1tH{l(_iszaemoz!kkcat(fm|_ZVZE%$<3NsO$v1qi5@H{Cwp>WF z^OV0ymibgk;7iQPoq^PevScY$3iz{gbMZ7Jvt&6{4)|+Hcq&O*vb-t}{AYk$;dxFM zpT<{JRTb>sUr6u@wlpC_U2!mh#-(Xv0}o6IXnfEOy08ROOXT1~8Xs~)!29#$;;90` z#B=ikpO%DA(f9&x0pOo(!S}~Zi}PthVYe^{FKL3oQ=iF_#oS`RA3l>?p<)`J=B5EZ z&CM-1P2)?srGS4b1>@m048AM8r>t8A_<7-6eCe1bRCgPK@Z)c}1(ehHOg9twGhpjX z({)qQHNLgm8u)!lcxpFUvaQ<|__ayzsjBfE+z!Am`6Tx})Mv6}4>#5Wgr6{_Gra=f zhy>wA_eS6!Ou|z~$&!QJ!T-QF(fC2`pnu>qHGZHw@E`cL8sFa?VDPb=f;(wKKeyjM z9_X&|ecismm&4d6y0n+Z-|F50{M#R5ZhBqaTjR&NlYzf{J{R9t8}ZM+(jTP&LQ}w4Al5X+$F%TNx~1-__+H7@JCkX_S_JSU*)a>{?${dISso>K8}O@= z@V9IHo9>&ypGm6dXpP_H?gBn`pmA=&V>RIe_X7}C%+AH%squTZ%z{48-vKYH<-TXR#-DM|03Uun7yqop{Lhl--SZ&SP8tHbpR(iy z_X6-wCNb9w8h^$0g@t$z_a~Tct;YMqF7S~ratqj?@dd&KfWHbIJ=5z6DvVjOaJX;` zgfe&K61HeUv2Zcq_gu}zXKQ>~I1TtalX&7ajV~203;Zuhf`vLIL~=MC_%>T}-}8pX zR|{7IzCZA>Os__7X+rgIbr1?AJ+M>bYlUk8Up)!`j>gvx*9Ly$p4y10-cLO=OV$h51Afwh9DHmFHP9^CFx(J?XFkdyOrh$TC0m4B0RKi3o;qiiY!z+= z{7s+b-cMySOSTEO0scpbX34SPyMg~aM*Y{5 zTxT?4Vt5`11*s5t__G?nFnkpFmDKz^{O=lnJUk4};=_>b2|TsaEIB+f2KZW^=Hjnt z{GE~efUkDW;A5PA^qgkN2O@JoSnCmpr=prA=SQ9dzTiBp_g=vvjb9yE3w-q?d|2aO zj_d&bG<;SX&Qen zas~JS5FiPBX^sCoB2zGAH{{~WYrK_G0QiGo-o*VCHNJ34u@rb5>r$!o3aF|HX(^@f zz;9r>1fHrZ*6)-`z*nRK?A>2S*pi+W-*GrPU5&qD#ZR6M70T{*Bsx~b z(xXDW5C0g0K>L0BedXN;aTSJ8!zhX~ZsFezG{e0Hn>Ya6B>9?Z6&xKL6C4|Se^{D! zpM%M*23FASWOuf^*j?>zc6Ymn-P7)6-)Q%?PdQ&X?}NjGc=}RUM1qmRxQa(wMGD7W zMA!=G6#IN6nsN|LX0Zd@2iF;>cDV3!`9x9RTEe;c6g-&Ez)iUVzR1S1lNzW7slh5s z4N*hYP3l(F7fZw;_o#aU5;$@?zxLE0l$X`*^G($U`$}3poZFn+ojaTfFuQ^X)rg;E zLCf#taq>F(oczwgQ-y_v;;y+e911((BfH@0$M?FbZd`s6EfZ_4Zc)S4OX@9kP#sc- z)d}^f3R$)_(5>*ZiL+F&dpa|mnzyHkf_U&n`I)M1wGFikwGVX&bqsY1bq;k2bq#e3 zbr1Cj^$hh2^|U{BjyuJ$?y&9q-C~$aEb@cUosnYDEQlTKe)X}A)Wt*<-(+>wUp$Z+ z_zGf)(9XDz+Zt6>;q0Mw-`Lze5#%3 zrVd$OTBocdP~`YjrdxTMi8oGnr@L?DylW;5caHoX`MZkk3!Myo89Ei33AK~2IqW;) zJMJr}%DN2fbp_@t-)Vf$3+=Zs6xw1?UelncmUYX!mE7uX26W1{&=Y$=_3H~Qj4Ikd zsC9$gsTe)3!Czxt{m$j8`yDIAWBjEs-OA~PZjBTFJ1aBYly6xkoCp7PNV1=6Urc4f2%vf9qHB@<=*Dr?xq2Oxta6W0q0BS zqI1ca{Z5MR%E``{$4vaKLA>#&(Gsz%>TgxTDruFnN?T>Ea#ndOYGsTv{raTbuQmt& z2wn(Y3}(Ri;^0>oU-8lh^i{^AI8ztF;Q3=Gy~py!95dBL%mtcN8}#0A^2_Z zbnv@iTF%@}3uCl6&+>9S;=#|N+hWaCrfR8fP;FE@)n0W}T~#;LQ{AX~t3Il)>Zkgv z0qSNoOpR2d)NSexHCjzj_o#c-M0KCKUp=5EtC*UirmER$j+(3HsrhPwdQ>e|%hd|? ztXip7snzOvwMMN~FRKk|v)ZCwQCn5EdR6UEZ>x7>>OHkfy{|r0AE~`+pE|0JsZZ4B z>I-#BeXYJx->L7F&q}fKS^2HvR;rb5Rj`ghrTY}x+qXzSU}Jw3x2uQzYyIo|pGI!E z)!i71 zY?tqSUq)pU!Xyi3z`soo4Gakk4Qz&UmPOZ)kE<1dt%2;otAPx7|9RKn;(oQn zf6;%*zi)vN1?B9n&QxcgnYyBqZ!Qx_KnU%P9Hc%`GNs*ttu5P z9sJ$yd7f@9r4cy1}nKNO9|ZYodROe^Vee_-ZKjPUwTsF-+v|LO+KthkSM(`)Rwb)6D6D z&=z0SN%T?|tc%t=whfb>ZSE$Ts-D&z)@W;tWqb2vk^D%l4}KXu6|^DYIg|Q@M`G43 ziR4Fkj!(4~EmUu7vK6zYSZRmz>-D0#tPyW|G8&03Q;(}B)RXFI^^7WN6|)Aor9UyP z9O(XqQD#MijH$oy!IpYlKLZ~eJ>&xV*ht-6I~haL{i3AO&(NI^V+Immf8)F-WmR%g4v zJ-{Al53&c_S@ze?H_jsnTe4*>L@U+Lnr|(z7FyK~rs>vKvAt@QHqBTQxgVYiR;r7& zI=9#3@646&suzOWg4=_1Pf%P7V4`Oxp7aWEk`)D6S8hbM%Krj(4OR7hc# z0jp8dMgEg!(X!$lUrj7+og*UM8geyqMX+U zOXLS?UGQk|Sn%UuIY<4`0E?_!;MEmbEMyls{C zSMt~KH}kjiclQtQPw*$k-z;(C5Pjq;&x>(tuKzv%F8}e!IIu9Q*<9S923Sv6Pg--~ zj^cX@yWx#y*!Ih-KA*az&V??8{)C7a8NM^Tn=`y~_EV>$5nri-s*oxIFCAIctWf_o z!zR`*GHx8K`!)npNq=cDa3!#C9WZe-uyH#ua(A%u05J0eKLysjz=FWSz$0L6^3M~2 zP0(g8Lx{1NuZAec_U1^kbExPwEzQc><;eUoaDPR+lD;b2RqU#EH9Z?{ut!7SJ!_w` z^EhQ43O>q|E>2f(mh^IN)K_oFnZ8ax%$k9iH7nXnF=?bOX}kM^(ruLsW;1LR8*UifX#GaAm*^mkITV3KCT$DoI97qFaiS)Li|c zG*NBhlr>PDeCdl-E}c&RlKMd=gw-QXYnt+7`fLESoC;N_cGcSHLx>q zP$aZ4IvLVnEw_RN41Mfh>e%owud(`?7@io8O@xNFP+ti>ZD07fzOL8TYDPLnhU;r& z6{o6G&H2N*;5_!BnZ(C@SKQc(;g7<9g>Q-!g26$J{3m(AcfsdcF)-gs zdzJm1{n#0^Y`y8$PMK@OtZ?MR$`14n^a*?r`2d>hN^cVXCdR5c{vH0E{u7bETbrt8 z$qgzaSSR?4J$byrY?0rq#i7SSMeK92jd`{3cmXQ#Tx4fa5*WSPXx(#RC{Vae@xL3{ zjfzkPq`8HV_QT3H5nH1s^|RG1(mc{4^7k7?auk-2sL6p?V87k%W%JbA&TV*6 zNj#M-kzz(9ktHUA3yz0}V{9M5XmU|`7h}fJ`Wu5(SPx9ql)s@k!|oOhMHf}cI%plT z4qHd8qt-F&W2>0G%h~O`R>Q0~)7=@kUPEWI(qr9*Si#wpkD(&&hB?m$tcZ!Bs;j>n zL`pCJjs7k6z3w#6kbO>ms)~g&LoGwCLO##ltQGd1HeI+t^j47K{&n`}cnvusk4UJ9 zbNd(2i+w`Qc0+HmVD?WpxwyhXUI{L=TB znirU_h3O)Q(}Q*%^c(B_mM=qf_}Z^qS=sIliAI66v|>QpI46By`iuZJ;@7v=r1aH~ zOhed|Lv>OXuv%D-?RNrB&CKp7m!Nz|1p;jY?E*eeTmDnrqaN{p z?f=Gq8|t4QuPLP(srFU}tE1J)C^yc-uGDiTNuri4=Ll$ev^rYx9kY6Z`BN*<^bMWXM)A;!=8<_PJXRAhbD&Z3mpb0h5yxa~3(vu;@PLtaV0LVKXqPFNz6jq5l*A3IAxcjH7Ts+@kLA zkM@u8543-|)3mK{czpO5bUkx?|CD9m;7J7oC3LuX(AX9@3-S6#zWFHEi(Ys|Oub~h-REx_Bn>uYz%lLo3D-tl?NjAb2P zKI?n?FZ+tUJS3{#3O+&rD2iS8ak*f>Xf`wVyC8s0EkHZZP#X;Z3mP;j9+)*VeTHcF+#lw(Zz1 zwjo9A6u2keaz1yWDYZRbtZMg#)?FJ;2X;@taElo7ec9|*B2)FTrdu z)gEiFwIcLK-=Y$XoiR1hWYf4zTUNXy$36>w7-nLD)}qx ztBRjjReja**VR`&Kd)xEn(M2DzXeRLcK-I>)g78r4}JCY_v`{IY=D2Dz6QY>o8Z4& zU#Xb!G`jyIt?q@$8fbPK{v+Kk-qlJk5}T+N`+xTT;_r=l#cq059#@4!HAA%^5=Obl zJQvBG@)gxQ*grTRcZ#S1Y1PD@pRcufs>K9yovLJ`xZja zLZ3))PndMJdLQ-_qK=}cI%oZ6 zy=O04ZR)qmEgM;c*~O}4_)@GL_Gk9z_9Da*+1^s_E1RXJ<%VhQTW=)aNAjF{0Y>ot z(1Fl>SX$Vt6?_ML6|7fak7he>IF}K(<5Z~Xb7IzH`w9C=`ze^e6WsftGf;RYn*{ge z6j}BMTNi%V7iwli2>s}-ya_!;zM4(s6w-X3^6uqSXRa6Is3;M>5DfnNi^2mTCP3m_~O zObHeU77dmPmJe16Ru5(b8w5MR`*$PQJ1aOWI1bDTJ za)G3EpIru;_+8<;XANU_@%^Fpg}y~gzYDE}*h*F$*J4^yGEnt;1-cw}{`@RPsLEEn zbS(r-N89Ov*kk@B{{a8?cT9aRM|NM%B|yNQi{`|!*wo;+9+IeWXQ=A-hU!hXq+3f*m=MPKphPQI%O z{;LLdLnucjN1M7z(vcvA>kC0#?K- zU=^}HfptZ*W~WsO=1zvcslP2O_5S|x{(eYoVjXI^i#@+&F}EPr3u*|@$RnzjRUlL_ zR47z9R3ub1R17mAHIx?WVIOslIR%l4$MzL)-wRiad^RCPn?mK_1%&bygZq!Jzl7tD z%5PWLVa5s@2!ZQXB6)xe6SuyPTwQBA?uvU2;mHtUkyjzSS?L1d zt6uP>l6y5L@HR92TBHFJfp|-G<$7lDWpRg^<=^Pv*nX(^%zgS z@`4zz7Wj|&kNWq+w5S2Qjn&=n*1-Bl`aoY4POuj-uU~>TUgIg#2YJEI21u@@q1nr4TeBdwme_IoE?DZ1!Ajr7VBQE2T{%ZNfdPSm z0p{MZZU^uvy>fI2{L|-P{BIv2*1>28Bgi!>o9Zw^SOYtr$iipDaP@$HvOflYbpSGA zcYI?$=sM>idrm;oPK9(~wv*ISz4>Mzcf3QExzuvybje4qU74f-mK02KoZ=#9w;bvlQ9Sa?gh38}8=a(Mt z=*awY2L3rTKQd}f5k0bNB2jo8Y5HZzr&KlT!@x&a#r6jF1wOL(Is2U=@S%{}SbpWZ zRo#WDIl+IA|6cgz*VuQvMPNd*S*gDK7E}dCIz{H1su(X-tO(Q#7XP$eHKhkS+wlJR z7tGi)5HMuE8O1@q5>|ICAGgBj8v^mpQDhLQj`adou9rePowuD&ozI;45S`@mo8b;z z=Fb;c9e59w{WQ=im>o<*HpQw?7Od7e_ICTCT`lHhz{8f}1v{FGHfkXBkQG+@&rAom z3AaadpA~de$eoV=`Radrmj3B|qt}f&1s2*<3{R90Z}{>dLT@4)xnb7Wzg=>PFl&)l z3`f{2@Q`}5T4}pF>;ftVKogl3pNk72xbOb23rMN2X6?r3APQk3$}+|(lOX6 z*v&rZ9CAju(=j-l^+SB6kvMY?*7b?7#;3!6;(G_ee7?Ja(r|gVW8@IF9&z2OBcE0u zLK8Y17<44ixUsNf_H)dR}t z2skD#c+z#e%vPCDx^4+x7-h;{CJ(7#C={|oo$QhBg>i@YCEOi# zkz9D;N}ArX=qbCs|5I(3%I^P8wJi%jUwwb3zXP<;gy#AG^v!?io8e@Ab9IvnMPvUv zrPK0U0-2(v>I*~UVJmB5nszlGl7Fds@G=yz3)+S3!gdk6s9nr1Zl^*EE@79nzi>`E zCy_ow(bvNlw3=8C;4qX~(1jm{Z27_Y(aE}q*+p^oh5z$ZO@#powW*2|jypnP7$6qoN zcz?WeiS$Y_#^$@I5o(f(tEbc^^^Q8CK2tv`Y5A?76}IwPMXZXRK6F*wryleF=0ETM z+FLtrbSFl>hHPYOnf&$mM@2P!4H|zfIL2w$){;-El`z2G3A~H-U{~OAZ@snTbfsc} z27!iwPF{voP2Wk?9!Ap5@IQ9)jD)Vf3s|Usf-&@S=Xcgtgf%=b&|yj7*28)9pfe$e zO6Gj0Q{$q#=GTSHRYUdl+C=ePB0VB~B70Cgv(2uFNvet!f4^jU*%*Qgfjoh{fqa3W z^P%&Rb2I#VC9eE`3c;uBxGtay5p**WLgm%Mf{2VN0xE6eNq~ zUbPXffiuCDFB|2{Wd9@%fawxhh<(_+Geyo*;lM3{TLUk_@MaMg!heVTNQ5g01G{si z3XB!@QUUi*gya}Nde_+nqxVB+kF(D?=p1&AIv+cq#Gr_M?tI~#a=v!Hb-r_caDH-r zc78>`?>xfae>yEa^R$v|ud?9r*=W_lShKi+a-Aw4j0VqRoFge);G}1@y2@c{gny*} zMZ1ot4h)eSRfAx|;2ArFP{x+6W>z(G3a8XTj91IOW5`b0@~wHnLeWS0{Q>_bd*N5t z8*C+V+~-dyETRl!udgg4SAU$=y3IrQ{}a1_=8d!fC^zSEtjS^VulA#KQZ z^L6+AqRzKgr#)rjF1b~;fDdO#@K#6{w&i8{jp_o&ODwd-TYPR19o05#yR|&j6%&!8 zyv}_pd^*0UYShZr<&*g(EpJi5h4`MXPMO87nLRRt}iCPRbAmE znvN(;U+D6TGR>0jsG3&1OS$yIvCY9P@I!5dYTeyF>>P29e{5P=+4q3D;x7~^9O#Qh zlI`w>j@b~}4)@ZnP|_%p>&j=;NAQMy5;y_%{IkHV-m>(l=&uU;3;AEM%XkxYvfQR_ zfdA`$M2gBl{bJQ#kw2(qvC!iP4HdOlKunV_Tf0~AH;PYwL3`e0^_Y;#e`M5~44#B( zKUo|145=mJmo)Jw;l+ISRcFiJ`E*mt%5w5CwL}eeV|@pjh1CSU`W`e351gphelIgL zET^bz{_=rnV81usZA5c*BYdCtS(6$dg8;8iNXE^PGTzLnC|9d%0TF!H?t9YMk{`gj zEa1sIpPZ&-pn9N2EKuMsGit@cw}lIM^7sS!E4q3o{CMw#9?dop%rxH>Ro^OLdr41r z4fyhE*|qHqyN>;(QvmJ=cIptg)rw)J7svG|TvTlL8kcTcLRHnsZ~Qoi3R@5K5k_@I ztR51EO&T|ImQ3Pyvaq}ro5xJjHq(fhHe`~8OnT4?2oYvAEV0JGF5ZYt**CE?9|12E z4=xTWDBO8MO_6+25_<$5#B__pCw<&@5q7PEtcWu2r^a*!{hjVz?gaO4_a66NccOcr zd%ru$eZbv?C_BSBxeLY>c#7D{*L}@YFDT^W5sI7yxzBWg9r8z&f%R~CXazi>D`6#m zXn*3IaI!&T+g;2A&WYF<^{{`Nf4l#a$a@GL^W|&hSE>`7tK$*5yuq8Q zCKUB3UT_w7T=sQDn&Aj!$&LpP#1Myi7#X6EA;oS5bcD5#hFc*Gb|W5j43Y6u2(O<( z7~mqJ3=$&Dg)UVHLA!E@{5L4*Z|U!dtd%TiaU&7gycZ6JrSTuq;e@{A&l}HI0Z!=I zfkjBEd=3Gs4M;|Q1NzTi7+xn320tD63Bim%koYfxeq=x7fofR{*~L-#7-}G0s3ABdzMzNwGUXiIEq=ocCc?P?@kiQ^Guk3qUTjJ*kuVKT3TA-^%S6>?%H z6pHm?2-0ZgrTQF?Oq6H&XdTO+6FW4 zb2z*%AnYlfjt;hMltA`IRi`%6X<8$kGZ;RE+p(-pL}Yg@>X&9AoGsuYKb?ajl5s=h>^`S_?bqJLvEXnOBu@Rn>YXuspCL@N8fuLPyWRfAzk-$Jy&Ng7jju zMqrbP*<;cOQk&JS<8E-fKdhVB2it7|hfKPn>GnUM8*#PG>nmziLL8&Uyx1 z!6O^~>xAe;c3p0`1Gd+a`0kSF<*Lxg$gL{FJRwLKC6DjDtFlaA_Z zS#?)ER4;YA8l%Rlaq3QWmm06`R@2mjYPy=CW~ztOEcLKjs1~V5)Kc|=dQq)Y>(xf} zntEMrQ`^-W>P@v%?N%SCJ!-!?pgvZ|)k*cG`bvGPPOBf(HKi=ea;-cutDsfbVgO|s zP7|bPii&rAog=+G9ek>MQ?*0%c^>k#dU?^yn|;a}fH3e#WMw`7eO@i{{zMiemCZD( zjCIqmCK0rs+jOiEh{;Mg4+o`G&2$6Monn-26XdI^CBogKf&myC#B7((D+}7mPxh~E z4CbsDt!DeT`m_DNo;Tw9fN!dMsiJ|IB!3BFoX<9pE7Z5pat_#+;E*Qf3N~%}Vc!f2 z2M`ORWBxs)3x5C)$=-^HWgLP9a|~N8PauqN5_?j=L2BFgaOItW%lIskRewk7_T~7- zy6FWfa{K4zy~b$$QCe0Pgbc?(6&Yu5h9`>M*Aw}a<0IJvd!*x#-UjK`>hTpyZ*7u( zsc814wG}p5skJ1JIp8S(Epa!_k(|O%C~~VsmH2zhqSsh#vX5Nr9oO1OFd>~UyF;{*OhPBT z5Sx_gbE3R_Q&-|`F&qVtkd&glW4h=gDJcp6B`nDhIpNZxzNF)aC$ivd%W|Tje15wj z)t3z@1Gsqd*|O3|Jtq*E^ZA<_?4HBC}*axHs6{ zEkqlnv33-H;x0bXL^hSn-q8ISLrCj2ueegOjEu^}0lT9GlgD}cx8fJk@_zGZCKAhd z@Gh(Oz4#H7#NoS5P+g-y~VABd~9^)OdX7eN}=1zptqtJ(F)o)t0C%OZ0m^z$dYd)8pD^|6n@A= zYrBbFq95Kq81KIsC5%8Bci>3XabkkFN8BqWib-Nh3}ZAy%o20Oe6Za@oGckf&U*3= z>lej3u^A_!zA9c9Z;M^xBXLL^5y!p3F@10zxvzg>BZzF#47;&_?LDH?m z&DHgArd5(83CFx{NgYB){X?Q&+B#tJ&S1^H{URKVvE~1YZD2C#I z-D#py3}e$!HkZ9*S9B)px*Fo; zk<(1jgTzO>V8`jLm@I~U=o#WmC=)k}onDvTfRUzCi1!qPe^KajXU&Y^e5r`Ot)hp- z%!AJjjD%;UkUn0OcNY+e^Q7+(5ATeb?pPo?>@jWb2YJP@ z;pT4M{;1$yYrcFa@bkTZRTPqMpVy+M;s;Q9Z+<~bmiLYm9VBxW2=7P#ehk^l9_;|R zz*8u*y=NQ8#6=IRB%`PTA0Ufx`!ic@#(y^C0}H4pKk$TfTZk2g{ds>HdVnS;;en_= z6OIXgBt}U_=lNusXzZ=4e3EI!ykjIz#F5;F%v-Vr^MDC8)2C$f2FmKhIobCJM%GF1 zB^XX8og!#2c!DsbxnLlju;zAe{Eb+?8*3pO)Jog{Da!D+zAuJJ!5znZZGOSsy+q$3 z+RChlOto$h&v-r5P;e_RUt+{eMXvxO{m&&yH*SdKd$?Ni)PKSYab5?v#S*?pbdtsO z0^A%o$;Z7lo9f5SN$WSmdc3_4)-i_i2u~DUB)75>o-YQ)&#jCW>S#n~v;U#+#E)Tk ziq~}UWOn!M6|(#>9>3NSMdWI1&tnBN$F(K!G`NL$Ogx9bJl`#Wr%HxYTC^DRA9`W} zPr1nf=!w5PCoX~Kt^_zTFzkrV8GJw&Trj?FW_pogOh&2QT{~Tml zB>wZVXc1X79(f4gip5Jjj&H@|P5CV~-WlIqMh^K5o{F!3D1BUv#~^XP6^FgC7=WE6 zg!&5}=iviX7d(<+ivoIuqDv+Xm8^>fv_az@!$tYT^lLslORq76=7>Z-*AIfu^W$+#V0RzujGgHEQsW!G+ZU|R1IB3 zT{NQ=t~Op{SYTiD-V8lRd@Bd)c~to#-opyV3JS)zsS%XaMOQ*i*}kTzZ4dCl05M2# zzY%YqDVU$j>^4(CNAwqq=#Ry#&@*OuvIN7+G`>2EAz0vV6H{}fase^%OA{N0+Ha~D z(;d!zrW_HrnLAA>S!RldFzSg-F7pI;v=Cok4^s;-r;|!=eG!;rwoS05iS3_vix)jl zVreX==JbBDZ7Wom49hH7ZFNjW?Puhu?D_TYWUw*=Fs_M>oUBS>m&jbfeVgo$IfDB| zSgBGNnA+k+?AsxJy!QgJWGjVV)nth7k%q?|06CQ4iy z3Q3qfd!P))hs;S&D@e*juLS}fJPp;0zdR?sTRdfMdh2qzFHEc>9}E8O0!QUt@gbJ% zFL|`*Mj7K#jxB+uaASQrd!NBy9_5(8b9Nxr5``eEG3kEt0Xd-${_+UP#QhAfu;MN7 zH(5xL$NnL_v~asA#YnF_MtbEn(kq{lUippmDxjs8LlxghulVGL(rYi7m0mhl-)9c2 z!haZsQi8c&?4O!?X(NQ6fxurv1;q42<`+uhVp)#BswKExgBdTJOXZ?O-g? zT)G7;e4DskJdBImDA^rtaIVoH=)JSVV?)Fec$?W5Wnj6~#k^@RhCp=PD#nV;PmC|N zqNwWqphhjstR{ltOIEjym?yfQGqYt5;K#({m;$GOVP$VNBF&7{jXZv|C9oVRKFf1d z9>ZTASDL_6rZ5=X6n~R@p5y+Hp4ZDpz;t}jbbQEkylpz(F&*#fj*m}zJQ|KKd?&qT zY!RwPPY%mscXz?XJ+`cI39-a8j>n0+k~*CSL6P1@cRv?P>f!8@p5jKV=mT)7IFuK9T_lLWQ*_h! zL-46z1P??bbiZW$fY4~k1JMYLl8H0VT7&1fErQs$VuHRMf_nwM;)L!H^zpD^52L`j z7=?v`o*vS^7u*CvsHUVloIU)Ccumle!zUg=^%jGrR7oSAl#c}6s)XJX%-|<9Q8GuL(0IwjdOpXkFH|e&S|#O@ zNZ93Bl4p^MNV!Lzss?G(&=C-l4E@mqwHWXv1)0N5at%p?laP>! zZ0%O!#9B+^T8aC;sajevXPfukEE6krJHcbHh;t;fvI(U~W@8hoBx#}&nkt!P{R<$f zpYfDnh2p^*MQp|YbSE^UX^=mUV1-`+U&R{nl3160$CK&fWPHyX z>G@++1}J>;gUe~=lC>&BQ#&b`9?XKe2&M%S>LHo*OK6Z}o-UzY+V~~(vtXt!At`x& z6`{(Kr&bY4mCV{DG*I%SDnhM9y%=l~f^7x!atXaCc=i;bG|AjsLU&4@K1HaDq^(To zGr=rdLZbzImx4<2;D1bE)zO0cqY{KT+}MTMzo`O)2D(~G@5^yZ5V}Y51RX+mNFI#CK^dy$2;&X>RtZw_lwkHN?>a12#=KhZ77RU5B+$n_025}2 z;7K^VEhu>c4x#3f>8pg=>VN|wpJYZUq2q#?q=d>#8X$y*YsH(;4}wXhgnkrECMA>) z3-GfB+$4C;&Go&U=wzma^7h_>$Jh|MSuib>P)W&TP(mdnlRybg(m(M>C{;%t*sNt( zw4cD-e@5`68q#V@`@f!H@Xw!r7^gaR;LyZC=fHNP2=`QK6t z66VbqnU1&o$L(TDCkwq%d+`aK5p>{dv0zDNauT^l`|b&aB$G1<-7a`c455*dK70;t z6&P_}2%ZE({64|tOhUzE!tFj-(o4a4+XhTU$2*OI{upgG@qUO%YGQLmY@XI4*k4>6 zw5SFjGC`9sj7TPC5^5~zpC@!ptoAtWcD-sbQIq&Sf}U^|$<>VhYxe3ys8lR&ieR24 z@B3EJpH1kjD3RdG4+N7ciEJX7NlB=@ZZWFp7c+d)=TLp6?35^lV zi6oR?(%(&}h2#+{g!;*Z8e32>|B$%Y$AXE61Um|zyh3Q0;4vzMdduv#37O2~L*lM# zHwU53f=8zix+r*L3ZbGouI5h!PfQ`Mkz^hsp$x$+L_%#Oa}V|S_mn(Hg~;0^{m|^T zY0yGVfGLq^_@Jb7nRk6Cn5svpgP;SMP(U(Ok5Hzh3xvZ^2;wH;xPbE*^OVflUn}m@ zG4_iwO=2rC=FHgRqq_vt^awSSJnw{1Dao@<2n~?T|01+s@E8$7djwApA@q{qnIVMI z1y2kibeH@Ae_0hS9&|Ai`?=tWAcSg35%UDvSh)jA9+AT(58xm)R`4JVLYo9rp9r;< zJV1j`eaV9{2o;b#{DM$-$?PUVb+u!e&~KuJH^7~>gPFLS1RcqQV!sL=KtXVmV5$?R z7uC7aB5_j0KunrJ`Wg%$HG_f^aN*Y#aZM5r=xegz#ovddb7ZEz9)d^aA?Wl8+ls$k zN9W%X?|Kq*?x`3oSOyKB#^hTChbS)wk{G4omFji*0m0)QSk3D4m^V4Y62~!U+&IZI z7)ZS=c=iIJQG#bK5V~9TK5TF!1P@3cZkXiZ2NIG*w39sZfXE5*@+SrwB6&ywaRnuh zCg9I*wT|1t3Z;s9Dg-*^AKj9xRK)H~>LNx<|J_N`{?Sbj|D&TGxvs00p{p2NP4v}@ z>w3#mT5@|WNqs57jq_~Bjgp(*33Zd)+fJxc_HAb>G%wb%s^o7u@JAn70!x z{IN3rNJIipTbdTfDg5P+N+j^cqg_IzXaBJ`J&%mhr7gHK$L6LF6%D>%_?$ z_3(TrIR3f_p0U9i9T7YxoY2^ufgF@$u8tCk-xuyC62C8elVCCf=hz8M3D4^r0|O_1 zDmb~|Sqlsw)Del{ywPoe_F@+WXOs;1Bpd)&TVBz}+>4ms~-F9>P}Y|ROA+ZP6^ zD*~NOr*_ma4C)T-YQxqOu&BqdK0O4d#R9k?9);c*lxYZJmqQGe5%U-qnueZJyr&iv zqp(^g!W-2Dw{oz^s*+peX(%$?Ai*<(pOJI6^$hg$%P<`rr0Jx}vhr83 z9GA*^vK7)6x*|7V0U~L9YmJyzKL`$#3%u?N$%KZ{Nh}49>~j}1S!xmF`W6Vfwan2Z z`pSeRF4a^y}f_n)5{&Tbo=TzwW-kTlsj#1w$)?7EI6Y-f3p+h8M<258z7xutwx{!oR zp{t;R!b$foCNEi%x(WMqfTT{s{@V%>nef}`sJQN@sxp>=-%_kA>&Z+{;M5k_j-Vg; z6ow;x5`0k~nNVaha-0&K1%Gdu-Mt&det?QX-SI@vK>fSI(?hw|p1eUSyF#%IQHapPS6A5of zU6IhO?hrjN6 zZ8KmA&&%nF#4l9O&iRGv!8y^1dLrT9=pOHWIlaJuH$|4$%m+j%Z>*M!gjb=5s0clf zi**o5RT2CgDwC3U?lg;K2#jv*#(=M%mh~Y4TF1v&6$-_u-0;`5M_spa-vw1>DpZ%* zP@b1UC0PzdgkFLfmq!+prDehs(N8A)58brOfP9`SO6Pjr z+Dq(?_xuaSX|8CvUK~*7nmL&)d8^9Aw4)P&Eu{!fxDjfJ$Ih7XJ1lPW`mU2Gb?S(dUniwZv`Ik{I3upF45OG{KJs_|)JO!kd`r#~pM z|Ej*u+Aw|&4rmtEu%X%`#s0Yg1IU;Omlp;>6o#r9GNNvl<0OMzCeB+Dv8pPF4cvpF z7qSE8w13vv5YmwXf~HEp&<11 zF6K23@vfWYFgX(AXs&VcPB}qNl=sWY+Eie57a_coNZ@UUj!q=-_Cc>EylC~cU!7?J zjO6pFJ20i+9}a&LeZD;=ts&Y6>@Pi?Its>YjR#fbmCI2wvHh0le_ zTdgT~;*ns5)R-}tnfBp{1y3q4wV3t+g%86d2@dB^MZcPA%$Er{(Xt^r6POjN2hS#R zfeE*P&z^on_De0X11r!T$Oa|=6O(~p-tHJQw8Ns{rv~*hrqL!$qpgC+Q}Y$XyhB?try`K1JSnGvr1hmR%BoD^AjcmobVZF_GT;JOUGR7V?eQ1WWbt z03;QIY-vEHVSbx=&B|~_bC5XxW%R7&Fp+6FQ4>>?!^Biw_EkMC(oHp4c^VvCSsG$N zZ=%zH=bEnLO4s0Rck&z9!MU($vKp^74rd^-fv zlIL#`o2K2CWXF~eM6U^xhRgWIX_1Hn4gt@M1Xm>v*{UFyp19deDCWX$!h>5O>s!M_ zW@Q*8WXBGJIA&Cyc2G-Dc`+5cy<`RjyD<&kgbDDZ&eqAjtj-3VF2Q4iqoU&foB?w^ zqBK;v;6^cJYh0%nH9*Y0H4;49!{3-|xG>+TCt9Ci@7eHA-!8ccoYfm66N$XtVpx%W z1iunJSw}J1=FV8HXpXQ$=Of6_U;9l->54Th;V*qe8y&=EVd=Ww)L?I!MU3K|3vwd+ zwkK9U+8fkER*JUI!Mx5E+b}(LVnVzFn}F8LKDaRtXj6o*AAl8-zEpO0ZQQpDcO25@ z2DQXO|7V^2Pu1c&TSbrhYUD`1heCHFs02kED+YV3wD!!hdcCobGgwQwFBbIk-W?+n zNxm`B0?d_g!7dd%w~Vhy)AkD`I+9euG+T6+HTF6zk@eeAe3oO$^oO=^%R)0S6toj1 z_pws)r9(PUJ}@N9iZp`qF&+PNQg;2P1hY^&37qZ8ss?|;h%YmhX)L+~lDW_W=$Zo^lWnHtz$6hw?@QOAvgec6}kBkRYh2 z`3gyXfTo3y9Q&n)MMo>@Vi{vMD@`-IT4FzMS=tpV%hG(5x9n!}|E_%wXx;lid=|6! znwd3g)~uOXGqd*I%Q3|cI2LE2&g583Et{t7uF`%XeI|+6m|!0f&cg1Y`;p@P*zFpp zI2u!qeCWV_=*|Iw-Y-lN4H92%gmW0JLdh&_`a|s&qBbNNilGBwx=x4K2i%TnXrz;0 zB5i>x9)l8|9z5-xtDN1E)X3^lV?4~pC|H59j}Bq)Hlp7jTXDeo_&(utJ|Q@=E{ne# z6p`h|ZqJK+k-wM`am%aq+0~H%84v}C2E+hj0datMKmx!FNCYGSEP!M{3Lq7b1{ltt zT|HvP*`6usi6R^N?{H5I^+Az^{5#xBLu}hGNjCONV%mO54mq|<(S^lMO%G=0rlxnW z1z)#i@cnM`XtB{l2wA65nqk0!iJU@dgh<6oY>r}Dl0+>S4Ysea^#(e%tN4daqIZ3g zieOn#%10r`mG;jK%@dmK3qbN*qC*m5*~d;BB{nKPQ||*A1h{LQdMoZz!(g~skeFPX z$ct+N4hLr{Y}uGy0##^+=g@}1GZ%y6ML57PS%5(fP30+6#M$;3hM{WI;Ykj`it8YG#Ll$iU@qE_RO9+VU7%IK8XN}N9jx(3tHJvnw#S_^c5UO`II7=t-yqA(e|#t5dOZ4%+#I0n!J zh(&_C?R3{Qa$x549^51L9Gsv$6!jvx+1!w+zW3_Wzyx5x$AGW7IJr8z(kJ!!zh|dA zh>(KKCz~=2IR4RuOz*EI&dHZ=z*CzZVOw{@R*QiL*~mqk(vfpyn}@BoM=6l-Wu8#bi`^H zDq)7WN1(U@#Zh#ea+vlsIgx5b?xF)*8u7wn)Sbj^ z5*C?lkIR-TTYH4dP-aQWQ-TS>4QD=7nR&_y%-seh7wZ9OQLod|qJ<_Sn|~_FAp(aF zG*pC<6@bn)U?0({iL%yVGl;q(HP|?4_(Ghp(%Q+0B8ibF1$rw4U9}B%(Q!z%5|tcq zR;JO#_7MVjtPkrU)~8iA z(uAk?6%$+22Oay&!r+UDg^E+Q*kFOamrBe9f^OB|vpZ(H&o$~l;8k2B(0ocYAHZbV zi>MdoO|-RlrLrWUc_>g(E>bJG$kHhdrdv|MvHT{vi+&eTaUEowTdJobpFZ`+s1vozwr6 zW^2HobNL1S8M8f5egk!RAV?mAvefug-p(LdR*CNHSg;%qloqI)!SYKEj%yua@Wz7v z{w%aTfTWk;jsXk>Oo%++XlEbNcW7&!tM9WWaL z(}T6X(6Z&~EY=z$Kge8z($DZWV&#>R=*3dZayC*rAmu`{JObRkY?cdw(ExM9EZ2zZ z*o;Iu4MbU@9Fbjw)++|2+1nG(Xe0AFhoK0y2tyF+5SkD=A`C|8gm4H#yhe%rD^ZSt zZVXM5Ls5t`3YniSZ(^sD5LN9~?2n`7R5qcvGK}f9# zl~8_pN1YYx#tU~@sPjmVEVjcU&z?b9vJ}#O2#K^WLLzNMNThub5@~OQM4G;%aWCoj zK$>=7NI}Oy*|+Pn?xQjj1u>iDrpe*Vlr6`x?qt~k>gbD&5~_$1A(iHXkV+$`6)Meu zkV^AHNTvBBRMhc$vh1rm;=!C!l{1RId-md6gt$o%f(6x zgyZi!V+6EK^{-%L%JmrJJa>?D3#2~;dppE5eN~>Arq9|F)3m`yO#34wru`5S(rt(yCa@iY*nf}D`yBc6>Nm_?1b~|g!Al#^X!E46vDnp?}Gw@5h_v% zN|RSXs*%`wasfU9Aq^tK5YiwLj*teCFoaYNJ46F=i}ADU@Q+* ziU7qdH(mBJm4EK6@Jvnn24IHkpn!^y-;Ap{gjA$ILTVL1gw!g& z2&q+!2&qUPgj8e@!h4J4EicH+RWzh$$Pug{L;k0RxF}|!nes9X$)Jcmohh4HWQIJ1 zpV^Tfse+nwRjGVO>dBYAHQalud|9=%NPdOCGEE*YSxaRX>w$E2&osHsU;K@)T_Tsb zh~ezBN971{G85Ne;C_R}u91faWKLgm`@(nMo&4x}V{iZM8-`UYE=|8(*7;NRuaF98sYh(T=nSMtmV(nHcE(o6D|@dwZ&O>|a7nn3#IFN|i>L%l+B zN!dwFsOh}{J^&-Y7eH!2?MZD%?MQ7(?L}=z?MQ9r#Wr4%jXdycd7|hZ45pmW{Pe?< zo~-erT#IqDSonC(OH$^1p2|=0|>#CrV6Tl4M{p zzsN<79uT1iWb+ITb&XKrSE;FcOdt7zHQ* z6aq#A?gQKp7y~E*6a&TrN&uyRae(oF34n=!Nq`3clL1ozQvnYG{sNc=m=2f$mbxqvFJuCKn`in?Mpb=C^+DRt$YQdFPB_TH@aXB|IRyL0(=^{3k1 z&DtnED{HRuVjXv?{kQr&r01E2hYpACZZ<|4Sgv!efju&&(!fd|pR3~uMGy5lYrb^Q z2y57`@F*kiNPlRSz9%EfZKhbn+@FrhWbIc|e9-zX7;_^U{FK(`%}+-y*GO5gy~JHn zhrKk}h%9Ah9t9Eai@NEDFAWi|7)|^8ha=3wyjLW|IW1@74xkWqPgJw0$w8(ZcIYi2 zI(bx^MJ(d6SE62v6le1bhUmX&#U!2?7=2cwO-8~uTb)?{M^WC~GBkR$O0@7*VbR_R z=plI^U(60ojW)9G`gse%DPhjH+WTP6f_Xzgc;=+&CReeTUziA z)T!rI?W|;WhvbDbzo8~Q{ru_KFv9B9?8s;1Hd`tQK z8hy|0*wxN09rIf{>Uuirb(eUXHttrawQGTzua1sOkl4Z5(FT3DiI!%0L>k=W2)s8g z?uh8_0ptMlzJf1%E+H;i8D=@#7#C;c*AwC@k~NX2T?h+#2#ESQaSfs-9*7{;R2ygP zsfr6!i6eN>Lve@eS>VbPCyBWK;qy3Sn5_f*_Qw@DiYQh@!68pJ#T)s`esIWY+GBJO zZ!Xjdk-3gGo!lN8->q`D4TfOOrgQu+!{RS^i4%C{i1<25oXB6!jMw^VCV`E7<}nQ< zdnd(Dlf(yj?9}*xK+R-Ce9O$Wh^SZ`-{GJs0OBSy*8yR=zA#4=3whb9_z0CI9}%lgGdo4xPHc-Wbe2|Cp6o%|^ER1#_Sn%6GhAUL=Ym*p0s;PyS2h z95>Av5P6A}5u)P_bGHga#vL%fuhPsRe%XQ^L|EQ2Z&Qhnu#h8WW6!(hDb5;twc}_O zatx6TADVNtn)`sLV7tBmqW82}=OB4su(8Trb~kjJ#EGn|C=u#VlDJJ2OITSkZVrq~ zY!D@U$&sBrpW??8CM2GAlJFT<b$+6b2ni%+?^Bel+o4DrGQn7G7h!jv`C_2Z^s(Fj55HN%V6Fp&3?jGqBqN zq+q_#Kz~%9Mu02Kd=r^!)Jf~r+9^Q(KGWN#mIlY9TN-gLcXdxHBO%v$ByChXQ}=OD z{VQK?B|Okx(_I60}@N5WTLZ6aOCZq$Q-%lxDaQNpKZ6|D5@Tu)ZlCwuc* zbx95GTH5C@2nKfck)%mlEu>6K>-ff`Uq@`c66J#(aJ^u{m=rl^@7#|x#n{@)`_*PV z@S49R8Qv0OdDBvhm!zTBARl9=7FdkDd%5Mb$PWG}8=REk8V&P_ip}qnefYkWmMx;j z6Btik{D@^tHrw}>#aBy~7714&W>nl?3DOapmup{rK#AxknPJZpZlx1$wiunUh=?7!dc7eBj;I(FoP7cgbcT9FJJ5Q&aQ)ytO z2%oZ3N2#n&Q>N+I?SDl%X-7ii@Qf!jp8(#}mvUWl_6EuewZU6a*b^UE{J7=olmn7j z!f$+=;suLfU6xuJ=jLw{oay_NgS5$a;c`lYU4sqc%LJR}&3 zeYaGYPTJH+gJ|Hf0ja4Djz+NThRC;Bh!K&^A*pH+nrNnPwy~3o68+eop{WPi^&c&G zBNnR-O}!`;VbnJdMdF&U)cPo~hZGnT%z6(#K0W*_F(&q`e%#cCE>blmh<>XZa%Z?15Zi9N`?<;~Rf zA=LeS97*Vz!qo_87GJ%@hmZRrHP~N_;tPIB4b@8cAOtJl>?il88F|;8)NWA< z1zK5=_34t;;&Hb3$5i9%4QXmo%0&!KA!6W@xoJk$E~cH3a6mOcB!z91fNoHwwM%&a z1M3fo_IC6H2d)s=4rX>h5rI-#sY=3Y3Y4J+Qvl9dt+rmrnl))tB)pQ~Zj^PGy}CCw zX)Y~2*O&L2ZId+lE{{mK;! zI8gYJdFZlWyLx7Atx+N~8?%x$?$pHwmadqrSYvaRpRy+1eAdA>b96Unt=5P$xOrXH zw`!&zpRI8Z&q-f zvraIf@Vg?2kMY^9QNaTe{XZqgA0@iA63gg|nBPvU%tD~0`9hNp-Oglt+eaDs=}n^^ zmc(dYymizBE$pgYJ4Vr1AEN)BE!Z&1$a;5-3KTQ>4?9Lh=rk$Fhv}yS`4X(74(K$g zK&0^-uZ&9ffY@UXj*1A-l0$Avmey8Y{n=67VPf&?Aq6K*Yz)$6hQL={RV0EWKJV$vx>FI`fY5h|AR4NnzbOI5m4 z@Spi*N|%hl9I96tD8w%XT%4HultyZg6vV1yciSDm^N+=8@6iXs=?S zkcF%oZEQW5@)$puvOcZUrUfofR}?wZa#2E(@JsfIss8DTgg{>QRoi5dy?L}^G0Qk! zaYQrkEEY`cLjKwcR{TbV2OIlFg*#unzhY^*HE@Fq%ROI_%1S?}^xrzHa=CKBdQFvn ztUaJ|6-yXadH+CU0@J5e2C##Eh&*VjlqtnrW{SW+%08G&!C~0`twF(}-K#cw>yk;1Y^9~vg-NoRcHyI1KURAN$w!>1HL~j;)jHX3uSVADS>LC%PQ2z!?G~+d&t@H4F!7-f7XL-9 zA0N?Id(_?9xmj&}cs_Q0Hy5$o`^o}%K;V{(oQWUL4`!v8@$Vg7oq_d^tMlOHSLW|H zZtZwdZQWm2)N<}g>$$DltZhtZUD>kI>atC3z17lSZQiD5P0LyXncltClj%3K>R5eC zE9ASRHGp-*w0f}l^RQL2;_-4P{&-F6!d7eGQ$^OBtuEGvr_`NorPgCl8LXvkzSf&h z>8w?4&DPcbYhWHfv_)=R)8@e1HEVUu<%c#SFTT>Yys2@*vPBJ*wIfDMXfQ3QtFACb zMlGx?t061dF&B?Ot_?ak?_Y-g6}DYvcwEm#W?cjivbYo|I(7F^Bw z>FG&EX$-F3esS$yPYE0OeBoPbzwzC?(KVUP>TYx4xhtQ3$BRw*WNo>G9e@7zCu_}a z(#6l5`Hx?(4GNe1fb(=(SD?3^ep=0^_^;a&ZauhNy|EM@_Nm%5ZkRQ4dmx|k_@)Sh z6pf^hKD+6Y0Bgf`_3kNeZz{4L*{)_&oHk#U4ufF9(j9+u=?UAsB2u*{hllUnbXIgx z!Pq_&>?9lmaF>ovHzmhA*X~?XVR%^29S`jA(l(Y?mCc`9`9Sre>e)4w1$7H+7YX#= zJYvLuiBSY=ODfdVl~v@{*H_N3xDQer$n+;H1S$aLRM%8e*q~g@wwEU8sze@qct@qW zN54Z-^VauwEYtT??d+4t$l_nk+qo;$TC_vAyZMQo3D)KvI-cgX^NOC=_wH`w}~w-CL@5wp2aSQq|E?wX3D-S!>mE%{(oybBi1I-TI8dfhD*L-O{l^e4A_vK`x@@w07FD~cZ3!bZ*EoI{VnWrBbO%u(DhYtsQ_{zzgu8h9inqNbHn`7cbwrm?6y!q?ECPl~XI$w4(%&@uC zd!d4hy+`kbS9H&>wrkRe3fvxi7^qNO*nbD#94dSTvMu58OTtRF{)Ye|qQw>d z>Ug+vIW!dfuT-%Sx5J_|oxq)8)%&-t5Zl^4L3J#vrCU+10_<&+SrcG@rxM;Vj!w-xaO-4wv6^IVAk7oAvabDO{Zpe%*)V z&+Qt`!kV9&!ml6i(o3q#ZtRu&!)LSWTe|`^bdL2Y_Z|~|GR*ZHvVRM>1jykx>cZ!$ z#BCm_y%)Q<>1 zbK_a3x@L&nG9>(j$oAEAS(tA83t?MNyb#7$n!@uZwjMn80^mi!OZ?!muAGto4~I?E A9{>OV delta 6404 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 delta 4652 zcmb`L3vg7`9men3-E1}wLb3@V&=8XF3hx9YJn~?9$Rj)g0m3ULgr{1>04b6nSx~?r zk3jy=QUnH(Du^QNWjc&47$}I)@@Qo!1x2F_QbA&w&>}^)-?w`*F4XDBO#j2T=exgq z&bjBFd(Qvfu%zC)<0xV7I*53aPmqzuFSHh4_1U9tBFiMrlVN*j*~YJ_GTcx2W$KBF=s z427D5plMKVoIJhf31{7dTVC=?9B+Y=AK_2nc)WZcHCP6QrrHZ}BneXP9BNmg@Zs#< z-W1NI99LfAY_wd9KHK(pf;hi>IdfN0I(=C!$R4I`&LuK2nSY?y_8}7)PB{6dT(0vsw`)7HTLsY_ONiO`Y?3)`C z^zt_2q=9D>-6R&{=HPom*$~%KfAe3@F14ab*_^W~%)efqUoFmO51Pm3-cqttZsJ;w z>XqT*ayjJG;&e$Yimxtp_y-?enzDZEC|OpTx_|6&yd2j>ox$@QlNnje)Px zYy?&{?>^z2llOMV!#=jArcTFYtDh7c}FRI@ieUzsO$$;NRfc;A#N72G96f zvnlX5HM_4F@A!dcmI(iBk=fuGjsO;_nG+SIHm;xPTH>(vY`NjeTGr(1WXVW?xX(HF z%zSYWqa{R^h{RAEx74$|QUwhQTl#`;^+~V2;quOkNxl0yzubdLzM3oT31sk5nJuVy<63 zDu`px;89Q=`iYaWHN%2>!KIUheFGQEi*nQ})6CR$HjB*e>%`VNyQxlY_HkM%GIwhFN#urXn8exe98FhfjwBVHd}GLKN`{1XlF}`?{%z^8+f$URd#*%E4miXaSIDU{FBWDh&kma7`% zu~iqju-qA~Al^6cf$l5@ROAuKi^a;e^BPE*)rNdwZMy6)u z!|=leJ6tKx+x6DmV02FIpEf!^kr6QMQI14O76j$OB%vIoSqJzyold^PgQ{UZkzmZb>NJxSf>tpsf zS+d@0>YLI{nvO>KYl!hS#FqR<@ohqshcrWB9Oe(=2*i4v_$v@6{whQ^1Ud>azJkay zExv-NGUIea_@l2$Q$Dj;e(d#md1xDR)a7YPY7R%ph@rFpXC1tUq{__ad>he*%bse( zcZb*e$i@Hb+JkFmsOtBZxRclp!S)<@GWRL zv`aHC@!b%Y?taa9jdX~y6eIC^tw`WfTh&);eur1^`ZU>SPR0EBlb3G>(C`8arl+ep@s^PTF4My6(LoDI*n zQvU#!2cHC%uNjl(czDJv&051hquKMCvA+`dSd{a8%zSY4Bjs*|V-EiRl?LO{8T;cJ zVfu5R?5`R5X#6k@=J{EMFY7UjG3$->LtoY#2cHDSuXOzL?Vb&NBao zU=Eg?Q|WTMD#v{FM7qr#k2CXe8VkiJ^G&$_GoxIyiU8(@XDri<4{HT{BFa^o@xg7< z^|l1m+XmkR=XM0J-CI#sQ`8X-U)UofPD_%9qbFuGT^VmGj0U1Z#1jd zjD!9sd?LzwVMtz_pJ*sJ+&>GUD9L!iFnC5|&Db~+o_i%GfVG0>$631omIluy-XnnZ zhEE3T)4-TKvov%yK(GPuyt{##aX>ln+?c~PV@}M4XXI;^4?jV(BF*>}IUl|NWvOOt zTMRG1KmDX^E@`gwQ&xu_>5rA67M;mcnds{}#JB-*tV5ui5aR(v#_;+J!va7y#*A7S ztYqMyy)qy)&Hg&rB_*RBIdbgdEScgM@KAZQGF#$iI`v@3M?L(9C-#MzUUNzz&p!5j zbi7=N?^E9&kCD>i{G`@D`8E39`J3ve*Z%lI{bSVjUJU)w&x1v0ddm^dhxj^hniuO* zf<4z=s@SUMxV@fQ&U6ROI%_r*j0uLp|K`xv;GdlgCK}r25WfT&hfw;z-IgY_l)MC& m6o2uabiLY2^)gEi1}T|vFlEOzi%dB*RQAoVo4H@_Z~Py_?19Sw diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 16525632e4e1abcea62d988e069c93edeb2820fe..b4e24fbefd286df69e3f32cc1c41aa511dbe96c4 100644 GIT binary patch delta 2353 zcmbVNUuaup6hGG;43#CO5e)ZPa96>k{oYgu1m*hMjD>Djk%jO>14&#U$M( z42v(qL@n&R4IBtE1W}wsKgd&f;=i7UW$C9t^Y|{% zQiaB6o?vU)yXiSYY1qs=FtKLkk0&%8_JUf0&cb3@XIe^|vxuNzWB6*oUE&+_EGxEY zhfa*!0*;9IQ@yu@H}yrz!P-3X^Aeo{cc-Sw{d%Agx!`w)V%B+WpQ~<`H_bk4tK*bB zoZO`Zml|A))<12BnmT0#mXMicx>)4sv|XzX+q~8BG(Q*VKAHo$Jgwk&4XSAvNRvVP zX&uruodo@L6-=6*g@XbDlBbK1%OuJorit&Ezw@sH-CEJuMT*d46yevqV|=)`jqmgZ z8zKs%PeCsS%~AL&f?ucr+rW?$_%a;Z@Jie5y7R0|H4pE94)*X(vq=WIA*o_LLx&ep4B^92Kfk(X-Xj}E5I(uo-c8e`VqXHcE}eYiSS>8e(R>` zc3tsypq^9J^|V6X%gy{j=PfI{?`|t+1CO-s%n)}5CiXh!4DUVs@ld~&3I=3r)S7xb z^oq+T2ex`_J>hY_+Ig3=9UYCx8sG4QeRftInd7hb`Z=hzgk+HqlFYA$j~mez5V(cfsX$rqfbdc}q1N=_6fx5RVFF*ATyA1wtDAc$>8S6~MSC^c%X&zF^ zNuo2Vh+CfUxdud3d$4IvOKW2_8ry^0u27u=)FvgltD5ZehvgpjHuTgC5W+;z{O?FK z;YdFWs3oQnVz=l#rl4ZsDb0HW{zMsDci|~3dCWn^X_s&Jhlb0VyDmTFWnxeGWEoqv z`l?vk9O}nVxfK1;@IW~}wHm8fZU+1gmSt?!s#Glh(|h)mSn>^BcWCaqDwSrR-j^(C zk|iF9@5B`mTKA@6GjU`su44Q}+{Ve4FzCMc3je+Uh98UsHGzpNiTDTe54okr%UjBz zW8$*-=*rQXO}r=?gzR-&$Dkj@d*XfZ8w~!v{0uKdeNh88-BL258>OW@7vB&G1)xk?%FVDgicTt zPG;3qEMa9{z)ez?pTMHXLu%hD2G+0hF3ACV3YZ*Ft2kN1dlGdP_$KHH%=!WKCd(u> zv$*VYK(63sD!7%SBa#4*x_y&H<2iujwIe6LXfh6*K@(`{44x%*MYPx*lE8Vj)8afD d4F&924f^0Ob+pq+C0arivstripItemEnglish->Checked = true; } - this->loadInit(); // 設定ファイルの読み込み + // 非表示項目 + this->changeVisibleForms( false ); + + // 設定ファイルの読み込み + this->loadInit(); + this->loadAppendInit(); // 追加設定ファイル } protected: @@ -815,10 +820,10 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; void InitializeComponent(void) { System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(Form1::typeid)); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle1 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle2 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle3 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle4 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle5 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle6 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle7 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle8 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); this->tboxFile = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -2336,15 +2341,15 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, this->colLibName}); - dataGridViewCellStyle1->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle1->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle1->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle5->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle5->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle5->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle1->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle1->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle1->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle1->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle5->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle5->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle5->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle5->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle5; resources->ApplyResources(this->gridLibrary, L"gridLibrary"); this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->ReadOnly = true; @@ -2373,6 +2378,7 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // // tabTWLInfo // + this->tabTWLInfo->Controls->Add(this->cboxIsNormalJump); this->tabTWLInfo->Controls->Add(this->gboxLaunch); this->tabTWLInfo->Controls->Add(this->tboxGuideTWLInfo); this->tabTWLInfo->Controls->Add(this->gboxExFlags); @@ -2413,7 +2419,6 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // // gboxExFlags // - this->gboxExFlags->Controls->Add(this->cboxIsNormalJump); this->gboxExFlags->Controls->Add(this->cboxIsTmpJump); this->gboxExFlags->Controls->Add(this->cboxIsSubBanner); resources->ApplyResources(this->gboxExFlags, L"gboxExFlags"); @@ -2636,15 +2641,15 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; this->gridWarn->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridWarn->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colWarnName, this->colWarnBegin, this->colWarnEnd, this->colWarnCause}); - dataGridViewCellStyle2->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle2->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle2->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle6->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle6->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle6->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle2->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle2->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle2->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle2->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridWarn->DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle6->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle6->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle6->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle6->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridWarn->DefaultCellStyle = dataGridViewCellStyle6; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridWarn, L"gridWarn"); this->gridWarn->Name = L"gridWarn"; @@ -2679,22 +2684,22 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // // gridError // - dataGridViewCellStyle3->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle7->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridError->BackgroundColor = System::Drawing::SystemColors::Control; this->gridError->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridError->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colErrorName, this->colErrorBegin, this->colErrorEnd, this->colErrorCause}); - dataGridViewCellStyle4->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle4->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle4->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle8->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle8->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle8->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle4->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle4->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle4->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle4->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridError->DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle8->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle8->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle8->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle8->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridError->DefaultCellStyle = dataGridViewCellStyle8; this->gridError->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridError, L"gridError"); this->gridError->Name = L"gridError"; @@ -2813,16 +2818,21 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; ///////////////////////////////////////////// private: // ---------------------------------------------- - // ファイルのR/W + // 設定ファイルの読み込み // ---------------------------------------------- - // 設定ファイルの読み込み - void loadInit(void); + void loadInit(void); // 設定ファイル + void loadAppendInit(void); // 追加設定ファイル(内部向け) - // ファイルの読み込み (TAD/SRL読み込みをラップ) + private: + // ---------------------------------------------- + // ROMファイルのR/W + // ---------------------------------------------- + + // ROMファイルの読み込み (TAD/SRL読み込みをラップ) System::Boolean loadRom( System::String ^infile ); - // ファイルの書き出し (SRL書き出しをラップ) + // ROMファイルの書き出し (SRL書き出しをラップ) System::Boolean saveRom( System::String ^outname ); // SRLの読み込み @@ -2849,18 +2859,6 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; return tmpfile; } - // ミドルウェアリストの作成(XML形式) - System::Void makeMiddlewareListXml(System::Xml::XmlDocument^ doc); - - // ミドルウェアリストの書き出し - System::Boolean saveMiddlewareListXml( System::String ^filename ); - - // ミドルウェアリストの書き出し(XML->HTML変換) - System::Boolean saveMiddlewareListHtml( System::String ^filename ); - - // ミドルウェアリストの書き出し(XSL埋め込み) - System::Boolean saveMiddlewareListXmlEmbeddedXsl( System::String ^filename ); - // 提出ファイル名をゲームコードなどから決定 System::String^ getSubmitFilePrefix(void) { @@ -2875,6 +2873,23 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; return prefix; } + private: + // ---------------------------------------------- + // ミドルウェアリストの書き出し + // ---------------------------------------------- + + // XML形式のリストを作成 + System::Void makeMiddlewareListXml(System::Xml::XmlDocument^ doc); + + // XML形式で書き出し + System::Boolean saveMiddlewareListXml( System::String ^filename ); + + // HTML形式で書き出し(XML->HTML変換) + System::Boolean saveMiddlewareListHtml( System::String ^filename ); + + // XSL埋め込みXML形式で書き出し + System::Boolean saveMiddlewareListXmlEmbeddedXsl( System::String ^filename ); + private: // ---------------------------------------------- // 一時ファイルの取り扱い @@ -2900,10 +2915,19 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // フォームの初期設定 // ---------------------------------------------- + // 非表示項目の表示切替 + void changeVisibleForms( System::Boolean visible ) + { + this->gboxShared2Size->Visible = visible; + this->cboxIsNormalJump->Visible = visible; + this->tboxIsGameCardOn->Visible = visible; + this->labIsGameCardOn->Visible = visible; + this->labIsGameCardOn2->Visible = visible; + } + // 設定/選択可能なフォームをすべて disable にする void readOnly( void ) { - this->cboxIsEULA->Enabled = false; this->cboxIsUGC->Enabled = false; this->cboxIsPhotoEx->Enabled = false; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index 6b25eaf..a8f20d8 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -140,6 +140,210 @@ 3 + + tboxRemasterVer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 0 + + + tboxRomSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 1 + + + tboxPlatform + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 2 + + + labPlatform + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 3 + + + tboxRomLatency + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 4 + + + labRomSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 5 + + + labRomType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 6 + + + tboxMakerCode + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 7 + + + cboxRemasterVerE + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 8 + + + labMakerCode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 9 + + + labGameCode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 10 + + + tboxGameCode + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 11 + + + labTitleName + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 12 + + + labRemasterVer + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 13 + + + tboxTitleName + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 14 + + + 26, 52 + + + 285, 227 + + + 3 + + + ROM Info. + + + gboxSrl + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 2 + 109, 190 @@ -519,30 +723,6 @@ 14 - - 26, 52 - - - 285, 227 - - - 3 - - - ROM Info. - - - gboxSrl - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 2 - True @@ -648,6 +828,78 @@ 2 + + labRomCRC + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 0 + + + labHeaderCRC + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 1 + + + tboxHeaderCRC + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 2 + + + tboxWholeCRC + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 3 + + + 26, 285 + + + 285, 49 + + + 5 + + + CRC + + + gboxCRC + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 6 + True @@ -744,30 +996,6 @@ 3 - - 26, 285 - - - 285, 49 - - - 5 - - - CRC - - - gboxCRC - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 6 - True @@ -1452,6 +1680,261 @@ 1 + + labArbit4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 0 + + + labArbit3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 1 + + + labNTSC2Sur + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 2 + + + tboxNTSC2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 3 + + + labFax2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 4 + + + labNTSC2Pre + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 5 + + + tboxFax2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 6 + + + tboxMail2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 7 + + + tboxTel2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 8 + + + tboxFurigana2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 9 + + + tboxPerson2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 10 + + + tboxDepart2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 11 + + + labDepart2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 12 + + + tboxCompany2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 13 + + + labMail2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 14 + + + labTel2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 15 + + + labFurigana2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 16 + + + labPerson2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 17 + + + labCompany2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 18 + + + False + + + 377, 88 + + + 347, 234 + + + 14 + + + Contact2 + + + gboxPerson2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCompanyInfo + + + 3 + True @@ -1941,32 +2424,257 @@ 18 - - False + + labArbit2 - - 377, 88 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 347, 234 + + gboxPerson1 - + + 0 + + + labArbit1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 1 + + + labNTSC1Sur + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 2 + + + labFax1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 3 + + + labNTSC1Pre + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 4 + + + tboxNTSC1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 5 + + + tboxFax1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 6 + + + tboxMail1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 7 + + + tboxTel1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 8 + + + tboxFurigana1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 9 + + + tboxPerson1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 10 + + + tboxDepart1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 11 + + + labDepart1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 12 + + + tboxCompany1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 13 + + + labMail1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + 14 - - Contact2 + + labTel1 - - gboxPerson2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxPerson1 + + + 15 + + + labFurigana1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 16 + + + labPerson1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 17 + + + labCompany1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 18 + + + 17, 88 + + + 344, 234 + + + 8 + + + Contact1 + + + gboxPerson1 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabCompanyInfo - - 3 + + 2 True @@ -2457,30 +3165,6 @@ 18 - - 17, 88 - - - 344, 234 - - - 8 - - - Contact1 - - - gboxPerson1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCompanyInfo - - - 2 - 175, 81 @@ -2652,6 +3336,90 @@ 14 + + tboxUsageOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 0 + + + rUsageOther + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 1 + + + rUsageDst + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 2 + + + rUsageSample + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 3 + + + rUsageSale + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 4 + + + 16, 258 + + + 346, 79 + + + 6 + + + Purpose + + + gboxUsage + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 8 + False @@ -2787,29 +3555,53 @@ 4 - - 16, 258 + + rSubmitHand - - 346, 79 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + gboxSubmitWay - - Purpose + + 0 - - gboxUsage + + rSubmitPost - + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSubmitWay + + + 1 + + + 16, 207 + + + 155, 45 + + + 5 + + + How To Submit + + + gboxSubmitWay + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabSubmitInfo - - 8 + + 11 True @@ -2865,30 +3657,6 @@ 1 - - 16, 207 - - - 155, 45 - - - 5 - - - How To Submit - - - gboxSubmitWay - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabSubmitInfo - - - 11 - True @@ -3369,6 +4137,186 @@ 4 + + labShared2Size5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 0 + + + labShared2Size4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 1 + + + labShared2Size3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 2 + + + labShared2Size2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 3 + + + labShared2Size1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 4 + + + labShared2Size0 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 5 + + + tboxShared2Size5 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 6 + + + tboxShared2Size4 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 7 + + + tboxShared2Size3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 8 + + + tboxShared2Size2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 9 + + + tboxShared2Size1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 10 + + + tboxShared2Size0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 11 + + + cboxIsShared2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 12 + + + 545, 147 + + + 181, 197 + + + 1 + + + Size of Shared2 Files + + + gboxShared2Size + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 4 + True @@ -3705,30 +4653,6 @@ 12 - - 545, 147 - - - 181, 197 - - - 1 - - - Size of Shared2 Files - - - gboxShared2Size - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 3 - True @@ -3810,6 +4734,186 @@ 8 + + labByte1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 0 + + + labHex4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 1 + + + labHex3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 2 + + + tboxIsCodec + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 3 + + + labIsCodec + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 4 + + + tboxPrivateSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 5 + + + labPrivateSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 6 + + + labNormalRomOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 7 + + + tboxNormalRomOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 8 + + + labKeyTableRomOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 9 + + + labPublicSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 10 + + + tboxPublicSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 11 + + + tboxKeyTableRomOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 12 + + + 251, 54 + + + 280, 146 + + + 24 + + + TWL Extended Info + + + gboxTWLExInfo + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 5 + True @@ -4152,30 +5256,6 @@ 12 - - 251, 54 - - - 280, 146 - - - 24 - - - TWL Extended Info - - - gboxTWLExInfo - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 4 - True @@ -4204,7 +5284,7 @@ gboxExFlags - 2 + 1 True @@ -4213,7 +5293,7 @@ False - 14, 62 + 559, 122 154, 16 @@ -4231,7 +5311,7 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - gboxExFlags + tabTWLInfo 0 @@ -4264,8 +5344,116 @@ gboxExFlags + 0 + + + labIsGameCardOn2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 0 + + + labAccessOther + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + 1 + + tboxAccessOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 2 + + + tboxIsGameCardOn + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 3 + + + labIsGameCardOn + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 4 + + + cboxIsNAND + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 5 + + + cboxIsSD + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 6 + + + 251, 211 + + + 280, 133 + + + 0 + + + Access Control + + + gboxAccess + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 6 + True @@ -4461,29 +5649,161 @@ 6 - - 251, 211 + + labAppType - - 280, 133 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxTitleID + + 0 - - Access Control + + labMedia - - gboxAccess + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxTitleID + + + 1 + + + tboxAppType + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 2 + + + tboxMedia + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 3 + + + labHex2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 4 + + + tboxTitleIDLo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 5 + + + labTitleIDLo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 6 + + + labTitleIDHi + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 7 + + + tboxTitleIDHi + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 8 + + + tboxAppTypeOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 9 + + + labAppTypeOther + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 10 + + + 12, 54 + + + 225, 174 + + + 23 + + + TitleID + + + gboxTitleID + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabTWLInfo - - 5 + + 7 True @@ -4767,30 +6087,6 @@ 10 - - 12, 54 - - - 225, 174 - - - 23 - - - TitleID - - - gboxTitleID - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 6 - True @@ -4872,6 +6168,36 @@ 0, 0 + + 0, 0 + + + 777, 24 + + + 33 + + + menuStrip1 + + + menuStripAbove + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 36, 20 + + + File + 274, 22 @@ -4893,11 +6219,11 @@ Load a temporary info. saved previously - - 36, 20 + + 52, 20 - - File + + Master 288, 22 @@ -4926,11 +6252,11 @@ Make a middleware list only(HTML format) - - 52, 20 + + 65, 20 - - Master + + Language 119, 22 @@ -4944,35 +6270,464 @@ Japanese - - 65, 20 + + gridLibrary - - Language + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + tabRomInfo - - 777, 24 + + 0 - - 33 + + tboxGuideRomInfo - - menuStrip1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuStripAbove + + tabRomInfo - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - + + 4, 21 + + + 3, 3, 3, 3 + + + 745, 352 + + + 0 + + + ROM Info.(Read Only) + + + tabRomInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 0 + + + labConnectIcon + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxLaunch + + + 0 + + + tboxConnectIcon + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxLaunch + + + 1 + + + 12, 238 + + + 225, 106 + + + 37 + + + Launch Control On DSi Menu + + + gboxLaunch + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 1 + + + 24, 11 + + + 687, 19 + + + 36 + + + This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. + + + tboxGuideTWLInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 2 + + + 545, 54 + + + 181, 64 + + + 35 + + + TWL Extended Flags + + + gboxExFlags + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 3 + + + 4, 21 + + + 3, 3, 3, 3 + + + 745, 352 + + + 1 + + + TWL Info.(Read Only) + + + tabTWLInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 1 + + + gboxOtherSpec + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 0 + + + butSetBack + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 1 + + + tboxGuideRomEditInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 2 + + + gboxParental + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 3 + + + 4, 21 + + + 745, 352 + + + 2 + + + ROM Settings(Editable) + + + tabRomEditInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 2 + + + labProductNameLimit + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 0 + + + tboxGuideSubmitInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 1 + + + gboxForeign + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 2 + + + 4, 21 + + + 745, 352 + + + 3 + + + Submission Info.(Editable) + + + tabSubmitInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 3 + + + tboxGuideCompanyInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCompanyInfo + + + 0 + + + 4, 21 + + + 745, 352 + + + 4 + + + Company Info.(Editable) + + + tabCompanyInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 4 + + + tboxGuideErrorInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 0 + + + gboxErrorTiming + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 1 + + + labWarn + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 2 + + + labError + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 3 + + + gridWarn + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 4 + + + gridError + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 5 + + + 4, 21 + + + 745, 352 + + + 5 + + + Error(Read Only) + + + tabErrorInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 5 + + + 12, 93 + + + 753, 377 + + + 34 + + + tabMain + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 4 + + 2 True @@ -5031,33 +6786,6 @@ 1 - - 4, 21 - - - 3, 3, 3, 3 - - - 745, 352 - - - 0 - - - ROM Info.(Read Only) - - - tabRomInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 0 - True @@ -5106,104 +6834,53 @@ 1 - - 12, 238 + + cboxIsUGC - - 225, 106 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 37 + + gboxOtherSpec - - Launch Control On DSi Menu - - - gboxLaunch - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - + 0 - - 24, 11 + + cboxIsPhotoEx - - 687, 19 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 36 + + gboxOtherSpec - - This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. - - - tboxGuideTWLInfo - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - + 1 - - 545, 54 + + 445, 60 - - 181, 85 + + 266, 90 - - 35 + + 41 - - TWL Extended Flags + + Other ROM Spec. - - gboxExFlags + + gboxOtherSpec - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabTWLInfo + + tabRomEditInfo - - 2 - - - 4, 21 - - - 3, 3, 3, 3 - - - 745, 352 - - - 1 - - - TWL Info.(Read Only) - - - tabTWLInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 1 + + 0 True @@ -5259,30 +6936,6 @@ 1 - - 445, 60 - - - 266, 90 - - - 41 - - - Other ROM Spec. - - - gboxOtherSpec - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomEditInfo - - - 0 - 483, 185 @@ -5358,30 +7011,6 @@ 3 - - 4, 21 - - - 745, 352 - - - 2 - - - ROM Settings(Editable) - - - tabRomEditInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 2 - 237, 75 @@ -5433,6 +7062,54 @@ 1 + + labProductNameLimitForeign + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxForeign + + + 0 + + + labMultiForeign2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxForeign + + + 1 + + + 378, 91 + + + 355, 144 + + + 35 + + + Foreign Ver. + + + gboxForeign + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 2 + 225, 62 @@ -5487,54 +7164,6 @@ 1 - - 378, 91 - - - 355, 144 - - - 35 - - - Foreign Ver. - - - gboxForeign - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabSubmitInfo - - - 2 - - - 4, 21 - - - 745, 352 - - - 3 - - - Submission Info.(Editable) - - - tabSubmitInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 3 - 24, 11 @@ -5559,30 +7188,6 @@ 0 - - 4, 21 - - - 745, 352 - - - 4 - - - Company Info.(Editable) - - - tabCompanyInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 4 - 24, 11 @@ -5610,6 +7215,54 @@ 0 + + rErrorCurrent + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxErrorTiming + + + 0 + + + rErrorReading + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxErrorTiming + + + 1 + + + 551, 11 + + + 172, 71 + + + 41 + + + Error of Timing + + + gboxErrorTiming + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 1 + True @@ -5664,30 +7317,6 @@ 1 - - 551, 11 - - - 172, 71 - - - 41 - - - Error of Timing - - - gboxErrorTiming - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabErrorInfo - - - 1 - True @@ -5850,51 +7479,6 @@ 5 - - 4, 21 - - - 745, 352 - - - 5 - - - Error(Read Only) - - - tabErrorInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 5 - - - 12, 93 - - - 753, 377 - - - 34 - - - tabMain - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - True diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 9d292a7..6d1239d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -21,6 +21,11 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; + +// ---------------------------------------------- +// [sheet <= Form] +// 提出確認書にフォームを反映 +// ---------------------------------------------- void Form1::setDeliverableProperties(void) { // 提出情報 @@ -297,7 +302,6 @@ void Form1::setDeliverableProperties(void) // ---------------------------------------------- // マスタ書類情報(SRL影響なし)のフォームチェック // ---------------------------------------------- - System::Boolean Form1::checkDeliverableForms(void) { // 不正な場合はダイアログで注意してreturn diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp index c9e4c77..11258a6 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp @@ -1,5 +1,5 @@ // ---------------------------------------------- -// ファイルのR/W +// ROMファイルのR/W // ---------------------------------------------- #include "stdafx.h" @@ -22,10 +22,10 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; + // ---------------------------------------------- // ファイルの読み込み (TAD/SRL読み込みをラップ) // ---------------------------------------------- - System::Boolean Form1::loadRom( System::String ^infile ) { System::Boolean result = false; @@ -45,7 +45,6 @@ System::Boolean Form1::loadRom( System::String ^infile ) // ---------------------------------------------- // ファイルの書き出し (TAD/SRL書き出しをラップ) // ---------------------------------------------- - System::Boolean Form1::saveRom( System::String ^outfile ) { System::Boolean result = false; @@ -66,7 +65,6 @@ System::Boolean Form1::saveRom( System::String ^outfile ) // ---------------------------------------------- // tadの読み込み // ---------------------------------------------- - System::Boolean Form1::loadTad( System::String ^tadfile ) { // tadファイルを変換したSRLを一時ファイルに保存 @@ -88,7 +86,6 @@ System::Boolean Form1::loadTad( System::String ^tadfile ) // ---------------------------------------------- // SRLの読み込み // ---------------------------------------------- - System::Boolean Form1::loadSrl( System::String ^srlfile ) { ECSrlResult result = this->hSrl->readFromFile( srlfile ); @@ -150,7 +147,6 @@ System::Boolean Form1::loadSrl( System::String ^srlfile ) // ---------------------------------------------- // SRLの保存 // ---------------------------------------------- - System::Boolean Form1::saveSrl( System::String ^infile, System::String ^outfile ) { if( !System::IO::File::Exists( infile ) ) @@ -187,259 +183,3 @@ System::Boolean Form1::saveSrlCore( System::String ^infile, System::String ^outf } return true; } - -// ---------------------------------------------- -// ミドルウェアリストの作成 -// ---------------------------------------------- - -System::Void Form1::makeMiddlewareListXml(System::Xml::XmlDocument^ doc) -{ - System::Xml::XmlElement ^root = doc->CreateElement( "twl-master-editor" ); - System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly(); - root->SetAttribute( "version", this->getVersion() ); - doc->AppendChild( root ); - - // ゲーム情報 - System::Xml::XmlElement ^game = doc->CreateElement( "game" ); - root->AppendChild( game ); - if( System::String::IsNullOrEmpty( this->tboxProductName->Text ) ) - { - MasterEditorTWL::appendXmlTag( doc, game, "product-name", this->tboxTitleName->Text ); // 製品名が未入力のときはソフトタイトルで代用 - } - else - { - MasterEditorTWL::appendXmlTag( doc, game, "product-name", this->tboxProductName->Text ); - } - MasterEditorTWL::appendXmlTag( doc, game, "title-name", this->tboxTitleName->Text ); - MasterEditorTWL::appendXmlTag( doc, game, "game-code", this->tboxGameCode->Text ); - MasterEditorTWL::appendXmlTag( doc, game, "rom-version", this->tboxRemasterVer->Text ); - MasterEditorTWL::appendXmlTag( doc, game, "submit-version", System::Decimal::ToByte(this->numSubmitVersion->Value).ToString("X") ); - - // ミドルウェアリスト - System::Xml::XmlElement ^midlist = doc->CreateElement( "middleware-list" ); - root->AppendChild( midlist ); - if( this->hSrl->hLicenseList != nullptr ) - { - for each( RCLicense ^lic in this->hSrl->hLicenseList ) - { - System::Xml::XmlElement ^mid = doc->CreateElement( "middleware" ); - MasterEditorTWL::appendXmlTag( doc, mid, "publisher", lic->Publisher ); - MasterEditorTWL::appendXmlTag( doc, mid, "name", lic->Name ); - midlist->AppendChild( mid ); - } - } -} - -// ---------------------------------------------- -// ミドルウェアリストの保存(XML) -// ---------------------------------------------- - -System::Boolean Form1::saveMiddlewareListXml( System::String ^filename ) -{ - System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); - doc->AppendChild( doc->CreateXmlDeclaration("1.0","UTF-8",nullptr) ); - - this->makeMiddlewareListXml( doc ); - - try - { - doc->Save( filename ); - } - catch ( System::Exception ^ex ) - { - (void)ex; - return false; - } - return true; -} - -// ---------------------------------------------- -// ミドルウェアリストの保存(XSL埋め込みXML) -// ---------------------------------------------- - -System::Boolean Form1::saveMiddlewareListXmlEmbeddedXsl( System::String ^filename ) -{ - System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); - doc->AppendChild( doc->CreateXmlDeclaration("1.0","UTF-8",nullptr) ); - - // XSLを埋め込むための宣言たち - System::Xml::XmlProcessingInstruction ^proc = doc->CreateProcessingInstruction( "xml-stylesheet", "type='text/xml' href='#stylesheet'" ); - doc->AppendChild( proc ); - System::Xml::XmlDocumentType ^doctype = doc->CreateDocumentType( "twl-master-editor", nullptr, nullptr, "" ); - doc->AppendChild( doctype ); - - this->makeMiddlewareListXml( doc ); - - // 埋め込みスタイルシート - System::Xml::XmlDocument ^xsl = gcnew System::Xml::XmlDocument(); - System::Xml::XmlElement ^root = doc->DocumentElement; - try - { - xsl->Load("../resource/middleware_e.xsl"); - root->AppendChild( doc->ImportNode(xsl->DocumentElement, true) ); - } - catch ( System::Exception ^ex ) - { - (void)ex; - return false; - } - - try - { - doc->Save( filename ); - } - catch ( System::Exception ^ex ) - { - (void)ex; - return false; - } - return true; -} - -// ---------------------------------------------- -// ミドルウェアリストの保存(XML->HTML変換) -// ---------------------------------------------- - -System::Boolean Form1::saveMiddlewareListHtml( System::String ^filename ) -{ - System::Xml::Xsl::XslCompiledTransform ^xslt = gcnew System::Xml::Xsl::XslCompiledTransform; - System::String ^tmpxml = gcnew System::String( "middleware-tmp.xml" ); - - if( !saveMiddlewareListXml(tmpxml) ) - { - return false; - } - - try - { - xslt->Load("../resource/middleware.xsl"); - xslt->Transform( tmpxml, filename ); - } - catch (System::Exception ^s) - { - (void)s; - System::IO::File::Delete( tmpxml ); - return false; - } - System::IO::File::Delete( tmpxml ); - return true; -} - -// ---------------------------------------------- -// 設定ファイルの読み込み -// ---------------------------------------------- - -void Form1::loadInit(void) -{ - System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); - - // xmlファイルの読み込み - try - { - doc->Load( "../resource/ini.xml" ); - } - catch( System::IO::FileNotFoundException ^s ) - { - (void)s; - this->errMsg( "設定ファイルが見つかりません。", "Setting file is not found." ); - return; - } - catch( System::Exception ^s ) - { - (void)s; - this->errMsg( "設定ファイルを開くことができませんでした。", "Setting file can't be opened." ); - return; - } - - // タグ : ルート - System::Xml::XmlElement ^root = doc->DocumentElement; - - // タグ - System::Boolean bReadOnly = MasterEditorTWL::isXmlEqual( root, "rw", "r" ); - this->IsReadOnly = bReadOnly; - if( bReadOnly ) - { - this->readOnly(); - } - - // タグ - if( MasterEditorTWL::isXmlEqual( root, "lang", "E" ) ) - { - this->stripItemEnglish->Checked = true; - this->stripItemJapanese->Checked = false; - this->changeEnglish(); - } - - // タグ - System::Boolean bXML = MasterEditorTWL::isXmlEqual( root, "output", "XML" ); - - // タグ - System::Boolean bCheck = MasterEditorTWL::isXmlEqual( root, "spcheck", "ON" ); - - if( bCheck ) // チェックするときのみ追加チェック項目を設定 - { - // チェックするかどうか - this->hSrl->hMrcSpecialList->IsCheck = true; - - // SDK - try - { - u32 major = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/major" ) ); - u32 minor = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/minor" ) ); - u32 relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/relstep" ) ); - u32 sdkver = (major << 24) | (minor << 16) | (relstep & 0xFFFF); - this->hSrl->hMrcSpecialList->SDKVer = sdkver; - } - catch ( System::Exception ^ex ) - { - (void)ex; - this->errMsg( "設定ファイル中のSDKバージョンが読み込めませんでした。バージョンは0とみなされます。", - "SDK ver. can't be read from setting file. Therefore it is set by 0." ); - this->hSrl->hMrcSpecialList->SDKVer = 0; - } - - // Shared2File - try - { - System::Int32 i; - for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ ) - { - u32 size = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/shared2/size" + i.ToString() ) ); - this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = size; - } - } - catch ( System::Exception ^ex ) - { - (void)ex; - this->errMsg( "設定ファイル中のShared2ファイルサイズが読み込めませんでした。サイズはすべて0とみなされます。", - "One of shared2 file sizes can't be read from setting file. Therefore they are set by 0." ); - System::Int32 i; - for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ ) - { - this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = 0; - } - } - } //if( bCheck ) - - if( bReadOnly || bXML | bCheck ) - { - System::String ^msgJ = gcnew System::String("[動作モード]"); - System::String ^msgE = gcnew System::String("[Processing Mode]"); - if( bReadOnly ) - { - msgJ += "\nリードオンリーモード"; - msgE += "\nRead Only Mode"; - } - if( bXML ) - { - msgJ += "\nXML出力モード"; - msgE += "\nXML Output Mode"; - } - if( bCheck ) - { - msgJ += "\n追加チェックモード"; - msgE += "\nExtra Check Mode"; - } - this->sucMsg( msgJ, msgE ); - } -} // loadInit() diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp new file mode 100644 index 0000000..d3cbcd5 --- /dev/null +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp @@ -0,0 +1,150 @@ +// ---------------------------------------------- +// 設定ファイルの読み込み +// ---------------------------------------------- + +#include "stdafx.h" +#include +#include "common.h" +#include "srl.h" +#include "deliverable.h" +#include "crc_whole.h" +#include "utility.h" +#include "lang.h" +#include "split_tad.h" +#include "FormError.h" +#include "Form1.h" + +using namespace System; +using namespace System::ComponentModel; +using namespace System::Collections; +using namespace System::Windows::Forms; +using namespace System::Data; +using namespace System::Drawing; +using namespace MasterEditorTWL; + + +// ---------------------------------------------- +// 通常設定ファイルの読み込み +// ---------------------------------------------- + +void Form1::loadInit(void) +{ + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); + + // xmlファイルの読み込み + try + { + doc->Load( "../resource/ini.xml" ); + } + catch( System::IO::FileNotFoundException ^s ) + { + (void)s; + this->errMsg( "設定ファイルが見つかりません。", "Setting file is not found." ); + return; + } + catch( System::Exception ^s ) + { + (void)s; + this->errMsg( "設定ファイルを開くことができませんでした。", "Setting file can't be opened." ); + return; + } + + // タグ : ルート + System::Xml::XmlElement ^root = doc->DocumentElement; + + // タグ + System::Boolean bReadOnly = MasterEditorTWL::isXmlEqual( root, "rw", "r" ); + this->IsReadOnly = bReadOnly; + if( bReadOnly ) + { + this->readOnly(); + } +} // loadInit() + + +// ---------------------------------------------- +// 追加設定ファイルの読み込み +// ---------------------------------------------- + +void Form1::loadAppendInit(void) +{ + System::String ^initfile = "../resource/append_ini.xml"; + + // 通常は存在しない + if( !System::IO::File::Exists( initfile ) ) + { + return; + } + + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); + try + { + doc->Load( initfile ); + } + catch( System::IO::FileNotFoundException ^s ) + { + (void)s; + this->errMsg( "追加設定ファイルが見つかりません。", "Setting file is not found." ); + return; + } + catch( System::Exception ^s ) + { + (void)s; + this->errMsg( "追加設定ファイルを開くことができませんでした。", "Setting file can't be opened." ); + return; + } + System::Xml::XmlElement ^root = doc->DocumentElement; + + // タグ + System::Boolean bVisible = MasterEditorTWL::isXmlEqual( root, "visible", "ON" ); + this->changeVisibleForms( bVisible ); + + // タグ + System::Boolean bCheck = MasterEditorTWL::isXmlEqual( root, "spcheck", "ON" ); + + if( bCheck ) // チェックするときのみ追加チェック項目を設定 + { + // チェックするかどうか + this->hSrl->hMrcSpecialList->IsCheck = true; + + // SDK + try + { + u32 major = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/major" ) ); + u32 minor = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/minor" ) ); + u32 relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/relstep" ) ); + u32 sdkver = (major << 24) | (minor << 16) | (relstep & 0xFFFF); + this->hSrl->hMrcSpecialList->SDKVer = sdkver; + } + catch ( System::Exception ^ex ) + { + (void)ex; + this->errMsg( "設定ファイル中のSDKバージョンが読み込めませんでした。バージョンは0とみなされます。", + "SDK ver. can't be read from setting file. Therefore it is set by 0." ); + this->hSrl->hMrcSpecialList->SDKVer = 0; + } + + // Shared2File + try + { + System::Int32 i; + for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ ) + { + u32 size = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/shared2/size" + i.ToString() ) ); + this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = size; + } + } + catch ( System::Exception ^ex ) + { + (void)ex; + this->errMsg( "設定ファイル中のShared2ファイルサイズが読み込めませんでした。サイズはすべて0とみなされます。", + "One of shared2 file sizes can't be read from setting file. Therefore they are set by 0." ); + System::Int32 i; + for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ ) + { + this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = 0; + } + } + } //if( bCheck ) + +} // loadAppendInit() \ No newline at end of file diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 2c4632c..20edf81 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -21,7 +21,10 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; -// 日本語版と英語版でテキストボックスの文字列制限が変わる +// ---------------------------------------------- +// テキストボックスの文字列制限を変える +// (日本語版と英語版で文字列制限を変えたい) +// ---------------------------------------------- void Form1::changeMaxLength( System::Windows::Forms::TextBox ^tbox, System::Int32 maxlen ) { if( tbox->Text->Length > maxlen ) @@ -30,7 +33,9 @@ void Form1::changeMaxLength( System::Windows::Forms::TextBox ^tbox, System::Int3 tbox->MaxLength = maxlen; } +// ---------------------------------------------- // 日本語版への切り替え +// ---------------------------------------------- void Form1::changeJapanese(void) { // 入力文字数制限を変更する @@ -41,7 +46,9 @@ void Form1::changeJapanese(void) this->changeLanguage( "ja" ); } +// ---------------------------------------------- // 英語版への切り替え +// ---------------------------------------------- void Form1::changeEnglish(void) { this->changeMaxLength( this->tboxCompany1, 40 ); @@ -51,7 +58,9 @@ void Form1::changeEnglish(void) this->changeLanguage( "en" ); } +// ---------------------------------------------- // 言語リソース切り替え +// ---------------------------------------------- void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) { int index; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp new file mode 100644 index 0000000..aec5d8c --- /dev/null +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp @@ -0,0 +1,156 @@ +// ---------------------------------------------- +// ミドルウェアリストの書き出し +// ---------------------------------------------- + +#include "stdafx.h" +#include +#include "common.h" +#include "srl.h" +#include "deliverable.h" +#include "crc_whole.h" +#include "utility.h" +#include "lang.h" +#include "split_tad.h" +#include "FormError.h" +#include "Form1.h" + +using namespace System; +using namespace System::ComponentModel; +using namespace System::Collections; +using namespace System::Windows::Forms; +using namespace System::Data; +using namespace System::Drawing; +using namespace MasterEditorTWL; + +// ---------------------------------------------- +// XML形式のリストを作成 +// ---------------------------------------------- +System::Void Form1::makeMiddlewareListXml(System::Xml::XmlDocument^ doc) +{ + System::Xml::XmlElement ^root = doc->CreateElement( "twl-master-editor" ); + System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly(); + root->SetAttribute( "version", this->getVersion() ); + doc->AppendChild( root ); + + // ゲーム情報 + System::Xml::XmlElement ^game = doc->CreateElement( "game" ); + root->AppendChild( game ); + if( System::String::IsNullOrEmpty( this->tboxProductName->Text ) ) + { + MasterEditorTWL::appendXmlTag( doc, game, "product-name", this->tboxTitleName->Text ); // 製品名が未入力のときはソフトタイトルで代用 + } + else + { + MasterEditorTWL::appendXmlTag( doc, game, "product-name", this->tboxProductName->Text ); + } + MasterEditorTWL::appendXmlTag( doc, game, "title-name", this->tboxTitleName->Text ); + MasterEditorTWL::appendXmlTag( doc, game, "game-code", this->tboxGameCode->Text ); + MasterEditorTWL::appendXmlTag( doc, game, "rom-version", this->tboxRemasterVer->Text ); + MasterEditorTWL::appendXmlTag( doc, game, "submit-version", System::Decimal::ToByte(this->numSubmitVersion->Value).ToString("X") ); + + // ミドルウェアリスト + System::Xml::XmlElement ^midlist = doc->CreateElement( "middleware-list" ); + root->AppendChild( midlist ); + if( this->hSrl->hLicenseList != nullptr ) + { + for each( RCLicense ^lic in this->hSrl->hLicenseList ) + { + System::Xml::XmlElement ^mid = doc->CreateElement( "middleware" ); + MasterEditorTWL::appendXmlTag( doc, mid, "publisher", lic->Publisher ); + MasterEditorTWL::appendXmlTag( doc, mid, "name", lic->Name ); + midlist->AppendChild( mid ); + } + } +} + +// ---------------------------------------------- +// XML形式で書き出し +// ---------------------------------------------- +System::Boolean Form1::saveMiddlewareListXml( System::String ^filename ) +{ + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); + doc->AppendChild( doc->CreateXmlDeclaration("1.0","UTF-8",nullptr) ); + + this->makeMiddlewareListXml( doc ); + + try + { + doc->Save( filename ); + } + catch ( System::Exception ^ex ) + { + (void)ex; + return false; + } + return true; +} + +// ---------------------------------------------- +// XSL埋め込みXML形式で書き出し +// ---------------------------------------------- +System::Boolean Form1::saveMiddlewareListXmlEmbeddedXsl( System::String ^filename ) +{ + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); + doc->AppendChild( doc->CreateXmlDeclaration("1.0","UTF-8",nullptr) ); + + // XSLを埋め込むための宣言たち + System::Xml::XmlProcessingInstruction ^proc = doc->CreateProcessingInstruction( "xml-stylesheet", "type='text/xml' href='#stylesheet'" ); + doc->AppendChild( proc ); + System::Xml::XmlDocumentType ^doctype = doc->CreateDocumentType( "twl-master-editor", nullptr, nullptr, "" ); + doc->AppendChild( doctype ); + + this->makeMiddlewareListXml( doc ); + + // 埋め込みスタイルシート + System::Xml::XmlDocument ^xsl = gcnew System::Xml::XmlDocument(); + System::Xml::XmlElement ^root = doc->DocumentElement; + try + { + xsl->Load("../resource/middleware_e.xsl"); + root->AppendChild( doc->ImportNode(xsl->DocumentElement, true) ); + } + catch ( System::Exception ^ex ) + { + (void)ex; + return false; + } + + try + { + doc->Save( filename ); + } + catch ( System::Exception ^ex ) + { + (void)ex; + return false; + } + return true; +} + +// ---------------------------------------------- +// HTML形式で書き出し(XML->HTML変換) +// ---------------------------------------------- +System::Boolean Form1::saveMiddlewareListHtml( System::String ^filename ) +{ + System::Xml::Xsl::XslCompiledTransform ^xslt = gcnew System::Xml::Xsl::XslCompiledTransform; + System::String ^tmpxml = gcnew System::String( "middleware-tmp.xml" ); + + if( !saveMiddlewareListXml(tmpxml) ) + { + return false; + } + + try + { + xslt->Load("../resource/middleware.xsl"); + xslt->Transform( tmpxml, filename ); + } + catch (System::Exception ^s) + { + (void)s; + System::IO::File::Delete( tmpxml ); + return false; + } + System::IO::File::Delete( tmpxml ); + return true; +} diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index d37e2f7..662adad 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -21,8 +21,12 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; -// ROM情報をフォームから取得してSRLクラスのプロパティに反映させる +// ---------------------------------------------- +// [SRL <= Form] +// ROM情報をフォームから取得して +// SRLクラスのプロパティに反映させる // (ROMヘッダへの反映やCRCと署名の再計算をしない) +// ---------------------------------------------- void Form1::setSrlProperties(void) { // ROMヘッダの[0,0x160)の領域はRead Onlyで変更しない @@ -34,7 +38,11 @@ void Form1::setSrlProperties(void) this->setParentalSrlProperties(); } //setSrlProperties() -// SRLのROM情報をフォームに反映させる(ファイルが読み込まれていることが前提) +// ---------------------------------------------- +// [SRL => Form] +// SRLのROM情報をフォームに反映させる +// (ファイルが読み込まれていることが前提) +// ---------------------------------------------- void Form1::setSrlForms(void) { // NTR互換情報 @@ -217,7 +225,11 @@ void Form1::setSrlForms(void) } } // setSrlForms() -// SRLの特殊な設定をフォームにセットする(言語切り替えで表示を変えたいので独立させる) +// ---------------------------------------------- +// [SRL => Form] +// SRLの特殊な設定をフォームにセットする +// (言語切り替えで表示を変えたいので独立させる) +// ---------------------------------------------- void Form1::setSrlFormsTextBox() { if( !this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon ) @@ -283,7 +295,9 @@ void Form1::setSrlFormsTextBox() } } // setSrlFormsTextBox() +// ---------------------------------------------- // フォームの入力をチェックする +// ---------------------------------------------- System::Boolean Form1::checkSrlForms(void) { // リージョン diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index b9fdc11..42c50af 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -21,7 +21,10 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; + +// ---------------------------------------------- // 一時保存 +// ---------------------------------------------- System::Void Form1::saveTmp( System::String ^filename ) { System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); @@ -107,7 +110,9 @@ System::Void Form1::saveTmp( System::String ^filename ) } } //saveTmp() +// ---------------------------------------------- // 一時ファイルの読み込み +// ---------------------------------------------- void Form1::loadTmp( System::String ^filename ) { System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument; @@ -243,7 +248,9 @@ void Form1::loadTmp( System::String ^filename ) } //loadTmp() +// ---------------------------------------------- // 一時保存情報をフォーム情報に変換 +// ---------------------------------------------- System::Boolean Form1::parseTmp( System::Xml::XmlElement ^root, System::String ^xpath, System::Windows::Forms::ComboBox ^comb ) { // コンボボックスの保存情報 - インデックスの範囲に含まれるか調べる(含まれない場合は-1) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj index 7431d98..4e1c03f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj @@ -219,10 +219,18 @@ RelativePath=".\Form_file.cpp" > + + + + diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 885438d..3c38492 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -340,13 +340,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( else node->FirstChild->Value = nullptr; } - if( node->FirstChild->Value->Equals( "TagIsWL" ) ) - { - if( hSrl->IsWL ) - node->FirstChild->Value = gcnew System::String("○"); - else - node->FirstChild->Value = nullptr; - } if( node->FirstChild->Value->Equals( "TagIsSD" ) ) { if( hSrl->IsSD ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml new file mode 100644 index 0000000..535b053 --- /dev/null +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml @@ -0,0 +1,18 @@ + + + ON + ON + + 5 + 0 + 20200 + + + 0 + 0 + 0 + 0 + 0 + 0 + + diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml index 60e26ef..ce60798 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml @@ -1,22 +1,6 @@ w - J - Sheet - OFF - - 5 - 0 - 20200 - - - 0 - 0 - 0 - 0 - 0 - 0 - 787f 16017f