diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index 987dc059..046dfc85 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index c290af95..e323653f 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 630dcec1..04a4ee41 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index 093d761f..63a114cf 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -44,6 +44,9 @@ namespace MasterEditorTWL { System::Collections::Generic::List ^hErrorList; System::Collections::Generic::List ^hWarnList; + // SRLに登録されないROM仕様を読み込み時の状態に戻せる仕組み + System::Boolean ^hIsCheckedUGC; // 読み込み時にチェックされていたか + System::Boolean ^hIsCheckedPhotoEx; // VC自動追加フィールド private: System::Windows::Forms::GroupBox^ gboxCRC; @@ -583,6 +586,11 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemMiddlewareXml; private: System::Windows::Forms::ToolStripMenuItem^ stripItemMiddlewareHtml; private: System::Windows::Forms::ToolStripSeparator^ stripItemSepFile1; private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; +private: System::Windows::Forms::GroupBox^ gboxOtherSpec; +private: System::Windows::Forms::CheckBox^ cboxIsUGC; +private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx; + + @@ -670,6 +678,8 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->hErrorList->Clear(); this->hWarnList = gcnew System::Collections::Generic::List(); this->hWarnList->Clear(); + this->hIsCheckedUGC = gcnew System::Boolean(false); + this->hIsCheckedPhotoEx = gcnew System::Boolean(false); // バージョン情報を表示 //this->labAssemblyVersion->Text = System::Windows::Forms::Application::ProductVersion; @@ -701,8 +711,8 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; } // 複数行表示したいが初期値で設定できないのでここで設定 - this->tboxGuideRomEditInfo->Text = "このタブの情報は提出確認書およびマスターROMの作成に必要です。編集してください。"; - this->tboxGuideRomEditInfo->Text += "\r\n(マスターROMの作成をするまでROMデータの中には登録されません。)"; + this->tboxGuideRomEditInfo->Text = "このタブの各項目への入力は提出確認書およびマスターROMの作成のために必要です。"; + this->tboxGuideRomEditInfo->Text += "\r\nこれらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM情報」を除く。)"; this->tboxGuideErrorInfo->Text = "このタブには読み込んだROMデータの問題と本プログラムでの入力ミスが列挙されます。"; this->tboxGuideErrorInfo->Text += "\r\n赤文字の項目は、本プログラムで修正不可です。ROMデータ作成時の設定をご確認ください。"; @@ -745,10 +755,10 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; /// void InitializeComponent(void) { - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle5 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle6 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle7 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle8 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle13 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle14 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle15 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle16 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); this->tboxFile = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -951,6 +961,9 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->tboxGuideTWLInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxExFlags = (gcnew System::Windows::Forms::GroupBox()); this->tabRomEditInfo = (gcnew System::Windows::Forms::TabPage()); + this->gboxOtherSpec = (gcnew System::Windows::Forms::GroupBox()); + this->cboxIsUGC = (gcnew System::Windows::Forms::CheckBox()); + this->cboxIsPhotoEx = (gcnew System::Windows::Forms::CheckBox()); this->butSetBack = (gcnew System::Windows::Forms::Button()); this->tboxGuideRomEditInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxParental = (gcnew System::Windows::Forms::GroupBox()); @@ -1005,6 +1018,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->tabTWLInfo->SuspendLayout(); this->gboxExFlags->SuspendLayout(); this->tabRomEditInfo->SuspendLayout(); + this->gboxOtherSpec->SuspendLayout(); this->gboxParental->SuspendLayout(); this->gboxIcon->SuspendLayout(); this->gboxEULA->SuspendLayout(); @@ -1435,11 +1449,11 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; // labRegion // this->labRegion->AutoSize = true; - this->labRegion->Location = System::Drawing::Point(71, 24); + this->labRegion->Location = System::Drawing::Point(98, 24); this->labRegion->Name = L"labRegion"; - this->labRegion->Size = System::Drawing::Size(75, 12); + this->labRegion->Size = System::Drawing::Size(47, 12); this->labRegion->TabIndex = 37; - this->labRegion->Text = L"カードリージョン"; + this->labRegion->Text = L"リージョン"; // // cboxIsEULA // @@ -2813,19 +2827,19 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; // stripItemSheet // this->stripItemSheet->Name = L"stripItemSheet"; - this->stripItemSheet->Size = System::Drawing::Size(283, 22); + this->stripItemSheet->Size = System::Drawing::Size(304, 22); this->stripItemSheet->Text = L"提出データ一式を作成する"; this->stripItemSheet->Click += gcnew System::EventHandler(this, &Form1::stripItemSheet_Click); // // stripItemSepMaster1 // this->stripItemSepMaster1->Name = L"stripItemSepMaster1"; - this->stripItemSepMaster1->Size = System::Drawing::Size(280, 6); + this->stripItemSepMaster1->Size = System::Drawing::Size(301, 6); // // stripItemMasterRom // this->stripItemMasterRom->Name = L"stripItemMasterRom"; - this->stripItemMasterRom->Size = System::Drawing::Size(283, 22); + this->stripItemMasterRom->Size = System::Drawing::Size(304, 22); this->stripItemMasterRom->Text = L"マスターROMのみを作成する"; this->stripItemMasterRom->Click += gcnew System::EventHandler(this, &Form1::stripItemMasterRom_Click); // @@ -2908,15 +2922,15 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, this->colLibName}); - dataGridViewCellStyle5->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle5->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle5->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle13->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle13->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle13->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle5->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle5->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle5->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle5->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle13->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle13->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle13->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle13->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle13; this->gridLibrary->Location = System::Drawing::Point(337, 189); this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->ReadOnly = true; @@ -2989,6 +3003,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; // // tabRomEditInfo // + this->tabRomEditInfo->Controls->Add(this->gboxOtherSpec); this->tabRomEditInfo->Controls->Add(this->butSetBack); this->tabRomEditInfo->Controls->Add(this->tboxGuideRomEditInfo); this->tabRomEditInfo->Controls->Add(this->gboxParental); @@ -3001,9 +3016,40 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->tabRomEditInfo->Text = L"ROM登録情報(編集可)"; this->tabRomEditInfo->UseVisualStyleBackColor = true; // + // gboxOtherSpec + // + this->gboxOtherSpec->Controls->Add(this->cboxIsUGC); + this->gboxOtherSpec->Controls->Add(this->cboxIsPhotoEx); + this->gboxOtherSpec->Location = System::Drawing::Point(19, 225); + this->gboxOtherSpec->Name = L"gboxOtherSpec"; + this->gboxOtherSpec->Size = System::Drawing::Size(266, 70); + this->gboxOtherSpec->TabIndex = 41; + this->gboxOtherSpec->TabStop = false; + this->gboxOtherSpec->Text = L"その他ROM仕様"; + // + // cboxIsUGC + // + this->cboxIsUGC->AutoSize = true; + this->cboxIsUGC->Location = System::Drawing::Point(8, 18); + this->cboxIsUGC->Name = L"cboxIsUGC"; + this->cboxIsUGC->Size = System::Drawing::Size(210, 16); + this->cboxIsUGC->TabIndex = 39; + this->cboxIsUGC->Text = L"UGC(User Generated Contents)対応"; + this->cboxIsUGC->UseVisualStyleBackColor = true; + // + // cboxIsPhotoEx + // + this->cboxIsPhotoEx->AutoSize = true; + this->cboxIsPhotoEx->Location = System::Drawing::Point(8, 46); + this->cboxIsPhotoEx->Name = L"cboxIsPhotoEx"; + this->cboxIsPhotoEx->Size = System::Drawing::Size(96, 16); + this->cboxIsPhotoEx->TabIndex = 40; + this->cboxIsPhotoEx->Text = L"写真交換対応"; + this->cboxIsPhotoEx->UseVisualStyleBackColor = true; + // // butSetBack // - this->butSetBack->Location = System::Drawing::Point(43, 289); + this->butSetBack->Location = System::Drawing::Point(69, 309); this->butSetBack->Name = L"butSetBack"; this->butSetBack->Size = System::Drawing::Size(151, 23); this->butSetBack->TabIndex = 38; @@ -3040,12 +3086,12 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gboxParental->Controls->Add(this->combPEGI); this->gboxParental->Controls->Add(this->combUSK); this->gboxParental->Controls->Add(this->labUSK); - this->gboxParental->Location = System::Drawing::Point(262, 60); + this->gboxParental->Location = System::Drawing::Point(313, 60); this->gboxParental->Name = L"gboxParental"; this->gboxParental->Size = System::Drawing::Size(398, 272); this->gboxParental->TabIndex = 33; this->gboxParental->TabStop = false; - this->gboxParental->Text = L"リージョンとペアレンタルコントロール"; + this->gboxParental->Text = L"リージョンとレーティング情報"; // // gboxIcon // @@ -3054,7 +3100,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gboxIcon->Controls->Add(this->rIsWirelessIcon); this->gboxIcon->Location = System::Drawing::Point(19, 114); this->gboxIcon->Name = L"gboxIcon"; - this->gboxIcon->Size = System::Drawing::Size(227, 116); + this->gboxIcon->Size = System::Drawing::Size(266, 105); this->gboxIcon->TabIndex = 32; this->gboxIcon->TabStop = false; this->gboxIcon->Text = L"メニュー上でのアイコン表示"; @@ -3096,7 +3142,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gboxEULA->Controls->Add(this->cboxIsEULA); this->gboxEULA->Location = System::Drawing::Point(19, 60); this->gboxEULA->Name = L"gboxEULA"; - this->gboxEULA->Size = System::Drawing::Size(227, 48); + this->gboxEULA->Size = System::Drawing::Size(266, 48); this->gboxEULA->TabIndex = 31; this->gboxEULA->TabStop = false; this->gboxEULA->Text = L"EULA(利用規約)"; @@ -3302,15 +3348,15 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gridWarn->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridWarn->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colWarnName, this->colWarnBegin, this->colWarnEnd, this->colWarnCause}); - dataGridViewCellStyle6->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle6->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle6->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle14->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle14->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle14->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle6->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle6->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle6->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle6->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridWarn->DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle14->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle14->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle14->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle14->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridWarn->DefaultCellStyle = dataGridViewCellStyle14; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; this->gridWarn->Location = System::Drawing::Point(24, 228); this->gridWarn->Name = L"gridWarn"; @@ -3350,22 +3396,22 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; // // gridError // - dataGridViewCellStyle7->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle15->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle15; this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridError->BackgroundColor = System::Drawing::SystemColors::Control; this->gridError->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridError->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colErrorName, this->colErrorBegin, this->colErrorEnd, this->colErrorCause}); - dataGridViewCellStyle8->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle8->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle8->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle16->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle16->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle16->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle8->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle8->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle8->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle8->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridError->DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle16->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle16->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle16->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle16->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridError->DefaultCellStyle = dataGridViewCellStyle16; this->gridError->GridColor = System::Drawing::SystemColors::Control; this->gridError->Location = System::Drawing::Point(24, 99); this->gridError->Name = L"gridError"; @@ -3470,6 +3516,8 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->gboxExFlags->PerformLayout(); this->tabRomEditInfo->ResumeLayout(false); this->tabRomEditInfo->PerformLayout(); + this->gboxOtherSpec->ResumeLayout(false); + this->gboxOtherSpec->PerformLayout(); this->gboxParental->ResumeLayout(false); this->gboxParental->PerformLayout(); this->gboxIcon->ResumeLayout(false); @@ -3558,6 +3606,8 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; this->rIsWirelessIcon->Enabled = false; this->rIsWiFiIcon->Enabled = false; this->rIsNoIcon->Enabled = false; + this->cboxIsUGC->Enabled = false; + this->cboxIsPhotoEx->Enabled = false; this->combCERO->Enabled = false; this->combESRB->Enabled = false; @@ -3576,6 +3626,27 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "." + ver->Build.ToString() ); } + // SRLに登録されないROM仕様のフォーム入力を + // 新規読み込みのときにはクリアして + // 再読み込みのときには前の状態に戻す + void clearOtherForms(void) + { + this->cboxIsUGC->Checked = false; + this->cboxIsPhotoEx->Checked = false; + this->hIsCheckedUGC = gcnew System::Boolean(false); + this->hIsCheckedPhotoEx = gcnew System::Boolean(false); + } + void saveOtherForms(void) + { + this->hIsCheckedUGC = gcnew System::Boolean(this->cboxIsUGC->Checked); + this->hIsCheckedPhotoEx = gcnew System::Boolean(this->cboxIsPhotoEx->Checked); + } + void loadOtherForms(void) + { + this->cboxIsUGC->Checked = *(this->hIsCheckedUGC); + this->cboxIsPhotoEx->Checked = *(this->hIsCheckedPhotoEx); + } + private: // ---------------------------------------------- // フォームとSRL内情報を矛盾なく一致させる @@ -3773,6 +3844,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; filename = dlg->FileName; } this->loadSrl( filename ); + this->clearOtherForms(); //this->sucMsg( "ROMデータファイルのオープンに成功しました。", "The ROM data file is opened successfully." ); } //stripItemOpenRom_Click() @@ -4239,6 +4311,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; return; } this->loadSrl( filename ); // ドラッグアンドドロップの時点でボタンを押さなくてもファイルを開く + this->clearOtherForms(); //this->sucMsg( "ROMデータファイルのオープンに成功しました。", "The ROM data file is opened successfully." ); } @@ -4370,6 +4443,7 @@ private: System::Windows::Forms::ToolStripSeparator^ stripItemSepMaster1; } this->setRegionForms(); this->setParentalForms(); + this->loadOtherForms(); // SRLに登録されていないROM仕様のフォームも戻す } }; // enf of ref class Form1 diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index d7c8e491..28ccc925 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -186,6 +186,17 @@ void Form1::setDeliverableProperties(void) } // SRL情報を文字列で登録 + if( this->combRegion->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hRegion = gcnew System::String("不明"); + else + this->hDeliv->hRegion = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hRegion = dynamic_cast(this->combRegion->SelectedItem); + } if( this->combCERO->SelectedIndex < 0 ) { if( this->stripItemJapanese->Checked == true ) @@ -263,6 +274,10 @@ void Form1::setDeliverableProperties(void) { this->hDeliv->hOFLC = dynamic_cast(this->combOFLC->SelectedItem); } + + // SRLには登録されないROM仕様 + this->hDeliv->hIsUGC = System::Boolean( this->cboxIsUGC->Checked ); + this->hDeliv->hIsPhotoEx = System::Boolean( this->cboxIsPhotoEx->Checked ); } // ---------------------------------------------- diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp index 7a7a4e06..14246679 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp @@ -167,6 +167,10 @@ System::Void Form1::loadSrl( System::String ^filename ) // GUIにROM情報を格納 this->setSrlForms(); + // SRLに登録されないROM仕様のフォーム情報も戻るボタンで読み込み時の状態に戻したいが + // 読み込み時の状態をSRLに保存しておけないので退避しておく + this->saveOtherForms(); + // 全体のCRCを算出 u16 crc; if( !getWholeCRCInFile( filename, &crc ) ) @@ -207,7 +211,7 @@ System::Boolean Form1::saveSrl( System::String ^filename ) return true; } // saveSrl() -// SRLの一時保存 +// SRLの保存 System::Boolean Form1::saveSrlCore( System::String ^filename ) { // ROM情報をフォームから取得してSRLバイナリに反映させる diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index d0525b7f..750143f0 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -66,8 +66,8 @@ void Form1::changeJapanese(void) this->tboxGuideRomInfo->Text = gcnew System::String( "このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。" ); this->tboxGuideTWLInfo->Text = gcnew System::String( "このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。" ); this->tboxGuideRomEditInfo->Text = gcnew System::String( "" ); - this->tboxGuideRomEditInfo->Text += "このタブの情報は提出確認書およびマスターROMの作成に必要です。編集してください。"; - this->tboxGuideRomEditInfo->Text += "\r\n(マスターROMの作成をするまでROMデータの中には登録されません。)"; + this->tboxGuideRomEditInfo->Text += "このタブの各項目への入力は提出確認書およびマスターROMの作成のために必要です。"; + this->tboxGuideRomEditInfo->Text += "\r\nこれらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM情報」を除く。)"; this->tboxGuideSubmitInfo->Text = gcnew System::String( "このタブの情報は提出確認書の作成に必要です。入力してください。" ); this->tboxGuideCompanyInfo->Text = gcnew System::String( "このタブの情報は提出確認書の作成に必要です。入力してください。" ); this->tboxGuideErrorInfo->Text = gcnew System::String( "" ); @@ -177,6 +177,9 @@ void Form1::changeJapanese(void) this->rIsWiFiIcon->Text = gcnew System::String( LANG_WIFI_ICON_J ); this->rIsNoIcon->Text = gcnew System::String( LANG_NO_ICON_J ); this->labRegion->Text = gcnew System::String( LANG_REGION_J ); + this->gboxOtherSpec->Text = gcnew System::String( LANG_OTHER_SPEC_J ); + this->cboxIsUGC->Text = gcnew System::String( LANG_UGC_J ); + this->cboxIsPhotoEx->Text = gcnew System::String( LANG_PHOTO_EX_J ); // リージョン index = this->combRegion->SelectedIndex; @@ -292,7 +295,7 @@ void Form1::changeEnglish(void) this->tboxGuideTWLInfo->Text = gcnew System::String( "This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data" ); this->tboxGuideRomEditInfo->Text = gcnew System::String( "" ); this->tboxGuideRomEditInfo->Text += "These items is necessary not only to make a submission sheet and but also to make a master ROM data. Please edit certainly."; - this->tboxGuideRomEditInfo->Text += "\r\n(In making a master ROM data, these info will be registered in it.)"; + this->tboxGuideRomEditInfo->Text += "\r\nIn making a master ROM data, these info will be registered in the ROM data(except \"Other Rom Spec\")."; this->tboxGuideSubmitInfo->Text = gcnew System::String( "These items are necessary for making a submission sheet. Please input." ); this->tboxGuideCompanyInfo->Text = gcnew System::String( "These items are necessary for making a submission sheet. Please input." ); this->tboxGuideErrorInfo->Text = gcnew System::String( "" ); @@ -404,6 +407,9 @@ void Form1::changeEnglish(void) this->rIsWiFiIcon->Text = gcnew System::String( LANG_WIFI_ICON_E ); this->rIsNoIcon->Text = gcnew System::String( LANG_NO_ICON_E ); this->labRegion->Text = gcnew System::String( LANG_REGION_E ); + this->gboxOtherSpec->Text = gcnew System::String( LANG_OTHER_SPEC_E ); + this->cboxIsUGC->Text = gcnew System::String( LANG_UGC_E ); + this->cboxIsPhotoEx->Text = gcnew System::String( LANG_PHOTO_EX_E ); // リージョン index = this->combRegion->SelectedIndex; diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 16c6e119..15b4634e 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -304,34 +304,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( { node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hPrivateSize ); } - if( node->FirstChild->Value->Equals( "TagIsRegionJapan" ) ) - { - if( *(hSrl->hIsRegionJapan) == true ) - node->FirstChild->Value = gcnew System::String("○"); - else - node->FirstChild->Value = nullptr; - } - if( node->FirstChild->Value->Equals( "TagIsRegionAmerica" ) ) - { - if( *(hSrl->hIsRegionAmerica) == true ) - node->FirstChild->Value = gcnew System::String("○"); - else - node->FirstChild->Value = nullptr; - } - if( node->FirstChild->Value->Equals( "TagIsRegionEurope" ) ) - { - if( *(hSrl->hIsRegionEurope) == true ) - node->FirstChild->Value = gcnew System::String("○"); - else - node->FirstChild->Value = nullptr; - } - if( node->FirstChild->Value->Equals( "TagIsRegionAustralia" ) ) - { - if( *(hSrl->hIsRegionAustralia) == true ) - node->FirstChild->Value = gcnew System::String("○"); - else - node->FirstChild->Value = nullptr; - } if( node->FirstChild->Value->Equals( "TagIsCodec" ) ) { if( *(hSrl->hIsCodecTWL) == true ) @@ -497,6 +469,12 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( node->FirstChild->Value = this->hCaption; } + // リージョン + if( node->FirstChild->Value->Equals( "TagRegion" ) ) + { + node->FirstChild->Value = this->hRegion; + } + // ペアレンタルコントロール if( node->FirstChild->Value->Equals( "TagRatingCERO" ) ) { @@ -527,6 +505,22 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( node->FirstChild->Value = this->hOFLC; } + // SRLに登録されないROM仕様 + if( node->FirstChild->Value->Equals( "TagIsUGC" ) ) + { + if( *(this->hIsUGC) == true ) + node->FirstChild->Value = gcnew System::String("○"); + else + node->FirstChild->Value = nullptr; + } + if( node->FirstChild->Value->Equals( "TagIsPhotoEx" ) ) + { + if( *(this->hIsPhotoEx) == true ) + node->FirstChild->Value = gcnew System::String("○"); + else + node->FirstChild->Value = nullptr; + } + // ROM内登録データを1バイトずつ表に書き込む if( node->FirstChild->Value->Equals( "TagRomVersionHex" ) ) { diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h index a0169ca8..f679fb6d 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -87,6 +87,7 @@ namespace MasterEditorTWL property System::String ^hBackupMemory; // バックアップメモリの種別 // SRL情報の一部を文字列で持っておく + property System::String ^hRegion; property System::String ^hCERO; property System::String ^hESRB; property System::String ^hUSK; @@ -96,6 +97,10 @@ namespace MasterEditorTWL property System::String ^hOFLC; property System::String ^hAppTypeOther; // 特記事項 + // SRLには登録されないROM仕様 + property System::Boolean ^hIsUGC; + property System::Boolean ^hIsPhotoEx; + // constructor and destructor public: diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/lang.h b/build/tools/MasterEditorTWL/MasterEditorTWL/lang.h index 1ebce593..d55b296e 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/lang.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/lang.h @@ -44,11 +44,14 @@ #define LANG_WIRELESS_ICON_J ("DSワイヤレス通信アイコン表示") #define LANG_WIFI_ICON_J ("Wi-Fi通信アイコン表示") #define LANG_NO_ICON_J ("アイコンを表示しない") -#define LANG_REGION_PCTL_J ("リージョンとペアレンタルコントロール") -#define LANG_REGION_J ("カードリージョン") +#define LANG_REGION_PCTL_J ("リージョンとリージョン情報") +#define LANG_REGION_J ("リージョン") #define LANG_PCTL_RATING_J ("レーティング年齢") #define LANG_PCTL_ENABLE_J ("制限を有効") #define LANG_PCTL_ALWAYS_J ("審査中") +#define LANG_OTHER_SPEC_J ("その他ROM仕様") +#define LANG_UGC_J ("UGC(User Generated Contents)対応") +#define LANG_PHOTO_EX_J ("写真交換対応") #define LANG_PRODUCT_NAME_E ("Product Name") @@ -93,8 +96,11 @@ #define LANG_WIRELESS_ICON_E ("Display an Icon of DS Wireless") #define LANG_WIFI_ICON_E ("Display an Icon of Wi-Fi connection") #define LANG_NO_ICON_E ("Display No Icon") -#define LANG_REGION_PCTL_E ("Card Region and Parental Control") -#define LANG_REGION_E ("Card Region") +#define LANG_REGION_PCTL_E ("Region and Rating Information") +#define LANG_REGION_E ("Region") #define LANG_PCTL_RATING_E ("Rating Information") #define LANG_PCTL_ENABLE_E ("Enable Control") #define LANG_PCTL_ALWAYS_E ("Rating Pending") +#define LANG_OTHER_SPEC_E ("Other ROM Spec.") +#define LANG_UGC_E ("UGC(User Generated Contents) Support") +#define LANG_PHOTO_EX_E ("Photo Exchange Support") diff --git a/build/tools/MasterEditorTWL/resource/sheet_templete.xml b/build/tools/MasterEditorTWL/resource/sheet_templete.xml index 898d0f76..dceb8f2b 100644 --- a/build/tools/MasterEditorTWL/resource/sheet_templete.xml +++ b/build/tools/MasterEditorTWL/resource/sheet_templete.xml @@ -33,7 +33,7 @@ - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + - + + - - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - -