diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 25bdeee..a81c798 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index c6049c8..faa80b4 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 1180434..b1595e2 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 525e1ad..6dca2bb 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -611,6 +611,8 @@ private: System::Windows::Forms::GroupBox^ gboxLaunch; private: System::Windows::Forms::Label^ labConnectIcon; private: System::Windows::Forms::TextBox^ tboxConnectIcon; private: System::Windows::Forms::Label^ labIsGameCardOn2; +private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; + @@ -729,7 +731,6 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; System::IO::File::Delete( this->getSplitTadTmpFilename() ); } - // デフォルト値 this->IsSpreadSheet = true; this->IsReadOnly = false; @@ -820,10 +821,10 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; void InitializeComponent(void) { System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(Form1::typeid)); - 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^ 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()); this->tboxFile = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -1035,6 +1036,7 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; this->butSetBack = (gcnew System::Windows::Forms::Button()); this->tboxGuideRomEditInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxParental = (gcnew System::Windows::Forms::GroupBox()); + this->cboxIsUnnecessaryRating = (gcnew System::Windows::Forms::CheckBox()); this->tabSubmitInfo = (gcnew System::Windows::Forms::TabPage()); this->labProductNameLimit = (gcnew System::Windows::Forms::Label()); this->tboxGuideSubmitInfo = (gcnew System::Windows::Forms::TextBox()); @@ -2341,15 +2343,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}); - 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, + 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, 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; + 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; resources->ApplyResources(this->gridLibrary, L"gridLibrary"); this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->ReadOnly = true; @@ -2471,6 +2473,7 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // // gboxParental // + this->gboxParental->Controls->Add(this->cboxIsUnnecessaryRating); this->gboxParental->Controls->Add(this->labRegion); this->gboxParental->Controls->Add(this->combRegion); this->gboxParental->Controls->Add(this->labParentalRating); @@ -2492,6 +2495,13 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; this->gboxParental->Name = L"gboxParental"; this->gboxParental->TabStop = false; // + // cboxIsUnnecessaryRating + // + resources->ApplyResources(this->cboxIsUnnecessaryRating, L"cboxIsUnnecessaryRating"); + this->cboxIsUnnecessaryRating->Name = L"cboxIsUnnecessaryRating"; + this->cboxIsUnnecessaryRating->UseVisualStyleBackColor = true; + this->cboxIsUnnecessaryRating->CheckedChanged += gcnew System::EventHandler(this, &Form1::cboxIsUnnecessaryRating_CheckedChanged); + // // tabSubmitInfo // this->tabSubmitInfo->Controls->Add(this->labProductNameLimit); @@ -2641,15 +2651,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}); - 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, + 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, 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; + 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; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridWarn, L"gridWarn"); this->gridWarn->Name = L"gridWarn"; @@ -2684,22 +2694,22 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // // gridError // - dataGridViewCellStyle7->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle3->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; 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, + 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, 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; + 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; this->gridError->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridError, L"gridError"); this->gridError->Name = L"gridError"; @@ -3008,33 +3018,42 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; private: // --------------------------------------------------------------------- - // ペアレンタルコントロール設定は複雑なので別に切り出す + // レーティング設定は複雑なので別に切り出す // --------------------------------------------------------------------- // フォーム入力をSRLに反映させる - void setParentalSrlProperties(void); + void setRatingSrlProperties(void); // SRL情報をフォームに反映させる - void setParentalForms(void); + void setRatingForms(void); // リージョン情報からペアレンタルコントロールの編集可能団体をマスクする - void maskParentalForms(void); + void maskRatingForms(void); // フォーム入力が正しいか書き込み前チェック - void checkParentalForms( System::Boolean inRegion, System::Windows::Forms::ComboBox ^comb, System::String ^msg ); + void checkRatingForms( System::Boolean inRegion, System::Windows::Forms::ComboBox ^comb, System::String ^msg ); // クリアする - void clearParental( System::Windows::Forms::ComboBox ^comb ); + void clearRating( System::Windows::Forms::ComboBox ^comb ); // 編集できるようにする - void enableParental( System::Windows::Forms::ComboBox ^comb, - System::Windows::Forms::Label ^lab1, - System::Windows::Forms::Label ^lab2 ); + void enableRating( System::Windows::Forms::ComboBox ^comb, + System::Windows::Forms::Label ^lab1, + System::Windows::Forms::Label ^lab2 ); // 編集できなくする - void disableParental( System::Windows::Forms::ComboBox ^comb, - System::Windows::Forms::Label ^lab1, - System::Windows::Forms::Label ^lab2 ); + void disableRating( System::Windows::Forms::ComboBox ^comb, + System::Windows::Forms::Label ^lab1, + System::Windows::Forms::Label ^lab2 ); + + // 全団体を「レーティング表示不要」の設定/解除をする + void changeUnnecessaryRatingForms( System::Boolean bInitial ); + + // 「レーティング表示不要」と表示して編集できなくする + void unnecessaryRating( System::Windows::Forms::ComboBox ^comb ); + + // 「レーティング表示不要」表示を消して通常の設定に戻す + void necessaryRating( System::Windows::Forms::ComboBox ^comb, System::Boolean bInitial ); // ---------------------------------------------- // フォームのチェック @@ -3059,6 +3078,9 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // 提出確認書にフォームを反映 void setDeliverableProperties(void); + // 提出確認書に反映するレーティング(1団体)のフォームを返す + System::String^ setDeliverableRatingOgnProperties( System::Windows::Forms::ComboBox ^box ); + // 提出情報のフォームチェック System::Boolean checkDeliverableForms(void); @@ -3582,7 +3604,26 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; private: System::Void combRegion_SelectedIndexChanged(System::Object^ sender, System::EventArgs^ e) { - this->maskParentalForms(); + this->maskRatingForms(); + this->changeUnnecessaryRatingForms(false); // 一度コンボボックスがenableになるので再設定 + } + + private: + System::Void cboxIsUnnecessaryRating_CheckedChanged(System::Object^ sender, System::EventArgs^ e) + { + this->changeUnnecessaryRatingForms(false); + } + + private: + System::Void butSetBack_Click(System::Object^ sender, System::EventArgs^ e) + { + if( System::String::IsNullOrEmpty( this->tboxFile->Text ) ) + return; + + // 編集可能情報を読み込み時の設定に戻す + this->setRegionForms(); + this->setRatingForms(); + this->loadOtherForms(); // SRLに登録されていないROM仕様のフォームも戻す } private: @@ -3625,21 +3666,6 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; } } - private: - System::Void butSetBack_Click(System::Object^ sender, System::EventArgs^ e) - { - if( System::String::IsNullOrEmpty( this->tboxFile->Text ) ) - return; - - // 編集可能情報を読み込み時の設定に戻す - this->setRegionForms(); - this->setParentalForms(); - this->loadOtherForms(); // SRLに登録されていないROM仕様のフォームも戻す - } - - - - }; // enf of ref class Form1 } // end of namespace MasterEditorTWL diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx index b720b51..71c959a 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -329,10 +329,10 @@ 蟇ｩ譟ｻ荳ｭ - 82, 12 + 58, 12 - 繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ諠蝣ｱ + 繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ 47, 12 @@ -742,6 +742,12 @@ 縺薙ｮ繧ｿ繝悶ｮ蜷鬆逶ｮ縺ｸ縺ｮ蜈･蜉帙ｯ謠仙ｺ遒ｺ隱肴嶌縺翫ｈ縺ｳ繝槭せ繧ｿ繝ｼROM縺ｮ菴懈舌ｮ縺溘ａ縺ｫ蠢隕√〒縺吶<newline>縺薙ｌ繧峨ｮ諠蝣ｱ縺ｯ繝槭せ繧ｿ繝ｼROM縺ｮ菴懈先凾縺ｫROM蜀逋ｻ骭ｲ繝繝ｼ繧ｿ縺ｨ縺励※逋ｻ骭ｲ縺輔ｌ縺ｾ縺(縲後◎縺ｮ莉乏OM莉墓ｧ倥阪ｒ髯､縺)縲 + + 235, 16 + + + 繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ陦ｨ遉ｺ荳崎ｦ (繝繝ｼ繝ｫ鬘槭ｮ縺ｿ驕ｸ謚槫庄) + 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ諠蝣ｱ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index a8f20d8..946f3e4 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -140,210 +140,6 @@ 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 @@ -723,6 +519,30 @@ 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 @@ -828,78 +648,6 @@ 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 @@ -996,6 +744,30 @@ 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 @@ -1054,7 +826,7 @@ True - 101, 234 + 101, 252 34, 12 @@ -1075,13 +847,13 @@ gboxParental - 3 + 4 True - 12, 208 + 12, 226 134, 12 @@ -1102,13 +874,13 @@ gboxParental - 4 + 5 True - 69, 182 + 69, 200 76, 12 @@ -1129,13 +901,13 @@ gboxParental - 9 + 10 True - 69, 156 + 69, 174 77, 12 @@ -1156,13 +928,13 @@ gboxParental - 13 + 14 True - 102, 130 + 102, 148 27, 12 @@ -1183,13 +955,13 @@ gboxParental - 16 + 17 True - 102, 104 + 102, 122 35, 12 @@ -1210,13 +982,13 @@ gboxParental - 12 + 13 True - 101, 78 + 101, 96 36, 12 @@ -1237,7 +1009,7 @@ gboxParental - 7 + 8 G @@ -1255,7 +1027,7 @@ Rating Pending - 152, 232 + 152, 250 204, 20 @@ -1273,7 +1045,7 @@ gboxParental - 8 + 9 All ages @@ -1306,7 +1078,7 @@ Rating Pending - 152, 205 + 152, 223 10 @@ -1327,7 +1099,7 @@ gboxParental - 5 + 6 All ages @@ -1351,7 +1123,7 @@ Rating Pending - 152, 179 + 152, 197 204, 20 @@ -1369,7 +1141,7 @@ gboxParental - 10 + 11 All ages @@ -1393,7 +1165,7 @@ Rating Pending - 152, 153 + 152, 171 204, 20 @@ -1411,7 +1183,7 @@ gboxParental - 14 + 15 All ages @@ -1432,7 +1204,7 @@ Rating Pending - 152, 127 + 152, 145 204, 20 @@ -1450,7 +1222,7 @@ gboxParental - 15 + 16 All ages @@ -1474,7 +1246,7 @@ Rating Pending - 152, 101 + 152, 119 204, 20 @@ -1492,7 +1264,7 @@ gboxParental - 11 + 12 A (All ages) @@ -1513,7 +1285,7 @@ Rating Pending - 152, 75 + 152, 93 204, 20 @@ -1531,22 +1303,22 @@ gboxParental - 6 + 7 True - 201, 60 + 219, 78 - 99, 12 + 38, 12 2 - Rating Information + Rating labParentalRating @@ -1558,7 +1330,7 @@ gboxParental - 2 + 3 True @@ -1585,7 +1357,7 @@ gboxParental - 0 + 1 True @@ -1651,7 +1423,7 @@ gboxParental - 1 + 2 True @@ -1680,261 +1452,6 @@ 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 @@ -2424,257 +1941,32 @@ 18 - - labArbit2 + + False - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 377, 88 - - gboxPerson1 + + 347, 234 - - 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 - - labTel1 + + Contact2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gboxPerson2 - - 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 - - 2 + + 3 True @@ -3165,6 +2457,30 @@ 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 @@ -3336,90 +2652,6 @@ 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 @@ -3555,53 +2787,29 @@ 4 - - rSubmitHand + + 16, 258 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 346, 79 - - gboxSubmitWay + + 6 - - 0 + + Purpose - - rSubmitPost + + gboxUsage - - 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 - - 11 + + 8 True @@ -3657,6 +2865,30 @@ 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 @@ -4137,186 +3369,6 @@ 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 @@ -4653,6 +3705,30 @@ 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 @@ -4734,186 +3810,6 @@ 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 @@ -5256,6 +4152,30 @@ 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 @@ -5346,114 +4266,6 @@ 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 @@ -5649,161 +4461,29 @@ 6 - - labAppType + + 251, 211 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 280, 133 - - gboxTitleID - - + 0 - - labMedia + + Access Control - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gboxAccess - - 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 - - 7 + + 6 True @@ -6087,6 +4767,30 @@ 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 + + + 7 + True @@ -6168,36 +4872,6 @@ 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 @@ -6219,11 +4893,11 @@ Load a temporary info. saved previously - - 52, 20 + + 36, 20 - - Master + + File 288, 22 @@ -6252,11 +4926,11 @@ Make a middleware list only(HTML format) - - 65, 20 + + 52, 20 - - Language + + Master 119, 22 @@ -6270,6 +4944,57 @@ Japanese + + 65, 20 + + + Language + + + 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 + + + True + + + Publisher + + + True + + + Library Name + + + 337, 189 + + + 374, 145 + + + 36 + gridLibrary @@ -6282,6 +5007,18 @@ 0 + + 24, 11 + + + 687, 19 + + + 35 + + + This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. + tboxGuideRomInfo @@ -6321,6 +5058,21 @@ 0 + + True + + + 6, 50 + + + 200, 12 + + + 2 + + + Display Connection Icon On DSi Menu + labConnectIcon @@ -6333,6 +5085,15 @@ 0 + + 6, 65 + + + 192, 19 + + + 1 + tboxConnectIcon @@ -6444,444 +5205,6 @@ 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 - - - 2 - - - True - - - Publisher - - - True - - - Library Name - - - 337, 189 - - - 374, 145 - - - 36 - - - gridLibrary - - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 0 - - - 24, 11 - - - 687, 19 - - - 35 - - - This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. - - - tboxGuideRomInfo - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 1 - - - True - - - 6, 50 - - - 200, 12 - - - 2 - - - Display Connection Icon On DSi Menu - - - labConnectIcon - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxLaunch - - - 0 - - - 6, 65 - - - 192, 19 - - - 1 - - - tboxConnectIcon - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxLaunch - - - 1 - - - cboxIsUGC - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxOtherSpec - - - 0 - - - cboxIsPhotoEx - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxOtherSpec - - - 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 - True @@ -6936,6 +5259,30 @@ 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 @@ -6987,11 +5334,38 @@ 2 + + True + + + 116, 56 + + + 263, 16 + + + 38 + + + Unnecessary Rating (Available Only Tool App) + + + cboxIsUnnecessaryRating + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxParental + + + 0 + 24, 60 - 398, 272 + 398, 280 33 @@ -7011,6 +5385,30 @@ 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 @@ -7062,54 +5460,6 @@ 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 @@ -7164,6 +5514,54 @@ 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 @@ -7188,6 +5586,30 @@ 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 @@ -7215,54 +5637,6 @@ 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 @@ -7317,6 +5691,30 @@ 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 @@ -7479,6 +5877,51 @@ 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 6d1239d..d1077a7 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -216,89 +216,56 @@ void Form1::setDeliverableProperties(void) { this->hDeliv->hRegion = dynamic_cast(this->combRegion->SelectedItem); } - if( this->combCERO->SelectedIndex < 0 ) - { - if( this->isJapanese() == true ) - this->hDeliv->hCERO = gcnew System::String("不可"); - else - this->hDeliv->hCERO = gcnew System::String("Undefined"); - } - else - { - this->hDeliv->hCERO = dynamic_cast(this->combCERO->SelectedItem); - } - if( this->combESRB->SelectedIndex < 0 ) - { - if( this->isJapanese() == true ) - this->hDeliv->hESRB = gcnew System::String("不可"); - else - this->hDeliv->hESRB = gcnew System::String("Undefined"); - } - else - { - this->hDeliv->hESRB = dynamic_cast(this->combESRB->SelectedItem); - } - if( this->combUSK->SelectedIndex < 0 ) - { - if( this->isJapanese() == true ) - this->hDeliv->hUSK = gcnew System::String("不可"); - else - this->hDeliv->hUSK = gcnew System::String("Undefined"); - } - else - { - this->hDeliv->hUSK = dynamic_cast(this->combUSK->SelectedItem); - } - if( this->combPEGI->SelectedIndex < 0 ) - { - if( this->isJapanese() == true ) - this->hDeliv->hPEGI = gcnew System::String("不可"); - else - this->hDeliv->hPEGI = gcnew System::String("Undefined"); - } - else - { - this->hDeliv->hPEGI = dynamic_cast(this->combPEGI->SelectedItem); - } - if( this->combPEGI_PRT->SelectedIndex < 0 ) - { - if( this->isJapanese() == true ) - this->hDeliv->hPEGI_PRT = gcnew System::String("不可"); - else - this->hDeliv->hPEGI_PRT = gcnew System::String("Undefined"); - } - else - { - this->hDeliv->hPEGI_PRT = dynamic_cast(this->combPEGI_PRT->SelectedItem); - } - if( this->combPEGI_BBFC->SelectedIndex < 0 ) - { - if( this->isJapanese() == true ) - this->hDeliv->hPEGI_BBFC = gcnew System::String("不可"); - else - this->hDeliv->hPEGI_BBFC = gcnew System::String("Undefined"); - } - else - { - this->hDeliv->hPEGI_BBFC = dynamic_cast(this->combPEGI_BBFC->SelectedItem); - } - if( this->combOFLC->SelectedIndex < 0 ) - { - if( this->isJapanese() == true ) - this->hDeliv->hOFLC = gcnew System::String("不可"); - else - this->hDeliv->hOFLC = gcnew System::String("Undefined"); - } - else - { - this->hDeliv->hOFLC = dynamic_cast(this->combOFLC->SelectedItem); - } + this->hDeliv->hCERO = this->setDeliverableRatingOgnProperties( this->combCERO ); + this->hDeliv->hESRB = this->setDeliverableRatingOgnProperties( this->combESRB ); + this->hDeliv->hUSK = this->setDeliverableRatingOgnProperties( this->combUSK ); + this->hDeliv->hPEGI = this->setDeliverableRatingOgnProperties( this->combPEGI ); + this->hDeliv->hPEGI_PRT = this->setDeliverableRatingOgnProperties( this->combPEGI_PRT ); + this->hDeliv->hPEGI_BBFC = this->setDeliverableRatingOgnProperties( this->combPEGI_BBFC ); + this->hDeliv->hOFLC = this->setDeliverableRatingOgnProperties( this->combOFLC ); // SRLには登録されないROM仕様 this->hDeliv->IsUGC = this->cboxIsUGC->Checked; this->hDeliv->IsPhotoEx = this->cboxIsPhotoEx->Checked; } +// ---------------------------------------------- +// 提出確認書にレーティング(1団体)のフォームを反映 +// ---------------------------------------------- +System::String^ Form1::setDeliverableRatingOgnProperties( System::Windows::Forms::ComboBox ^box ) +{ + System::String ^str; + if( this->cboxIsUnnecessaryRating->Checked ) + { + if( box->Visible ) + { + str = System::String::Copy( box->Text ); // テキスト入力可になっているので取得できるはず + } + else // リージョンに含まれていない(コンボボックスが表示されていない)ときには不可とする + { + if( this->isJapanese() == true ) + str = gcnew System::String("不可"); + else + str = gcnew System::String("Undefined"); + } + } + else + { + if( box->SelectedIndex < 0 ) + { + if( this->isJapanese() == true ) + str = gcnew System::String("不可"); + else + str = gcnew System::String("Undefined"); + } + else + { + str = dynamic_cast(this->combCERO->SelectedItem); + } + } + return str; +} + // ---------------------------------------------- // マスタ書類情報(SRL影響なし)のフォームチェック // ---------------------------------------------- diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 20edf81..1d2c912 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -353,6 +353,7 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->butSetBack, L"butSetBack"); resources->ApplyResources(this->tboxGuideRomEditInfo, L"tboxGuideRomEditInfo"); resources->ApplyResources(this->gboxParental, L"gboxParental"); + resources->ApplyResources(this->cboxIsUnnecessaryRating, L"cboxIsUnnecessaryRating"); resources->ApplyResources(this->tabSubmitInfo, L"tabSubmitInfo"); resources->ApplyResources(this->labProductNameLimit, L"labProductNameLimit"); resources->ApplyResources(this->tboxGuideSubmitInfo, L"tboxGuideSubmitInfo"); @@ -388,9 +389,26 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) this->setSrlFormsTextBox(); } + // 「レーティング表示不要」にチェックが入っているときのみレーティングのコンボボックスのテキストを変更 + // (それ以外のときにはApplyResourcesで自動的に切り替わる) + if( this->cboxIsUnnecessaryRating->Checked ) + { + this->unnecessaryRating( this->combCERO ); + this->unnecessaryRating( this->combESRB ); + this->unnecessaryRating( this->combUSK ); + this->unnecessaryRating( this->combPEGI ); + this->unnecessaryRating( this->combPEGI_PRT ); + this->unnecessaryRating( this->combPEGI_BBFC ); + this->unnecessaryRating( this->combOFLC ); + } + // 複数行表示の改行を挿入 this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "", "\r\n" ); this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); + + // バージョンがなくなるので再設定 + System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly(); + this->labAssemblyVersion->Text = "ver." + this->getVersion(); } // end of file \ No newline at end of file diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp index 77b614f..28ab3c9 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp @@ -68,10 +68,6 @@ void Form1::setRegionSrlPropaties(void) } } -// --------------------------------------------------------------------- -// ペアレンタルコントロール設定は複雑なので別に切り出す -// --------------------------------------------------------------------- - // SRL情報をフォームに反映させる void Form1::setRegionForms(void) { @@ -97,12 +93,15 @@ void Form1::setRegionForms(void) index = 5; #endif this->combRegion->SelectedIndex = index; - this->maskParentalForms(); // ペアレンタルコントロール用フォームの表示/非表示切り替え + this->maskRatingForms(); // ペアレンタルコントロール用フォームの表示/非表示切り替え } +// --------------------------------------------------------------------- +// ペアレンタルコントロール設定は複雑なので別に切り出す +// --------------------------------------------------------------------- // フォーム入力をSRLに反映させる -void Form1::setParentalSrlProperties(void) +void Form1::setRatingSrlProperties(void) { // 各団体のフォーム入力を反映 this->hSrl->hArrayParentalIndex[ OS_TWL_PCTL_OGN_CERO ] = this->combCERO->SelectedIndex; @@ -112,11 +111,18 @@ void Form1::setParentalSrlProperties(void) this->hSrl->hArrayParentalIndex[ OS_TWL_PCTL_OGN_PEGI_PRT ] = this->combPEGI_PRT->SelectedIndex; this->hSrl->hArrayParentalIndex[ OS_TWL_PCTL_OGN_PEGI_BBFC ] = this->combPEGI_BBFC->SelectedIndex; this->hSrl->hArrayParentalIndex[ OS_TWL_PCTL_OGN_OFLC ] = this->combOFLC->SelectedIndex; -} //setParentalSrlProperties() + + // レーティング表示不要かどうかを設定 + this->hSrl->IsUnnecessaryRating = this->cboxIsUnnecessaryRating->Checked; +} //setRatingSrlProperties() // SRL内のペアレンタルコントロール情報を抜き出してフォームに反映させる -void Form1::setParentalForms(void) +void Form1::setRatingForms(void) { + // レーティング表示不要かどうかを判断 + this->cboxIsUnnecessaryRating->Checked = this->hSrl->IsUnnecessaryRating; + this->changeUnnecessaryRatingForms( true ); // 不要かどうかに応じてフォームを設定 + // 各団体のコンボボックスのインデックスを設定 this->combCERO->SelectedIndex = this->hSrl->hArrayParentalIndex[ OS_TWL_PCTL_OGN_CERO ]; this->combESRB->SelectedIndex = this->hSrl->hArrayParentalIndex[ OS_TWL_PCTL_OGN_ESRB ]; @@ -125,83 +131,108 @@ void Form1::setParentalForms(void) this->combPEGI_PRT->SelectedIndex = this->hSrl->hArrayParentalIndex[ OS_TWL_PCTL_OGN_PEGI_PRT ]; this->combPEGI_BBFC->SelectedIndex = this->hSrl->hArrayParentalIndex[ OS_TWL_PCTL_OGN_PEGI_BBFC ]; this->combOFLC->SelectedIndex = this->hSrl->hArrayParentalIndex[ OS_TWL_PCTL_OGN_OFLC ]; -} //setParentalForms() +} //setRatingForms() // リージョン情報からペアレンタルコントロールの編集可能団体をマスクする -void Form1::maskParentalForms(void) +void Form1::maskRatingForms(void) { - this->enableParental( this->combCERO, this->labCERO, nullptr ); - this->enableParental( this->combESRB, this->labESRB, nullptr ); - this->enableParental( this->combUSK, this->labUSK, nullptr ); - this->enableParental( this->combPEGI, this->labPEGI, nullptr ); - this->enableParental( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); - this->enableParental( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); - this->enableParental( this->combOFLC, this->labOFLC, nullptr ); + this->enableRating( this->combCERO, this->labCERO, nullptr ); + this->enableRating( this->combESRB, this->labESRB, nullptr ); + this->enableRating( this->combUSK, this->labUSK, nullptr ); + this->enableRating( this->combPEGI, this->labPEGI, nullptr ); + this->enableRating( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); + this->enableRating( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); + this->enableRating( this->combOFLC, this->labOFLC, nullptr ); switch( this->combRegion->SelectedIndex ) { case 0: // 日本 - this->enableParental( this->combCERO, this->labCERO, nullptr ); - this->disableParental( this->combESRB, this->labESRB, nullptr ); - this->disableParental( this->combUSK, this->labUSK, nullptr ); - this->disableParental( this->combPEGI, this->labPEGI, nullptr ); - this->disableParental( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); - this->disableParental( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); - this->disableParental( this->combOFLC, this->labOFLC, nullptr ); + this->enableRating( this->combCERO, this->labCERO, nullptr ); + this->disableRating( this->combESRB, this->labESRB, nullptr ); + this->disableRating( this->combUSK, this->labUSK, nullptr ); + this->disableRating( this->combPEGI, this->labPEGI, nullptr ); + this->disableRating( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); + this->disableRating( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); + this->disableRating( this->combOFLC, this->labOFLC, nullptr ); break; case 1: // 米国 - this->disableParental( this->combCERO, this->labCERO, nullptr ); - this->enableParental( this->combESRB, this->labESRB, nullptr ); - this->disableParental( this->combUSK, this->labUSK, nullptr ); - this->disableParental( this->combPEGI, this->labPEGI, nullptr ); - this->disableParental( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); - this->disableParental( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); - this->disableParental( this->combOFLC, this->labOFLC, nullptr ); + this->disableRating( this->combCERO, this->labCERO, nullptr ); + this->enableRating( this->combESRB, this->labESRB, nullptr ); + this->disableRating( this->combUSK, this->labUSK, nullptr ); + this->disableRating( this->combPEGI, this->labPEGI, nullptr ); + this->disableRating( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); + this->disableRating( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); + this->disableRating( this->combOFLC, this->labOFLC, nullptr ); break; case 2: // 欧州 - this->disableParental( this->combCERO, this->labCERO, nullptr ); - this->disableParental( this->combESRB, this->labESRB, nullptr ); - this->enableParental( this->combUSK, this->labUSK, nullptr ); - this->enableParental( this->combPEGI, this->labPEGI, nullptr ); - this->enableParental( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); - this->enableParental( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); - this->disableParental( this->combOFLC, this->labOFLC, nullptr ); + this->disableRating( this->combCERO, this->labCERO, nullptr ); + this->disableRating( this->combESRB, this->labESRB, nullptr ); + this->enableRating( this->combUSK, this->labUSK, nullptr ); + this->enableRating( this->combPEGI, this->labPEGI, nullptr ); + this->enableRating( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); + this->enableRating( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); + this->disableRating( this->combOFLC, this->labOFLC, nullptr ); break; case 3: // 豪州 - this->disableParental( this->combCERO, this->labCERO, nullptr ); - this->disableParental( this->combESRB, this->labESRB, nullptr ); - this->disableParental( this->combUSK, this->labUSK, nullptr ); - this->disableParental( this->combPEGI, this->labPEGI, nullptr ); - this->disableParental( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); - this->disableParental( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); - this->enableParental( this->combOFLC, this->labOFLC, nullptr ); + this->disableRating( this->combCERO, this->labCERO, nullptr ); + this->disableRating( this->combESRB, this->labESRB, nullptr ); + this->disableRating( this->combUSK, this->labUSK, nullptr ); + this->disableRating( this->combPEGI, this->labPEGI, nullptr ); + this->disableRating( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); + this->disableRating( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); + this->enableRating( this->combOFLC, this->labOFLC, nullptr ); break; case 4: // 欧州と豪州 - this->disableParental( this->combCERO, this->labCERO, nullptr ); - this->disableParental( this->combESRB, this->labESRB, nullptr ); - this->enableParental( this->combUSK, this->labUSK, nullptr ); - this->enableParental( this->combPEGI, this->labPEGI, nullptr ); - this->enableParental( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); - this->enableParental( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); - this->enableParental( this->combOFLC, this->labOFLC, nullptr ); + this->disableRating( this->combCERO, this->labCERO, nullptr ); + this->disableRating( this->combESRB, this->labESRB, nullptr ); + this->enableRating( this->combUSK, this->labUSK, nullptr ); + this->enableRating( this->combPEGI, this->labPEGI, nullptr ); + this->enableRating( this->combPEGI_PRT, this->labPEGI_PRT, nullptr ); + this->enableRating( this->combPEGI_BBFC, this->labPEGI_BBFC, nullptr ); + this->enableRating( this->combOFLC, this->labOFLC, nullptr ); break; // 全リージョンのときは何もdisableにしない default: break; } -} //maskParentalForms() +} //maskRatingForms() + +// 全団体を「レーティング表示不要」の設定/解除をする +void Form1::changeUnnecessaryRatingForms( System::Boolean bInitial ) +{ + if( this->cboxIsUnnecessaryRating->Checked ) + { + this->unnecessaryRating( this->combCERO ); // マスクは別のところでするのでここでは全団体を不要にしてもかまわない + this->unnecessaryRating( this->combESRB ); + this->unnecessaryRating( this->combUSK ); + this->unnecessaryRating( this->combPEGI ); + this->unnecessaryRating( this->combPEGI_PRT ); + this->unnecessaryRating( this->combPEGI_BBFC ); + this->unnecessaryRating( this->combOFLC ); + } + else + { + this->necessaryRating( this->combCERO, bInitial ); + this->necessaryRating( this->combESRB, bInitial ); + this->necessaryRating( this->combUSK, bInitial ); + this->necessaryRating( this->combPEGI, bInitial ); + this->necessaryRating( this->combPEGI_PRT, bInitial ); + this->necessaryRating( this->combPEGI_BBFC, bInitial ); + this->necessaryRating( this->combOFLC, bInitial ); + } +} // ペアレンタルコントロール関連のフォーム入力が正しいか書き込み前チェック -void Form1::checkParentalForms( System::Boolean inRegion, System::Windows::Forms::ComboBox ^comb, System::String ^msg ) +void Form1::checkRatingForms( System::Boolean inRegion, System::Windows::Forms::ComboBox ^comb, System::String ^msg ) { // リージョンに含まれていないとき: 0クリアが保証されるのでチェック必要なし if( !inRegion ) @@ -225,18 +256,17 @@ void Form1::checkParentalForms( System::Boolean inRegion, System::Windows::Forms msg + ": 審査中指定がされています。審査が決まりしだい、再提出してください。", "Parental Control", msg + ": Save ROM data as Game soft which needs rating examinination.", true, true ) ); } -} //checkParentalForms() - +} //checkRatingForms() // ペアレンタルコントロール情報をクリアする -void Form1::clearParental( System::Windows::Forms::ComboBox ^comb ) +void Form1::clearRating( System::Windows::Forms::ComboBox ^comb ) { comb->SelectedIndex = -1; // 空白にする } // ペアレンタルコントロール情報を編集できるようにする -void Form1::enableParental( System::Windows::Forms::ComboBox ^comb, +void Form1::enableRating( System::Windows::Forms::ComboBox ^comb, System::Windows::Forms::Label ^lab1, System::Windows::Forms::Label ^lab2 ) { @@ -250,11 +280,11 @@ void Form1::enableParental( System::Windows::Forms::ComboBox ^comb, } // ペアレンタルコントロール情報を編集できなくする -void Form1::disableParental( System::Windows::Forms::ComboBox ^comb, +void Form1::disableRating( System::Windows::Forms::ComboBox ^comb, System::Windows::Forms::Label ^lab1, System::Windows::Forms::Label ^lab2 ) { - this->clearParental( comb ); + this->clearRating( comb ); comb->Enabled = false; comb->Visible = false; lab1->Visible = false; @@ -264,4 +294,33 @@ void Form1::disableParental( System::Windows::Forms::ComboBox ^comb, } } +// 「レーティング表示不要」と表示して編集できなくする +void Form1::unnecessaryRating( System::Windows::Forms::ComboBox ^comb ) +{ + comb->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDown; // 一時的にテキスト入力可能にする + comb->SelectedIndex = -1; // 何も選択されていないとみなす + System::String ^msg; + if( this->isJapanese() ) + { + msg = gcnew System::String( "レーティング表示不要(全年齢)" ); + } + else + { + msg = gcnew System::String( "Unnecessary Rating(All ages)" ); + } + comb->Text = msg; + comb->Enabled = false; // 編集不可能にする +} + +// 「レーティング表示不要」表示を消して通常の設定に戻す +void Form1::necessaryRating( System::Windows::Forms::ComboBox ^comb, System::Boolean bInitial ) +{ + comb->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList; + if( !bInitial ) + { + comb->SelectedIndex = -1; // 読み込みの場合にはコンボボックスを初期化しない(せっかく読み込んだ情報を消してしまうため) + } + comb->Enabled = true; // 編集不可能にする +} + // end of file \ No newline at end of file diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 662adad..8ab9ea0 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -35,7 +35,7 @@ void Form1::setSrlProperties(void) this->setRegionSrlPropaties(); // ペアレンタルコントロール - this->setParentalSrlProperties(); + this->setRatingSrlProperties(); } //setSrlProperties() // ---------------------------------------------- @@ -210,7 +210,7 @@ void Form1::setSrlForms(void) // 編集可能情報 this->setRegionForms(); - this->setParentalForms(); // ペアレンタルコントロール関連 + this->setRatingForms(); // ペアレンタルコントロール関連 // ROMヘッダには関係ないが // NANDアプリのときにバックアップメモリを自動的に「なし」にしておく @@ -341,13 +341,24 @@ System::Boolean Form1::checkSrlForms(void) } // ペアレンタルコントロール - this->checkParentalForms( bJapan, this->combCERO, this->labCERO->Text ); - this->checkParentalForms( bAmerica, this->combESRB, this->labESRB->Text ); - this->checkParentalForms( bEurope, this->combUSK, this->labUSK->Text ); - this->checkParentalForms( bEurope, this->combPEGI, this->labPEGI->Text ); - this->checkParentalForms( bEurope, this->combPEGI_PRT, this->labPEGI_PRT->Text ); - this->checkParentalForms( bEurope, this->combPEGI_BBFC, this->labPEGI_BBFC->Text ); - this->checkParentalForms( bAustralia, this->combOFLC, this->labOFLC->Text ); + if( this->cboxIsUnnecessaryRating->Checked ) + { + this->hWarnList->Add( gcnew RCMrcError( + "ペアレンタルコントロール情報", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, + "レーティング表示が不要であると指定されています。この指定は、ソフトがゲームでないツール類のときのみ選択可能です。レーティング表示が不要であるかどうかは弊社窓口にご相談ください。", + "Parental Control", + "In your selection, rating is unnecessary. This selection is available for only tool application which is not game. Please contact Nintendo for checking validation of this selection", true, true ) ); + } + else + { + this->checkRatingForms( bJapan, this->combCERO, this->labCERO->Text ); + this->checkRatingForms( bAmerica, this->combESRB, this->labESRB->Text ); + this->checkRatingForms( bEurope, this->combUSK, this->labUSK->Text ); + this->checkRatingForms( bEurope, this->combPEGI, this->labPEGI->Text ); + this->checkRatingForms( bEurope, this->combPEGI_PRT, this->labPEGI_PRT->Text ); + this->checkRatingForms( bEurope, this->combPEGI_BBFC, this->labPEGI_BBFC->Text ); + this->checkRatingForms( bAustralia, this->combOFLC, this->labOFLC->Text ); + } // ひととおりエラー登録をした後で // SRLバイナリに影響を与えるエラーが存在するかチェック diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index 42c50af..d56ec02 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -244,7 +244,7 @@ void Form1::loadTmp( System::String ^filename ) this->parseTmp( root, "/MasterEditorTWL/Form/IsUGC", this->cboxIsUGC ); this->parseTmp( root, "/MasterEditorTWL/Form/IsPhotoEx", this->cboxIsPhotoEx ); - this->maskParentalForms(); // ペアレンタルコントロール情報をリージョンに合わせる + this->maskRatingForms(); // ペアレンタルコントロール情報をリージョンに合わせる } //loadTmp() diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index 684688e..540cd9d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -480,12 +480,7 @@ ECSrlResult RCSrl::setRomHeader(void) // ROMヘッダの[0,0x160)の領域はRead Onlyで変更しない - // いくつかのフラグをROMヘッダに反映 - this->pRomHeader->s.exFlags.agree_EULA = (this->IsEULA == true)?1:0; - this->pRomHeader->s.exFlags.WiFiConnectionIcon = (this->IsWiFiIcon == true)?1:0; - this->pRomHeader->s.exFlags.DSWirelessIcon = (this->IsWirelessIcon == true)?1:0; - - // レーティング + // リージョン u32 map = 0; if( this->IsRegionJapan == true ) { map |= METWL_MASK_REGION_JAPAN; } if( this->IsRegionAmerica == true ) { map |= METWL_MASK_REGION_AMERICA; } @@ -501,8 +496,8 @@ ECSrlResult RCSrl::setRomHeader(void) #endif this->pRomHeader->s.card_region_bitmap = map; - // ペアレンタルコントロール - this->setParentalControlHeader(); + // レーティング + this->setRatingRomHeader( map ); // ROMヘッダのCRCと署名を更新する result = this->calcRomHeaderCRC(); @@ -520,27 +515,38 @@ ECSrlResult RCSrl::setRomHeader(void) } // ECSrlResult RCSrl::setRomHeader(void) // ペアレンタルコントロールのプロパティをROMヘッダに反映させる -void RCSrl::setParentalControlHeader(void) +void RCSrl::setRatingRomHeader( u32 region ) { - int i; - for( i=0; i < PARENTAL_CONTROL_INFO_SIZE; i++ ) + // リージョンに含まれない団体はすべて「不可」(未定義) + int j; + for( j=0; j < PARENTAL_CONTROL_INFO_SIZE; j++ ) { - u8 rating; + this->pRomHeader->s.parental_control_rating_info[j] = 0x00; + } + + // 「レーティング表示不要」フラグを立てる + this->pRomHeader->s.unnecessary_rating_display = (this->IsUnnecessaryRating == true)?1:0; + + // リージョンに含まれる団体のみを設定 + System::Collections::Generic::List ^ognlist = MasterEditorTWL::getOgnListInRegion( region ); + for each( int ogn in ognlist ) + { + u8 rating = 0; if( this->IsUnnecessaryRating ) { rating = OS_TWL_PCTL_OGNINFO_ENABLE_MASK | 0; // レーティング表示が不要のときは「全年齢」と同じ値にする } else { - cli::array ^ages = MasterEditorTWL::getOgnRatingAges( i ); // 設定可能年齢リストを取得 + cli::array ^ages = MasterEditorTWL::getOgnRatingAges( ogn ); // 設定可能年齢リストを取得 - if( this->hArrayParentalIndex[i] < 0 ) // 未定義 + if( this->hArrayParentalIndex[ ogn ] < 0 ) // 未定義 { rating = 0x00; } else { - int index = this->hArrayParentalIndex[i]; + int index = this->hArrayParentalIndex[ ogn ]; if( index == ages->Length ) // 審査中 { rating = OS_TWL_PCTL_OGNINFO_ENABLE_MASK | OS_TWL_PCTL_OGNINFO_ALWAYS_MASK; @@ -551,7 +557,7 @@ void RCSrl::setParentalControlHeader(void) } } } - this->pRomHeader->s.parental_control_rating_info[i] = rating; + this->pRomHeader->s.parental_control_rating_info[ ogn ] = rating; } } diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h index 4f79798..1519e9f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h @@ -369,7 +369,7 @@ namespace MasterEditorTWL void setUnnecessaryRatingInfo( u32 region ); // レーティング情報が不要かどうかを取得(エラー情報も登録) void setRatingInfo( u32 region ); // リージョンに含まれる団体のレーティングを取得 void setOneRatingOrgInfo( int ogn ); // 1つの団体のレーティングを取得(エラー情報も登録) - void setParentalControlHeader(void); // ROMヘッダにフィールドの値を反映させる + void setRatingRomHeader( u32 region ); // ROMヘッダにフィールドの値を反映させる // ROMヘッダの更新 ECSrlResult calcRomHeaderCRC(void); // ROMヘッダのCRCを再計算