From 777a83bcd667733d5a1ec71015cb120e2e5fee8e Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Mon, 6 Oct 2008 11:27:31 +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:UGC=E3=81=A8=E5=86=99=E7=9C=9F=E4=BA=A4?= =?UTF-8?q?=E6=8F=9B=E3=81=AE=E5=AF=BE=E5=BF=9C=E3=82=92=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E6=9B=B8=E3=81=AB=E8=A8=98=E8=BC=89=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=81=A8=E6=8F=90=E5=87=BA=E7=A2=BA=E8=AA=8D?= =?UTF-8?q?=E6=9B=B8=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=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/TwlIPL/trunk@2590 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../tools/MasterEditorTWL/MasterEditorTWL.ncb | Bin 11275264 -> 11275264 bytes .../tools/MasterEditorTWL/MasterEditorTWL.suo | Bin 59904 -> 57856 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 17502 -> 17462 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 160 +- .../MasterEditorTWL/Form_deliv.cpp | 15 + .../MasterEditorTWL/Form_file.cpp | 6 +- .../MasterEditorTWL/Form_lang.cpp | 12 +- .../MasterEditorTWL/deliverable.cpp | 50 +- .../MasterEditorTWL/deliverable.h | 5 + .../MasterEditorTWL/MasterEditorTWL/lang.h | 14 +- .../resource/sheet_templete.xml | 2010 ++++++++--------- .../resource/sheet_templete.xml | 2010 ++++++++--------- .../resource/sheet_templete.xml | 2010 ++++++++--------- .../resource/sheet_templete.xml | 2010 ++++++++--------- .../resource/sheet_templete.xml | 2010 ++++++++--------- 15 files changed, 5063 insertions(+), 5249 deletions(-) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index 987dc05972c5d9e31e0b5aedce23f836760e378a..046dfc85d5d1f85ee2daabc1793875fc2c7fd8b4 100644 GIT binary patch delta 55366 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 ANB{r; delta 12508 zcmeHtd2|#-+wb)B^kinLI+;NBg(Q&a&LoqK5D1V!2s;D`dysuc2%CbU0tpDimOv2S z6bLHo5Dcr}6z(9X2q+++h$ulI?3)Bd$ZPJeXGTB2_j|u{?sw1q=bm%(oZtC%*K}1^ zJ@wS{JXPtERlB4Tpxj~UGE?XITVvnd?uKDSf&a=BbLdLJ*m_TixkN8q+ucqPq`G?i z?Quw__2$=7(uJo_Pv~;x6*FCErUIY`M8E(@fD!NmOn@1%00hvUmjQonrUAeGR$;O} zUQv*ye{_MTOV;E1l~$v~dK;`6EW==ZvZ6rZDU$Uoy^~sDmJw*@3%N4cY!jl_ohz*6D(QFd&?-e^SX5P7hWc*84}GwyixMqm^04R8v$#KM26ieUwJs&X4NL3{DQ6O`8hjVWu>ZEK@WAt(z2CZlXBFbx-+$ttcB06UP*((hIcVr#o^Z8k6$_cu}Z z7H}K51BBw8qrm%t1Hh-iZr~kY5AY%IG4Khn8E^qxfbGCR;1KW`lkZi92JgV-PGA>s z95?}-WV_E)X7HI)ZHXqnp;8?xx;|7*?wPhc1J9eKbQ5^#Y}<5w#jb>Ayjh8oBJd-# zZ2khDI?q-v$P!HX9Y6p?E|)0%1U_=B`ljA}NIj=#w`SRHvCpg2R<6TnvsP`RXKg-L z*Ya~mR7G%|wi#UafJZj!8m|~!R57?`DW$$Qx=WOi|LJ9}!#1lc49^uQR#xz`vWP8O zr>Nn_qI4LB?xwyk=|}pLLNbs%O$L#{gzZ?Tq$KYVZ;2^n4k;!jWGGqsGaq8sUU`ab=Fo}|_E8V!|W7g~2+mkNqUjq zq%TZ=63qL1`U5>rf1+2YpKO&I$PMLSIZAHBX75qv27W?T)0omIkIfG!H)&%Qa6)M< z*jV=yO0=+=J##{7LLS26McE-|$gLPVq4W~kuj`H`CzT=6B;tpL z%T6kt$+u#V+(OQhTcXZ|lZxG}b(`_1~z-!a^GXMb+B3yR%?N|29jWp!Ny{+D%73&-@c4jvu&r{+U|(xtVVhxNJLz87*@yH1 z{T$ZzB_{hM4E}q1&Nn+3V1Jrigb`e#moZzdufia2W77OFZGpat3z0)T5+;Ys5ppCZ zvJp%+UTy=k?E>2=@T{7l{Qf!RT|w$ks%a>zI?a4Hk%KJrM`cK4PdaD1cWqP&Z-`Zv zZIiFlxad9EBi_5DSX3z{0R%@D2uzG#E7r~*8YN`wmVMl z$`jEG1ZbUEe^lH+_tE#DpAVp+kLbtr6S^Oox_LQDhcKv1(|;shA|f?V3A5lwP1MY) zE-1-=v#E<0l<>fRU61cEQmw>9CeQ!`C2d7j=&$R$U6MT3K7d@LVXR}dk{te-SSzNJ zY4ln89G#9id>*qnlfFn_VoR%)FIzrE&s#59U2yc8(w+#P>JRD<=|9sS78iM@cr|^U zuE9jVK}X;{20YUlw&)~IR(4Ub`NhLb?~wP{dl!}5s2cBxUeh%Y3#49BZ>g`;PwFoX zkP4+^EcIt4S=h^l{H)AnkA7AhjYp7Mw29p9D{qLY7TytaJofuMc>y;3B6*4MzL%6D zp<@fum5f5cBDnmw$adl;2gwiQD)|LI$BzcmG}@AOpabbhT7;3kLRX-(F1ic4K0;5^ zJJcq3mHRO1ijpM6v-B%Uq|l!AxT4sizYrgaP01p=M|-G!(Q}zYqd4o=S#evK&VmTJd04XY#1&}u2IG`)I8mS-BCI#H1)mku6SE4 zX7_j7f&)wCGI_ymuQTcizhz}dYm|PrVdNPy6(e2&JIq6HT|;lsT7+S}Y?0&SB$#wd zxgG0x6?P`G#aETcxKrXIv5W@%wQiz4t0WdrHZH<-B#=!H;YH$>mR_| zKeW7bGD=7AqDJ~n`tQZ3JbtYgJX;^RuRKP6{JnQQG|_W$Graa*_-!}gWFHn;yF1D- zvRmu}M?aZNAyZk^9i?T)HZg=~%TPhQNI=Bs=Ref{b^ne2@A!`m_$eUso_DYv^_57$ z{19c##KJ=F!i!C3i|<0oO&GtcWQ43C_jr`fh>o?_?-F~Hab!G9v!YfB6B@DbT4jci z#g^A93xu{T_#xuv4snm@7C#X`6Te{XA1XcD%_DQhZ6`27kpvhDh-rFe7?Ss+>@PpsH{Q4IOSKky8~jFCkVBpc?d)uXh*jCS7lO@ z@8Id%$Zh3Zxt+Wd>4TOM-xbb^9T6frBS>_WyD|H3%6AnG_3a*4EVrQVCl)=%Y$f3c z#|fkx{K{hT8d*ds}5cwM$ovgNs>_eY}7t^|OOaBu_SN&I*t6^{9@wQ))>$32Dq{mIa zVd(3(3_aHpaZd=7mmyYY4!q719oOp)s?is7*2slh7Bu zFKeJbBzD8%eTGgzbS^@-Lwyd)lZwcp=e+gbV=tp3IWC^3zt9KpE)UsO6od~y?rrCe zJ{Z#w`d846W=HXJ;5u?1X8(XRpid)k?xr8J`V=)vMkTH5xAp#VfXpIN)x^I=svfCo z(tn#dE>Be_3N`FWs@g&=Auq`<%kzEvk2d;mu>bIrO|ltoZ~j_uzpv6pY+#x?utfp= z!TPhcpUwYoO8bCE>Kbc`5Sf=1FP8ciF~7#hny8l~Epf4bURSj9%9 ztAlJi#2au-*(8UwA#F)6X-D!%d(r{vRVPn^)fMK^on1^<$Edw&0wyUCZ}>`Zi+99S zvYEKZ7E(#JBA=>4MztLlw3AJ0s)kFw2plI{ic8^3wz;XQ=8VG%{RKNJ9mZrwZqfoa zyBmI|0UCTPd@cSamj0C=)le-Nx(>&Glios7bcdNUR8{znrDv$!$-Clv;``#q;-})5 zY+;6)D%yyRy_ccB91hPz^L@*^lYT2q(jN(=l?1XL&C~&LS)|rFb`bTL(-gm#{KlRN z&}sWvZCjzOyhiM^X6iG-b1XGeeUWSu&sc6CC%t94&Guxf-G%O~K2x0{*x8ikYL9?H z7NNxM5?HaWmqv}b$J0k7YT$wlB_Bu2z z)&4Wl{iUrF}=B*!lP-$=5x6#MT9w&qE_iM2Pa_U6?7$fy6zq`i5xH;evHIkY@d z9xcy8P}Sn9OWykj+t*tS3-lx=a^cA^kJTUsv5URcfkGr}-A8Smu@S1gWVvj)VyUsL zM6l3SM??Ki@uryl*WP3>HmO6&FfyEsfSN|Jt$oxPq1|x+u@fQeA$Evn+LXRTSJFLn zKg;Z^E*9eWCw z5hj~qwGTyfn?jz)5lK0D1Iu|YHUi%x*5AWkR-yqk1rfX*9f0g-0y5?jq=m0z53vI| z{9$Aj*WpGVQvu#87TH5Oc7nNxKE32Zd5AnwZn)o@C;g&J7EiN}3e{lj+O*8-I`q|< zx812+6!^zat4;O)!%c1U5Os|2q-Eg{bz$o3LLimWEDlQnVyARM-n+&wF%#{ zcB2u9qS+wa*%IkbCnI&yn7RwXd*WSj3;8#iW^+fVkv+=g74qtx-gNPh;DR^*9Uk!s zPJu?=@@Bma{73p+u*c8J-Eoo>j;7BFpNbE}aQZjhvmY{)NR}{0tt0PR<$+!SiCQ8B{GgE0&qwX zNE_hfP#mY)BUJhbxq`MS?c-nQKiGeS|DVj39kh+_T`%eks}0)>c~U<1prfS8(u>l3 zsY)vFo9Oqv-&xZ|(+$%DQ=LgN$C<~P=bBfVH=8+9kU^Hwmgg-iEPE}VTTbAZCXmD- zPv}m15LcFB(hg?bxys`pcBhNdiRX4z_Um1bRO(u%1i1|fs|3F4cXhnpZAv&z`00bn zAru5BjJLQ>D6y{C1cR#<2f*!p~N&+g3dNi@~AIN_v1eA&aRDat!}+8`hYjjd`kDVZua3wZ-^A0 z5(Q3vv)ioB9gk*z|CN$@xENZ66SB0ySE!-HU zJ{H|Uo{>#UxF_>PN$O0iyCh+zg?-vVZNQgwQp5Co!!>oNpQ}L4cJEKn8@Rq){Ug$~ zNHw_2)qQ5R@7;t${LS9Vd;tgVLGJ8?x-edMUNwjnB?%k&hSCJotyQ~J1Zj8M)S&_H z6Y5CHM`o*UitcJPO=M}q5>B`;tN8-YACa&((OsB;|LZu~CpfT6AJ{&@p0v++%DDGI zghxf)^q=c%Cwdh#LELM2(YW`5_YOl8IQyu5Lg;`4hOZ2INtRwlVscQrD&3b_89N!5 zzvZ>5Y+;BnUN|irzvwm30n%`3tW+dDixlR^&%CeMtXpSz;~Vewd_C9y_;RG~RhHBt z;e+C7hIxj!4C@T*4euH*7^)2qAUcUifl>sdiAPegjUFgHExDvE(spSFWUu6gaL7K$ z0mxbDd+8SBHslWEF64K~Y>Y7WGj22PGoHk#!(zP?yI2V8=DjkofgKZq18*B#UwW4r z5o%tH)JxEs(lEs%(+rC|vcyn^<&rFEk}73;q>c2OM}C+5jG9=CVIGMz z=6WR0STQ`|eE0@q;cpQ-6D%r3-&lXr_>J*2Dv8R}(|#8s;0880;IOJSp>3;aj1XevN*ig(U!X zAQ4Cc96&OV!YwTI*L&{Q5-cLKR3-ho*Z!Q$pA+n5dY9EsU6pB36;bwFo@=%57u~V; zwI;UqUQ!2y+K(dEDs)oBKImi-)I=kBH{6&>ugY~3bXQ?9hMpVPa$*h^(z+SNW? z?>3~Htjv_*&S=rKaAf|vb$9N=TCj{|+&09;=m%n!G8JkguK_N(cFmUU_DShgc8@vJcn zyI@gw)))#lfJ49%I2ddMM}X_=&l=f*MJs}2P2uQ^rwJ?Tnd6vD|GZ7p34|TbcG%dR z9EVl7!t2A+-w?E(^S9bM`Uu4_MuV;)#uQ_ed~5^<;oi^3CLf!@!6>)*nE052Lr^aJ z*x$zi;82uXeH`fH2H-H1H`F)-7eT&)U~o9@Lwp?S<1lap%ENukH$|uS*B2L=3}`<= zS7efWZ1k}o*p70OkIg=|fD=(pd`x{TgOgD1@8bX;Tfq*L2l}{ykF{|n7vqN@?E)O^ z;}CEP?n8YX=Hqa1D#{~#9O>gIa2m>^ecT9~j{6uN$AX*UKF-IDecS{*Is-q%<3eMb zj}>q;+^arL@Ub17iSk4rC;8X`ZjSO~AE)>@72E>lY;Z@%+a5bNcXEt1w>CO36ZQ42 z`OL=YGxY3sl>LOzntvQ^&(l}rJK{V~#^*bxdM;SL<7soCF%WZ9UmwUHC#1(4M3_2@ z>*bg(Zhz@ATh+@k%kyYxZ%1BqwsvUd`P*Ggbn$poGu$0Qpw<@J^SvFtJ7yaj>srDq zWgFwbCU7j+42}U?z>UBJ>}yGPv7G1z<3_^}Kx;})P5($lvraB1)ap!Uv3q| z?e+{&+?&)}&*!9M>=4|Br0V8qEF%_;CDoaP#yqfH$|$`M$I70|c+1r#X*gT=QKFF< z6C4G6!lsnBMR#S=4FeDPF(X8D?@DSa@u62TzSg_vP zC;jB$zurq}EV^rxUe}98-F~(rvRNoU_G?PMQ1K|q!TRRs2Jym2De%vAN!20T+P)e3 z66A;%c;AlA&g(1sIy$rrvBv0f;9EnijlhB6XmA5?6c`@G8VL>pM}ULDap3y;5H`Cn z4DC|Ib+$giKC)GaHC)%m(@q#zYbO+}wG#r?+6e}0?F50fb|S%O$I5c-_64XPrfch| z9}3p$hk&*E!CW6`~`k`R0eh65r9}L#& zM}a-{t6HVUvQvrnF;GS$T{}-B(O|8SD6rN@Bv@-C0<1L>4%Qlp1#8NfHoy_CuieB- zlkB60YR%;Nn#uDuljmzD&(}8O%IWH$Qkv9zM{yngYP)2_7>e!9kbGf7uf9ejwIm&c3^gT zOX;H_uhd=Q^|RA=8hC}v@p+=4V?$2jcO6^59lv{C#V>46-)-PCzjc%(i2=Ge_C!b? zD8h^JDL5OzN%CsLThPL9tGWgkw-?!XpJ z$hLCpqi61kth8|s<Vjx5^3S+p;G_i7fUr zNAT`~9}K$-tRk;#k&~96wYyG5aPvbgFF@&$?A~IFcW_ z+t%Q>#n66|nIEoin`PkHeJ2%;VRh4UOM|r#r^Qb#v}tiuOA4Cs1v7F(>lWt!JPmjj zcn+8j%;5PyKfkw^v$U(Tw41ZEyR$UkS=z%{`joS@r?a%cS&E-}J4^dGOZz%Y`#DSd zJ4**ROADQ)1D&N$J4**SO9wkkhd4`zI!lK+ONTp4M>tDIx=KeK;{^vh)xEQ@uI2?` zCh#J!t9i*V!c{chu&`j`m@Nex$1Y-yrOA{{J)9}=j!`){R47OqXL1=PSho~pj0
    x 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 BfB^si delta 3928 zcmZXX3s6+o8OQIryUY9GuFFG3SU_0~C}5*e)UXBwK_aZFZzL9L3JMVrZKcYtMmy1( zMD}Cq_z0r0#`=i5mm0O0_`pfgni0pE#L-r*wQ*vjCWcAWLjT|H*<>?0Gyna*^SkGq zd(OGvd91TT=e(>t)UJvVbV5xQD9~$^Moj*r51-+qx=B?O0~*_`Ds(gU0Np=gq8@7q>8*XV z*dcAfVO#4n*ZJN?pJqNtwwl`U?6QD$p*B z+!wBf2x`b_R0D+eIHy46i3upgQxkArL4e?z7T^2?6yr&XN{{mzMWePn{{@xioElAE z7v$@8)(Hb$R&y{%9M@6k{>lWcq41o}z@1I;HKEl{StCR=eOK%d{b_m0`JgaagUZsA z_zO|Jy~HpIaK!g@9@(GhC}+LVJv}Wz45neF13Y0sMWv&M^2?Gj>Ol|>HwD%T4S|M2 z&p@eAPm{gaVDmc3!G&-pdo!tnX26*Vl|tN{FU>{140;)&6>|qgRl?zSEP}0qsyW|e zpX@3#Q0=KC&02O(@Qi4S+g}&1s}Zz$T7s+mORB5rrqYUNLmgI1mexC8s8n+7MNgH* z?M;H>cbCxgw0J6?-$FIzQ>kW22vt-@i*6E0t6U4u=}({O*MixlTMP4IPa&QIBfSCR z`}7=~u6QS2WOG+d(urq$Q%CiSyIog<=+FW^IqURf{_Lp;q!aIaN8!y8SlS8Ns=9T0 zu}cg6b%jc`jyGJEIErhqdg9_LTEN5eR=bGJ$xSF9kLEl6AQ-U>mtVr^t| zUi5@GnOCKet;0!c>TK@SHkBS;tMZJaw8Es%8n8B%iq<^KH8k7WNg}L&|5O`V_b#92 z-&G0MX^Ymn$C~?hU!ZFdC(@ei+Uh#oV=!Z$P^_&K0fat<}PT525f* zwF7K6>`qu_yt(a#KM{7HWQp((!S4rqSTbHq8vGd8Ha~VmviBtm$Ma_RoH`|gaVRhG zE`u~1mR~#;DwS-$WL$3nd<$%)AFG4k2W*)iTMK^x*gDC$O&9#(u+5V37P<*Ozh7yQ zkk5x!4^)(Q{R;j`G7cYZjQ7|xlEomLnDIW`4?d@E$+*35B{QOzT#i{^?lDptGrZrk zNe`E>L>A<;XR2gNCF2H`!HXTd)#*-^>(c{}_7*prg+!FgPkJLSjDNcOQGy9l4tWy$8jzv5-_${h*$sQO$M zyys)o&t-KK<4KQv5@qyGB!}BTh*OMY9G0OTqA2~rcsJrKhbYe-D+%J^43T+esgkAp zu@RDu;t=sw9wT9nUqL>xxxo@Y#?ioxhvciv^Tq5HKUOJOjUQVgS;O}%P*EBg(nK2T z>T;6(dc4;1_glif!YnjXW0=s)D{lxIQ8|jYCM|c1UKP*%u?O@zb=`o6w|rQ2*yyW@Wz@a5keqAG4!%F|2RaII zLEfv5K{?QIh#B9ac%W0DvyhLSgI^AvmyEyPMJOBUl8ozKf%rK8L^8gGUGuU<%5@33 z@mtVB=wFg?<x9o=;({N$4nGm>CNr9K!0I^#xP>Pm7FY%Q z8^48FIDFo6jD9RuvN%6B5`Hwwjqzg>;hVq;{8%ykpMlvW!-h`}w{P~Gd84+Pw6>i^ z!u3idt}W4?1MOh5UC_xB+4RV1!o9!~CGwIq3Hg zr_&I#EQrIO(?y6G{{guKak>pL<4b}Hhoh1I0x;tUz5{XMVft7&JKRiyguKrsdZCgp zSpisqWWRv*&ZGB!z-vsQ69;mrD`q=(1@8yS(Qx{cXv3l<&e{54*>Y9e}?B z>^;d)Ck6j(6lFPJn}l5X82ojx$0aMGu6=zcP60U!QVIK!U+KTW=WlvJG7Eg3cuu!r zee=X9K^uSkHQ_#6Bf^Iv`)@9T^n_0QCCB}y6RV-qNzS*N?)^4FnYD@ZW^9C(esrer ztpYmOJb^?(p6jYf`}C7<18Mc8J2a~6ocrPz#;AAj3f?7DlX4~FOvb^Ce`Gw(_&dl3Q`Aq17llMwXZ{{=6W8}ABFhEi5 NZ~78b(A!*?7XXBfEsy{J delta 276 zcmdni!FaEOaf2C~upxsngAs!zgBgPXgCTBcHp$Ib^}+U-VbNv0xx>(g38)KG@~)ut=6A+= UAQzgW>)fnu`VzZ@vbiuX0C;OKumAu6 diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index 093d761f..63a114cf 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -44,6 +44,9 @@ namespace MasterEditorTWL { System::Collections::Generic::List ^hErrorList; System::Collections::Generic::List ^hWarnList; + // SRLɓo^ȂROMdlǂݍݎ̏Ԃɖ߂dg + System::Boolean ^hIsCheckedUGC; // ǂݍݎɃ`FbNĂ + System::Boolean ^hIsCheckedPhotoEx; // VCljtB[h private: System::Windows::Forms::GroupBox^ gboxCRC; @@ -583,6 +586,11 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemMiddlewareXml; private: System::Windows::Forms::ToolStripMenuItem^ stripItemMiddlewareHtml; private: System::Windows::Forms::ToolStripSeparator^ stripItemSepFile1; private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; +private: System::Windows::Forms::GroupBox^ gboxOtherSpec; +private: System::Windows::Forms::CheckBox^ cboxIsUGC; +private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx; + + @@ -670,6 +678,8 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->hErrorList->Clear(); this->hWarnList = gcnew System::Collections::Generic::List(); this->hWarnList->Clear(); + this->hIsCheckedUGC = gcnew System::Boolean(false); + this->hIsCheckedPhotoEx = gcnew System::Boolean(false); // o[W\ //this->labAssemblyVersion->Text = System::Windows::Forms::Application::ProductVersion; @@ -701,8 +711,8 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; } // s\lŐݒłȂ̂łŐݒ - this->tboxGuideRomEditInfo->Text = "̃^ȕ͒omFу}X^[ROM̍쐬ɕKvłBҏWĂB"; - this->tboxGuideRomEditInfo->Text += "\r\n(}X^[ROM̍쐬܂ROMf[^̒ɂ͓o^܂B)"; + this->tboxGuideRomEditInfo->Text = "̃^ůeڂւ̓͂͒omFу}X^[ROM̍쐬̂߂ɕKvłB"; + this->tboxGuideRomEditInfo->Text += "\r\n̏̓}X^[ROM̍쐬ROMo^f[^Ƃēo^܂(ȗROMvB)"; this->tboxGuideErrorInfo->Text = "̃^uɂ͓ǂݍROMf[^̖Ɩ{vOł̓̓~X񋓂܂B"; this->tboxGuideErrorInfo->Text += "\r\nԕ̍ڂ́A{vOŏCs‚łBROMf[^쐬̐ݒmFB"; @@ -745,10 +755,10 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; /// void InitializeComponent(void) { - 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()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle13 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle14 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle15 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle16 = (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()); @@ -951,6 +961,9 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->tboxGuideTWLInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxExFlags = (gcnew System::Windows::Forms::GroupBox()); this->tabRomEditInfo = (gcnew System::Windows::Forms::TabPage()); + this->gboxOtherSpec = (gcnew System::Windows::Forms::GroupBox()); + this->cboxIsUGC = (gcnew System::Windows::Forms::CheckBox()); + this->cboxIsPhotoEx = (gcnew System::Windows::Forms::CheckBox()); this->butSetBack = (gcnew System::Windows::Forms::Button()); this->tboxGuideRomEditInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxParental = (gcnew System::Windows::Forms::GroupBox()); @@ -1005,6 +1018,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->tabTWLInfo->SuspendLayout(); this->gboxExFlags->SuspendLayout(); this->tabRomEditInfo->SuspendLayout(); + this->gboxOtherSpec->SuspendLayout(); this->gboxParental->SuspendLayout(); this->gboxIcon->SuspendLayout(); this->gboxEULA->SuspendLayout(); @@ -1435,11 +1449,11 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; // labRegion // this->labRegion->AutoSize = true; - this->labRegion->Location = System::Drawing::Point(71, 24); + this->labRegion->Location = System::Drawing::Point(98, 24); this->labRegion->Name = L"labRegion"; - this->labRegion->Size = System::Drawing::Size(75, 12); + this->labRegion->Size = System::Drawing::Size(47, 12); this->labRegion->TabIndex = 37; - this->labRegion->Text = L"J[h[W"; + this->labRegion->Text = L"[W"; // // cboxIsEULA // @@ -2813,19 +2827,19 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; // stripItemSheet // this->stripItemSheet->Name = L"stripItemSheet"; - this->stripItemSheet->Size = System::Drawing::Size(283, 22); + this->stripItemSheet->Size = System::Drawing::Size(304, 22); this->stripItemSheet->Text = L"of[^ꎮ쐬"; this->stripItemSheet->Click += gcnew System::EventHandler(this, &Form1::stripItemSheet_Click); // // stripItemSepMaster1 // this->stripItemSepMaster1->Name = L"stripItemSepMaster1"; - this->stripItemSepMaster1->Size = System::Drawing::Size(280, 6); + this->stripItemSepMaster1->Size = System::Drawing::Size(301, 6); // // stripItemMasterRom // this->stripItemMasterRom->Name = L"stripItemMasterRom"; - this->stripItemMasterRom->Size = System::Drawing::Size(283, 22); + this->stripItemMasterRom->Size = System::Drawing::Size(304, 22); this->stripItemMasterRom->Text = L"}X^[ROM݂̂쐬"; this->stripItemMasterRom->Click += gcnew System::EventHandler(this, &Form1::stripItemMasterRom_Click); // @@ -2908,15 +2922,15 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, this->colLibName}); - 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, + dataGridViewCellStyle13->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle13->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle13->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - 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; + dataGridViewCellStyle13->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle13->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle13->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle13->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle13; this->gridLibrary->Location = System::Drawing::Point(337, 189); this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->ReadOnly = true; @@ -2989,6 +3003,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; // // tabRomEditInfo // + this->tabRomEditInfo->Controls->Add(this->gboxOtherSpec); this->tabRomEditInfo->Controls->Add(this->butSetBack); this->tabRomEditInfo->Controls->Add(this->tboxGuideRomEditInfo); this->tabRomEditInfo->Controls->Add(this->gboxParental); @@ -3001,9 +3016,40 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->tabRomEditInfo->Text = L"ROMo^(ҏW)"; this->tabRomEditInfo->UseVisualStyleBackColor = true; // + // gboxOtherSpec + // + this->gboxOtherSpec->Controls->Add(this->cboxIsUGC); + this->gboxOtherSpec->Controls->Add(this->cboxIsPhotoEx); + this->gboxOtherSpec->Location = System::Drawing::Point(19, 225); + this->gboxOtherSpec->Name = L"gboxOtherSpec"; + this->gboxOtherSpec->Size = System::Drawing::Size(266, 70); + this->gboxOtherSpec->TabIndex = 41; + this->gboxOtherSpec->TabStop = false; + this->gboxOtherSpec->Text = L"̑ROMdl"; + // + // cboxIsUGC + // + this->cboxIsUGC->AutoSize = true; + this->cboxIsUGC->Location = System::Drawing::Point(8, 18); + this->cboxIsUGC->Name = L"cboxIsUGC"; + this->cboxIsUGC->Size = System::Drawing::Size(210, 16); + this->cboxIsUGC->TabIndex = 39; + this->cboxIsUGC->Text = L"UGC(User Generated Contents)Ή"; + this->cboxIsUGC->UseVisualStyleBackColor = true; + // + // cboxIsPhotoEx + // + this->cboxIsPhotoEx->AutoSize = true; + this->cboxIsPhotoEx->Location = System::Drawing::Point(8, 46); + this->cboxIsPhotoEx->Name = L"cboxIsPhotoEx"; + this->cboxIsPhotoEx->Size = System::Drawing::Size(96, 16); + this->cboxIsPhotoEx->TabIndex = 40; + this->cboxIsPhotoEx->Text = L"ʐ^Ή"; + this->cboxIsPhotoEx->UseVisualStyleBackColor = true; + // // butSetBack // - this->butSetBack->Location = System::Drawing::Point(43, 289); + this->butSetBack->Location = System::Drawing::Point(69, 309); this->butSetBack->Name = L"butSetBack"; this->butSetBack->Size = System::Drawing::Size(151, 23); this->butSetBack->TabIndex = 38; @@ -3040,12 +3086,12 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gboxParental->Controls->Add(this->combPEGI); this->gboxParental->Controls->Add(this->combUSK); this->gboxParental->Controls->Add(this->labUSK); - this->gboxParental->Location = System::Drawing::Point(262, 60); + this->gboxParental->Location = System::Drawing::Point(313, 60); this->gboxParental->Name = L"gboxParental"; this->gboxParental->Size = System::Drawing::Size(398, 272); this->gboxParental->TabIndex = 33; this->gboxParental->TabStop = false; - this->gboxParental->Text = L"[WƃyA^Rg["; + this->gboxParental->Text = L"[Wƃ[eBO"; // // gboxIcon // @@ -3054,7 +3100,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gboxIcon->Controls->Add(this->rIsWirelessIcon); this->gboxIcon->Location = System::Drawing::Point(19, 114); this->gboxIcon->Name = L"gboxIcon"; - this->gboxIcon->Size = System::Drawing::Size(227, 116); + this->gboxIcon->Size = System::Drawing::Size(266, 105); this->gboxIcon->TabIndex = 32; this->gboxIcon->TabStop = false; this->gboxIcon->Text = L"j[ł̃ACR\"; @@ -3096,7 +3142,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gboxEULA->Controls->Add(this->cboxIsEULA); this->gboxEULA->Location = System::Drawing::Point(19, 60); this->gboxEULA->Name = L"gboxEULA"; - this->gboxEULA->Size = System::Drawing::Size(227, 48); + this->gboxEULA->Size = System::Drawing::Size(266, 48); this->gboxEULA->TabIndex = 31; this->gboxEULA->TabStop = false; this->gboxEULA->Text = L"EULA(pK)"; @@ -3302,15 +3348,15 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; 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}); - 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, + dataGridViewCellStyle14->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle14->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle14->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - 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; + dataGridViewCellStyle14->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle14->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle14->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle14->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridWarn->DefaultCellStyle = dataGridViewCellStyle14; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; this->gridWarn->Location = System::Drawing::Point(24, 228); this->gridWarn->Name = L"gridWarn"; @@ -3350,22 +3396,22 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; // // gridError // - dataGridViewCellStyle7->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle15->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle15; 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}); - 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, + dataGridViewCellStyle16->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle16->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle16->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - 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; + dataGridViewCellStyle16->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle16->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle16->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle16->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridError->DefaultCellStyle = dataGridViewCellStyle16; this->gridError->GridColor = System::Drawing::SystemColors::Control; this->gridError->Location = System::Drawing::Point(24, 99); this->gridError->Name = L"gridError"; @@ -3470,6 +3516,8 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gboxExFlags->PerformLayout(); this->tabRomEditInfo->ResumeLayout(false); this->tabRomEditInfo->PerformLayout(); + this->gboxOtherSpec->ResumeLayout(false); + this->gboxOtherSpec->PerformLayout(); this->gboxParental->ResumeLayout(false); this->gboxParental->PerformLayout(); this->gboxIcon->ResumeLayout(false); @@ -3558,6 +3606,8 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->rIsWirelessIcon->Enabled = false; this->rIsWiFiIcon->Enabled = false; this->rIsNoIcon->Enabled = false; + this->cboxIsUGC->Enabled = false; + this->cboxIsPhotoEx->Enabled = false; this->combCERO->Enabled = false; this->combESRB->Enabled = false; @@ -3576,6 +3626,27 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "." + ver->Build.ToString() ); } + // SRLɓo^ȂROMdl̃tH[͂ + // VKǂݍ݂̂Ƃɂ̓NA + // ēǂݍ݂̂Ƃɂ͑ȌԂɖ߂ + void clearOtherForms(void) + { + this->cboxIsUGC->Checked = false; + this->cboxIsPhotoEx->Checked = false; + this->hIsCheckedUGC = gcnew System::Boolean(false); + this->hIsCheckedPhotoEx = gcnew System::Boolean(false); + } + void saveOtherForms(void) + { + this->hIsCheckedUGC = gcnew System::Boolean(this->cboxIsUGC->Checked); + this->hIsCheckedPhotoEx = gcnew System::Boolean(this->cboxIsPhotoEx->Checked); + } + void loadOtherForms(void) + { + this->cboxIsUGC->Checked = *(this->hIsCheckedUGC); + this->cboxIsPhotoEx->Checked = *(this->hIsCheckedPhotoEx); + } + private: // ---------------------------------------------- // tH[SRL𖵏Ȃv @@ -3773,6 +3844,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; filename = dlg->FileName; } this->loadSrl( filename ); + this->clearOtherForms(); //this->sucMsg( "ROMf[^t@C̃I[vɐ܂B", "The ROM data file is opened successfully." ); } //stripItemOpenRom_Click() @@ -4239,6 +4311,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; return; } this->loadSrl( filename ); // hbOAhhbv̎_Ń{^ȂĂt@CJ + this->clearOtherForms(); //this->sucMsg( "ROMf[^t@C̃I[vɐ܂B", "The ROM data file is opened successfully." ); } @@ -4370,6 +4443,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; } this->setRegionForms(); this->setParentalForms(); + this->loadOtherForms(); // SRLɓo^ĂȂROMdl̃tH[߂ } }; // enf of ref class Form1 diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index d7c8e491..28ccc925 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -186,6 +186,17 @@ void Form1::setDeliverableProperties(void) } // SRL𕶎œo^ + if( this->combRegion->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hRegion = gcnew System::String("s"); + else + this->hDeliv->hRegion = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hRegion = dynamic_cast(this->combRegion->SelectedItem); + } if( this->combCERO->SelectedIndex < 0 ) { if( this->stripItemJapanese->Checked == true ) @@ -263,6 +274,10 @@ void Form1::setDeliverableProperties(void) { this->hDeliv->hOFLC = dynamic_cast(this->combOFLC->SelectedItem); } + + // SRLɂ͓o^ȂROMdl + this->hDeliv->hIsUGC = System::Boolean( this->cboxIsUGC->Checked ); + this->hDeliv->hIsPhotoEx = System::Boolean( this->cboxIsPhotoEx->Checked ); } // ---------------------------------------------- diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp index 7a7a4e06..14246679 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp @@ -167,6 +167,10 @@ System::Void Form1::loadSrl( System::String ^filename ) // GUIROMi[ this->setSrlForms(); + // SRLɓo^ȂROMdl̃tH[߂{^œǂݍݎ̏Ԃɖ߂ + // ǂݍݎ̏ԂSRLɕۑĂȂ̂őޔĂ + this->saveOtherForms(); + // ŜCRCZo u16 crc; if( !getWholeCRCInFile( filename, &crc ) ) @@ -207,7 +211,7 @@ System::Boolean Form1::saveSrl( System::String ^filename ) return true; } // saveSrl() -// SRL̈ꎞۑ +// SRL̕ۑ System::Boolean Form1::saveSrlCore( System::String ^filename ) { // ROMtH[擾SRLoCiɔf diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index d0525b7f..750143f0 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -66,8 +66,8 @@ void Form1::changeJapanese(void) this->tboxGuideRomInfo->Text = gcnew System::String( "̃^ȕ͕ҏWs‚łBf[^Ɍ肪ꍇɂROMf[^̍쐬̐ݒĂB" ); this->tboxGuideTWLInfo->Text = gcnew System::String( "̃^ȕ͕ҏWs‚łBf[^Ɍ肪ꍇɂROMf[^̍쐬̐ݒĂB" ); this->tboxGuideRomEditInfo->Text = gcnew System::String( "" ); - this->tboxGuideRomEditInfo->Text += "̃^ȕ͒omFу}X^[ROM̍쐬ɕKvłBҏWĂB"; - this->tboxGuideRomEditInfo->Text += "\r\n(}X^[ROM̍쐬܂ROMf[^̒ɂ͓o^܂B)"; + this->tboxGuideRomEditInfo->Text += "̃^ůeڂւ̓͂͒omFу}X^[ROM̍쐬̂߂ɕKvłB"; + this->tboxGuideRomEditInfo->Text += "\r\n̏̓}X^[ROM̍쐬ROMo^f[^Ƃēo^܂(ȗROMvB)"; this->tboxGuideSubmitInfo->Text = gcnew System::String( "̃^ȕ͒omF̍쐬ɕKvłB͂ĂB" ); this->tboxGuideCompanyInfo->Text = gcnew System::String( "̃^ȕ͒omF̍쐬ɕKvłB͂ĂB" ); this->tboxGuideErrorInfo->Text = gcnew System::String( "" ); @@ -177,6 +177,9 @@ void Form1::changeJapanese(void) this->rIsWiFiIcon->Text = gcnew System::String( LANG_WIFI_ICON_J ); this->rIsNoIcon->Text = gcnew System::String( LANG_NO_ICON_J ); this->labRegion->Text = gcnew System::String( LANG_REGION_J ); + this->gboxOtherSpec->Text = gcnew System::String( LANG_OTHER_SPEC_J ); + this->cboxIsUGC->Text = gcnew System::String( LANG_UGC_J ); + this->cboxIsPhotoEx->Text = gcnew System::String( LANG_PHOTO_EX_J ); // [W index = this->combRegion->SelectedIndex; @@ -292,7 +295,7 @@ void Form1::changeEnglish(void) this->tboxGuideTWLInfo->Text = gcnew System::String( "This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data" ); this->tboxGuideRomEditInfo->Text = gcnew System::String( "" ); this->tboxGuideRomEditInfo->Text += "These items is necessary not only to make a submission sheet and but also to make a master ROM data. Please edit certainly."; - this->tboxGuideRomEditInfo->Text += "\r\n(In making a master ROM data, these info will be registered in it.)"; + this->tboxGuideRomEditInfo->Text += "\r\nIn making a master ROM data, these info will be registered in the ROM data(except \"Other Rom Spec\")."; this->tboxGuideSubmitInfo->Text = gcnew System::String( "These items are necessary for making a submission sheet. Please input." ); this->tboxGuideCompanyInfo->Text = gcnew System::String( "These items are necessary for making a submission sheet. Please input." ); this->tboxGuideErrorInfo->Text = gcnew System::String( "" ); @@ -404,6 +407,9 @@ void Form1::changeEnglish(void) this->rIsWiFiIcon->Text = gcnew System::String( LANG_WIFI_ICON_E ); this->rIsNoIcon->Text = gcnew System::String( LANG_NO_ICON_E ); this->labRegion->Text = gcnew System::String( LANG_REGION_E ); + this->gboxOtherSpec->Text = gcnew System::String( LANG_OTHER_SPEC_E ); + this->cboxIsUGC->Text = gcnew System::String( LANG_UGC_E ); + this->cboxIsPhotoEx->Text = gcnew System::String( LANG_PHOTO_EX_E ); // [W index = this->combRegion->SelectedIndex; diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 16c6e119..15b4634e 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -304,34 +304,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( { node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hPrivateSize ); } - if( node->FirstChild->Value->Equals( "TagIsRegionJapan" ) ) - { - if( *(hSrl->hIsRegionJapan) == true ) - node->FirstChild->Value = gcnew System::String(""); - else - node->FirstChild->Value = nullptr; - } - if( node->FirstChild->Value->Equals( "TagIsRegionAmerica" ) ) - { - if( *(hSrl->hIsRegionAmerica) == true ) - node->FirstChild->Value = gcnew System::String(""); - else - node->FirstChild->Value = nullptr; - } - if( node->FirstChild->Value->Equals( "TagIsRegionEurope" ) ) - { - if( *(hSrl->hIsRegionEurope) == true ) - node->FirstChild->Value = gcnew System::String(""); - else - node->FirstChild->Value = nullptr; - } - if( node->FirstChild->Value->Equals( "TagIsRegionAustralia" ) ) - { - if( *(hSrl->hIsRegionAustralia) == true ) - node->FirstChild->Value = gcnew System::String(""); - else - node->FirstChild->Value = nullptr; - } if( node->FirstChild->Value->Equals( "TagIsCodec" ) ) { if( *(hSrl->hIsCodecTWL) == true ) @@ -497,6 +469,12 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( node->FirstChild->Value = this->hCaption; } + // [W + if( node->FirstChild->Value->Equals( "TagRegion" ) ) + { + node->FirstChild->Value = this->hRegion; + } + // yA^Rg[ if( node->FirstChild->Value->Equals( "TagRatingCERO" ) ) { @@ -527,6 +505,22 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( node->FirstChild->Value = this->hOFLC; } + // SRLɓo^ȂROMdl + if( node->FirstChild->Value->Equals( "TagIsUGC" ) ) + { + if( *(this->hIsUGC) == true ) + node->FirstChild->Value = gcnew System::String(""); + else + node->FirstChild->Value = nullptr; + } + if( node->FirstChild->Value->Equals( "TagIsPhotoEx" ) ) + { + if( *(this->hIsPhotoEx) == true ) + node->FirstChild->Value = gcnew System::String(""); + else + node->FirstChild->Value = nullptr; + } + // ROMo^f[^1oCg•\ɏ if( node->FirstChild->Value->Equals( "TagRomVersionHex" ) ) { diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h index a0169ca8..f679fb6d 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -87,6 +87,7 @@ namespace MasterEditorTWL property System::String ^hBackupMemory; // obNAbv̎ // SRL̈ꕔ𕶎ŎĂ + property System::String ^hRegion; property System::String ^hCERO; property System::String ^hESRB; property System::String ^hUSK; @@ -96,6 +97,10 @@ namespace MasterEditorTWL property System::String ^hOFLC; property System::String ^hAppTypeOther; // L + // SRLɂ͓o^ȂROMdl + property System::Boolean ^hIsUGC; + property System::Boolean ^hIsPhotoEx; + // constructor and destructor public: diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/lang.h b/build/tools/MasterEditorTWL/MasterEditorTWL/lang.h index 1ebce593..d55b296e 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/lang.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/lang.h @@ -44,11 +44,14 @@ #define LANG_WIRELESS_ICON_J ("DSCXʐMACR\") #define LANG_WIFI_ICON_J ("Wi-FiʐMACR\") #define LANG_NO_ICON_J ("ACR\Ȃ") -#define LANG_REGION_PCTL_J ("[WƃyA^Rg[") -#define LANG_REGION_J ("J[h[W") +#define LANG_REGION_PCTL_J ("[Wƃ[W") +#define LANG_REGION_J ("[W") #define LANG_PCTL_RATING_J ("[eBON") #define LANG_PCTL_ENABLE_J ("L") #define LANG_PCTL_ALWAYS_J ("R") +#define LANG_OTHER_SPEC_J ("̑ROMdl") +#define LANG_UGC_J ("UGC(User Generated Contents)Ή") +#define LANG_PHOTO_EX_J ("ʐ^Ή") #define LANG_PRODUCT_NAME_E ("Product Name") @@ -93,8 +96,11 @@ #define LANG_WIRELESS_ICON_E ("Display an Icon of DS Wireless") #define LANG_WIFI_ICON_E ("Display an Icon of Wi-Fi connection") #define LANG_NO_ICON_E ("Display No Icon") -#define LANG_REGION_PCTL_E ("Card Region and Parental Control") -#define LANG_REGION_E ("Card Region") +#define LANG_REGION_PCTL_E ("Region and Rating Information") +#define LANG_REGION_E ("Region") #define LANG_PCTL_RATING_E ("Rating Information") #define LANG_PCTL_ENABLE_E ("Enable Control") #define LANG_PCTL_ALWAYS_E ("Rating Pending") +#define LANG_OTHER_SPEC_E ("Other ROM Spec.") +#define LANG_UGC_E ("UGC(User Generated Contents) Support") +#define LANG_PHOTO_EX_E ("Photo Exchange Support") diff --git a/build/tools/MasterEditorTWL/resource/sheet_templete.xml b/build/tools/MasterEditorTWL/resource/sheet_templete.xml index 898d0f76..dceb8f2b 100644 --- a/build/tools/MasterEditorTWL/resource/sheet_templete.xml +++ b/build/tools/MasterEditorTWL/resource/sheet_templete.xml @@ -33,7 +33,7 @@ - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - -