From 11433153da0c5f052984f82d37754ec787f024d6 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Wed, 9 Dec 2009 10:28:54 +0000 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E9=80=94=E6=AC=84=E3=82=92=E6=9B=B4?= =?UTF-8?q?=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/TwlToolsRED@440 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 13937664 -> 13937664 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 86528 -> 91136 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 12570 -> 18062 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 185 +------ .../MasterEditorTWL/Form1.ja.resx | 51 +- .../MasterEditorTWL/Form1.resX | 516 +++++++----------- .../MasterEditorTWL/Form_deliv.cpp | 10 - .../MasterEditorTWL/Form_lang.cpp | 5 - .../MasterEditorTWL/Form_tmp.cpp | 20 - .../MasterEditorTWL/Form_util.cpp | 9 +- 10 files changed, 209 insertions(+), 587 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 5b6133e9cba0e5c57d215f7e533a08a04809e75b..131d253d5de43c296d766817d319220e8af13055 100644 GIT binary patch delta 47300 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 N{E;Sq?2^w^{U6NvAEy8S delta 14916 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 DfF$m` diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 59da9b71e7569033039caf1c7ea07c533debd482..3b3f6a1432ee59208241851f31d19f8c00a40364 100644 GIT binary patch delta 6032 zcma)=3s_WT8pqE!48v6hhH>O34v2UM29OjH2F1Kk2}qhj3Z`bQ86s`!W`lW6$qV1+ zF*U)Ticc27M%`|S7d=l!4GdCzyg+xh0q zlyC7YKj``9X@j-Dq9{Y4LC`>G4J3ayq=^T#z8)DO;7IAAygjoH2@mkPb=n-`34`H; zka=E9jm<4BE%L0_MQN)aD98Im%fh4>Y4%ArI^s%&%=OOD>U`#Vngr5X0%Xv|-m=V` zRCQsLO*zgdFbd zFTZehlcN&-hDpNv!OWy zOA#3_CsxpQsU==lG_lct8Xy&I7b>TC_lhEhTDd-ER5&9CM^JfsxLKmQO(0S-< zh|Yb3_$_o1qQ&(+WW;>P9Z%GJLiB;o@^LT32&lCniSnojEyMM`FlLopJgWK6 zOY<-WS9xS(b|SQ?3)Xl@L+oYwtkhuF+rBC&+)tmNoj3OUY{dU)Qkubua&*>p^tpF zK0>-*9Z~5MFXQ(FRo2@)=Zi;E3pZ^u$b#+Nr1RAR^_K)uBNLVdXwKJ8ny|k8Wdar^ zI?yDW;vg!{lZ6ud;cG%_~l!8SAfBS;P%l zw#X_?yKfn?o|4X_bj`UZ*&w5TP zk3x4udIIP;3bMn~z8S@=3w&4jj)*Zj7R#(Vvtc+t3!>rxqqPG2wDP1fS(&a#zY_!H zf*pa6I{;Ovy$ucUM(8lJctrXHqB0&ylt*O(3|(8y%mqJ@J?(DzQ|3c1_Up8_PY9Fs z3XmDdAF+L)WJ6GztgG*1jWsLE6&udzPO1smohn<()dPuQnw)bcOkj7zvr*C*BL945 z5$%)e1}_oenT(4bmh-k`%EGgeqFIXQ#jbbp3HFEOJX>_>RI z%~fXM@Yk5#)UjLeR9cut!wZX|wVcoP9!j5eH28n#NULQR`+stL4(tH?BODik9fhZI zL9S?e$3<(A0BtK(5H)QpM9dDYg{b@$B1T*18xZByLd3d2+aW5uA!1Zt9YlGDAYu-P zo&#c^LSWHKH<-O`2g+w0=_X%7l=!W7?UJ9t^#dPXMx?rE$WKC4u0h25LO0lZ01)c~ z8OfjoF{5b+X4ahG)b&y0rT9cIT6@dA496o8!p9R{UV-@fgu$4OYGQ1sZLomjGnv@My z0n+l?#EHZskNuz zsWdX9i_gG!Ks>KwH{of&xT9lU*0zVi50N@Y*P7v@5d(EBn3%kCrBf8Wr!B_WCD04d zQixc4nXoE1Jn$vJ)sPBphGfyz7$3?aZCjNa97Q_1>1o!Nu%J>Y5B;+TzrkB6s{#*Dh24o}xQ+n7tC zi!(VfUza$B6CYwmlRb{}_UiKXbKcv`MkB9|^G0|4@0dRbPd6URj2ie*#|->ODb^)E z%88S8iBsUIJf+K8@*81=*84% zoO^*;A^cL#Tc^ug&v_e|QGL~%w_BIDhx7Kev2;KhW>n!Ecu&On%&4Np@Fv6xW;6~9;pyCqI<}J8I%d?7SKz6> zZLJJ@5M8{36E#kxQK)6Mo7pI^easq|6@k6S>;yBKz0aAQ*0DxrUooT3opa&f9+>kC z=@GdOPc6L7j4HeUPrYkqHVIyIYGbfU2ke|wA@wi-9%)KfW>jZSczW|rU`C(%F|B^r zAc19&#GI~AhR;Im$BcXmJe3K|hQQB;r*@X>*gR$nbZiN;6*{((nQUXO*3PZQK~Ge; zh7+m7o8fyQ{)Jg*_+oe}b=d(ToIh>BGN8mW4C!<2 zEGM34M(<7+nEk>m5$p=H>&)m)`3AFF%;-htHnSFH)G2|FF1oK#1iRldh{0YiBj%Lm zk>;0v(xS6I%%;HmF$-We0W6SNFtbO%Ix-7kMr$Yxo=PM$I>-$$g8&kRh z(&wP!e#uu{GP=tGMWj%lH;c>e${;b_Bri8Ek@0o@ZfhSg&0}kX5cGwtb-GO4Gatlu z=F6;uj+vQRbS#*ejTvp`A6VT zfysbZ>pBakyF6ax8D!~$w#qd&xhk}$YVL+#1&a2Y@FmgeemzQz_Ew#_qFX?Ntvap2 zMm&7LA|Yr4P> z6cLBrhqFYYknzu$G}9k*464B_O5F#u!~hRD_=!cWZ8A6#RadA8yGyfFH0!(Ck;3UE zbIvfovK=YHo0B$f3(%zHUzeff$H2YBG2SVOiJ#TqJG@v?zdc=D`vZk zB86F~=1@_lz7Z~LcWIh?Z>aD!+~tJ&ZMX?z)W`>7=fQYDw;{z=s1TEUMmhQHjnrmuhiu?Nw|MA0TKYKp&o%1`t`@iR&dtUd> zlpME}Y_skA#uEO#VHiC@H_#Q-K79C4-?XHvHs+H)X)5^Au&~f}1t*mcj+K~ZvGttA zl4a2Ye3x2tm0{>hzCWn>dSp_z{_9SgUhfRo$w!-OAOF@$=}f;gv)X^YO&_%;>cWN@ zx>xhm@{l9SVmI{JZ&J&`df9?eZ37+p!xQ$`Er!uNNEe6oW4OHuuV?6cVg2kX06K_4 zTMHWnsm{8{;ZkeOI}TsFwa2~X73J;E23XM+L!VE4OwUb9lcq$dg0iGMU7b{7&n=pm zmtUx>(^AZmj?O^)Bu7$0LT6p#OwhwR2Doz?slK|evvZJPPt7lyFrhmtGn5{llq*#= zC{LeZSNHVHK8y6&Be8naa;urNG)k#(t)eS*PSZG@kQ;2K^zUw00q6-c%8*gO|27M=u|(^w|TQ%ZF^UTZ`C(yRxo?v)A)b7z3z1qp)dsC)X?( z)4>cd6BGj;Jc8aj4m}6F2};0Rc=Nz~umHRY7J@}!F<1hYg4e(@zrD&&%zuv?VO6o5wYqT9vMp;Z z{^_U(7c}g;;kuu6b%mcE(}WF;D0YL z1l~~a;{Q3OC;utZm5T$TK^_tOb0W- zOi&DFf!W|sU=DDB65ucf8ihuYdtI~|uM6g^>^4z)aw>B4hKDoAIZ{`p9E&^(Fxe2q zI3~N9<~pIQ14dOj%)q&+KGx^v)z)CtqRg=i*7`IWX^b=CjTy#7V*-McK(wi@_$VFH z&!NNCUDI)=Bh8dify!NNQCWKTm=R^mj=OtAsW^RmS%&QoIH7CZpuheCH?juT;mqUi ziFK41q4wCuLWP>?ISN(S)eU#PT?J}qjupGYU46GC%&dH+nZoX3RoZ$r+|~u*e&*#0 zOhlfU;6B|{)y*D9xz(4J4J*dA9{X+W;$~$jwYDI5_qA$$UFWBT*sLgpV3+!*{%%vU zJ1AZS+YMv*ua9r$JqNK@rhpt!U`}2CoYLE!&a&8O9lfEQ?J2m)b$7EN!3 zcAC7?+uBhcY4$QBm3j6+pelcxFTGm+2dta6**YD_@Mu>eNvxj}r>jTY(s8KCaq{*An_MXs+zX>v>Oz7bjjH9G?N0lHqa9LKb1}gZg8%vYa1C$hQEd0t7IIX(|NI1y3=rL6R#vKIo$YEescF!8UstD7mip73omz3SpZ^|GG3 zEnROs5U%qt2XH^QXJaF3v3wULN(IJ#h<d}1;2&Bfas zzQM3Lc!TkH>CkH=u2MWsV!l@}@f`x^nu$wo%CuhX?fW#loVD>Ci@6J&5dD?pbKsp5 z&4)5R#;brG&GegIaqXDvEhrj%GVB08;B7$90X74seSlsv;QVFWAwZA!z8^4E1A46Q zQ^2^>fF9@USAgC(0A6c@U3{djV0KkdIO8=mK1+O&bqj;F9N3ffF2ii zt>^$4^f(3$D3Bt><8!x}c=6)#cn9dF$UBP1kk0suFpTa-7cmoH)-61^;&p`AiP1>u z;<4BVUymX0s}J3L&DBpLp05}20yHm~DIRMd0L_sfA|7w6Cp6Pb_2NcIT#k5r91fGX zJn?uA-`X9VBNN0-g*g$LX});W3!ojy7l}6%dNDN9cJZipKyxg2iq{!>m&BbEk6ltD z-q*87faN9t z!{tdm@a>K335`A8W%L)5Z5{|%;Rx~AxKV&!F5t;*Xda-)w;6ijfcrDkIN-g=cxYV2 zC=ieRTnu>b9FOO!TP!7F&i9yg8_5Fk7Kzs!`BcEP1b8p96q*+)6^}Dz72poLMm+Yy zc3=g2#bfVo)enAd(q$VIud*1hX4c4e;bq8|gOOkbSP6KQGN1w8>Ko}%x7#-5o0j+O zoR{Igu@k(uKQmXkc(>jighTcYptm3JCOC7-0lf-9j}3kgu)!YzdR#b_fN|Bp8+R0% zaVN#&JH=tZxKkWrZ{X)J7|1P$9_LyOVBk66jr$s!ahJqnPyG!r?y`71{tplfu8YS; zUjaOJN4)k%8Xi?B@Z`HufyDQU2^Y8ckUQ;33n8(q=EH3F8mmHT=e*O=1&?0(jvt->tJEC|rle z$M}zUoE7~4h$#^F%*!wZLG#iL#iQQ@nv=Mxcx+BIG@H{#JT@n$&T|>D^~^X4Ocale z=?KkhCyU36^nq@Vysvo4&>_%Fnc`6ofMx>+iI)gHSmN?Mo{M4lLqYbljvDMa0>n%7W8tE#e4m2cN!)s6M?$Y6KF7yh_yG3giqT5)* zs?4D(!1Ac*zW9=Ax&wcJ@;@5mhV%jN^023Am~G;*RkxryaJR+dpj)t^%|h;roMq0+ zJ94hSc(9BBXb19O@t%ebg=UJjV(s(fIlv)itOO2+7bjiitAS&#mQ^WD*1S=>D$)qtu2De4^`ozSkPs-~BE%Ex`Chw2~D9_{A% mSn!*B>~?Rj+qtle7if$6%IUi%R-q(=;C2mGGye+((BTyT diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index cde1589ec4dfe04276c927fac53eb7680b3533ae..96e785575952477cfdb387dbc63f29b84143a5c2 100644 GIT binary patch delta 1707 zcmbVMO-vI(82z?jiDF5iMHUy@&9(s{wH+W7(SuqIrlKg31dKlog(8>=r7VV+C^r*{ zit_2jlO$e^CaVb=_25D6!JB#$5^rLnCSE*v@SBCY%XZa-Y<9D|@6G$(d^2zEB(Gl+ z9!8y>CTN3Z*rDJ2y#=Be54LC*oKKy2%PVgffDB}?+!eqcpV#=R>VPrG!Z}EQO3w_0 z;SbYLgs>6PGC4A#LxiOvWk&Il zhNnT|rHOxj4cjXz+96kmVB5P~orEvSV)(AeJ=ajYKT8S|r8qpy0gNiU-9l4h1;m&--nn z3TH_rOp3hfltC|9#c)Zi6cp?ZR%voTkPJe_Zxsz;-f{U(A)B=^h_$2vas(3pX$KmqLoLd^v zkt96_aaKH_o9CKKV!a^aDVJa9*Dks$ZH;KTx?KV`2Fu9h-haBJR{g~#Z{qq~a!nhT z1xCy+V^)`1JUHec`-MQRE-pw-u+KVzmOQCn(LsJE+OiMY=FSW`W1$F)S@6V+OonCloZg-g z2csdMr9eFH5YBXaz=@w$$m&uejY|v5wl3eeGrTgFV3Ap~|g>@5k&F Z`%KQ?kn@vA+)3OM^8N?bZiHrve*+X!f3E-l delta 281 zcmeC{Wt^3?!HiANfWeu;n8BREjKPG#g28~nWOAUG>E=4N9c+`oC`e3p;TM^_MqOre zoq!l47PZ=X(vuGfI&DtS69GxPpc=I~P;8tabSubmitInfo = (gcnew System::Windows::Forms::TabPage()); this->gboxPurpose = (gcnew System::Windows::Forms::GroupBox()); this->gboxPurposeNand = (gcnew System::Windows::Forms::GroupBox()); - this->rPurposeNandShop = (gcnew System::Windows::Forms::RadioButton()); - this->rPurposeNandDSCentre = (gcnew System::Windows::Forms::RadioButton()); - this->rPurposeNandTouchTryDS = (gcnew System::Windows::Forms::RadioButton()); - this->rPurposeZone = (gcnew System::Windows::Forms::RadioButton()); this->rPurposeDSiWare = (gcnew System::Windows::Forms::RadioButton()); this->tboxPurposeOther = (gcnew System::Windows::Forms::TextBox()); this->rPurposeOther = (gcnew System::Windows::Forms::RadioButton()); this->gboxPurposeCard = (gcnew System::Windows::Forms::GroupBox()); - this->rPurposeCardDSCentre = (gcnew System::Windows::Forms::RadioButton()); this->rPurposeCardProduction = (gcnew System::Windows::Forms::RadioButton()); this->rPurposeCardTouchTryDS = (gcnew System::Windows::Forms::RadioButton()); this->rPurposeCardDistribution = (gcnew System::Windows::Forms::RadioButton()); @@ -3893,62 +3888,11 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; this->gboxPurposeNand->AccessibleName = nullptr; resources->ApplyResources(this->gboxPurposeNand, L"gboxPurposeNand"); this->gboxPurposeNand->BackgroundImage = nullptr; - this->gboxPurposeNand->Controls->Add(this->rPurposeNandShop); - this->gboxPurposeNand->Controls->Add(this->rPurposeNandDSCentre); - this->gboxPurposeNand->Controls->Add(this->rPurposeNandTouchTryDS); - this->gboxPurposeNand->Controls->Add(this->rPurposeZone); this->gboxPurposeNand->Controls->Add(this->rPurposeDSiWare); this->gboxPurposeNand->Font = nullptr; this->gboxPurposeNand->Name = L"gboxPurposeNand"; this->gboxPurposeNand->TabStop = false; // - // rPurposeNandShop - // - this->rPurposeNandShop->AccessibleDescription = nullptr; - this->rPurposeNandShop->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeNandShop, L"rPurposeNandShop"); - this->rPurposeNandShop->BackgroundImage = nullptr; - this->rPurposeNandShop->Font = nullptr; - this->rPurposeNandShop->Name = L"rPurposeNandShop"; - this->rPurposeNandShop->UseVisualStyleBackColor = true; - this->rPurposeNandShop->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandShop_CheckedChanged); - // - // rPurposeNandDSCentre - // - this->rPurposeNandDSCentre->AccessibleDescription = nullptr; - this->rPurposeNandDSCentre->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeNandDSCentre, L"rPurposeNandDSCentre"); - this->rPurposeNandDSCentre->BackgroundImage = nullptr; - this->rPurposeNandDSCentre->Font = nullptr; - this->rPurposeNandDSCentre->Name = L"rPurposeNandDSCentre"; - this->rPurposeNandDSCentre->TabStop = true; - this->rPurposeNandDSCentre->UseVisualStyleBackColor = true; - this->rPurposeNandDSCentre->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandDSCentre_CheckedChanged); - // - // rPurposeNandTouchTryDS - // - this->rPurposeNandTouchTryDS->AccessibleDescription = nullptr; - this->rPurposeNandTouchTryDS->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeNandTouchTryDS, L"rPurposeNandTouchTryDS"); - this->rPurposeNandTouchTryDS->BackgroundImage = nullptr; - this->rPurposeNandTouchTryDS->Font = nullptr; - this->rPurposeNandTouchTryDS->Name = L"rPurposeNandTouchTryDS"; - this->rPurposeNandTouchTryDS->TabStop = true; - this->rPurposeNandTouchTryDS->UseVisualStyleBackColor = true; - this->rPurposeNandTouchTryDS->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandTouchTryDS_CheckedChanged); - // - // rPurposeZone - // - this->rPurposeZone->AccessibleDescription = nullptr; - this->rPurposeZone->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeZone, L"rPurposeZone"); - this->rPurposeZone->BackgroundImage = nullptr; - this->rPurposeZone->Font = nullptr; - this->rPurposeZone->Name = L"rPurposeZone"; - this->rPurposeZone->TabStop = true; - this->rPurposeZone->UseVisualStyleBackColor = true; - this->rPurposeZone->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeZone_CheckedChanged); - // // rPurposeDSiWare // this->rPurposeDSiWare->AccessibleDescription = nullptr; @@ -3987,7 +3931,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; this->gboxPurposeCard->AccessibleName = nullptr; resources->ApplyResources(this->gboxPurposeCard, L"gboxPurposeCard"); this->gboxPurposeCard->BackgroundImage = nullptr; - this->gboxPurposeCard->Controls->Add(this->rPurposeCardDSCentre); this->gboxPurposeCard->Controls->Add(this->rPurposeCardProduction); this->gboxPurposeCard->Controls->Add(this->rPurposeCardTouchTryDS); this->gboxPurposeCard->Controls->Add(this->rPurposeCardDistribution); @@ -3996,18 +3939,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; this->gboxPurposeCard->Name = L"gboxPurposeCard"; this->gboxPurposeCard->TabStop = false; // - // rPurposeCardDSCentre - // - this->rPurposeCardDSCentre->AccessibleDescription = nullptr; - this->rPurposeCardDSCentre->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeCardDSCentre, L"rPurposeCardDSCentre"); - this->rPurposeCardDSCentre->BackgroundImage = nullptr; - this->rPurposeCardDSCentre->Font = nullptr; - this->rPurposeCardDSCentre->Name = L"rPurposeCardDSCentre"; - this->rPurposeCardDSCentre->TabStop = true; - this->rPurposeCardDSCentre->UseVisualStyleBackColor = true; - this->rPurposeCardDSCentre->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardDSCentre_CheckedChanged); - // // rPurposeCardProduction // this->rPurposeCardProduction->AccessibleDescription = nullptr; @@ -4734,27 +4665,17 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; // イベントが発生しないようにイベントを無効にする this->rPurposeCardProduction->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardProduction_CheckedChanged); this->rPurposeCardTouchTryDS->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardTouchTryDS_CheckedChanged); - this->rPurposeCardDSCentre->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardDSCentre_CheckedChanged); this->rPurposeCardDistribution->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardDistribution_CheckedChanged); this->rPurposeCardKiosk->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardKiosk_CheckedChanged); this->rPurposeDSiWare->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeDSiWare_CheckedChanged); - this->rPurposeNandTouchTryDS->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeNandTouchTryDS_CheckedChanged); - this->rPurposeNandDSCentre->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeNandDSCentre_CheckedChanged); - this->rPurposeNandShop->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeNandShop_CheckedChanged); - this->rPurposeZone->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeZone_CheckedChanged); this->rPurposeOther->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeOther_CheckedChanged); // いったんすべてチェックを外す this->rPurposeCardProduction->Checked = false; this->rPurposeCardTouchTryDS->Checked = false; - this->rPurposeCardDSCentre->Checked = false; this->rPurposeCardDistribution->Checked = false; this->rPurposeCardKiosk->Checked = false; this->rPurposeDSiWare->Checked = false; - this->rPurposeNandTouchTryDS->Checked = false; - this->rPurposeNandDSCentre->Checked = false; - this->rPurposeNandShop->Checked = false; - this->rPurposeZone->Checked = false; this->rPurposeOther->Checked = false; // 選択されたもののみチェックする @@ -4774,14 +4695,9 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; // イベントを有効にする this->rPurposeCardProduction->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardProduction_CheckedChanged); this->rPurposeCardTouchTryDS->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardTouchTryDS_CheckedChanged); - this->rPurposeCardDSCentre->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardDSCentre_CheckedChanged); this->rPurposeCardDistribution->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardDistribution_CheckedChanged); this->rPurposeCardKiosk->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardKiosk_CheckedChanged); this->rPurposeDSiWare->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeDSiWare_CheckedChanged); - this->rPurposeNandTouchTryDS->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandTouchTryDS_CheckedChanged); - this->rPurposeNandDSCentre->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandDSCentre_CheckedChanged); - this->rPurposeNandShop->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandShop_CheckedChanged); - this->rPurposeZone->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeZone_CheckedChanged); this->rPurposeOther->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeOther_CheckedChanged); } //changePurposeForms() @@ -4800,7 +4716,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, }; @@ -4808,10 +4723,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; cli::array ^rbutsNand = gcnew cli::array { this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, }; if( this->hSrl->IsMediaNand ) // SRLが読み込まれていないときにはfalseであることが保証されている @@ -4847,22 +4758,12 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; // SRLのリージョンによって選択可能な項目をマスクする - // 日本リージョンでは"DS CENTRE"をなくす - if( this->hSrl->IsRegionJapan || this->hSrl->IsRegionAmerica ) - { - this->rPurposeCardDSCentre->Enabled = false; - this->rPurposeNandDSCentre->Enabled = false; - if( this->rPurposeCardDSCentre->Checked || this->rPurposeNandDSCentre->Checked ) - { - this->changePurposeForms(this->rPurposeOther); // わざわざこれを選ぶには特別な理由があるだろうから"その他"にチェックをつけかえる - } - } - // 北米/欧州リージョンでは"Touch!Try!DS"をなくす - if( this->hSrl->IsRegionAmerica || this->hSrl->IsRegionEurope || this->hSrl->IsRegionAustralia ) + // 北米/欧州/中国韓国リージョンでは"Touch!Try!DS"をなくす + if( this->hSrl->IsRegionAmerica || this->hSrl->IsRegionEurope || this->hSrl->IsRegionAustralia || + this->hSrl->IsRegionChina || this->hSrl->IsRegionKorea ) { this->rPurposeCardTouchTryDS->Enabled = false; - this->rPurposeNandTouchTryDS->Enabled = false; - if( this->rPurposeCardTouchTryDS->Checked || this->rPurposeNandTouchTryDS->Checked ) + if( this->rPurposeCardTouchTryDS->Checked ) { this->changePurposeForms(this->rPurposeOther); } @@ -4870,45 +4771,17 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; // リージョンがコンボボックスで変更されている場合があるのでそちらを優先する - // 日本/北米リージョンでは"DS CENTRE"をなくす - if( (this->combRegion->SelectedIndex == 0) || - (this->combRegion->SelectedIndex == 1) || - (this->combRegion->SelectedIndex == 5) || - (this->combRegion->SelectedIndex == 6) ) - { - this->rPurposeCardDSCentre->Enabled = false; - this->rPurposeNandDSCentre->Enabled = false; - if( this->rPurposeCardDSCentre->Checked || this->rPurposeNandDSCentre->Checked ) - { - this->changePurposeForms(this->rPurposeOther); - } - } - else - { - // 別のリージョンに変更されたときに enable にしなければならない - if( !System::String::IsNullOrEmpty(this->tboxFile->Text) && this->hSrl->IsMediaNand ) - { - this->rPurposeCardDSCentre->Enabled = false; - this->rPurposeNandDSCentre->Enabled = true; - } - else - { - this->rPurposeCardDSCentre->Enabled = true; - this->rPurposeNandDSCentre->Enabled = false; - } - } - - // 北米/欧州/豪州リージョンでは"Touch!Try!DS"をなくす + // 北米/欧州/豪州/中韓リージョンでは"Touch!Try!DS"をなくす if( (this->combRegion->SelectedIndex == 1) || (this->combRegion->SelectedIndex == 2) || (this->combRegion->SelectedIndex == 3) || (this->combRegion->SelectedIndex == 4) || (this->combRegion->SelectedIndex == 5) || - (this->combRegion->SelectedIndex == 6) ) + (this->combRegion->SelectedIndex == 6) || + (this->combRegion->DropDownStyle == System::Windows::Forms::ComboBoxStyle::DropDown)) // 中韓のときはドロップダウンではない { this->rPurposeCardTouchTryDS->Enabled = false; - this->rPurposeNandTouchTryDS->Enabled = false; - if( this->rPurposeCardTouchTryDS->Checked || this->rPurposeNandTouchTryDS->Checked ) + if( this->rPurposeCardTouchTryDS->Checked ) { this->changePurposeForms(this->rPurposeOther); } @@ -4918,12 +4791,10 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; if( !System::String::IsNullOrEmpty(this->tboxFile->Text) && this->hSrl->IsMediaNand ) { this->rPurposeCardTouchTryDS->Enabled = false; - this->rPurposeNandTouchTryDS->Enabled = true; } else { this->rPurposeCardTouchTryDS->Enabled = true; - this->rPurposeNandTouchTryDS->Enabled = false; } } } //maskPurposeForms() @@ -5999,14 +5870,9 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther }; this->tboxPurposeInError->Text = ""; @@ -6030,11 +5896,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; { this->changePurposeForms(this->rPurposeCardTouchTryDS); } - private: - System::Void rPurposeCardDSCentre_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeCardDSCentre); - } private: System::Void rPurposeCardDistribution_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { @@ -6050,26 +5911,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; { this->changePurposeForms(this->rPurposeDSiWare); } - private: - System::Void rPurposeNandTouchTryDS_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeNandTouchTryDS); - } - private: - System::Void rPurposeNandDSCentre_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeNandDSCentre); - } - private: - System::Void rPurposeNandShop_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeNandShop); - } - private: - System::Void rPurposeZone_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeZone); - } private: System::Void rPurposeOther_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx index cc69842..e5169e7 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -1208,7 +1208,7 @@ 4, 21 - 772, 468 + 772, 436 ROM蝓ｺ譛ｬ諠蝣ｱ @@ -1223,7 +1223,7 @@ 4, 21 - 772, 468 + 772, 436 TWL諡｡蠑ｵ諠蝣ｱ @@ -1256,7 +1256,7 @@ 4, 21 - 772, 468 + 772, 436 DSi繧ｦ繧ｧ繧｢諠蝣ｱ @@ -1379,7 +1379,7 @@ 4, 21 - 772, 468 + 772, 436 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ(邱ｨ髮蜿ｯ) @@ -1442,7 +1442,7 @@ 4, 21 - 772, 468 + 772, 436 謠仙ｺ諠蝣ｱ(隕∝･蜉) @@ -1453,35 +1453,14 @@ DSiWare (NAND繧｢繝励Μ) - - 152, 16 - - - DSi繧ｷ繝ｧ繝繝鈴堺ｿ｡逕ｨ菴馴ｨ鍋沿 - - - 123, 16 - - - DS CENTRE菴馴ｨ鍋沿 - - - 128, 16 - - - Touch!Try!DS菴馴ｨ鍋沿 - - - 97, 16 - - 120, 16 + 71, 16 - DSi繧ｦ繧ｧ繧｢荳闊ｬ雋ｩ螢ｲ + 荳闊ｬ雋ｩ螢ｲ - 349, 19 + 209, 19 58, 16 @@ -1492,17 +1471,11 @@ TWL繧ｫ繝ｼ繝峨い繝励Μ - - 123, 16 - - - DS CENTRE菴馴ｨ鍋沿 - - 137, 16 + 71, 16 - 繧ｲ繝ｼ繝繧ｫ繝ｼ繝我ｸ闊ｬ雋ｩ螢ｲ + 荳闊ｬ雋ｩ螢ｲ 128, 16 @@ -1547,7 +1520,7 @@ 4, 21 - 772, 468 + 772, 436 莨夂､ｾ諠蝣ｱ(隕∝･蜉) @@ -1562,7 +1535,7 @@ 4, 21 - 772, 468 + 772, 436 繧ｨ繝ｩ繝ｼ諠蝣ｱ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index 8855996..0efb577 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -146,9 +146,6 @@ 339, 203 - - 0 - 27, 45 @@ -198,7 +195,7 @@ gboxTWLExInfo - 349, 21 + 209, 21 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -227,9 +224,6 @@ labProductCode2Foreign - - gboxPurposeNand - 3 @@ -263,8 +257,8 @@ 33 - - gboxPurposeNand + + gboxPurposeCard Display Connection Icon On DSi Menu @@ -338,9 +332,6 @@ TWL - - - rPurposeNandTouchTryDS - Language @@ -409,7 +400,7 @@ gboxNandSize - 88, 172 + 228, 109 18, 214 @@ -448,7 +439,7 @@ Permit Tmp Jump Landing - 411, 218 + 411, 177 aged 6 or older @@ -477,6 +468,9 @@ 155, 203 + + tabTWLInfo + 7 @@ -552,8 +546,8 @@ 20 - - 3 + + gboxTWLExInfo gboxTitleID @@ -615,11 +609,14 @@ 1 + + 339, 100 + 0 - 408, 406 + 408, 401 True @@ -627,6 +624,9 @@ 497, 15 + + tabTWLInfo + 96, 21 @@ -654,8 +654,8 @@ 56, 20 - - 8 + + tabSubmitInfo 558, 54 @@ -693,9 +693,6 @@ labGameCode - - Demo for "Touch!Try!DS" - NAND Flash Memory @@ -723,8 +720,8 @@ 37, 15 - - 5 + + labSrlSize 0 @@ -759,6 +756,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gboxSrl + 223, 68 @@ -831,9 +831,6 @@ rPurposeCardProduction - - 8 - 71, 21 @@ -1125,8 +1122,8 @@ labSumSize2 - - gboxPerson1 + + 2 NoControl @@ -1137,8 +1134,8 @@ 21, 55 - - labSrlSize + + tabMain NoControl @@ -1161,9 +1158,6 @@ stripItemJapanese - - 157, 19 - 59, 15 @@ -1176,8 +1170,8 @@ gboxSrl - - 339, 100 + + 8 12 @@ -1314,9 +1308,6 @@ Orignal Size in ROM - - Demo for "Nintendo DSi Shop" - 5 @@ -1353,9 +1344,6 @@ 27 - - gboxSubmitWay - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1392,6 +1380,9 @@ 117, 18 + + tabTWLInfo + TWL Normal Region ROM Offset @@ -1446,8 +1437,8 @@ 55, 21 - - tboxSubBannerSizeFS + + 158, 21 202, 212 @@ -1465,7 +1456,7 @@ gboxTitleID - 3 + 2 11 @@ -1551,9 +1542,6 @@ gboxTWLExInfo - - gboxPurposeNand - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1566,11 +1554,11 @@ 2 - - 261, 21 + + ver.0.0 - - tabTWLInfo + + 2 7 @@ -1600,7 +1588,7 @@ True - 289, 195 + 289, 190 (Arbitrary) @@ -1665,9 +1653,6 @@ gboxExFlags - - rPurposeNandDSCentre - 73, 15 @@ -1750,7 +1735,7 @@ aged 3 or older - 772, 465 + 772, 433 gboxParental @@ -1779,9 +1764,6 @@ M (aged 17 or older) - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Begin @@ -1824,9 +1806,6 @@ 171, 80 - - 532, 188 - 23, 163 @@ -1863,9 +1842,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl - 119, 15 @@ -1884,6 +1860,9 @@ 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1902,18 +1881,12 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tboxMakerCode - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1977,15 +1950,15 @@ 13 - - True - Other ROM Spec. Name + + You must complete all items on this tab to create a submission checklist. + All ages @@ -2058,6 +2031,9 @@ tabSubmitInfo + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2073,11 +2049,8 @@ 17 - - End - - - gboxSrl + + aged 16 or older 261, 21 @@ -2124,9 +2097,6 @@ 268, 21 - - rPurposeNandShop - 19 @@ -2155,10 +2125,10 @@ 29, 15 - 4 + 0 - - 64Kbit EEPROM + + True rSubmitPost @@ -2208,9 +2178,6 @@ labFurigana2 - - ver.0.0 - 155, 232 @@ -2220,9 +2187,6 @@ NoControl - - 142, 18 - 5 @@ -2241,11 +2205,11 @@ gboxErrorTiming - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 142, 18 - 772, 465 + 772, 433 False @@ -2295,8 +2259,8 @@ 181, 21 - - gboxTWLExInfo + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 gboxNandSize @@ -2334,9 +2298,6 @@ 2 - - NoControl - tabRomInfo @@ -2406,8 +2367,8 @@ 37 - - 8 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 gboxForeign @@ -2428,7 +2389,7 @@ 13 - 74, 19 + 67, 19 tabErrorInfo @@ -2457,12 +2418,6 @@ gboxPerson2 - - 7 - - - gboxPerson2 - 12 @@ -2491,7 +2446,7 @@ tabSubmitInfo - 209, 146 + 209, 53 - @@ -2515,7 +2470,7 @@ 4 - 6, 95 + 6, 70 5 @@ -2580,9 +2535,6 @@ 100 - - 95, 83 - 123, 21 @@ -2608,7 +2560,7 @@ True - 24, 298 + 24, 279 tboxPublicSizeFS @@ -2757,17 +2709,17 @@ gboxPerson2 + + 40, 15 + 300 - - NoControl - aged 18 or older - 285, 164 + 285, 131 System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2775,9 +2727,6 @@ True - - 2 - 203, 101 @@ -2847,9 +2796,6 @@ 7 - - Demo for "DS CENTRE" - 9 @@ -2857,14 +2803,11 @@ 149, 52 - 772, 465 + 772, 433 Region and Rating Infomation - - 192, 19 - 115, 15 @@ -2898,9 +2841,6 @@ True - - True - False @@ -3048,6 +2988,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 49, 15 + labMultiForeign2 @@ -3066,8 +3009,8 @@ 84, 15 - - Nintendo Zone + + tabErrorInfo gboxProd @@ -3141,9 +3084,6 @@ ROM Info. - - tabMain - 45, 21 @@ -3183,15 +3123,9 @@ 10 - - gboxOtherSpec - True - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 11 @@ -3219,9 +3153,6 @@ gboxPerson2 - - True - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -3231,9 +3162,6 @@ 322, 151 - - 6, 70 - gboxPurposeCard @@ -3270,9 +3198,6 @@ True - - gboxPurposeNand - 2 @@ -3318,8 +3243,8 @@ 125, 19 - - tabErrorInfo + + 95, 83 192, 21 @@ -3432,9 +3357,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - aged 16 or older - tboxPrivateSizeFS @@ -3540,21 +3462,18 @@ 94, 15 + + 3 + 96, 21 - - gboxPurposeCard - E10+ (aged 10 or older) 37, 15 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - PEGI(General) @@ -3592,7 +3511,7 @@ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 233, 139 + 233, 134 3 @@ -3600,6 +3519,9 @@ False + + 6, 18 + File 3 @@ -3636,9 +3558,6 @@ True - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 261, 21 @@ -3717,9 +3636,6 @@ 0 - - 6 - 1 @@ -3831,6 +3747,9 @@ 100 + + aged 4 or older + labSDAccessRight @@ -3859,7 +3778,7 @@ 18, 228 - 4 + 3 100, 19 @@ -3877,10 +3796,10 @@ tabCompanyInfo - 780, 493 + 780, 461 - 737, 152 + 737, 131 gboxPerson2 @@ -3910,7 +3829,7 @@ True - 737, 152 + 737, 131 204, 23 @@ -3984,8 +3903,8 @@ gboxShared2Size - - NoControl + + tboxDepart1 4 @@ -3999,8 +3918,8 @@ gboxNandSize - - Launch Control On DSi Menu + + End 337, 221 @@ -4008,9 +3927,6 @@ gboxSrl - - True - 183, 97 @@ -4050,11 +3966,14 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 261, 21 + 2 - - tabTWLInfo + + gboxParental Mail @@ -4080,9 +3999,6 @@ 8 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - gboxProd @@ -4233,9 +4149,6 @@ tabSubmitInfo - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Right @@ -4255,13 +4168,13 @@ 85, 154 - 792, 566 + 792, 541 System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 447, 201 + 447, 160 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -4272,9 +4185,6 @@ rPurposeCardKiosk - - 157, 19 - 0 @@ -4305,9 +4215,6 @@ tabErrorInfo - - 86, 15 - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -4347,8 +4254,8 @@ tabRomEditInfo - - 2 + + 532, 188 49, 15 @@ -4362,8 +4269,8 @@ gboxShared2Size - - 1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 89, 21 @@ -4383,9 +4290,6 @@ 11 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 525, 167 @@ -4566,9 +4470,6 @@ 17, 88 - - rPurposeZone - 155, 261 @@ -4593,9 +4494,6 @@ All ages - - 35 - 6, 21 @@ -4627,7 +4525,7 @@ 9 - 772, 465 + 772, 433 ) @@ -4698,8 +4596,8 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gboxPerson1 + + 9 None @@ -4722,8 +4620,8 @@ 512Kbit EEPROM - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 64Kbit EEPROM gboxPerson1 @@ -4770,9 +4668,6 @@ 0 - - Demo for "DS CENTRE" - 4, 24 @@ -4833,9 +4728,6 @@ 78, 25 - - 106, 19 - 2 @@ -4849,13 +4741,13 @@ tboxPurposeInError - 6, 120 + 6, 95 Remarks - Enter any other related information - - tabSubmitInfo + + 5 42 @@ -4947,8 +4839,8 @@ gboxNandSize - - You must complete all items on this tab to create a submission checklist. + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 6 @@ -5010,6 +4902,9 @@ 77, 15 + + 10 + 2 @@ -5049,26 +4944,23 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gboxOtherSpec - - 6, 95 + + labProductCode 9 - - 9 + + gboxPerson1 14, 15 - - Right - - - tabTWLInfo + + 86, 15 labIsGameCardOn2 @@ -5085,8 +4977,8 @@ 155, 87 - - 30 + + 36 gboxPurposeNand @@ -5121,8 +5013,8 @@ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 49, 15 + + labTel1 labFax2 @@ -5148,9 +5040,6 @@ 1 - - gboxParental - 4 @@ -5190,9 +5079,6 @@ tabSubmitInfo - - tboxDepart1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -5322,8 +5208,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 40, 15 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -5334,8 +5220,8 @@ tboxSDAccessRight - - 10 + + gboxPerson2 gboxParental @@ -5355,9 +5241,6 @@ 32 - - 158, 21 - 4, 24 @@ -5491,7 +5374,7 @@ 188, 19 - 2 + 1 16 @@ -5526,11 +5409,14 @@ 201, 189 + + gboxPerson1 + 19 - - rPurposeCardDSCentre + + tboxAccessOther tboxSumSizeMB @@ -5701,7 +5587,7 @@ TWL - - 1 + 0 E(Pre-Check) @@ -5718,8 +5604,8 @@ 13 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Right 0 @@ -5739,11 +5625,8 @@ 24, 11 - - labProductCode - - 22, 280 + 22, 261 True @@ -5772,9 +5655,6 @@ 74, 15 - - tboxAccessOther - gboxParental @@ -5947,7 +5827,7 @@ 1 - 16, 173 + 234, 90 0 @@ -5955,9 +5835,6 @@ 3 - - 6, 70 - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6006,8 +5883,8 @@ 87, 15 - - 6, 121 + + 0 labNandSize @@ -6027,11 +5904,8 @@ 7 - - True - - - 5 + + tboxSubBannerSizeFS gboxPerson1 @@ -6096,9 +5970,6 @@ gboxLaunch - - NoControl - 5 @@ -6153,9 +6024,6 @@ labBracketR - - 6 - gboxForeign @@ -6294,8 +6162,8 @@ tboxProductName - - 6, 18 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6331,10 +6199,10 @@ True - 772, 465 + 772, 433 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabNandSizeInfo (Furigana) @@ -6442,7 +6310,7 @@ 158, 15 - 209, 146 + 209, 124 tabRomEditInfo @@ -6456,8 +6324,8 @@ tabRomEditInfo - - tabNandSizeInfo + + tboxMakerCode System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6510,18 +6378,12 @@ gboxTitleID - - gboxPurposeCard - CODEC Mode TitleID Low - - 0 - Media @@ -6547,7 +6409,7 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 273, 398 + 273, 393 stripItemSaveTemp @@ -6634,7 +6496,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 772, 465 + 772, 433 combPEGI_PRT @@ -6786,8 +6648,8 @@ 96, 21 - - 0 + + 35 gboxLaunch @@ -6801,8 +6663,8 @@ tabMain - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6 2 @@ -6865,7 +6727,7 @@ 11 - 124, 19 + 67, 19 True @@ -6972,9 +6834,6 @@ 78, 106 - - 0 - 24, 11 @@ -6990,9 +6849,6 @@ MiddleRight - - 36 - 554, 238 @@ -7038,9 +6894,6 @@ 89, 21 - - True - 4 @@ -7084,7 +6937,7 @@ stripItemMasterRom - DSiWare + Product System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -7092,9 +6945,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 160, 19 - Name @@ -7105,7 +6955,7 @@ 100 - 281, 412 + 281, 407 228, 164 @@ -7122,6 +6972,9 @@ True + + 30 + 550, 71 @@ -7159,7 +7012,7 @@ NoControl - 772, 465 + 772, 433 stripItemErrorListRead @@ -7188,8 +7041,8 @@ Set Back to Initial Settings - - labTel1 + + gboxSubmitWay System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -7212,6 +7065,9 @@ labTitleIDHi + + 5 + tboxSumSize @@ -7227,8 +7083,8 @@ 100, 21 - - aged 4 or older + + Launch Control On DSi Menu 200 @@ -7254,9 +7110,6 @@ 12 - - 6, 45 - True @@ -7359,11 +7212,11 @@ Foreign Ver. - - 2 + + 0 - Retail Game Card + Product Right @@ -7410,9 +7263,6 @@ True - - 3 - gboxExFlags diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 9f2cd0a..f1854bb 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -97,14 +97,9 @@ void Form1::setDeliverableProperties(void) { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther, }; for each( System::Windows::Forms::RadioButton ^r in rbuts ) @@ -342,14 +337,9 @@ System::Boolean Form1::checkDeliverableForms(void) { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther, }; this->checkRadioButton( rbuts, "LabelUsage" ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 620a3ce..5b33f94 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -484,14 +484,9 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->colWarnCause, L"colWarnCause"); resources->ApplyResources(this->rPurposeCardProduction, L"rPurposeCardProduction"); resources->ApplyResources(this->rPurposeCardTouchTryDS, L"rPurposeCardTouchTryDS"); - resources->ApplyResources(this->rPurposeCardDSCentre, L"rPurposeCardDSCentre"); resources->ApplyResources(this->rPurposeCardDistribution, L"rPurposeCardDistribution"); resources->ApplyResources(this->rPurposeCardKiosk, L"rPurposeCardKiosk"); resources->ApplyResources(this->rPurposeDSiWare, L"rPurposeDSiWare"); - resources->ApplyResources(this->rPurposeNandTouchTryDS, L"rPurposeNandTouchTryDS"); - resources->ApplyResources(this->rPurposeNandDSCentre, L"rPurposeNandDSCentre"); - resources->ApplyResources(this->rPurposeNandShop, L"rPurposeNandShop"); - resources->ApplyResources(this->rPurposeZone, L"rPurposeZone"); resources->ApplyResources(this->rPurposeOther, L"rPurposeOther"); resources->ApplyResources(this->gboxPurposeCard, L"gboxPurposeCard"); resources->ApplyResources(this->gboxPurposeNand, L"gboxPurposeNand"); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index 24f1222..0464a92 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -75,28 +75,18 @@ System::Void Form1::saveTmp( System::String ^filename ) { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther }; cli::array ^strs = gcnew cli::array { "CardProduction", "CardTouchTryDS", - "CardDSCentre", "CardDistribution", "CardKiosk", "DSiWare", - "NandTouchTryDS", - "NandDSCentre", - "NandShop", - "Zone", "Other" }; int i; @@ -228,28 +218,18 @@ void Form1::loadTmp( System::String ^filename ) { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther }; strs = gcnew cli::array { "CardProduction", "CardTouchTryDS", - "CardDSCentre", "CardDistribution", "CardKiosk", "DSiWare", - "NandTouchTryDS", - "NandDSCentre", - "NandShop", - "Zone", "Other" }; this->parseTmp( root, "/MasterEditorTWL/Form/Purpose", rbuts, strs ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp index c66911f..1b74b36 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp @@ -129,7 +129,6 @@ bool Form1::isDisplayOneGridErrorForPurpose( RCMrcError ^err ) if( ((err->Purpose & RCMrcError::PurposeType::Production) != (RCMrcError::PurposeType)0) && (this->rPurposeCardProduction->Checked || this->rPurposeDSiWare->Checked || - this->rPurposeNandShop || // ショップ配信体験版は通常版と同じ this->rPurposeOther->Checked) ) { is_display = true; @@ -145,13 +144,7 @@ bool Form1::isDisplayOneGridErrorForPurpose( RCMrcError ^err ) is_display = true; } if( ((err->Purpose & RCMrcError::PurposeType::DSStation) != (RCMrcError::PurposeType)0) && - (this->rPurposeCardTouchTryDS->Checked || this->rPurposeCardDSCentre->Checked || - this->rPurposeNandTouchTryDS->Checked || this->rPurposeNandDSCentre->Checked) ) - { - is_display = true; - } - if( ((err->Purpose & RCMrcError::PurposeType::Zone) != (RCMrcError::PurposeType)0) && - this->rPurposeZone->Checked ) + this->rPurposeCardTouchTryDS->Checked) { is_display = true; }