diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index eebcb7f5..35516607 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 65187645..3a23a0d4 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 056c955e..daa236ba 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 a29a270b..359f4fcb 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -37,10 +37,6 @@ namespace MasterEditorTWL { // 書類出力モード(ノーマルXML or XML Spread Sheet) System::Boolean ^hIsSpreadSheet; - // エラーウインドウ - FormError ^hErrorWindowR; - FormError ^hErrorWindowW; - // 入力エラー情報 System::Collections::Generic::List ^hErrorList; System::Collections::Generic::List ^hWarnList; @@ -67,9 +63,9 @@ namespace MasterEditorTWL { private: System::Windows::Forms::TextBox^ tboxBackupOther; private: System::Windows::Forms::Label^ labCaption; private: System::Windows::Forms::TextBox^ tboxCaption; - private: System::Windows::Forms::GroupBox^ gboxSelectLang; - private: System::Windows::Forms::RadioButton^ rSelectE; - private: System::Windows::Forms::RadioButton^ rSelectJ; + + + private: System::Windows::Forms::TextBox^ tboxRomSize; @@ -197,7 +193,7 @@ namespace MasterEditorTWL { - private: System::Windows::Forms::GroupBox^ gboxTWLInfoWritable; + private: System::Windows::Forms::CheckBox^ cboxIsEULA; private: System::Windows::Forms::CheckBox^ cboxIsWiFiIcon; private: System::Windows::Forms::Label^ labEULA; @@ -326,10 +322,10 @@ private: System::Windows::Forms::ComboBox^ combRegion; private: System::Windows::Forms::Label^ labRegion; -private: System::Windows::Forms::TabControl^ tabDoc; -private: System::Windows::Forms::TabPage^ tabSubmitInfo; -private: System::Windows::Forms::TabPage^ tabForeignInfo; + + + @@ -346,12 +342,12 @@ private: System::Windows::Forms::TextBox^ tboxProductCode2Foreign1; -private: System::Windows::Forms::TabPage^ tabCompanyInfo1; -private: System::Windows::Forms::TabPage^ tabCompanyInfo2; -private: System::Windows::Forms::TabPage^ tabCaption; -private: System::Windows::Forms::TabPage^ tabTWLSpec4; + + + + @@ -377,11 +373,11 @@ private: System::Windows::Forms::TextBox^ tboxShared2Size2; private: System::Windows::Forms::TextBox^ tboxShared2Size1; private: System::Windows::Forms::TextBox^ tboxShared2Size0; private: System::Windows::Forms::CheckBox^ cboxIsShared2; -private: System::Windows::Forms::TabPage^ tabSDK; + private: System::Windows::Forms::Label^ labLib; private: System::Windows::Forms::TextBox^ tboxSDK; private: System::Windows::Forms::Label^ labSDK; -private: System::Windows::Forms::TabPage^ tabTWLSpec3; + private: System::Windows::Forms::GroupBox^ gboxTWLExInfo; @@ -403,7 +399,7 @@ private: System::Windows::Forms::CheckBox^ cboxIsNormalJump; private: System::Windows::Forms::CheckBox^ cboxIsTmpJump; private: System::Windows::Forms::Label^ labPublicSize; private: System::Windows::Forms::TextBox^ tboxPublicSize; -private: System::Windows::Forms::TabPage^ tabTWLSpec2; + private: System::Windows::Forms::GroupBox^ gboxAccess; private: System::Windows::Forms::Label^ labAccessOther; @@ -412,7 +408,7 @@ private: System::Windows::Forms::TextBox^ tboxIsGameCardOn; private: System::Windows::Forms::Label^ labIsGameCardOn; private: System::Windows::Forms::CheckBox^ cboxIsNAND; private: System::Windows::Forms::CheckBox^ cboxIsSD; -private: System::Windows::Forms::TabPage^ tabTWLSpec1; + private: System::Windows::Forms::GroupBox^ gboxTitleID; @@ -426,20 +422,122 @@ private: System::Windows::Forms::TextBox^ tboxAppType; private: System::Windows::Forms::Label^ labAppType; private: System::Windows::Forms::Label^ labCaptionEx; private: System::Windows::Forms::TextBox^ tboxCaptionEx; -private: System::Windows::Forms::TabControl^ tabCheck; -private: System::Windows::Forms::TextBox^ tboxLib; + + private: System::Windows::Forms::TextBox^ tboxProductCode2Foreign3; private: System::Windows::Forms::TextBox^ tboxProductCode2Foreign2; private: System::Windows::Forms::Label^ labMultiForeign1; -private: System::Windows::Forms::Label^ labMultiForeign2; -private: System::Windows::Forms::Label^ labCautionInput; -private: System::Windows::Forms::Label^ labCautionCheck; + + + private: System::Windows::Forms::GroupBox^ gboxProd; -private: System::Windows::Forms::Button^ butErrorWindow; -private: System::Windows::Forms::Button^ butMakeMaster; -private: System::Windows::Forms::GroupBox^ gboxMakeMaster; + + + +private: System::Windows::Forms::MenuStrip^ menuStripAbove; + +private: System::Windows::Forms::ToolStripMenuItem^ stripFile; +private: System::Windows::Forms::ToolStripMenuItem^ stripItemOpenRom; + +private: System::Windows::Forms::ToolStripMenuItem^ stripItemSaveTemp; +private: System::Windows::Forms::ToolStripMenuItem^ stripItemLoadTemp; +private: System::Windows::Forms::ToolStripMenuItem^ stripMaster; +private: System::Windows::Forms::ToolStripMenuItem^ stripItemMasterRom; +private: System::Windows::Forms::ToolStripMenuItem^ stripItemSheet; +private: System::Windows::Forms::ToolStripMenuItem^ stripLang; +private: System::Windows::Forms::ToolStripMenuItem^ stripItemEnglish; +private: System::Windows::Forms::ToolStripMenuItem^ stripItemJapanese; +private: System::Windows::Forms::TabControl^ tabMain; +private: System::Windows::Forms::TabPage^ tabRomInfo; + + +private: System::Windows::Forms::TabPage^ tabTWLInfo; +private: System::Windows::Forms::TabPage^ tabRomEditInfo; + + + + + + +private: System::Windows::Forms::TabPage^ tabPage4; +private: System::Windows::Forms::TabPage^ tabPage5; +private: System::Windows::Forms::GroupBox^ gboxForeign; +private: System::Windows::Forms::GroupBox^ gboxExFlags; +private: System::Windows::Forms::Label^ labByte3; +private: System::Windows::Forms::Label^ labByte5; +private: System::Windows::Forms::Label^ labByte4; +private: System::Windows::Forms::GroupBox^ gboxEULA; +private: System::Windows::Forms::GroupBox^ gboxIcon; +private: System::Windows::Forms::GroupBox^ gboxParental; +private: System::Windows::Forms::TextBox^ textBox1; + + +private: System::Windows::Forms::TextBox^ textBox2; +private: System::Windows::Forms::TextBox^ textBox3; +private: System::Windows::Forms::TextBox^ textBox4; +private: System::Windows::Forms::TextBox^ textBox5; +private: System::Windows::Forms::Label^ labFile; +public: System::Windows::Forms::DataGridView^ gridError; +private: + +public: + + + +private: System::Windows::Forms::TabPage^ tabError; +public: System::Windows::Forms::DataGridView^ gridWarn; +private: + +public: + + + +private: System::Windows::Forms::TextBox^ textBox6; +private: System::Windows::Forms::GroupBox^ gboxErrorTiming; +private: System::Windows::Forms::Label^ labWarn; +private: System::Windows::Forms::Label^ labError; +private: System::Windows::Forms::RadioButton^ rErrorCurrent; + +private: System::Windows::Forms::RadioButton^ rErrorReading; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnName; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnBegin; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnEnd; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorName; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorBegin; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorEnd; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; +private: System::Windows::Forms::Label^ labMultiForeign2; +private: System::Windows::Forms::DataGridView^ gridLibrary; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colLibPublisher; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colLibName; + + + + + + + + + + + + + + + + + + + + + + + + + @@ -483,8 +581,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // this->hSrl = gcnew (RCSrl); this->hDeliv = gcnew (RCDeliverable); - this->hErrorWindowR = gcnew (FormError); - this->hErrorWindowW = gcnew (FormError); this->hErrorList = gcnew System::Collections::Generic::List(); this->hErrorList->Clear(); this->hWarnList = gcnew System::Collections::Generic::List(); @@ -524,12 +620,12 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; } private: System::Windows::Forms::TextBox^ tboxFile; protected: - private: System::Windows::Forms::Button^ butOpen; + private: System::Windows::Forms::TextBox^ tboxMsg; private: System::Windows::Forms::GroupBox^ gboxSrl; private: System::Windows::Forms::TextBox^ tboxTitleName; - private: System::Windows::Forms::GroupBox^ gboxFileOpen; - private: System::Windows::Forms::Button^ butSaveAs; + + private: /// @@ -545,7 +641,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; void InitializeComponent(void) { this->tboxFile = (gcnew System::Windows::Forms::TextBox()); - this->butOpen = (gcnew System::Windows::Forms::Button()); this->tboxMsg = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -571,13 +666,8 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->labHeaderCRC = (gcnew System::Windows::Forms::Label()); this->tboxHeaderCRC = (gcnew System::Windows::Forms::TextBox()); this->tboxWholeCRC = (gcnew System::Windows::Forms::TextBox()); - this->gboxFileOpen = (gcnew System::Windows::Forms::GroupBox()); - this->butSaveAs = (gcnew System::Windows::Forms::Button()); this->labCaption = (gcnew System::Windows::Forms::Label()); this->tboxCaption = (gcnew System::Windows::Forms::TextBox()); - this->gboxSelectLang = (gcnew System::Windows::Forms::GroupBox()); - this->rSelectE = (gcnew System::Windows::Forms::RadioButton()); - this->rSelectJ = (gcnew System::Windows::Forms::RadioButton()); this->labPEGIBBFC2 = (gcnew System::Windows::Forms::Label()); this->labOFLC = (gcnew System::Windows::Forms::Label()); this->labPEGIBBFC = (gcnew System::Windows::Forms::Label()); @@ -610,7 +700,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->labParentalForceEnable = (gcnew System::Windows::Forms::Label()); this->labParentalRating = (gcnew System::Windows::Forms::Label()); this->labParentalEnable = (gcnew System::Windows::Forms::Label()); - this->gboxTWLInfoWritable = (gcnew System::Windows::Forms::GroupBox()); this->labRegion = (gcnew System::Windows::Forms::Label()); this->cboxIsEULA = (gcnew System::Windows::Forms::CheckBox()); this->combRegion = (gcnew System::Windows::Forms::ComboBox()); @@ -678,11 +767,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->labCapSubmitVer = (gcnew System::Windows::Forms::Label()); this->numSubmitVersion = (gcnew System::Windows::Forms::NumericUpDown()); this->labSubmitVer = (gcnew System::Windows::Forms::Label()); - this->tabDoc = (gcnew System::Windows::Forms::TabControl()); - this->tabSubmitInfo = (gcnew System::Windows::Forms::TabPage()); - this->labCautionInput = (gcnew System::Windows::Forms::Label()); - this->tabForeignInfo = (gcnew System::Windows::Forms::TabPage()); - this->labMultiForeign2 = (gcnew System::Windows::Forms::Label()); this->labMultiForeign1 = (gcnew System::Windows::Forms::Label()); this->tboxProductCode2Foreign3 = (gcnew System::Windows::Forms::TextBox()); this->tboxProductCode2Foreign2 = (gcnew System::Windows::Forms::TextBox()); @@ -694,10 +778,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxProductCode1Foreign = (gcnew System::Windows::Forms::TextBox()); this->labProductCodeForeign = (gcnew System::Windows::Forms::Label()); this->tboxProductCode2Foreign1 = (gcnew System::Windows::Forms::TextBox()); - this->tabCompanyInfo1 = (gcnew System::Windows::Forms::TabPage()); - this->tabCompanyInfo2 = (gcnew System::Windows::Forms::TabPage()); - this->tabCaption = (gcnew System::Windows::Forms::TabPage()); - this->tabTWLSpec4 = (gcnew System::Windows::Forms::TabPage()); this->gboxShared2Size = (gcnew System::Windows::Forms::GroupBox()); this->labShared2Size5 = (gcnew System::Windows::Forms::Label()); this->labShared2Size4 = (gcnew System::Windows::Forms::Label()); @@ -718,13 +798,13 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxShared2Size1 = (gcnew System::Windows::Forms::TextBox()); this->tboxShared2Size0 = (gcnew System::Windows::Forms::TextBox()); this->cboxIsShared2 = (gcnew System::Windows::Forms::CheckBox()); - this->tabSDK = (gcnew System::Windows::Forms::TabPage()); - this->tboxLib = (gcnew System::Windows::Forms::TextBox()); this->labLib = (gcnew System::Windows::Forms::Label()); this->tboxSDK = (gcnew System::Windows::Forms::TextBox()); this->labSDK = (gcnew System::Windows::Forms::Label()); - this->tabTWLSpec3 = (gcnew System::Windows::Forms::TabPage()); this->gboxTWLExInfo = (gcnew System::Windows::Forms::GroupBox()); + this->labByte5 = (gcnew System::Windows::Forms::Label()); + this->labByte4 = (gcnew System::Windows::Forms::Label()); + this->labByte3 = (gcnew System::Windows::Forms::Label()); this->labByte2 = (gcnew System::Windows::Forms::Label()); this->labByte1 = (gcnew System::Windows::Forms::Label()); this->labHex4 = (gcnew System::Windows::Forms::Label()); @@ -733,17 +813,16 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->labIsCodec = (gcnew System::Windows::Forms::Label()); this->labNormalRomOffset = (gcnew System::Windows::Forms::Label()); this->tboxNormalRomOffset = (gcnew System::Windows::Forms::TextBox()); - this->cboxIsSubBanner = (gcnew System::Windows::Forms::CheckBox()); this->labKeyTableRomOffset = (gcnew System::Windows::Forms::Label()); - this->cboxIsWL = (gcnew System::Windows::Forms::CheckBox()); this->tboxPrivateSize = (gcnew System::Windows::Forms::TextBox()); this->labPrivateSize = (gcnew System::Windows::Forms::Label()); this->tboxKeyTableRomOffset = (gcnew System::Windows::Forms::TextBox()); - this->cboxIsNormalJump = (gcnew System::Windows::Forms::CheckBox()); - this->cboxIsTmpJump = (gcnew System::Windows::Forms::CheckBox()); this->labPublicSize = (gcnew System::Windows::Forms::Label()); this->tboxPublicSize = (gcnew System::Windows::Forms::TextBox()); - this->tabTWLSpec2 = (gcnew System::Windows::Forms::TabPage()); + this->cboxIsSubBanner = (gcnew System::Windows::Forms::CheckBox()); + this->cboxIsWL = (gcnew System::Windows::Forms::CheckBox()); + this->cboxIsNormalJump = (gcnew System::Windows::Forms::CheckBox()); + this->cboxIsTmpJump = (gcnew System::Windows::Forms::CheckBox()); this->gboxAccess = (gcnew System::Windows::Forms::GroupBox()); this->labAccessOther = (gcnew System::Windows::Forms::Label()); this->tboxAccessOther = (gcnew System::Windows::Forms::TextBox()); @@ -751,8 +830,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->labIsGameCardOn = (gcnew System::Windows::Forms::Label()); this->cboxIsNAND = (gcnew System::Windows::Forms::CheckBox()); this->cboxIsSD = (gcnew System::Windows::Forms::CheckBox()); - this->tabTWLSpec1 = (gcnew System::Windows::Forms::TabPage()); - this->labCautionCheck = (gcnew System::Windows::Forms::Label()); this->gboxTitleID = (gcnew System::Windows::Forms::GroupBox()); this->labHex2 = (gcnew System::Windows::Forms::Label()); this->labHex1 = (gcnew System::Windows::Forms::Label()); @@ -764,69 +841,105 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->labAppType = (gcnew System::Windows::Forms::Label()); this->labCaptionEx = (gcnew System::Windows::Forms::Label()); this->tboxCaptionEx = (gcnew System::Windows::Forms::TextBox()); - this->tabCheck = (gcnew System::Windows::Forms::TabControl()); this->gboxProd = (gcnew System::Windows::Forms::GroupBox()); - this->butErrorWindow = (gcnew System::Windows::Forms::Button()); - this->butMakeMaster = (gcnew System::Windows::Forms::Button()); - this->gboxMakeMaster = (gcnew System::Windows::Forms::GroupBox()); + this->menuStripAbove = (gcnew System::Windows::Forms::MenuStrip()); + this->stripFile = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->stripItemOpenRom = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->stripItemSaveTemp = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->stripItemLoadTemp = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->stripMaster = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->stripItemMasterRom = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->stripItemSheet = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->stripLang = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->stripItemEnglish = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->stripItemJapanese = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->tabMain = (gcnew System::Windows::Forms::TabControl()); + this->tabRomInfo = (gcnew System::Windows::Forms::TabPage()); + this->gridLibrary = (gcnew System::Windows::Forms::DataGridView()); + this->colLibPublisher = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->colLibName = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->textBox1 = (gcnew System::Windows::Forms::TextBox()); + this->tabTWLInfo = (gcnew System::Windows::Forms::TabPage()); + this->textBox2 = (gcnew System::Windows::Forms::TextBox()); + this->gboxExFlags = (gcnew System::Windows::Forms::GroupBox()); + this->tabRomEditInfo = (gcnew System::Windows::Forms::TabPage()); + this->textBox3 = (gcnew System::Windows::Forms::TextBox()); + this->gboxParental = (gcnew System::Windows::Forms::GroupBox()); + this->gboxIcon = (gcnew System::Windows::Forms::GroupBox()); + this->gboxEULA = (gcnew System::Windows::Forms::GroupBox()); + this->tabPage4 = (gcnew System::Windows::Forms::TabPage()); + this->textBox4 = (gcnew System::Windows::Forms::TextBox()); + this->gboxForeign = (gcnew System::Windows::Forms::GroupBox()); + this->labMultiForeign2 = (gcnew System::Windows::Forms::Label()); + this->tabPage5 = (gcnew System::Windows::Forms::TabPage()); + this->textBox5 = (gcnew System::Windows::Forms::TextBox()); + this->tabError = (gcnew System::Windows::Forms::TabPage()); + this->textBox6 = (gcnew System::Windows::Forms::TextBox()); + this->gboxErrorTiming = (gcnew System::Windows::Forms::GroupBox()); + this->rErrorCurrent = (gcnew System::Windows::Forms::RadioButton()); + this->rErrorReading = (gcnew System::Windows::Forms::RadioButton()); + this->labWarn = (gcnew System::Windows::Forms::Label()); + this->labError = (gcnew System::Windows::Forms::Label()); + this->gridWarn = (gcnew System::Windows::Forms::DataGridView()); + this->colWarnName = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->colWarnBegin = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->colWarnEnd = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->colWarnCause = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->gridError = (gcnew System::Windows::Forms::DataGridView()); + this->colErrorName = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->colErrorBegin = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->colErrorEnd = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->colErrorCause = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->labFile = (gcnew System::Windows::Forms::Label()); this->gboxSrl->SuspendLayout(); this->gboxCRC->SuspendLayout(); - this->gboxFileOpen->SuspendLayout(); - this->gboxSelectLang->SuspendLayout(); - this->gboxTWLInfoWritable->SuspendLayout(); (cli::safe_cast(this->numEULA))->BeginInit(); this->gboxPerson2->SuspendLayout(); this->gboxPerson1->SuspendLayout(); this->gboxUsage->SuspendLayout(); this->gboxSubmitWay->SuspendLayout(); (cli::safe_cast(this->numSubmitVersion))->BeginInit(); - this->tabDoc->SuspendLayout(); - this->tabSubmitInfo->SuspendLayout(); - this->tabForeignInfo->SuspendLayout(); - this->tabCompanyInfo1->SuspendLayout(); - this->tabCompanyInfo2->SuspendLayout(); - this->tabCaption->SuspendLayout(); - this->tabTWLSpec4->SuspendLayout(); this->gboxShared2Size->SuspendLayout(); - this->tabSDK->SuspendLayout(); - this->tabTWLSpec3->SuspendLayout(); this->gboxTWLExInfo->SuspendLayout(); - this->tabTWLSpec2->SuspendLayout(); this->gboxAccess->SuspendLayout(); - this->tabTWLSpec1->SuspendLayout(); this->gboxTitleID->SuspendLayout(); - this->tabCheck->SuspendLayout(); this->gboxProd->SuspendLayout(); - this->gboxMakeMaster->SuspendLayout(); + this->menuStripAbove->SuspendLayout(); + this->tabMain->SuspendLayout(); + this->tabRomInfo->SuspendLayout(); + (cli::safe_cast(this->gridLibrary))->BeginInit(); + this->tabTWLInfo->SuspendLayout(); + this->gboxExFlags->SuspendLayout(); + this->tabRomEditInfo->SuspendLayout(); + this->gboxParental->SuspendLayout(); + this->gboxIcon->SuspendLayout(); + this->gboxEULA->SuspendLayout(); + this->tabPage4->SuspendLayout(); + this->gboxForeign->SuspendLayout(); + this->tabPage5->SuspendLayout(); + this->tabError->SuspendLayout(); + this->gboxErrorTiming->SuspendLayout(); + (cli::safe_cast(this->gridWarn))->BeginInit(); + (cli::safe_cast(this->gridError))->BeginInit(); this->SuspendLayout(); // // tboxFile // this->tboxFile->AllowDrop = true; - this->tboxFile->Location = System::Drawing::Point(6, 18); + this->tboxFile->Location = System::Drawing::Point(120, 50); this->tboxFile->Name = L"tboxFile"; this->tboxFile->ReadOnly = true; - this->tboxFile->Size = System::Drawing::Size(329, 19); + this->tboxFile->Size = System::Drawing::Size(607, 19); this->tboxFile->TabIndex = 0; this->tboxFile->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &Form1::tboxFile_DragDrop); this->tboxFile->DragEnter += gcnew System::Windows::Forms::DragEventHandler(this, &Form1::tboxFile_DragEnter); // - // butOpen - // - this->butOpen->Location = System::Drawing::Point(341, 16); - this->butOpen->Name = L"butOpen"; - this->butOpen->Size = System::Drawing::Size(112, 23); - this->butOpen->TabIndex = 1; - this->butOpen->Text = L"ROMデータを開く"; - this->butOpen->UseVisualStyleBackColor = true; - this->butOpen->Click += gcnew System::EventHandler(this, &Form1::butOpen_Click); - // // tboxMsg // - this->tboxMsg->Location = System::Drawing::Point(12, 678); + this->tboxMsg->Location = System::Drawing::Point(12, 486); this->tboxMsg->Name = L"tboxMsg"; this->tboxMsg->ReadOnly = true; - this->tboxMsg->Size = System::Drawing::Size(622, 19); + this->tboxMsg->Size = System::Drawing::Size(745, 19); this->tboxMsg->TabIndex = 2; // // gboxSrl @@ -846,24 +959,24 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxSrl->Controls->Add(this->labTitleName); this->gboxSrl->Controls->Add(this->labRemasterVer); this->gboxSrl->Controls->Add(this->tboxTitleName); - this->gboxSrl->Location = System::Drawing::Point(12, 90); + this->gboxSrl->Location = System::Drawing::Point(26, 52); this->gboxSrl->Name = L"gboxSrl"; - this->gboxSrl->Size = System::Drawing::Size(326, 171); + this->gboxSrl->Size = System::Drawing::Size(285, 227); this->gboxSrl->TabIndex = 3; this->gboxSrl->TabStop = false; this->gboxSrl->Text = L"ROMデータ情報"; // // tboxRemasterVer // - this->tboxRemasterVer->Location = System::Drawing::Point(104, 146); + this->tboxRemasterVer->Location = System::Drawing::Point(109, 190); this->tboxRemasterVer->Name = L"tboxRemasterVer"; this->tboxRemasterVer->ReadOnly = true; - this->tboxRemasterVer->Size = System::Drawing::Size(35, 19); + this->tboxRemasterVer->Size = System::Drawing::Size(42, 19); this->tboxRemasterVer->TabIndex = 7; // // tboxRomSize // - this->tboxRomSize->Location = System::Drawing::Point(104, 121); + this->tboxRomSize->Location = System::Drawing::Point(109, 162); this->tboxRomSize->Name = L"tboxRomSize"; this->tboxRomSize->ReadOnly = true; this->tboxRomSize->Size = System::Drawing::Size(100, 19); @@ -871,7 +984,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxPlatform // - this->tboxPlatform->Location = System::Drawing::Point(104, 71); + this->tboxPlatform->Location = System::Drawing::Point(109, 106); this->tboxPlatform->Name = L"tboxPlatform"; this->tboxPlatform->ReadOnly = true; this->tboxPlatform->Size = System::Drawing::Size(100, 19); @@ -880,7 +993,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labPlatform // this->labPlatform->AutoSize = true; - this->labPlatform->Location = System::Drawing::Point(14, 73); + this->labPlatform->Location = System::Drawing::Point(22, 109); this->labPlatform->Name = L"labPlatform"; this->labPlatform->Size = System::Drawing::Size(73, 12); this->labPlatform->TabIndex = 13; @@ -888,7 +1001,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxRomLatency // - this->tboxRomLatency->Location = System::Drawing::Point(104, 96); + this->tboxRomLatency->Location = System::Drawing::Point(109, 134); this->tboxRomLatency->Name = L"tboxRomLatency"; this->tboxRomLatency->ReadOnly = true; this->tboxRomLatency->Size = System::Drawing::Size(100, 19); @@ -897,7 +1010,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labRomSize // this->labRomSize->AutoSize = true; - this->labRomSize->Location = System::Drawing::Point(14, 124); + this->labRomSize->Location = System::Drawing::Point(22, 165); this->labRomSize->Name = L"labRomSize"; this->labRomSize->Size = System::Drawing::Size(54, 12); this->labRomSize->TabIndex = 9; @@ -906,7 +1019,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labRomType // this->labRomType->AutoSize = true; - this->labRomType->Location = System::Drawing::Point(14, 99); + this->labRomType->Location = System::Drawing::Point(22, 137); this->labRomType->Name = L"labRomType"; this->labRomType->Size = System::Drawing::Size(80, 12); this->labRomType->TabIndex = 7; @@ -914,18 +1027,18 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxMakerCode // - this->tboxMakerCode->Location = System::Drawing::Point(248, 45); + this->tboxMakerCode->Location = System::Drawing::Point(109, 78); this->tboxMakerCode->MaxLength = 2; this->tboxMakerCode->Name = L"tboxMakerCode"; this->tboxMakerCode->ReadOnly = true; - this->tboxMakerCode->Size = System::Drawing::Size(35, 19); + this->tboxMakerCode->Size = System::Drawing::Size(100, 19); this->tboxMakerCode->TabIndex = 2; // // cboxRemasterVerE // this->cboxRemasterVerE->AutoSize = true; this->cboxRemasterVerE->Enabled = false; - this->cboxRemasterVerE->Location = System::Drawing::Point(145, 148); + this->cboxRemasterVerE->Location = System::Drawing::Point(157, 192); this->cboxRemasterVerE->Name = L"cboxRemasterVerE"; this->cboxRemasterVerE->Size = System::Drawing::Size(75, 16); this->cboxRemasterVerE->TabIndex = 8; @@ -936,7 +1049,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labMakerCode // this->labMakerCode->AutoSize = true; - this->labMakerCode->Location = System::Drawing::Point(178, 48); + this->labMakerCode->Location = System::Drawing::Point(22, 81); this->labMakerCode->Name = L"labMakerCode"; this->labMakerCode->Size = System::Drawing::Size(59, 12); this->labMakerCode->TabIndex = 4; @@ -945,7 +1058,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labGameCode // this->labGameCode->AutoSize = true; - this->labGameCode->Location = System::Drawing::Point(14, 49); + this->labGameCode->Location = System::Drawing::Point(22, 53); this->labGameCode->Name = L"labGameCode"; this->labGameCode->Size = System::Drawing::Size(78, 12); this->labGameCode->TabIndex = 3; @@ -953,17 +1066,17 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxGameCode // - this->tboxGameCode->Location = System::Drawing::Point(104, 46); + this->tboxGameCode->Location = System::Drawing::Point(109, 50); this->tboxGameCode->MaxLength = 4; this->tboxGameCode->Name = L"tboxGameCode"; this->tboxGameCode->ReadOnly = true; - this->tboxGameCode->Size = System::Drawing::Size(59, 19); + this->tboxGameCode->Size = System::Drawing::Size(100, 19); this->tboxGameCode->TabIndex = 1; // // labTitleName // this->labTitleName->AutoSize = true; - this->labTitleName->Location = System::Drawing::Point(14, 24); + this->labTitleName->Location = System::Drawing::Point(22, 24); this->labTitleName->Name = L"labTitleName"; this->labTitleName->Size = System::Drawing::Size(65, 12); this->labTitleName->TabIndex = 1; @@ -972,7 +1085,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labRemasterVer // this->labRemasterVer->AutoSize = true; - this->labRemasterVer->Location = System::Drawing::Point(5, 149); + this->labRemasterVer->Location = System::Drawing::Point(13, 193); this->labRemasterVer->Name = L"labRemasterVer"; this->labRemasterVer->Size = System::Drawing::Size(93, 12); this->labRemasterVer->TabIndex = 22; @@ -981,7 +1094,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // tboxTitleName // this->tboxTitleName->ImeMode = System::Windows::Forms::ImeMode::NoControl; - this->tboxTitleName->Location = System::Drawing::Point(104, 21); + this->tboxTitleName->Location = System::Drawing::Point(109, 21); this->tboxTitleName->MaxLength = 12; this->tboxTitleName->Name = L"tboxTitleName"; this->tboxTitleName->ReadOnly = true; @@ -1015,7 +1128,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxBackupOther->Enabled = false; this->tboxBackupOther->Location = System::Drawing::Point(224, 17); this->tboxBackupOther->Name = L"tboxBackupOther"; - this->tboxBackupOther->Size = System::Drawing::Size(97, 19); + this->tboxBackupOther->Size = System::Drawing::Size(120, 19); this->tboxBackupOther->TabIndex = 6; // // gboxCRC @@ -1024,9 +1137,9 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxCRC->Controls->Add(this->labHeaderCRC); this->gboxCRC->Controls->Add(this->tboxHeaderCRC); this->gboxCRC->Controls->Add(this->tboxWholeCRC); - this->gboxCRC->Location = System::Drawing::Point(185, 14); + this->gboxCRC->Location = System::Drawing::Point(26, 285); this->gboxCRC->Name = L"gboxCRC"; - this->gboxCRC->Size = System::Drawing::Size(153, 70); + this->gboxCRC->Size = System::Drawing::Size(285, 49); this->gboxCRC->TabIndex = 5; this->gboxCRC->TabStop = false; this->gboxCRC->Text = L"CRC"; @@ -1034,7 +1147,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labRomCRC // this->labRomCRC->AutoSize = true; - this->labRomCRC->Location = System::Drawing::Point(6, 46); + this->labRomCRC->Location = System::Drawing::Point(146, 20); this->labRomCRC->Name = L"labRomCRC"; this->labRomCRC->Size = System::Drawing::Size(63, 12); this->labRomCRC->TabIndex = 3; @@ -1051,7 +1164,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxHeaderCRC // - this->tboxHeaderCRC->Location = System::Drawing::Point(75, 17); + this->tboxHeaderCRC->Location = System::Drawing::Point(78, 17); this->tboxHeaderCRC->Name = L"tboxHeaderCRC"; this->tboxHeaderCRC->ReadOnly = true; this->tboxHeaderCRC->Size = System::Drawing::Size(55, 19); @@ -1059,38 +1172,16 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxWholeCRC // - this->tboxWholeCRC->Location = System::Drawing::Point(75, 43); + this->tboxWholeCRC->Location = System::Drawing::Point(215, 17); this->tboxWholeCRC->Name = L"tboxWholeCRC"; this->tboxWholeCRC->ReadOnly = true; this->tboxWholeCRC->Size = System::Drawing::Size(55, 19); this->tboxWholeCRC->TabIndex = 0; // - // gboxFileOpen - // - this->gboxFileOpen->Controls->Add(this->butSaveAs); - this->gboxFileOpen->Controls->Add(this->tboxFile); - this->gboxFileOpen->Controls->Add(this->butOpen); - this->gboxFileOpen->Location = System::Drawing::Point(12, 625); - this->gboxFileOpen->Name = L"gboxFileOpen"; - this->gboxFileOpen->Size = System::Drawing::Size(622, 47); - this->gboxFileOpen->TabIndex = 4; - this->gboxFileOpen->TabStop = false; - this->gboxFileOpen->Text = L"ROMデータファイルの入出力"; - // - // butSaveAs - // - this->butSaveAs->Location = System::Drawing::Point(462, 16); - this->butSaveAs->Name = L"butSaveAs"; - this->butSaveAs->Size = System::Drawing::Size(148, 23); - this->butSaveAs->TabIndex = 2; - this->butSaveAs->Text = L"入力情報を反映させて保存"; - this->butSaveAs->UseVisualStyleBackColor = true; - this->butSaveAs->Click += gcnew System::EventHandler(this, &Form1::butSaveAs_Click); - // // labCaption // this->labCaption->AutoSize = true; - this->labCaption->Location = System::Drawing::Point(23, 42); + this->labCaption->Location = System::Drawing::Point(367, 263); this->labCaption->Name = L"labCaption"; this->labCaption->Size = System::Drawing::Size(241, 12); this->labCaption->TabIndex = 8; @@ -1098,51 +1189,16 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxCaption // - this->tboxCaption->Location = System::Drawing::Point(25, 57); + this->tboxCaption->Location = System::Drawing::Point(366, 280); this->tboxCaption->Multiline = true; this->tboxCaption->Name = L"tboxCaption"; - this->tboxCaption->Size = System::Drawing::Size(328, 120); + this->tboxCaption->Size = System::Drawing::Size(345, 57); this->tboxCaption->TabIndex = 8; // - // gboxSelectLang - // - this->gboxSelectLang->Controls->Add(this->rSelectE); - this->gboxSelectLang->Controls->Add(this->rSelectJ); - this->gboxSelectLang->Location = System::Drawing::Point(12, 12); - this->gboxSelectLang->Name = L"gboxSelectLang"; - this->gboxSelectLang->Size = System::Drawing::Size(153, 72); - this->gboxSelectLang->TabIndex = 9; - this->gboxSelectLang->TabStop = false; - this->gboxSelectLang->Text = L"Select Language"; - // - // rSelectE - // - this->rSelectE->AutoSize = true; - this->rSelectE->Location = System::Drawing::Point(16, 22); - this->rSelectE->Name = L"rSelectE"; - this->rSelectE->Size = System::Drawing::Size(60, 16); - this->rSelectE->TabIndex = 1; - this->rSelectE->Text = L"English"; - this->rSelectE->UseVisualStyleBackColor = true; - this->rSelectE->CheckedChanged += gcnew System::EventHandler(this, &Form1::rSelectE_CheckedChanged); - // - // rSelectJ - // - this->rSelectJ->AutoSize = true; - this->rSelectJ->Checked = true; - this->rSelectJ->Location = System::Drawing::Point(16, 44); - this->rSelectJ->Name = L"rSelectJ"; - this->rSelectJ->Size = System::Drawing::Size(72, 16); - this->rSelectJ->TabIndex = 0; - this->rSelectJ->TabStop = true; - this->rSelectJ->Text = L"Japanese"; - this->rSelectJ->UseVisualStyleBackColor = true; - this->rSelectJ->CheckedChanged += gcnew System::EventHandler(this, &Form1::rSelectJ_CheckedChanged); - // // labPEGIBBFC2 // this->labPEGIBBFC2->AutoSize = true; - this->labPEGIBBFC2->Location = System::Drawing::Point(14, 266); + this->labPEGIBBFC2->Location = System::Drawing::Point(12, 216); this->labPEGIBBFC2->Name = L"labPEGIBBFC2"; this->labPEGIBBFC2->Size = System::Drawing::Size(46, 12); this->labPEGIBBFC2->TabIndex = 35; @@ -1151,7 +1207,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labOFLC // this->labOFLC->AutoSize = true; - this->labOFLC->Location = System::Drawing::Point(50, 284); + this->labOFLC->Location = System::Drawing::Point(48, 234); this->labOFLC->Name = L"labOFLC"; this->labOFLC->Size = System::Drawing::Size(34, 12); this->labOFLC->TabIndex = 33; @@ -1160,7 +1216,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labPEGIBBFC // this->labPEGIBBFC->AutoSize = true; - this->labPEGIBBFC->Location = System::Drawing::Point(14, 254); + this->labPEGIBBFC->Location = System::Drawing::Point(12, 204); this->labPEGIBBFC->Name = L"labPEGIBBFC"; this->labPEGIBBFC->Size = System::Drawing::Size(77, 12); this->labPEGIBBFC->TabIndex = 32; @@ -1169,7 +1225,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labPEGIPRT // this->labPEGIPRT->AutoSize = true; - this->labPEGIPRT->Location = System::Drawing::Point(14, 232); + this->labPEGIPRT->Location = System::Drawing::Point(12, 182); this->labPEGIPRT->Name = L"labPEGIPRT"; this->labPEGIPRT->Size = System::Drawing::Size(76, 12); this->labPEGIPRT->TabIndex = 31; @@ -1178,7 +1234,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labPEGI // this->labPEGI->AutoSize = true; - this->labPEGI->Location = System::Drawing::Point(14, 206); + this->labPEGI->Location = System::Drawing::Point(12, 156); this->labPEGI->Name = L"labPEGI"; this->labPEGI->Size = System::Drawing::Size(77, 12); this->labPEGI->TabIndex = 30; @@ -1187,7 +1243,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labUSK // this->labUSK->AutoSize = true; - this->labUSK->Location = System::Drawing::Point(50, 180); + this->labUSK->Location = System::Drawing::Point(48, 130); this->labUSK->Name = L"labUSK"; this->labUSK->Size = System::Drawing::Size(27, 12); this->labUSK->TabIndex = 29; @@ -1196,7 +1252,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labESRB // this->labESRB->AutoSize = true; - this->labESRB->Location = System::Drawing::Point(50, 154); + this->labESRB->Location = System::Drawing::Point(48, 104); this->labESRB->Name = L"labESRB"; this->labESRB->Size = System::Drawing::Size(35, 12); this->labESRB->TabIndex = 28; @@ -1205,7 +1261,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labCERO // this->labCERO->AutoSize = true; - this->labCERO->Location = System::Drawing::Point(50, 128); + this->labCERO->Location = System::Drawing::Point(48, 78); this->labCERO->Name = L"labCERO"; this->labCERO->Size = System::Drawing::Size(36, 12); this->labCERO->TabIndex = 27; @@ -1214,7 +1270,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxAlwaysOFLC // this->cboxAlwaysOFLC->AutoSize = true; - this->cboxAlwaysOFLC->Location = System::Drawing::Point(375, 284); + this->cboxAlwaysOFLC->Location = System::Drawing::Point(373, 234); this->cboxAlwaysOFLC->Name = L"cboxAlwaysOFLC"; this->cboxAlwaysOFLC->Size = System::Drawing::Size(15, 14); this->cboxAlwaysOFLC->TabIndex = 20; @@ -1223,7 +1279,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxAlwaysPEGIBBFC // this->cboxAlwaysPEGIBBFC->AutoSize = true; - this->cboxAlwaysPEGIBBFC->Location = System::Drawing::Point(375, 258); + this->cboxAlwaysPEGIBBFC->Location = System::Drawing::Point(373, 208); this->cboxAlwaysPEGIBBFC->Name = L"cboxAlwaysPEGIBBFC"; this->cboxAlwaysPEGIBBFC->Size = System::Drawing::Size(15, 14); this->cboxAlwaysPEGIBBFC->TabIndex = 17; @@ -1232,7 +1288,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxAlwaysPEGIPRT // this->cboxAlwaysPEGIPRT->AutoSize = true; - this->cboxAlwaysPEGIPRT->Location = System::Drawing::Point(375, 232); + this->cboxAlwaysPEGIPRT->Location = System::Drawing::Point(373, 182); this->cboxAlwaysPEGIPRT->Name = L"cboxAlwaysPEGIPRT"; this->cboxAlwaysPEGIPRT->Size = System::Drawing::Size(15, 14); this->cboxAlwaysPEGIPRT->TabIndex = 14; @@ -1241,7 +1297,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxAlwaysPEGI // this->cboxAlwaysPEGI->AutoSize = true; - this->cboxAlwaysPEGI->Location = System::Drawing::Point(375, 206); + this->cboxAlwaysPEGI->Location = System::Drawing::Point(373, 156); this->cboxAlwaysPEGI->Name = L"cboxAlwaysPEGI"; this->cboxAlwaysPEGI->Size = System::Drawing::Size(15, 14); this->cboxAlwaysPEGI->TabIndex = 11; @@ -1250,7 +1306,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxAlwaysUSK // this->cboxAlwaysUSK->AutoSize = true; - this->cboxAlwaysUSK->Location = System::Drawing::Point(375, 180); + this->cboxAlwaysUSK->Location = System::Drawing::Point(373, 130); this->cboxAlwaysUSK->Name = L"cboxAlwaysUSK"; this->cboxAlwaysUSK->Size = System::Drawing::Size(15, 14); this->cboxAlwaysUSK->TabIndex = 8; @@ -1259,7 +1315,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxAlwaysESRB // this->cboxAlwaysESRB->AutoSize = true; - this->cboxAlwaysESRB->Location = System::Drawing::Point(375, 154); + this->cboxAlwaysESRB->Location = System::Drawing::Point(373, 104); this->cboxAlwaysESRB->Name = L"cboxAlwaysESRB"; this->cboxAlwaysESRB->Size = System::Drawing::Size(15, 14); this->cboxAlwaysESRB->TabIndex = 5; @@ -1268,7 +1324,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxAlwaysCERO // this->cboxAlwaysCERO->AutoSize = true; - this->cboxAlwaysCERO->Location = System::Drawing::Point(375, 128); + this->cboxAlwaysCERO->Location = System::Drawing::Point(373, 78); this->cboxAlwaysCERO->Name = L"cboxAlwaysCERO"; this->cboxAlwaysCERO->Size = System::Drawing::Size(15, 14); this->cboxAlwaysCERO->TabIndex = 2; @@ -1279,7 +1335,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->combOFLC->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList; this->combOFLC->FormattingEnabled = true; this->combOFLC->Items->AddRange(gcnew cli::array< System::Object^ >(5) {L"G", L"PG", L"M", L"MA15+", L"未審査"}); - this->combOFLC->Location = System::Drawing::Point(97, 281); + this->combOFLC->Location = System::Drawing::Point(95, 231); this->combOFLC->Name = L"combOFLC"; this->combOFLC->Size = System::Drawing::Size(164, 20); this->combOFLC->TabIndex = 18; @@ -1290,7 +1346,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->combPEGIBBFC->FormattingEnabled = true; this->combPEGIBBFC->Items->AddRange(gcnew cli::array< System::Object^ >(9) {L"3歳以上", L"4歳以上推奨", L"7歳以上", L"8歳以上推奨", L"12歳以上", L"15歳以上", L"16歳以上", L"18歳以上", L"未審査"}); - this->combPEGIBBFC->Location = System::Drawing::Point(97, 255); + this->combPEGIBBFC->Location = System::Drawing::Point(95, 205); this->combPEGIBBFC->Name = L"combPEGIBBFC"; this->combPEGIBBFC->Size = System::Drawing::Size(164, 20); this->combPEGIBBFC->TabIndex = 15; @@ -1301,7 +1357,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->combPEGIPRT->FormattingEnabled = true; this->combPEGIPRT->Items->AddRange(gcnew cli::array< System::Object^ >(6) {L"4歳以上", L"6歳以上", L"12歳以上", L"16歳以上", L"18歳以上", L"未審査"}); - this->combPEGIPRT->Location = System::Drawing::Point(97, 229); + this->combPEGIPRT->Location = System::Drawing::Point(95, 179); this->combPEGIPRT->Name = L"combPEGIPRT"; this->combPEGIPRT->Size = System::Drawing::Size(164, 20); this->combPEGIPRT->TabIndex = 12; @@ -1312,7 +1368,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->combPEGI->FormattingEnabled = true; this->combPEGI->Items->AddRange(gcnew cli::array< System::Object^ >(6) {L"3歳以上", L"7歳以上", L"12歳以上", L"16歳以上", L"18歳以上", L"未審査"}); - this->combPEGI->Location = System::Drawing::Point(97, 203); + this->combPEGI->Location = System::Drawing::Point(95, 153); this->combPEGI->Name = L"combPEGI"; this->combPEGI->Size = System::Drawing::Size(164, 20); this->combPEGI->TabIndex = 9; @@ -1323,7 +1379,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->combUSK->FormattingEnabled = true; this->combUSK->Items->AddRange(gcnew cli::array< System::Object^ >(6) {L"年齢制限なし", L"6歳以上", L"12歳以上", L"16歳以上", L"青少年には不適切", L"未審査"}); - this->combUSK->Location = System::Drawing::Point(97, 177); + this->combUSK->Location = System::Drawing::Point(95, 127); this->combUSK->Name = L"combUSK"; this->combUSK->Size = System::Drawing::Size(164, 20); this->combUSK->TabIndex = 6; @@ -1334,7 +1390,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->combESRB->FormattingEnabled = true; this->combESRB->Items->AddRange(gcnew cli::array< System::Object^ >(6) {L"EC (3歳以上)", L"E (6歳以上)", L"E10+ (10歳以上)", L"T (13歳以上)", L"M (17歳以上)", L"未審査"}); - this->combESRB->Location = System::Drawing::Point(97, 151); + this->combESRB->Location = System::Drawing::Point(95, 101); this->combESRB->Name = L"combESRB"; this->combESRB->Size = System::Drawing::Size(164, 20); this->combESRB->TabIndex = 3; @@ -1345,7 +1401,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->combCERO->FormattingEnabled = true; this->combCERO->Items->AddRange(gcnew cli::array< System::Object^ >(6) {L"A (全年齢)", L"B (12歳以上)", L"C (15歳以上)", L"D (17歳以上)", L"Z (18歳以上)", L"未審査"}); - this->combCERO->Location = System::Drawing::Point(97, 125); + this->combCERO->Location = System::Drawing::Point(95, 75); this->combCERO->Name = L"combCERO"; this->combCERO->Size = System::Drawing::Size(164, 20); this->combCERO->TabIndex = 0; @@ -1353,7 +1409,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxOFLC // this->cboxOFLC->AutoSize = true; - this->cboxOFLC->Location = System::Drawing::Point(298, 284); + this->cboxOFLC->Location = System::Drawing::Point(296, 234); this->cboxOFLC->Name = L"cboxOFLC"; this->cboxOFLC->Size = System::Drawing::Size(15, 14); this->cboxOFLC->TabIndex = 19; @@ -1362,7 +1418,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxPEGIBBFC // this->cboxPEGIBBFC->AutoSize = true; - this->cboxPEGIBBFC->Location = System::Drawing::Point(298, 258); + this->cboxPEGIBBFC->Location = System::Drawing::Point(296, 208); this->cboxPEGIBBFC->Name = L"cboxPEGIBBFC"; this->cboxPEGIBBFC->Size = System::Drawing::Size(15, 14); this->cboxPEGIBBFC->TabIndex = 16; @@ -1371,7 +1427,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxPEGIPRT // this->cboxPEGIPRT->AutoSize = true; - this->cboxPEGIPRT->Location = System::Drawing::Point(298, 232); + this->cboxPEGIPRT->Location = System::Drawing::Point(296, 182); this->cboxPEGIPRT->Name = L"cboxPEGIPRT"; this->cboxPEGIPRT->Size = System::Drawing::Size(15, 14); this->cboxPEGIPRT->TabIndex = 13; @@ -1380,7 +1436,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxPEGI // this->cboxPEGI->AutoSize = true; - this->cboxPEGI->Location = System::Drawing::Point(298, 206); + this->cboxPEGI->Location = System::Drawing::Point(296, 156); this->cboxPEGI->Name = L"cboxPEGI"; this->cboxPEGI->Size = System::Drawing::Size(15, 14); this->cboxPEGI->TabIndex = 10; @@ -1389,7 +1445,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxUSK // this->cboxUSK->AutoSize = true; - this->cboxUSK->Location = System::Drawing::Point(298, 180); + this->cboxUSK->Location = System::Drawing::Point(296, 130); this->cboxUSK->Name = L"cboxUSK"; this->cboxUSK->Size = System::Drawing::Size(15, 14); this->cboxUSK->TabIndex = 7; @@ -1398,7 +1454,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxESRB // this->cboxESRB->AutoSize = true; - this->cboxESRB->Location = System::Drawing::Point(298, 154); + this->cboxESRB->Location = System::Drawing::Point(296, 104); this->cboxESRB->Name = L"cboxESRB"; this->cboxESRB->Size = System::Drawing::Size(15, 14); this->cboxESRB->TabIndex = 4; @@ -1407,7 +1463,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxCERO // this->cboxCERO->AutoSize = true; - this->cboxCERO->Location = System::Drawing::Point(298, 128); + this->cboxCERO->Location = System::Drawing::Point(296, 78); this->cboxCERO->Name = L"cboxCERO"; this->cboxCERO->Size = System::Drawing::Size(15, 14); this->cboxCERO->TabIndex = 1; @@ -1416,7 +1472,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labParentalForceEnable // this->labParentalForceEnable->AutoSize = true; - this->labParentalForceEnable->Location = System::Drawing::Point(349, 109); + this->labParentalForceEnable->Location = System::Drawing::Point(347, 59); this->labParentalForceEnable->Name = L"labParentalForceEnable"; this->labParentalForceEnable->Size = System::Drawing::Size(82, 12); this->labParentalForceEnable->TabIndex = 0; @@ -1425,7 +1481,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labParentalRating // this->labParentalRating->AutoSize = true; - this->labParentalRating->Location = System::Drawing::Point(141, 109); + this->labParentalRating->Location = System::Drawing::Point(139, 59); this->labParentalRating->Name = L"labParentalRating"; this->labParentalRating->Size = System::Drawing::Size(58, 12); this->labParentalRating->TabIndex = 2; @@ -1434,64 +1490,16 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labParentalEnable // this->labParentalEnable->AutoSize = true; - this->labParentalEnable->Location = System::Drawing::Point(265, 109); + this->labParentalEnable->Location = System::Drawing::Point(263, 59); this->labParentalEnable->Name = L"labParentalEnable"; this->labParentalEnable->Size = System::Drawing::Size(62, 12); this->labParentalEnable->TabIndex = 1; this->labParentalEnable->Text = L"制限を有効"; // - // gboxTWLInfoWritable - // - this->gboxTWLInfoWritable->Controls->Add(this->labRegion); - this->gboxTWLInfoWritable->Controls->Add(this->cboxIsEULA); - this->gboxTWLInfoWritable->Controls->Add(this->combRegion); - this->gboxTWLInfoWritable->Controls->Add(this->labPEGIBBFC2); - this->gboxTWLInfoWritable->Controls->Add(this->cboxIsWiFiIcon); - this->gboxTWLInfoWritable->Controls->Add(this->labParentalRating); - this->gboxTWLInfoWritable->Controls->Add(this->labEULA); - this->gboxTWLInfoWritable->Controls->Add(this->labOFLC); - this->gboxTWLInfoWritable->Controls->Add(this->cboxIsWirelessIcon); - this->gboxTWLInfoWritable->Controls->Add(this->labParentalEnable); - this->gboxTWLInfoWritable->Controls->Add(this->numEULA); - this->gboxTWLInfoWritable->Controls->Add(this->labPEGIBBFC); - this->gboxTWLInfoWritable->Controls->Add(this->combPEGIBBFC); - this->gboxTWLInfoWritable->Controls->Add(this->labParentalForceEnable); - this->gboxTWLInfoWritable->Controls->Add(this->combOFLC); - this->gboxTWLInfoWritable->Controls->Add(this->labPEGIPRT); - this->gboxTWLInfoWritable->Controls->Add(this->combPEGIPRT); - this->gboxTWLInfoWritable->Controls->Add(this->cboxCERO); - this->gboxTWLInfoWritable->Controls->Add(this->cboxAlwaysCERO); - this->gboxTWLInfoWritable->Controls->Add(this->labPEGI); - this->gboxTWLInfoWritable->Controls->Add(this->combPEGI); - this->gboxTWLInfoWritable->Controls->Add(this->cboxESRB); - this->gboxTWLInfoWritable->Controls->Add(this->cboxAlwaysESRB); - this->gboxTWLInfoWritable->Controls->Add(this->labUSK); - this->gboxTWLInfoWritable->Controls->Add(this->combUSK); - this->gboxTWLInfoWritable->Controls->Add(this->cboxUSK); - this->gboxTWLInfoWritable->Controls->Add(this->cboxAlwaysUSK); - this->gboxTWLInfoWritable->Controls->Add(this->labESRB); - this->gboxTWLInfoWritable->Controls->Add(this->combESRB); - this->gboxTWLInfoWritable->Controls->Add(this->cboxPEGI); - this->gboxTWLInfoWritable->Controls->Add(this->cboxAlwaysPEGI); - this->gboxTWLInfoWritable->Controls->Add(this->labCERO); - this->gboxTWLInfoWritable->Controls->Add(this->combCERO); - this->gboxTWLInfoWritable->Controls->Add(this->cboxPEGIPRT); - this->gboxTWLInfoWritable->Controls->Add(this->cboxAlwaysPEGIPRT); - this->gboxTWLInfoWritable->Controls->Add(this->cboxAlwaysOFLC); - this->gboxTWLInfoWritable->Controls->Add(this->cboxOFLC); - this->gboxTWLInfoWritable->Controls->Add(this->cboxPEGIBBFC); - this->gboxTWLInfoWritable->Controls->Add(this->cboxAlwaysPEGIBBFC); - this->gboxTWLInfoWritable->Location = System::Drawing::Point(358, 12); - this->gboxTWLInfoWritable->Name = L"gboxTWLInfoWritable"; - this->gboxTWLInfoWritable->Size = System::Drawing::Size(451, 313); - this->gboxTWLInfoWritable->TabIndex = 30; - this->gboxTWLInfoWritable->TabStop = false; - this->gboxTWLInfoWritable->Text = L"ROMデータ編集可能情報(必要があれば変更してください)"; - // // labRegion // this->labRegion->AutoSize = true; - this->labRegion->Location = System::Drawing::Point(15, 81); + this->labRegion->Location = System::Drawing::Point(12, 24); this->labRegion->Name = L"labRegion"; this->labRegion->Size = System::Drawing::Size(75, 12); this->labRegion->TabIndex = 37; @@ -1500,7 +1508,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxIsEULA // this->cboxIsEULA->AutoSize = true; - this->cboxIsEULA->Location = System::Drawing::Point(18, 23); + this->cboxIsEULA->Location = System::Drawing::Point(17, 18); this->cboxIsEULA->Name = L"cboxIsEULA"; this->cboxIsEULA->Size = System::Drawing::Size(77, 16); this->cboxIsEULA->TabIndex = 0; @@ -1512,7 +1520,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->combRegion->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList; this->combRegion->FormattingEnabled = true; this->combRegion->Items->AddRange(gcnew cli::array< System::Object^ >(5) {L"日本のみ", L"米国のみ", L"欧州のみ", L"豪州のみ", L"欧州および豪州"}); - this->combRegion->Location = System::Drawing::Point(97, 78); + this->combRegion->Location = System::Drawing::Point(95, 21); this->combRegion->Name = L"combRegion"; this->combRegion->Size = System::Drawing::Size(216, 20); this->combRegion->TabIndex = 36; @@ -1521,7 +1529,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxIsWiFiIcon // this->cboxIsWiFiIcon->AutoSize = true; - this->cboxIsWiFiIcon->Location = System::Drawing::Point(231, 45); + this->cboxIsWiFiIcon->Location = System::Drawing::Point(6, 43); this->cboxIsWiFiIcon->Name = L"cboxIsWiFiIcon"; this->cboxIsWiFiIcon->Size = System::Drawing::Size(135, 16); this->cboxIsWiFiIcon->TabIndex = 3; @@ -1531,7 +1539,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labEULA // this->labEULA->AutoSize = true; - this->labEULA->Location = System::Drawing::Point(15, 49); + this->labEULA->Location = System::Drawing::Point(14, 44); this->labEULA->Name = L"labEULA"; this->labEULA->Size = System::Drawing::Size(103, 12); this->labEULA->TabIndex = 7; @@ -1540,7 +1548,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxIsWirelessIcon // this->cboxIsWirelessIcon->AutoSize = true; - this->cboxIsWirelessIcon->Location = System::Drawing::Point(231, 23); + this->cboxIsWirelessIcon->Location = System::Drawing::Point(6, 18); this->cboxIsWirelessIcon->Name = L"cboxIsWirelessIcon"; this->cboxIsWirelessIcon->Size = System::Drawing::Size(168, 16); this->cboxIsWirelessIcon->TabIndex = 2; @@ -1549,7 +1557,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // numEULA // - this->numEULA->Location = System::Drawing::Point(131, 44); + this->numEULA->Location = System::Drawing::Point(130, 39); this->numEULA->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) {255, 0, 0, 0}); this->numEULA->Name = L"numEULA"; this->numEULA->Size = System::Drawing::Size(45, 19); @@ -1559,7 +1567,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxIsInputPerson2 // this->cboxIsInputPerson2->AutoSize = true; - this->cboxIsInputPerson2->Location = System::Drawing::Point(38, 11); + this->cboxIsInputPerson2->Location = System::Drawing::Point(392, 66); this->cboxIsInputPerson2->Name = L"cboxIsInputPerson2"; this->cboxIsInputPerson2->Size = System::Drawing::Size(150, 16); this->cboxIsInputPerson2->TabIndex = 7; @@ -1587,9 +1595,9 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxPerson2->Controls->Add(this->labPerson2); this->gboxPerson2->Controls->Add(this->labCompany2); this->gboxPerson2->Enabled = false; - this->gboxPerson2->Location = System::Drawing::Point(27, 35); + this->gboxPerson2->Location = System::Drawing::Point(392, 88); this->gboxPerson2->Name = L"gboxPerson2"; - this->gboxPerson2->Size = System::Drawing::Size(304, 210); + this->gboxPerson2->Size = System::Drawing::Size(304, 234); this->gboxPerson2->TabIndex = 14; this->gboxPerson2->TabStop = false; this->gboxPerson2->Text = L"担当者2"; @@ -1597,7 +1605,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labNTSC2Sur // this->labNTSC2Sur->AutoSize = true; - this->labNTSC2Sur->Location = System::Drawing::Point(18, 189); + this->labNTSC2Sur->Location = System::Drawing::Point(18, 214); this->labNTSC2Sur->Name = L"labNTSC2Sur"; this->labNTSC2Sur->Size = System::Drawing::Size(44, 12); this->labNTSC2Sur->TabIndex = 12; @@ -1605,7 +1613,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxNTSC2 // - this->tboxNTSC2->Location = System::Drawing::Point(66, 175); + this->tboxNTSC2->Location = System::Drawing::Point(66, 200); this->tboxNTSC2->Name = L"tboxNTSC2"; this->tboxNTSC2->Size = System::Drawing::Size(220, 19); this->tboxNTSC2->TabIndex = 11; @@ -1613,7 +1621,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labFax2 // this->labFax2->AutoSize = true; - this->labFax2->Location = System::Drawing::Point(159, 128); + this->labFax2->Location = System::Drawing::Point(26, 152); this->labFax2->Name = L"labFax2"; this->labFax2->Size = System::Drawing::Size(27, 12); this->labFax2->TabIndex = 4; @@ -1622,7 +1630,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labNTSC2Pre // this->labNTSC2Pre->AutoSize = true; - this->labNTSC2Pre->Location = System::Drawing::Point(18, 175); + this->labNTSC2Pre->Location = System::Drawing::Point(18, 200); this->labNTSC2Pre->Name = L"labNTSC2Pre"; this->labNTSC2Pre->Size = System::Drawing::Size(35, 12); this->labNTSC2Pre->TabIndex = 11; @@ -1630,14 +1638,14 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxFax2 // - this->tboxFax2->Location = System::Drawing::Point(192, 125); + this->tboxFax2->Location = System::Drawing::Point(66, 149); this->tboxFax2->Name = L"tboxFax2"; this->tboxFax2->Size = System::Drawing::Size(94, 19); this->tboxFax2->TabIndex = 13; // // tboxMail2 // - this->tboxMail2->Location = System::Drawing::Point(66, 150); + this->tboxMail2->Location = System::Drawing::Point(66, 175); this->tboxMail2->Name = L"tboxMail2"; this->tboxMail2->Size = System::Drawing::Size(220, 19); this->tboxMail2->TabIndex = 14; @@ -1646,7 +1654,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // this->tboxTel2->Location = System::Drawing::Point(66, 125); this->tboxTel2->Name = L"tboxTel2"; - this->tboxTel2->Size = System::Drawing::Size(84, 19); + this->tboxTel2->Size = System::Drawing::Size(94, 19); this->tboxTel2->TabIndex = 12; // // tboxFurigana2 @@ -1689,7 +1697,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labMail2 // this->labMail2->AutoSize = true; - this->labMail2->Location = System::Drawing::Point(18, 153); + this->labMail2->Location = System::Drawing::Point(18, 178); this->labMail2->Name = L"labMail2"; this->labMail2->Size = System::Drawing::Size(38, 12); this->labMail2->TabIndex = 5; @@ -1750,9 +1758,9 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxPerson1->Controls->Add(this->labFurigana1); this->gboxPerson1->Controls->Add(this->labPerson1); this->gboxPerson1->Controls->Add(this->labCompany1); - this->gboxPerson1->Location = System::Drawing::Point(27, 35); + this->gboxPerson1->Location = System::Drawing::Point(38, 88); this->gboxPerson1->Name = L"gboxPerson1"; - this->gboxPerson1->Size = System::Drawing::Size(304, 210); + this->gboxPerson1->Size = System::Drawing::Size(304, 234); this->gboxPerson1->TabIndex = 8; this->gboxPerson1->TabStop = false; this->gboxPerson1->Text = L"担当者1"; @@ -1760,7 +1768,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labNTSC1Sur // this->labNTSC1Sur->AutoSize = true; - this->labNTSC1Sur->Location = System::Drawing::Point(18, 189); + this->labNTSC1Sur->Location = System::Drawing::Point(18, 214); this->labNTSC1Sur->Name = L"labNTSC1Sur"; this->labNTSC1Sur->Size = System::Drawing::Size(44, 12); this->labNTSC1Sur->TabIndex = 10; @@ -1769,7 +1777,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labFax1 // this->labFax1->AutoSize = true; - this->labFax1->Location = System::Drawing::Point(159, 128); + this->labFax1->Location = System::Drawing::Point(26, 152); this->labFax1->Name = L"labFax1"; this->labFax1->Size = System::Drawing::Size(27, 12); this->labFax1->TabIndex = 4; @@ -1778,7 +1786,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labNTSC1Pre // this->labNTSC1Pre->AutoSize = true; - this->labNTSC1Pre->Location = System::Drawing::Point(18, 175); + this->labNTSC1Pre->Location = System::Drawing::Point(18, 200); this->labNTSC1Pre->Name = L"labNTSC1Pre"; this->labNTSC1Pre->Size = System::Drawing::Size(35, 12); this->labNTSC1Pre->TabIndex = 9; @@ -1786,21 +1794,21 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxNTSC1 // - this->tboxNTSC1->Location = System::Drawing::Point(66, 175); + this->tboxNTSC1->Location = System::Drawing::Point(66, 200); this->tboxNTSC1->Name = L"tboxNTSC1"; this->tboxNTSC1->Size = System::Drawing::Size(220, 19); this->tboxNTSC1->TabIndex = 8; // // tboxFax1 // - this->tboxFax1->Location = System::Drawing::Point(192, 125); + this->tboxFax1->Location = System::Drawing::Point(66, 149); this->tboxFax1->Name = L"tboxFax1"; this->tboxFax1->Size = System::Drawing::Size(94, 19); this->tboxFax1->TabIndex = 5; // // tboxMail1 // - this->tboxMail1->Location = System::Drawing::Point(66, 150); + this->tboxMail1->Location = System::Drawing::Point(66, 175); this->tboxMail1->Name = L"tboxMail1"; this->tboxMail1->Size = System::Drawing::Size(220, 19); this->tboxMail1->TabIndex = 6; @@ -1809,7 +1817,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // this->tboxTel1->Location = System::Drawing::Point(66, 125); this->tboxTel1->Name = L"tboxTel1"; - this->tboxTel1->Size = System::Drawing::Size(84, 19); + this->tboxTel1->Size = System::Drawing::Size(94, 19); this->tboxTel1->TabIndex = 4; // // tboxFurigana1 @@ -1852,7 +1860,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labMail1 // this->labMail1->AutoSize = true; - this->labMail1->Location = System::Drawing::Point(18, 153); + this->labMail1->Location = System::Drawing::Point(18, 178); this->labMail1->Name = L"labMail1"; this->labMail1->Size = System::Drawing::Size(38, 12); this->labMail1->TabIndex = 5; @@ -1896,7 +1904,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxProductCode2 // - this->tboxProductCode2->Location = System::Drawing::Point(166, 92); + this->tboxProductCode2->Location = System::Drawing::Point(177, 86); this->tboxProductCode2->MaxLength = 4; this->tboxProductCode2->Name = L"tboxProductCode2"; this->tboxProductCode2->Size = System::Drawing::Size(56, 19); @@ -1904,7 +1912,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxProductCode1 // - this->tboxProductCode1->Location = System::Drawing::Point(131, 92); + this->tboxProductCode1->Location = System::Drawing::Point(142, 86); this->tboxProductCode1->MaxLength = 1; this->tboxProductCode1->Name = L"tboxProductCode1"; this->tboxProductCode1->Size = System::Drawing::Size(18, 19); @@ -1912,15 +1920,15 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxProductName // - this->tboxProductName->Location = System::Drawing::Point(97, 63); + this->tboxProductName->Location = System::Drawing::Point(106, 58); this->tboxProductName->Name = L"tboxProductName"; - this->tboxProductName->Size = System::Drawing::Size(266, 19); + this->tboxProductName->Size = System::Drawing::Size(225, 19); this->tboxProductName->TabIndex = 0; // // labProductCode2 // this->labProductCode2->AutoSize = true; - this->labProductCode2->Location = System::Drawing::Point(155, 95); + this->labProductCode2->Location = System::Drawing::Point(166, 89); this->labProductCode2->Name = L"labProductCode2"; this->labProductCode2->Size = System::Drawing::Size(11, 12); this->labProductCode2->TabIndex = 33; @@ -1929,7 +1937,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labProductCode1 // this->labProductCode1->AutoSize = true; - this->labProductCode1->Location = System::Drawing::Point(95, 95); + this->labProductCode1->Location = System::Drawing::Point(106, 89); this->labProductCode1->Name = L"labProductCode1"; this->labProductCode1->Size = System::Drawing::Size(37, 12); this->labProductCode1->TabIndex = 32; @@ -1938,7 +1946,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // dateSubmit // this->dateSubmit->Format = System::Windows::Forms::DateTimePickerFormat::Short; - this->dateSubmit->Location = System::Drawing::Point(97, 121); + this->dateSubmit->Location = System::Drawing::Point(108, 145); this->dateSubmit->MaxDate = System::DateTime(2099, 12, 31, 0, 0, 0, 0); this->dateSubmit->MinDate = System::DateTime(2008, 1, 1, 0, 0, 0, 0); this->dateSubmit->Name = L"dateSubmit"; @@ -1949,7 +1957,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // dateRelease // this->dateRelease->Format = System::Windows::Forms::DateTimePickerFormat::Short; - this->dateRelease->Location = System::Drawing::Point(97, 152); + this->dateRelease->Location = System::Drawing::Point(108, 116); this->dateRelease->MaxDate = System::DateTime(2099, 12, 31, 0, 0, 0, 0); this->dateRelease->MinDate = System::DateTime(2008, 1, 1, 0, 0, 0, 0); this->dateRelease->Name = L"dateRelease"; @@ -1964,9 +1972,9 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxUsage->Controls->Add(this->rUsageDst); this->gboxUsage->Controls->Add(this->rUsageSample); this->gboxUsage->Controls->Add(this->rUsageSale); - this->gboxUsage->Location = System::Drawing::Point(14, 181); + this->gboxUsage->Location = System::Drawing::Point(18, 263); this->gboxUsage->Name = L"gboxUsage"; - this->gboxUsage->Size = System::Drawing::Size(364, 74); + this->gboxUsage->Size = System::Drawing::Size(310, 74); this->gboxUsage->TabIndex = 6; this->gboxUsage->TabStop = false; this->gboxUsage->Text = L"用途"; @@ -1976,7 +1984,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxUsageOther->Enabled = false; this->tboxUsageOther->Location = System::Drawing::Point(71, 42); this->tboxUsageOther->Name = L"tboxUsageOther"; - this->tboxUsageOther->Size = System::Drawing::Size(278, 19); + this->tboxUsageOther->Size = System::Drawing::Size(214, 19); this->tboxUsageOther->TabIndex = 4; // // rUsageOther @@ -2026,9 +2034,9 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // this->gboxSubmitWay->Controls->Add(this->rSubmitHand); this->gboxSubmitWay->Controls->Add(this->rSubmitPost); - this->gboxSubmitWay->Location = System::Drawing::Point(244, 114); + this->gboxSubmitWay->Location = System::Drawing::Point(18, 212); this->gboxSubmitWay->Name = L"gboxSubmitWay"; - this->gboxSubmitWay->Size = System::Drawing::Size(94, 63); + this->gboxSubmitWay->Size = System::Drawing::Size(155, 45); this->gboxSubmitWay->TabIndex = 5; this->gboxSubmitWay->TabStop = false; this->gboxSubmitWay->Text = L"提出方法"; @@ -2036,7 +2044,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // rSubmitHand // this->rSubmitHand->AutoSize = true; - this->rSubmitHand->Location = System::Drawing::Point(6, 40); + this->rSubmitHand->Location = System::Drawing::Point(82, 18); this->rSubmitHand->Name = L"rSubmitHand"; this->rSubmitHand->Size = System::Drawing::Size(56, 16); this->rSubmitHand->TabIndex = 1; @@ -2058,7 +2066,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labSubmiteDate // this->labSubmiteDate->AutoSize = true; - this->labSubmiteDate->Location = System::Drawing::Point(9, 124); + this->labSubmiteDate->Location = System::Drawing::Point(16, 148); this->labSubmiteDate->Name = L"labSubmiteDate"; this->labSubmiteDate->Size = System::Drawing::Size(65, 12); this->labSubmiteDate->TabIndex = 11; @@ -2067,7 +2075,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labReleaseDate // this->labReleaseDate->AutoSize = true; - this->labReleaseDate->Location = System::Drawing::Point(9, 156); + this->labReleaseDate->Location = System::Drawing::Point(17, 119); this->labReleaseDate->Name = L"labReleaseDate"; this->labReleaseDate->Size = System::Drawing::Size(65, 12); this->labReleaseDate->TabIndex = 7; @@ -2076,7 +2084,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labProductCode // this->labProductCode->AutoSize = true; - this->labProductCode->Location = System::Drawing::Point(9, 95); + this->labProductCode->Location = System::Drawing::Point(16, 89); this->labProductCode->Name = L"labProductCode"; this->labProductCode->Size = System::Drawing::Size(56, 12); this->labProductCode->TabIndex = 6; @@ -2085,7 +2093,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labProductName // this->labProductName->AutoSize = true; - this->labProductName->Location = System::Drawing::Point(10, 66); + this->labProductName->Location = System::Drawing::Point(16, 58); this->labProductName->Name = L"labProductName"; this->labProductName->Size = System::Drawing::Size(41, 12); this->labProductName->TabIndex = 5; @@ -2094,7 +2102,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labCapSubmitVer // this->labCapSubmitVer->AutoSize = true; - this->labCapSubmitVer->Location = System::Drawing::Point(138, 37); + this->labCapSubmitVer->Location = System::Drawing::Point(106, 199); this->labCapSubmitVer->Name = L"labCapSubmitVer"; this->labCapSubmitVer->Size = System::Drawing::Size(233, 12); this->labCapSubmitVer->TabIndex = 26; @@ -2102,7 +2110,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // numSubmitVersion // - this->numSubmitVersion->Location = System::Drawing::Point(97, 34); + this->numSubmitVersion->Location = System::Drawing::Point(108, 177); this->numSubmitVersion->Name = L"numSubmitVersion"; this->numSubmitVersion->Size = System::Drawing::Size(38, 19); this->numSubmitVersion->TabIndex = 9; @@ -2110,106 +2118,25 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labSubmitVer // this->labSubmitVer->AutoSize = true; - this->labSubmitVer->Location = System::Drawing::Point(9, 36); + this->labSubmitVer->Location = System::Drawing::Point(17, 179); this->labSubmitVer->Name = L"labSubmitVer"; this->labSubmitVer->Size = System::Drawing::Size(74, 12); this->labSubmitVer->TabIndex = 24; this->labSubmitVer->Text = L"提出バージョン"; // - // tabDoc - // - this->tabDoc->Controls->Add(this->tabSubmitInfo); - this->tabDoc->Controls->Add(this->tabForeignInfo); - this->tabDoc->Controls->Add(this->tabCompanyInfo1); - this->tabDoc->Controls->Add(this->tabCompanyInfo2); - this->tabDoc->Controls->Add(this->tabCaption); - this->tabDoc->Location = System::Drawing::Point(12, 331); - this->tabDoc->Name = L"tabDoc"; - this->tabDoc->SelectedIndex = 0; - this->tabDoc->Size = System::Drawing::Size(392, 288); - this->tabDoc->TabIndex = 31; - // - // tabSubmitInfo - // - this->tabSubmitInfo->Controls->Add(this->labCautionInput); - this->tabSubmitInfo->Controls->Add(this->tboxProductCode2); - this->tabSubmitInfo->Controls->Add(this->labSubmitVer); - this->tabSubmitInfo->Controls->Add(this->tboxProductCode1); - this->tabSubmitInfo->Controls->Add(this->numSubmitVersion); - this->tabSubmitInfo->Controls->Add(this->tboxProductName); - this->tabSubmitInfo->Controls->Add(this->labCapSubmitVer); - this->tabSubmitInfo->Controls->Add(this->labProductCode2); - this->tabSubmitInfo->Controls->Add(this->labProductName); - this->tabSubmitInfo->Controls->Add(this->labProductCode1); - this->tabSubmitInfo->Controls->Add(this->labProductCode); - this->tabSubmitInfo->Controls->Add(this->dateSubmit); - this->tabSubmitInfo->Controls->Add(this->labReleaseDate); - this->tabSubmitInfo->Controls->Add(this->dateRelease); - this->tabSubmitInfo->Controls->Add(this->labSubmiteDate); - this->tabSubmitInfo->Controls->Add(this->gboxSubmitWay); - this->tabSubmitInfo->Controls->Add(this->gboxUsage); - this->tabSubmitInfo->Location = System::Drawing::Point(4, 21); - this->tabSubmitInfo->Name = L"tabSubmitInfo"; - this->tabSubmitInfo->Padding = System::Windows::Forms::Padding(3); - this->tabSubmitInfo->Size = System::Drawing::Size(384, 263); - this->tabSubmitInfo->TabIndex = 0; - this->tabSubmitInfo->Text = L"提出情報"; - this->tabSubmitInfo->UseVisualStyleBackColor = true; - // - // labCautionInput - // - this->labCautionInput->AutoSize = true; - this->labCautionInput->ForeColor = System::Drawing::SystemColors::ActiveCaption; - this->labCautionInput->Location = System::Drawing::Point(9, 8); - this->labCautionInput->Name = L"labCautionInput"; - this->labCautionInput->Size = System::Drawing::Size(312, 12); - this->labCautionInput->TabIndex = 34; - this->labCautionInput->Text = L"* これらの項目は書類提出に必要な情報です。入力してください。"; - // - // tabForeignInfo - // - this->tabForeignInfo->Controls->Add(this->labMultiForeign2); - this->tabForeignInfo->Controls->Add(this->labMultiForeign1); - this->tabForeignInfo->Controls->Add(this->tboxProductCode2Foreign3); - this->tabForeignInfo->Controls->Add(this->tboxProductCode2Foreign2); - this->tabForeignInfo->Controls->Add(this->labProductCode2Foreign); - this->tabForeignInfo->Controls->Add(this->cboxReleaseForeign); - this->tabForeignInfo->Controls->Add(this->labProductNameForeign); - this->tabForeignInfo->Controls->Add(this->tboxProductNameForeign); - this->tabForeignInfo->Controls->Add(this->labProductCode1Foreign); - this->tabForeignInfo->Controls->Add(this->tboxProductCode1Foreign); - this->tabForeignInfo->Controls->Add(this->labProductCodeForeign); - this->tabForeignInfo->Controls->Add(this->tboxProductCode2Foreign1); - this->tabForeignInfo->Location = System::Drawing::Point(4, 21); - this->tabForeignInfo->Name = L"tabForeignInfo"; - this->tabForeignInfo->Padding = System::Windows::Forms::Padding(3); - this->tabForeignInfo->Size = System::Drawing::Size(384, 263); - this->tabForeignInfo->TabIndex = 1; - this->tabForeignInfo->Text = L"海外版"; - this->tabForeignInfo->UseVisualStyleBackColor = true; - // - // labMultiForeign2 - // - this->labMultiForeign2->AutoSize = true; - this->labMultiForeign2->Location = System::Drawing::Point(221, 152); - this->labMultiForeign2->Name = L"labMultiForeign2"; - this->labMultiForeign2->Size = System::Drawing::Size(103, 12); - this->labMultiForeign2->TabIndex = 45; - this->labMultiForeign2->Text = L"* 複数ある場合のみ"; - // // labMultiForeign1 // this->labMultiForeign1->AutoSize = true; - this->labMultiForeign1->Location = System::Drawing::Point(221, 127); + this->labMultiForeign1->Location = System::Drawing::Point(217, 96); this->labMultiForeign1->Name = L"labMultiForeign1"; - this->labMultiForeign1->Size = System::Drawing::Size(103, 12); + this->labMultiForeign1->Size = System::Drawing::Size(101, 12); this->labMultiForeign1->TabIndex = 44; - this->labMultiForeign1->Text = L"* 複数ある場合のみ"; + this->labMultiForeign1->Text = L"(複数ある場合のみ)"; // // tboxProductCode2Foreign3 // this->tboxProductCode2Foreign3->Enabled = false; - this->tboxProductCode2Foreign3->Location = System::Drawing::Point(169, 149); + this->tboxProductCode2Foreign3->Location = System::Drawing::Point(165, 118); this->tboxProductCode2Foreign3->MaxLength = 4; this->tboxProductCode2Foreign3->Name = L"tboxProductCode2Foreign3"; this->tboxProductCode2Foreign3->Size = System::Drawing::Size(46, 19); @@ -2218,7 +2145,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // tboxProductCode2Foreign2 // this->tboxProductCode2Foreign2->Enabled = false; - this->tboxProductCode2Foreign2->Location = System::Drawing::Point(169, 124); + this->tboxProductCode2Foreign2->Location = System::Drawing::Point(165, 93); this->tboxProductCode2Foreign2->MaxLength = 4; this->tboxProductCode2Foreign2->Name = L"tboxProductCode2Foreign2"; this->tboxProductCode2Foreign2->Size = System::Drawing::Size(46, 19); @@ -2227,7 +2154,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labProductCode2Foreign // this->labProductCode2Foreign->AutoSize = true; - this->labProductCode2Foreign->Location = System::Drawing::Point(156, 105); + this->labProductCode2Foreign->Location = System::Drawing::Point(152, 74); this->labProductCode2Foreign->Name = L"labProductCode2Foreign"; this->labProductCode2Foreign->Size = System::Drawing::Size(11, 12); this->labProductCode2Foreign->TabIndex = 41; @@ -2236,7 +2163,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // cboxReleaseForeign // this->cboxReleaseForeign->AutoSize = true; - this->cboxReleaseForeign->Location = System::Drawing::Point(25, 33); + this->cboxReleaseForeign->Location = System::Drawing::Point(17, 18); this->cboxReleaseForeign->Name = L"cboxReleaseForeign"; this->cboxReleaseForeign->Size = System::Drawing::Size(144, 16); this->cboxReleaseForeign->TabIndex = 11; @@ -2247,7 +2174,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labProductNameForeign // this->labProductNameForeign->AutoSize = true; - this->labProductNameForeign->Location = System::Drawing::Point(19, 67); + this->labProductNameForeign->Location = System::Drawing::Point(15, 43); this->labProductNameForeign->Name = L"labProductNameForeign"; this->labProductNameForeign->Size = System::Drawing::Size(41, 12); this->labProductNameForeign->TabIndex = 37; @@ -2256,15 +2183,15 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // tboxProductNameForeign // this->tboxProductNameForeign->Enabled = false; - this->tboxProductNameForeign->Location = System::Drawing::Point(96, 64); + this->tboxProductNameForeign->Location = System::Drawing::Point(92, 40); this->tboxProductNameForeign->Name = L"tboxProductNameForeign"; - this->tboxProductNameForeign->Size = System::Drawing::Size(187, 19); + this->tboxProductNameForeign->Size = System::Drawing::Size(240, 19); this->tboxProductNameForeign->TabIndex = 12; // // labProductCode1Foreign // this->labProductCode1Foreign->AutoSize = true; - this->labProductCode1Foreign->Location = System::Drawing::Point(94, 105); + this->labProductCode1Foreign->Location = System::Drawing::Point(90, 74); this->labProductCode1Foreign->Name = L"labProductCode1Foreign"; this->labProductCode1Foreign->Size = System::Drawing::Size(37, 12); this->labProductCode1Foreign->TabIndex = 40; @@ -2273,7 +2200,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // tboxProductCode1Foreign // this->tboxProductCode1Foreign->Enabled = false; - this->tboxProductCode1Foreign->Location = System::Drawing::Point(133, 100); + this->tboxProductCode1Foreign->Location = System::Drawing::Point(129, 69); this->tboxProductCode1Foreign->MaxLength = 1; this->tboxProductCode1Foreign->Name = L"tboxProductCode1Foreign"; this->tboxProductCode1Foreign->Size = System::Drawing::Size(18, 19); @@ -2282,7 +2209,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labProductCodeForeign // this->labProductCodeForeign->AutoSize = true; - this->labProductCodeForeign->Location = System::Drawing::Point(19, 105); + this->labProductCodeForeign->Location = System::Drawing::Point(15, 74); this->labProductCodeForeign->Name = L"labProductCodeForeign"; this->labProductCodeForeign->Size = System::Drawing::Size(56, 12); this->labProductCodeForeign->TabIndex = 38; @@ -2291,56 +2218,12 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // tboxProductCode2Foreign1 // this->tboxProductCode2Foreign1->Enabled = false; - this->tboxProductCode2Foreign1->Location = System::Drawing::Point(169, 99); + this->tboxProductCode2Foreign1->Location = System::Drawing::Point(165, 68); this->tboxProductCode2Foreign1->MaxLength = 4; this->tboxProductCode2Foreign1->Name = L"tboxProductCode2Foreign1"; this->tboxProductCode2Foreign1->Size = System::Drawing::Size(46, 19); this->tboxProductCode2Foreign1->TabIndex = 14; // - // tabCompanyInfo1 - // - this->tabCompanyInfo1->Controls->Add(this->gboxPerson1); - this->tabCompanyInfo1->Location = System::Drawing::Point(4, 21); - this->tabCompanyInfo1->Name = L"tabCompanyInfo1"; - this->tabCompanyInfo1->Size = System::Drawing::Size(384, 263); - this->tabCompanyInfo1->TabIndex = 2; - this->tabCompanyInfo1->Text = L"会社情報1"; - this->tabCompanyInfo1->UseVisualStyleBackColor = true; - // - // tabCompanyInfo2 - // - this->tabCompanyInfo2->Controls->Add(this->cboxIsInputPerson2); - this->tabCompanyInfo2->Controls->Add(this->gboxPerson2); - this->tabCompanyInfo2->Location = System::Drawing::Point(4, 21); - this->tabCompanyInfo2->Name = L"tabCompanyInfo2"; - this->tabCompanyInfo2->Size = System::Drawing::Size(384, 263); - this->tabCompanyInfo2->TabIndex = 3; - this->tabCompanyInfo2->Text = L"会社情報2"; - this->tabCompanyInfo2->UseVisualStyleBackColor = true; - // - // tabCaption - // - this->tabCaption->Controls->Add(this->labCaption); - this->tabCaption->Controls->Add(this->tboxCaption); - this->tabCaption->Location = System::Drawing::Point(4, 21); - this->tabCaption->Name = L"tabCaption"; - this->tabCaption->Padding = System::Windows::Forms::Padding(3); - this->tabCaption->Size = System::Drawing::Size(384, 263); - this->tabCaption->TabIndex = 5; - this->tabCaption->Text = L"備考"; - this->tabCaption->UseVisualStyleBackColor = true; - // - // tabTWLSpec4 - // - this->tabTWLSpec4->Controls->Add(this->gboxShared2Size); - this->tabTWLSpec4->Location = System::Drawing::Point(4, 21); - this->tabTWLSpec4->Name = L"tabTWLSpec4"; - this->tabTWLSpec4->Padding = System::Windows::Forms::Padding(3); - this->tabTWLSpec4->Size = System::Drawing::Size(391, 263); - this->tabTWLSpec4->TabIndex = 12; - this->tabTWLSpec4->Text = L"TWL仕様4"; - this->tabTWLSpec4->UseVisualStyleBackColor = true; - // // gboxShared2Size // this->gboxShared2Size->Controls->Add(this->labShared2Size5); @@ -2362,9 +2245,9 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxShared2Size->Controls->Add(this->tboxShared2Size1); this->gboxShared2Size->Controls->Add(this->tboxShared2Size0); this->gboxShared2Size->Controls->Add(this->cboxIsShared2); - this->gboxShared2Size->Location = System::Drawing::Point(21, 17); + this->gboxShared2Size->Location = System::Drawing::Point(547, 54); this->gboxShared2Size->Name = L"gboxShared2Size"; - this->gboxShared2Size->Size = System::Drawing::Size(270, 220); + this->gboxShared2Size->Size = System::Drawing::Size(175, 220); this->gboxShared2Size->TabIndex = 1; this->gboxShared2Size->TabStop = false; this->gboxShared2Size->Text = L"Shared2ファイルサイズ"; @@ -2372,7 +2255,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labShared2Size5 // this->labShared2Size5->AutoSize = true; - this->labShared2Size5->Location = System::Drawing::Point(27, 185); + this->labShared2Size5->Location = System::Drawing::Point(7, 180); this->labShared2Size5->Name = L"labShared2Size5"; this->labShared2Size5->Size = System::Drawing::Size(34, 12); this->labShared2Size5->TabIndex = 20; @@ -2381,7 +2264,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labShared2Size4 // this->labShared2Size4->AutoSize = true; - this->labShared2Size4->Location = System::Drawing::Point(26, 160); + this->labShared2Size4->Location = System::Drawing::Point(6, 155); this->labShared2Size4->Name = L"labShared2Size4"; this->labShared2Size4->Size = System::Drawing::Size(34, 12); this->labShared2Size4->TabIndex = 19; @@ -2390,7 +2273,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labShared2Size3 // this->labShared2Size3->AutoSize = true; - this->labShared2Size3->Location = System::Drawing::Point(27, 135); + this->labShared2Size3->Location = System::Drawing::Point(7, 130); this->labShared2Size3->Name = L"labShared2Size3"; this->labShared2Size3->Size = System::Drawing::Size(34, 12); this->labShared2Size3->TabIndex = 18; @@ -2399,7 +2282,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labShared2Size2 // this->labShared2Size2->AutoSize = true; - this->labShared2Size2->Location = System::Drawing::Point(27, 110); + this->labShared2Size2->Location = System::Drawing::Point(7, 105); this->labShared2Size2->Name = L"labShared2Size2"; this->labShared2Size2->Size = System::Drawing::Size(34, 12); this->labShared2Size2->TabIndex = 17; @@ -2408,7 +2291,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labShared2Size1 // this->labShared2Size1->AutoSize = true; - this->labShared2Size1->Location = System::Drawing::Point(27, 85); + this->labShared2Size1->Location = System::Drawing::Point(7, 80); this->labShared2Size1->Name = L"labShared2Size1"; this->labShared2Size1->Size = System::Drawing::Size(34, 12); this->labShared2Size1->TabIndex = 16; @@ -2417,7 +2300,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labShared2Size0 // this->labShared2Size0->AutoSize = true; - this->labShared2Size0->Location = System::Drawing::Point(27, 60); + this->labShared2Size0->Location = System::Drawing::Point(7, 55); this->labShared2Size0->Name = L"labShared2Size0"; this->labShared2Size0->Size = System::Drawing::Size(34, 12); this->labShared2Size0->TabIndex = 15; @@ -2426,7 +2309,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labKB5 // this->labKB5->AutoSize = true; - this->labKB5->Location = System::Drawing::Point(199, 185); + this->labKB5->Location = System::Drawing::Point(142, 180); this->labKB5->Name = L"labKB5"; this->labKB5->Size = System::Drawing::Size(20, 12); this->labKB5->TabIndex = 14; @@ -2435,7 +2318,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labKB4 // this->labKB4->AutoSize = true; - this->labKB4->Location = System::Drawing::Point(199, 160); + this->labKB4->Location = System::Drawing::Point(142, 155); this->labKB4->Name = L"labKB4"; this->labKB4->Size = System::Drawing::Size(20, 12); this->labKB4->TabIndex = 13; @@ -2444,7 +2327,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labKB3 // this->labKB3->AutoSize = true; - this->labKB3->Location = System::Drawing::Point(199, 135); + this->labKB3->Location = System::Drawing::Point(142, 130); this->labKB3->Name = L"labKB3"; this->labKB3->Size = System::Drawing::Size(20, 12); this->labKB3->TabIndex = 12; @@ -2453,7 +2336,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labKB2 // this->labKB2->AutoSize = true; - this->labKB2->Location = System::Drawing::Point(199, 110); + this->labKB2->Location = System::Drawing::Point(142, 105); this->labKB2->Name = L"labKB2"; this->labKB2->Size = System::Drawing::Size(20, 12); this->labKB2->TabIndex = 11; @@ -2462,7 +2345,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labKB1 // this->labKB1->AutoSize = true; - this->labKB1->Location = System::Drawing::Point(199, 85); + this->labKB1->Location = System::Drawing::Point(142, 80); this->labKB1->Name = L"labKB1"; this->labKB1->Size = System::Drawing::Size(20, 12); this->labKB1->TabIndex = 10; @@ -2471,7 +2354,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labKB0 // this->labKB0->AutoSize = true; - this->labKB0->Location = System::Drawing::Point(199, 60); + this->labKB0->Location = System::Drawing::Point(142, 55); this->labKB0->Name = L"labKB0"; this->labKB0->Size = System::Drawing::Size(20, 12); this->labKB0->TabIndex = 9; @@ -2479,55 +2362,55 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxShared2Size5 // - this->tboxShared2Size5->Location = System::Drawing::Point(66, 182); + this->tboxShared2Size5->Location = System::Drawing::Point(46, 177); this->tboxShared2Size5->Name = L"tboxShared2Size5"; this->tboxShared2Size5->ReadOnly = true; - this->tboxShared2Size5->Size = System::Drawing::Size(126, 19); + this->tboxShared2Size5->Size = System::Drawing::Size(90, 19); this->tboxShared2Size5->TabIndex = 8; this->tboxShared2Size5->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // // tboxShared2Size4 // - this->tboxShared2Size4->Location = System::Drawing::Point(67, 157); + this->tboxShared2Size4->Location = System::Drawing::Point(47, 152); this->tboxShared2Size4->Name = L"tboxShared2Size4"; this->tboxShared2Size4->ReadOnly = true; - this->tboxShared2Size4->Size = System::Drawing::Size(126, 19); + this->tboxShared2Size4->Size = System::Drawing::Size(89, 19); this->tboxShared2Size4->TabIndex = 7; this->tboxShared2Size4->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // // tboxShared2Size3 // - this->tboxShared2Size3->Location = System::Drawing::Point(67, 132); + this->tboxShared2Size3->Location = System::Drawing::Point(47, 127); this->tboxShared2Size3->Name = L"tboxShared2Size3"; this->tboxShared2Size3->ReadOnly = true; - this->tboxShared2Size3->Size = System::Drawing::Size(126, 19); + this->tboxShared2Size3->Size = System::Drawing::Size(89, 19); this->tboxShared2Size3->TabIndex = 6; this->tboxShared2Size3->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // // tboxShared2Size2 // - this->tboxShared2Size2->Location = System::Drawing::Point(67, 107); + this->tboxShared2Size2->Location = System::Drawing::Point(47, 102); this->tboxShared2Size2->Name = L"tboxShared2Size2"; this->tboxShared2Size2->ReadOnly = true; - this->tboxShared2Size2->Size = System::Drawing::Size(126, 19); + this->tboxShared2Size2->Size = System::Drawing::Size(89, 19); this->tboxShared2Size2->TabIndex = 5; this->tboxShared2Size2->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // // tboxShared2Size1 // - this->tboxShared2Size1->Location = System::Drawing::Point(67, 82); + this->tboxShared2Size1->Location = System::Drawing::Point(47, 77); this->tboxShared2Size1->Name = L"tboxShared2Size1"; this->tboxShared2Size1->ReadOnly = true; - this->tboxShared2Size1->Size = System::Drawing::Size(126, 19); + this->tboxShared2Size1->Size = System::Drawing::Size(89, 19); this->tboxShared2Size1->TabIndex = 4; this->tboxShared2Size1->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // // tboxShared2Size0 // - this->tboxShared2Size0->Location = System::Drawing::Point(67, 57); + this->tboxShared2Size0->Location = System::Drawing::Point(47, 52); this->tboxShared2Size0->Name = L"tboxShared2Size0"; this->tboxShared2Size0->ReadOnly = true; - this->tboxShared2Size0->Size = System::Drawing::Size(126, 19); + this->tboxShared2Size0->Size = System::Drawing::Size(89, 19); this->tboxShared2Size0->TabIndex = 3; this->tboxShared2Size0->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // @@ -2535,40 +2418,17 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // this->cboxIsShared2->AutoSize = true; this->cboxIsShared2->Enabled = false; - this->cboxIsShared2->Location = System::Drawing::Point(28, 30); + this->cboxIsShared2->Location = System::Drawing::Point(8, 25); this->cboxIsShared2->Name = L"cboxIsShared2"; this->cboxIsShared2->Size = System::Drawing::Size(123, 16); this->cboxIsShared2->TabIndex = 2; this->cboxIsShared2->Text = L"Shared2ファイル使用"; this->cboxIsShared2->UseVisualStyleBackColor = true; // - // tabSDK - // - this->tabSDK->Controls->Add(this->tboxLib); - this->tabSDK->Controls->Add(this->labLib); - this->tabSDK->Controls->Add(this->tboxSDK); - this->tabSDK->Controls->Add(this->labSDK); - this->tabSDK->Location = System::Drawing::Point(4, 21); - this->tabSDK->Name = L"tabSDK"; - this->tabSDK->Size = System::Drawing::Size(391, 263); - this->tabSDK->TabIndex = 11; - this->tabSDK->Text = L"SDK"; - this->tabSDK->UseVisualStyleBackColor = true; - // - // tboxLib - // - this->tboxLib->Location = System::Drawing::Point(21, 149); - this->tboxLib->Multiline = true; - this->tboxLib->Name = L"tboxLib"; - this->tboxLib->ReadOnly = true; - this->tboxLib->ScrollBars = System::Windows::Forms::ScrollBars::Both; - this->tboxLib->Size = System::Drawing::Size(337, 91); - this->tboxLib->TabIndex = 32; - // // labLib // this->labLib->AutoSize = true; - this->labLib->Location = System::Drawing::Point(19, 134); + this->labLib->Location = System::Drawing::Point(335, 174); this->labLib->Name = L"labLib"; this->labLib->Size = System::Drawing::Size(70, 12); this->labLib->TabIndex = 31; @@ -2576,35 +2436,28 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxSDK // - this->tboxSDK->Location = System::Drawing::Point(21, 41); + this->tboxSDK->Location = System::Drawing::Point(337, 67); this->tboxSDK->Multiline = true; this->tboxSDK->Name = L"tboxSDK"; this->tboxSDK->ReadOnly = true; this->tboxSDK->ScrollBars = System::Windows::Forms::ScrollBars::Both; - this->tboxSDK->Size = System::Drawing::Size(337, 65); + this->tboxSDK->Size = System::Drawing::Size(175, 88); this->tboxSDK->TabIndex = 10; // // labSDK // this->labSDK->AutoSize = true; - this->labSDK->Location = System::Drawing::Point(19, 26); + this->labSDK->Location = System::Drawing::Point(335, 52); this->labSDK->Name = L"labSDK"; this->labSDK->Size = System::Drawing::Size(72, 12); this->labSDK->TabIndex = 30; this->labSDK->Text = L"SDKバージョン"; // - // tabTWLSpec3 - // - this->tabTWLSpec3->Controls->Add(this->gboxTWLExInfo); - this->tabTWLSpec3->Location = System::Drawing::Point(4, 21); - this->tabTWLSpec3->Name = L"tabTWLSpec3"; - this->tabTWLSpec3->Size = System::Drawing::Size(391, 263); - this->tabTWLSpec3->TabIndex = 10; - this->tabTWLSpec3->Text = L"TWL仕様3"; - this->tabTWLSpec3->UseVisualStyleBackColor = true; - // // gboxTWLExInfo // + this->gboxTWLExInfo->Controls->Add(this->labByte5); + this->gboxTWLExInfo->Controls->Add(this->labByte4); + this->gboxTWLExInfo->Controls->Add(this->labByte3); this->gboxTWLExInfo->Controls->Add(this->labByte2); this->gboxTWLExInfo->Controls->Add(this->labByte1); this->gboxTWLExInfo->Controls->Add(this->labHex4); @@ -2613,23 +2466,46 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxTWLExInfo->Controls->Add(this->labIsCodec); this->gboxTWLExInfo->Controls->Add(this->labNormalRomOffset); this->gboxTWLExInfo->Controls->Add(this->tboxNormalRomOffset); - this->gboxTWLExInfo->Controls->Add(this->cboxIsSubBanner); this->gboxTWLExInfo->Controls->Add(this->labKeyTableRomOffset); - this->gboxTWLExInfo->Controls->Add(this->cboxIsWL); this->gboxTWLExInfo->Controls->Add(this->tboxPrivateSize); this->gboxTWLExInfo->Controls->Add(this->labPrivateSize); this->gboxTWLExInfo->Controls->Add(this->tboxKeyTableRomOffset); - this->gboxTWLExInfo->Controls->Add(this->cboxIsNormalJump); - this->gboxTWLExInfo->Controls->Add(this->cboxIsTmpJump); this->gboxTWLExInfo->Controls->Add(this->labPublicSize); this->gboxTWLExInfo->Controls->Add(this->tboxPublicSize); - this->gboxTWLExInfo->Location = System::Drawing::Point(16, 17); + this->gboxTWLExInfo->Location = System::Drawing::Point(231, 54); this->gboxTWLExInfo->Name = L"gboxTWLExInfo"; - this->gboxTWLExInfo->Size = System::Drawing::Size(359, 225); + this->gboxTWLExInfo->Size = System::Drawing::Size(298, 146); this->gboxTWLExInfo->TabIndex = 24; this->gboxTWLExInfo->TabStop = false; this->gboxTWLExInfo->Text = L"TWL拡張情報"; // + // labByte5 + // + this->labByte5->AutoSize = true; + this->labByte5->Location = System::Drawing::Point(261, 121); + this->labByte5->Name = L"labByte5"; + this->labByte5->Size = System::Drawing::Size(29, 12); + this->labByte5->TabIndex = 34; + this->labByte5->Text = L"Byte"; + // + // labByte4 + // + this->labByte4->AutoSize = true; + this->labByte4->Location = System::Drawing::Point(261, 96); + this->labByte4->Name = L"labByte4"; + this->labByte4->Size = System::Drawing::Size(29, 12); + this->labByte4->TabIndex = 33; + this->labByte4->Text = L"Byte"; + // + // labByte3 + // + this->labByte3->AutoSize = true; + this->labByte3->Location = System::Drawing::Point(261, 71); + this->labByte3->Name = L"labByte3"; + this->labByte3->Size = System::Drawing::Size(29, 12); + this->labByte3->TabIndex = 32; + this->labByte3->Text = L"Byte"; + // // labByte2 // this->labByte2->AutoSize = true; @@ -2651,7 +2527,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labHex4 // this->labHex4->AutoSize = true; - this->labHex4->Location = System::Drawing::Point(270, 58); + this->labHex4->Location = System::Drawing::Point(261, 46); this->labHex4->Name = L"labHex4"; this->labHex4->Size = System::Drawing::Size(11, 12); this->labHex4->TabIndex = 29; @@ -2660,7 +2536,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labHex3 // this->labHex3->AutoSize = true; - this->labHex3->Location = System::Drawing::Point(270, 29); + this->labHex3->Location = System::Drawing::Point(261, 21); this->labHex3->Name = L"labHex3"; this->labHex3->Size = System::Drawing::Size(11, 12); this->labHex3->TabIndex = 8; @@ -2668,7 +2544,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxIsCodec // - this->tboxIsCodec->Location = System::Drawing::Point(177, 126); + this->tboxIsCodec->Location = System::Drawing::Point(172, 118); this->tboxIsCodec->Name = L"tboxIsCodec"; this->tboxIsCodec->ReadOnly = true; this->tboxIsCodec->Size = System::Drawing::Size(87, 19); @@ -2677,7 +2553,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labIsCodec // this->labIsCodec->AutoSize = true; - this->labIsCodec->Location = System::Drawing::Point(60, 129); + this->labIsCodec->Location = System::Drawing::Point(55, 121); this->labIsCodec->Name = L"labIsCodec"; this->labIsCodec->Size = System::Drawing::Size(75, 12); this->labIsCodec->TabIndex = 27; @@ -2686,7 +2562,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labNormalRomOffset // this->labNormalRomOffset->AutoSize = true; - this->labNormalRomOffset->Location = System::Drawing::Point(12, 29); + this->labNormalRomOffset->Location = System::Drawing::Point(7, 21); this->labNormalRomOffset->Name = L"labNormalRomOffset"; this->labNormalRomOffset->Size = System::Drawing::Size(155, 12); this->labNormalRomOffset->TabIndex = 9; @@ -2694,47 +2570,25 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxNormalRomOffset // - this->tboxNormalRomOffset->Location = System::Drawing::Point(177, 26); + this->tboxNormalRomOffset->Location = System::Drawing::Point(172, 18); this->tboxNormalRomOffset->Name = L"tboxNormalRomOffset"; this->tboxNormalRomOffset->ReadOnly = true; this->tboxNormalRomOffset->Size = System::Drawing::Size(87, 19); this->tboxNormalRomOffset->TabIndex = 8; this->tboxNormalRomOffset->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // - // cboxIsSubBanner - // - this->cboxIsSubBanner->AutoSize = true; - this->cboxIsSubBanner->Enabled = false; - this->cboxIsSubBanner->Location = System::Drawing::Point(159, 168); - this->cboxIsSubBanner->Name = L"cboxIsSubBanner"; - this->cboxIsSubBanner->Size = System::Drawing::Size(131, 16); - this->cboxIsSubBanner->TabIndex = 26; - this->cboxIsSubBanner->Text = L"サブバナーファイル有効"; - this->cboxIsSubBanner->UseVisualStyleBackColor = true; - // // labKeyTableRomOffset // this->labKeyTableRomOffset->AutoSize = true; - this->labKeyTableRomOffset->Location = System::Drawing::Point(12, 54); + this->labKeyTableRomOffset->Location = System::Drawing::Point(7, 46); this->labKeyTableRomOffset->Name = L"labKeyTableRomOffset"; this->labKeyTableRomOffset->Size = System::Drawing::Size(142, 12); this->labKeyTableRomOffset->TabIndex = 11; this->labKeyTableRomOffset->Text = L"TWL専用領域ROMオフセット"; // - // cboxIsWL - // - this->cboxIsWL->AutoSize = true; - this->cboxIsWL->Enabled = false; - this->cboxIsWL->Location = System::Drawing::Point(159, 196); - this->cboxIsWL->Name = L"cboxIsWL"; - this->cboxIsWL->Size = System::Drawing::Size(155, 16); - this->cboxIsWL->TabIndex = 25; - this->cboxIsWL->Text = L"NTRホワイトリスト署名有効"; - this->cboxIsWL->UseVisualStyleBackColor = true; - // // tboxPrivateSize // - this->tboxPrivateSize->Location = System::Drawing::Point(177, 101); + this->tboxPrivateSize->Location = System::Drawing::Point(172, 93); this->tboxPrivateSize->Name = L"tboxPrivateSize"; this->tboxPrivateSize->ReadOnly = true; this->tboxPrivateSize->Size = System::Drawing::Size(87, 19); @@ -2744,7 +2598,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labPrivateSize // this->labPrivateSize->AutoSize = true; - this->labPrivateSize->Location = System::Drawing::Point(36, 104); + this->labPrivateSize->Location = System::Drawing::Point(31, 96); this->labPrivateSize->Name = L"labPrivateSize"; this->labPrivateSize->Size = System::Drawing::Size(123, 12); this->labPrivateSize->TabIndex = 15; @@ -2752,18 +2606,58 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxKeyTableRomOffset // - this->tboxKeyTableRomOffset->Location = System::Drawing::Point(177, 51); + this->tboxKeyTableRomOffset->Location = System::Drawing::Point(172, 43); this->tboxKeyTableRomOffset->Name = L"tboxKeyTableRomOffset"; this->tboxKeyTableRomOffset->ReadOnly = true; this->tboxKeyTableRomOffset->Size = System::Drawing::Size(87, 19); this->tboxKeyTableRomOffset->TabIndex = 10; this->tboxKeyTableRomOffset->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // + // labPublicSize + // + this->labPublicSize->AutoSize = true; + this->labPublicSize->Location = System::Drawing::Point(31, 71); + this->labPublicSize->Name = L"labPublicSize"; + this->labPublicSize->Size = System::Drawing::Size(118, 12); + this->labPublicSize->TabIndex = 14; + this->labPublicSize->Text = L"Public Save Data Size"; + // + // tboxPublicSize + // + this->tboxPublicSize->Location = System::Drawing::Point(172, 68); + this->tboxPublicSize->Name = L"tboxPublicSize"; + this->tboxPublicSize->ReadOnly = true; + this->tboxPublicSize->Size = System::Drawing::Size(87, 19); + this->tboxPublicSize->TabIndex = 12; + this->tboxPublicSize->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; + // + // cboxIsSubBanner + // + this->cboxIsSubBanner->AutoSize = true; + this->cboxIsSubBanner->Enabled = false; + this->cboxIsSubBanner->Location = System::Drawing::Point(14, 62); + this->cboxIsSubBanner->Name = L"cboxIsSubBanner"; + this->cboxIsSubBanner->Size = System::Drawing::Size(131, 16); + this->cboxIsSubBanner->TabIndex = 26; + this->cboxIsSubBanner->Text = L"サブバナーファイル有効"; + this->cboxIsSubBanner->UseVisualStyleBackColor = true; + // + // cboxIsWL + // + this->cboxIsWL->AutoSize = true; + this->cboxIsWL->Enabled = false; + this->cboxIsWL->Location = System::Drawing::Point(14, 84); + this->cboxIsWL->Name = L"cboxIsWL"; + this->cboxIsWL->Size = System::Drawing::Size(155, 16); + this->cboxIsWL->TabIndex = 25; + this->cboxIsWL->Text = L"NTRホワイトリスト署名有効"; + this->cboxIsWL->UseVisualStyleBackColor = true; + // // cboxIsNormalJump // this->cboxIsNormalJump->AutoSize = true; this->cboxIsNormalJump->Enabled = false; - this->cboxIsNormalJump->Location = System::Drawing::Point(14, 168); + this->cboxIsNormalJump->Location = System::Drawing::Point(14, 18); this->cboxIsNormalJump->Name = L"cboxIsNormalJump"; this->cboxIsNormalJump->Size = System::Drawing::Size(121, 16); this->cboxIsNormalJump->TabIndex = 16; @@ -2774,41 +2668,13 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // this->cboxIsTmpJump->AutoSize = true; this->cboxIsTmpJump->Enabled = false; - this->cboxIsTmpJump->Location = System::Drawing::Point(14, 196); + this->cboxIsTmpJump->Location = System::Drawing::Point(14, 40); this->cboxIsTmpJump->Name = L"cboxIsTmpJump"; this->cboxIsTmpJump->Size = System::Drawing::Size(103, 16); this->cboxIsTmpJump->TabIndex = 17; this->cboxIsTmpJump->Text = L"tmpジャンプ許可"; this->cboxIsTmpJump->UseVisualStyleBackColor = true; // - // labPublicSize - // - this->labPublicSize->AutoSize = true; - this->labPublicSize->Location = System::Drawing::Point(36, 79); - this->labPublicSize->Name = L"labPublicSize"; - this->labPublicSize->Size = System::Drawing::Size(118, 12); - this->labPublicSize->TabIndex = 14; - this->labPublicSize->Text = L"Public Save Data Size"; - // - // tboxPublicSize - // - this->tboxPublicSize->Location = System::Drawing::Point(177, 76); - this->tboxPublicSize->Name = L"tboxPublicSize"; - this->tboxPublicSize->ReadOnly = true; - this->tboxPublicSize->Size = System::Drawing::Size(87, 19); - this->tboxPublicSize->TabIndex = 12; - this->tboxPublicSize->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; - // - // tabTWLSpec2 - // - this->tabTWLSpec2->Controls->Add(this->gboxAccess); - this->tabTWLSpec2->Location = System::Drawing::Point(4, 21); - this->tabTWLSpec2->Name = L"tabTWLSpec2"; - this->tabTWLSpec2->Size = System::Drawing::Size(391, 263); - this->tabTWLSpec2->TabIndex = 9; - this->tabTWLSpec2->Text = L"TWL仕様2"; - this->tabTWLSpec2->UseVisualStyleBackColor = true; - // // gboxAccess // this->gboxAccess->Controls->Add(this->labAccessOther); @@ -2817,9 +2683,9 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxAccess->Controls->Add(this->labIsGameCardOn); this->gboxAccess->Controls->Add(this->cboxIsNAND); this->gboxAccess->Controls->Add(this->cboxIsSD); - this->gboxAccess->Location = System::Drawing::Point(16, 17); + this->gboxAccess->Location = System::Drawing::Point(231, 211); this->gboxAccess->Name = L"gboxAccess"; - this->gboxAccess->Size = System::Drawing::Size(340, 220); + this->gboxAccess->Size = System::Drawing::Size(298, 133); this->gboxAccess->TabIndex = 0; this->gboxAccess->TabStop = false; this->gboxAccess->Text = L"アクセスコントロール情報"; @@ -2827,7 +2693,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labAccessOther // this->labAccessOther->AutoSize = true; - this->labAccessOther->Location = System::Drawing::Point(24, 89); + this->labAccessOther->Location = System::Drawing::Point(152, 21); this->labAccessOther->Name = L"labAccessOther"; this->labAccessOther->Size = System::Drawing::Size(36, 12); this->labAccessOther->TabIndex = 5; @@ -2835,25 +2701,25 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxAccessOther // - this->tboxAccessOther->Location = System::Drawing::Point(26, 104); + this->tboxAccessOther->Location = System::Drawing::Point(154, 36); this->tboxAccessOther->Multiline = true; this->tboxAccessOther->Name = L"tboxAccessOther"; this->tboxAccessOther->ReadOnly = true; - this->tboxAccessOther->Size = System::Drawing::Size(292, 104); + this->tboxAccessOther->Size = System::Drawing::Size(118, 85); this->tboxAccessOther->TabIndex = 4; // // tboxIsGameCardOn // - this->tboxIsGameCardOn->Location = System::Drawing::Point(117, 57); + this->tboxIsGameCardOn->Location = System::Drawing::Point(8, 102); this->tboxIsGameCardOn->Name = L"tboxIsGameCardOn"; this->tboxIsGameCardOn->ReadOnly = true; - this->tboxIsGameCardOn->Size = System::Drawing::Size(201, 19); + this->tboxIsGameCardOn->Size = System::Drawing::Size(122, 19); this->tboxIsGameCardOn->TabIndex = 3; // // labIsGameCardOn // this->labIsGameCardOn->AutoSize = true; - this->labIsGameCardOn->Location = System::Drawing::Point(24, 61); + this->labIsGameCardOn->Location = System::Drawing::Point(7, 83); this->labIsGameCardOn->Name = L"labIsGameCardOn"; this->labIsGameCardOn->Size = System::Drawing::Size(87, 12); this->labIsGameCardOn->TabIndex = 2; @@ -2863,7 +2729,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // this->cboxIsNAND->AutoSize = true; this->cboxIsNAND->Enabled = false; - this->cboxIsNAND->Location = System::Drawing::Point(150, 30); + this->cboxIsNAND->Location = System::Drawing::Point(8, 48); this->cboxIsNAND->Name = L"cboxIsNAND"; this->cboxIsNAND->Size = System::Drawing::Size(121, 16); this->cboxIsNAND->TabIndex = 1; @@ -2874,36 +2740,13 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // this->cboxIsSD->AutoSize = true; this->cboxIsSD->Enabled = false; - this->cboxIsSD->Location = System::Drawing::Point(26, 30); + this->cboxIsSD->Location = System::Drawing::Point(9, 24); this->cboxIsSD->Name = L"cboxIsSD"; this->cboxIsSD->Size = System::Drawing::Size(67, 16); this->cboxIsSD->TabIndex = 0; this->cboxIsSD->Text = L"SDカード"; this->cboxIsSD->UseVisualStyleBackColor = true; // - // tabTWLSpec1 - // - this->tabTWLSpec1->Controls->Add(this->labCautionCheck); - this->tabTWLSpec1->Controls->Add(this->gboxTitleID); - this->tabTWLSpec1->Controls->Add(this->labCaptionEx); - this->tabTWLSpec1->Controls->Add(this->tboxCaptionEx); - this->tabTWLSpec1->Location = System::Drawing::Point(4, 21); - this->tabTWLSpec1->Name = L"tabTWLSpec1"; - this->tabTWLSpec1->Size = System::Drawing::Size(391, 263); - this->tabTWLSpec1->TabIndex = 8; - this->tabTWLSpec1->Text = L"TWL仕様1"; - this->tabTWLSpec1->UseVisualStyleBackColor = true; - // - // labCautionCheck - // - this->labCautionCheck->AutoSize = true; - this->labCautionCheck->ForeColor = System::Drawing::SystemColors::ActiveCaption; - this->labCautionCheck->Location = System::Drawing::Point(16, 8); - this->labCautionCheck->Name = L"labCautionCheck"; - this->labCautionCheck->Size = System::Drawing::Size(336, 12); - this->labCautionCheck->TabIndex = 35; - this->labCautionCheck->Text = L"* これらの項目はROMデータの確認用です。入力の必要はありません。"; - // // gboxTitleID // this->gboxTitleID->Controls->Add(this->labHex2); @@ -2914,9 +2757,9 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxTitleID->Controls->Add(this->tboxTitleIDHi); this->gboxTitleID->Controls->Add(this->tboxAppType); this->gboxTitleID->Controls->Add(this->labAppType); - this->gboxTitleID->Location = System::Drawing::Point(18, 34); + this->gboxTitleID->Location = System::Drawing::Point(12, 54); this->gboxTitleID->Name = L"gboxTitleID"; - this->gboxTitleID->Size = System::Drawing::Size(348, 151); + this->gboxTitleID->Size = System::Drawing::Size(198, 174); this->gboxTitleID->TabIndex = 23; this->gboxTitleID->TabStop = false; this->gboxTitleID->Text = L"TitleID"; @@ -2924,7 +2767,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labHex2 // this->labHex2->AutoSize = true; - this->labHex2->Location = System::Drawing::Point(206, 51); + this->labHex2->Location = System::Drawing::Point(160, 52); this->labHex2->Name = L"labHex2"; this->labHex2->Size = System::Drawing::Size(11, 12); this->labHex2->TabIndex = 7; @@ -2933,7 +2776,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labHex1 // this->labHex1->AutoSize = true; - this->labHex1->Location = System::Drawing::Point(206, 23); + this->labHex1->Location = System::Drawing::Point(160, 23); this->labHex1->Name = L"labHex1"; this->labHex1->Size = System::Drawing::Size(11, 12); this->labHex1->TabIndex = 6; @@ -2944,7 +2787,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxTitleIDLo->Location = System::Drawing::Point(83, 20); this->tboxTitleIDLo->Name = L"tboxTitleIDLo"; this->tboxTitleIDLo->ReadOnly = true; - this->tboxTitleIDLo->Size = System::Drawing::Size(121, 19); + this->tboxTitleIDLo->Size = System::Drawing::Size(71, 19); this->tboxTitleIDLo->TabIndex = 1; this->tboxTitleIDLo->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // @@ -2971,23 +2814,23 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxTitleIDHi->Location = System::Drawing::Point(83, 48); this->tboxTitleIDHi->Name = L"tboxTitleIDHi"; this->tboxTitleIDHi->ReadOnly = true; - this->tboxTitleIDHi->Size = System::Drawing::Size(121, 19); + this->tboxTitleIDHi->Size = System::Drawing::Size(71, 19); this->tboxTitleIDHi->TabIndex = 3; this->tboxTitleIDHi->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // // tboxAppType // - this->tboxAppType->Location = System::Drawing::Point(13, 96); + this->tboxAppType->Location = System::Drawing::Point(13, 89); this->tboxAppType->Multiline = true; this->tboxAppType->Name = L"tboxAppType"; this->tboxAppType->ReadOnly = true; - this->tboxAppType->Size = System::Drawing::Size(304, 44); + this->tboxAppType->Size = System::Drawing::Size(158, 72); this->tboxAppType->TabIndex = 4; // // labAppType // this->labAppType->AutoSize = true; - this->labAppType->Location = System::Drawing::Point(12, 81); + this->labAppType->Location = System::Drawing::Point(12, 74); this->labAppType->Name = L"labAppType"; this->labAppType->Size = System::Drawing::Size(91, 12); this->labAppType->TabIndex = 5; @@ -2996,7 +2839,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // labCaptionEx // this->labCaptionEx->AutoSize = true; - this->labCaptionEx->Location = System::Drawing::Point(29, 195); + this->labCaptionEx->Location = System::Drawing::Point(528, 52); this->labCaptionEx->Name = L"labCaptionEx"; this->labCaptionEx->Size = System::Drawing::Size(53, 12); this->labCaptionEx->TabIndex = 11; @@ -3004,95 +2847,592 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // // tboxCaptionEx // - this->tboxCaptionEx->Location = System::Drawing::Point(30, 210); + this->tboxCaptionEx->Location = System::Drawing::Point(530, 67); this->tboxCaptionEx->Multiline = true; this->tboxCaptionEx->Name = L"tboxCaptionEx"; this->tboxCaptionEx->ReadOnly = true; - this->tboxCaptionEx->Size = System::Drawing::Size(304, 45); + this->tboxCaptionEx->ScrollBars = System::Windows::Forms::ScrollBars::Vertical; + this->tboxCaptionEx->Size = System::Drawing::Size(181, 88); this->tboxCaptionEx->TabIndex = 10; // - // tabCheck - // - this->tabCheck->Controls->Add(this->tabTWLSpec1); - this->tabCheck->Controls->Add(this->tabTWLSpec2); - this->tabCheck->Controls->Add(this->tabTWLSpec3); - this->tabCheck->Controls->Add(this->tabTWLSpec4); - this->tabCheck->Controls->Add(this->tabSDK); - this->tabCheck->Location = System::Drawing::Point(410, 331); - this->tabCheck->Name = L"tabCheck"; - this->tabCheck->SelectedIndex = 0; - this->tabCheck->Size = System::Drawing::Size(399, 288); - this->tabCheck->TabIndex = 6; - // // gboxProd // this->gboxProd->Controls->Add(this->combBackup); this->gboxProd->Controls->Add(this->labBackup); this->gboxProd->Controls->Add(this->tboxBackupOther); - this->gboxProd->Location = System::Drawing::Point(11, 270); + this->gboxProd->Location = System::Drawing::Point(361, 51); this->gboxProd->Name = L"gboxProd"; - this->gboxProd->Size = System::Drawing::Size(327, 50); + this->gboxProd->Size = System::Drawing::Size(350, 50); this->gboxProd->TabIndex = 13; this->gboxProd->TabStop = false; - this->gboxProd->Text = L"ROM生産情報(必ず入力してください)"; + this->gboxProd->Text = L"ROM生産情報"; // - // butErrorWindow + // menuStripAbove // - this->butErrorWindow->Location = System::Drawing::Point(652, 676); - this->butErrorWindow->Name = L"butErrorWindow"; - this->butErrorWindow->Size = System::Drawing::Size(149, 23); - this->butErrorWindow->TabIndex = 23; - this->butErrorWindow->Text = L"ROMチェック結果を表示"; - this->butErrorWindow->UseVisualStyleBackColor = true; - this->butErrorWindow->Click += gcnew System::EventHandler(this, &Form1::butErrorWindow_Click); + this->menuStripAbove->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(3) {this->stripFile, this->stripMaster, + this->stripLang}); + this->menuStripAbove->Location = System::Drawing::Point(0, 0); + this->menuStripAbove->Name = L"menuStripAbove"; + this->menuStripAbove->Size = System::Drawing::Size(777, 24); + this->menuStripAbove->TabIndex = 33; + this->menuStripAbove->Text = L"menuStrip1"; // - // butMakeMaster + // stripFile // - this->butMakeMaster->Location = System::Drawing::Point(6, 16); - this->butMakeMaster->Name = L"butMakeMaster"; - this->butMakeMaster->Size = System::Drawing::Size(149, 23); - this->butMakeMaster->TabIndex = 7; - this->butMakeMaster->Text = L"マスタ提出書類を作成"; - this->butMakeMaster->UseVisualStyleBackColor = true; - this->butMakeMaster->Click += gcnew System::EventHandler(this, &Form1::butMakeMaster_Click); + this->stripFile->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(3) {this->stripItemOpenRom, + this->stripItemSaveTemp, this->stripItemLoadTemp}); + this->stripFile->Name = L"stripFile"; + this->stripFile->Size = System::Drawing::Size(51, 20); + this->stripFile->Text = L"ファイル"; // - // gboxMakeMaster + // stripItemOpenRom // - this->gboxMakeMaster->Controls->Add(this->butMakeMaster); - this->gboxMakeMaster->Location = System::Drawing::Point(646, 625); - this->gboxMakeMaster->Name = L"gboxMakeMaster"; - this->gboxMakeMaster->Size = System::Drawing::Size(163, 47); - this->gboxMakeMaster->TabIndex = 32; - this->gboxMakeMaster->TabStop = false; + this->stripItemOpenRom->Name = L"stripItemOpenRom"; + this->stripItemOpenRom->Size = System::Drawing::Size(211, 22); + this->stripItemOpenRom->Text = L"ROMデータを開く"; + this->stripItemOpenRom->Click += gcnew System::EventHandler(this, &Form1::stripItemOpenRom_Click); + // + // stripItemSaveTemp + // + this->stripItemSaveTemp->Name = L"stripItemSaveTemp"; + this->stripItemSaveTemp->Size = System::Drawing::Size(211, 22); + this->stripItemSaveTemp->Text = L"提出情報を一時保存する"; + // + // stripItemLoadTemp + // + this->stripItemLoadTemp->Name = L"stripItemLoadTemp"; + this->stripItemLoadTemp->Size = System::Drawing::Size(211, 22); + this->stripItemLoadTemp->Text = L"一時保存した提出情報を開く"; + // + // stripMaster + // + this->stripMaster->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(2) {this->stripItemMasterRom, + this->stripItemSheet}); + this->stripMaster->Name = L"stripMaster"; + this->stripMaster->Size = System::Drawing::Size(53, 20); + this->stripMaster->Text = L"マスター"; + // + // stripItemMasterRom + // + this->stripItemMasterRom->Name = L"stripItemMasterRom"; + this->stripItemMasterRom->Size = System::Drawing::Size(165, 22); + this->stripItemMasterRom->Text = L"マスターROMの作成"; + this->stripItemMasterRom->Click += gcnew System::EventHandler(this, &Form1::stripItemMasterRom_Click); + // + // stripItemSheet + // + this->stripItemSheet->Name = L"stripItemSheet"; + this->stripItemSheet->Size = System::Drawing::Size(165, 22); + this->stripItemSheet->Text = L"提出書類の作成"; + this->stripItemSheet->Click += gcnew System::EventHandler(this, &Form1::stripItemSheet_Click); + // + // stripLang + // + this->stripLang->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(2) {this->stripItemEnglish, + this->stripItemJapanese}); + this->stripLang->Name = L"stripLang"; + this->stripLang->Size = System::Drawing::Size(65, 20); + this->stripLang->Text = L"Language"; + // + // stripItemEnglish + // + this->stripItemEnglish->Name = L"stripItemEnglish"; + this->stripItemEnglish->Size = System::Drawing::Size(119, 22); + this->stripItemEnglish->Text = L"English"; + this->stripItemEnglish->Click += gcnew System::EventHandler(this, &Form1::stripItemEnglish_Click); + // + // stripItemJapanese + // + this->stripItemJapanese->Checked = true; + this->stripItemJapanese->CheckState = System::Windows::Forms::CheckState::Checked; + this->stripItemJapanese->Name = L"stripItemJapanese"; + this->stripItemJapanese->Size = System::Drawing::Size(119, 22); + this->stripItemJapanese->Text = L"Japanese"; + this->stripItemJapanese->Click += gcnew System::EventHandler(this, &Form1::stripItemJapanese_Click); + // + // tabMain + // + this->tabMain->Controls->Add(this->tabRomInfo); + this->tabMain->Controls->Add(this->tabTWLInfo); + this->tabMain->Controls->Add(this->tabRomEditInfo); + this->tabMain->Controls->Add(this->tabPage4); + this->tabMain->Controls->Add(this->tabPage5); + this->tabMain->Controls->Add(this->tabError); + this->tabMain->Location = System::Drawing::Point(12, 93); + this->tabMain->Name = L"tabMain"; + this->tabMain->SelectedIndex = 0; + this->tabMain->Size = System::Drawing::Size(749, 377); + this->tabMain->TabIndex = 34; + // + // tabRomInfo + // + this->tabRomInfo->Controls->Add(this->gridLibrary); + this->tabRomInfo->Controls->Add(this->textBox1); + this->tabRomInfo->Controls->Add(this->gboxSrl); + this->tabRomInfo->Controls->Add(this->labLib); + this->tabRomInfo->Controls->Add(this->labCaptionEx); + this->tabRomInfo->Controls->Add(this->tboxCaptionEx); + this->tabRomInfo->Controls->Add(this->gboxCRC); + this->tabRomInfo->Controls->Add(this->tboxSDK); + this->tabRomInfo->Controls->Add(this->labSDK); + this->tabRomInfo->Location = System::Drawing::Point(4, 21); + this->tabRomInfo->Name = L"tabRomInfo"; + this->tabRomInfo->Padding = System::Windows::Forms::Padding(3); + this->tabRomInfo->Size = System::Drawing::Size(741, 352); + this->tabRomInfo->TabIndex = 0; + this->tabRomInfo->Text = L"ROM基本情報(確認用)"; + this->tabRomInfo->UseVisualStyleBackColor = true; + // + // gridLibrary + // + this->gridLibrary->BackgroundColor = System::Drawing::SystemColors::Control; + this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; + this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, + this->colLibName}); + this->gridLibrary->Location = System::Drawing::Point(337, 189); + this->gridLibrary->Name = L"gridLibrary"; + this->gridLibrary->RowHeadersVisible = false; + this->gridLibrary->RowTemplate->Height = 21; + this->gridLibrary->Size = System::Drawing::Size(374, 145); + this->gridLibrary->TabIndex = 36; + // + // colLibPublisher + // + this->colLibPublisher->HeaderText = L"Publisher"; + this->colLibPublisher->Name = L"colLibPublisher"; + // + // colLibName + // + this->colLibName->AutoSizeMode = System::Windows::Forms::DataGridViewAutoSizeColumnMode::Fill; + this->colLibName->HeaderText = L"Library Name"; + this->colLibName->Name = L"colLibName"; + this->colLibName->ReadOnly = true; + // + // textBox1 + // + this->textBox1->BackColor = System::Drawing::SystemColors::Info; + this->textBox1->Location = System::Drawing::Point(24, 17); + this->textBox1->Name = L"textBox1"; + this->textBox1->ReadOnly = true; + this->textBox1->Size = System::Drawing::Size(687, 19); + this->textBox1->TabIndex = 35; + this->textBox1->Text = L"このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。"; + // + // tabTWLInfo + // + this->tabTWLInfo->Controls->Add(this->textBox2); + this->tabTWLInfo->Controls->Add(this->gboxExFlags); + this->tabTWLInfo->Controls->Add(this->gboxShared2Size); + this->tabTWLInfo->Controls->Add(this->gboxTWLExInfo); + this->tabTWLInfo->Controls->Add(this->gboxAccess); + this->tabTWLInfo->Controls->Add(this->gboxTitleID); + this->tabTWLInfo->Location = System::Drawing::Point(4, 21); + this->tabTWLInfo->Name = L"tabTWLInfo"; + this->tabTWLInfo->Padding = System::Windows::Forms::Padding(3); + this->tabTWLInfo->Size = System::Drawing::Size(741, 352); + this->tabTWLInfo->TabIndex = 1; + this->tabTWLInfo->Text = L"TWL拡張情報(確認用)"; + this->tabTWLInfo->UseVisualStyleBackColor = true; + // + // textBox2 + // + this->textBox2->BackColor = System::Drawing::SystemColors::Info; + this->textBox2->Location = System::Drawing::Point(22, 18); + this->textBox2->Name = L"textBox2"; + this->textBox2->ReadOnly = true; + this->textBox2->Size = System::Drawing::Size(687, 19); + this->textBox2->TabIndex = 36; + this->textBox2->Text = L"このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。"; + // + // gboxExFlags + // + this->gboxExFlags->Controls->Add(this->cboxIsNormalJump); + this->gboxExFlags->Controls->Add(this->cboxIsTmpJump); + this->gboxExFlags->Controls->Add(this->cboxIsWL); + this->gboxExFlags->Controls->Add(this->cboxIsSubBanner); + this->gboxExFlags->Location = System::Drawing::Point(12, 236); + this->gboxExFlags->Name = L"gboxExFlags"; + this->gboxExFlags->Size = System::Drawing::Size(198, 108); + this->gboxExFlags->TabIndex = 35; + this->gboxExFlags->TabStop = false; + this->gboxExFlags->Text = L"TWL拡張諸フラグ"; + // + // tabRomEditInfo + // + this->tabRomEditInfo->Controls->Add(this->textBox3); + this->tabRomEditInfo->Controls->Add(this->gboxParental); + this->tabRomEditInfo->Controls->Add(this->gboxIcon); + this->tabRomEditInfo->Controls->Add(this->gboxEULA); + this->tabRomEditInfo->Location = System::Drawing::Point(4, 21); + this->tabRomEditInfo->Name = L"tabRomEditInfo"; + this->tabRomEditInfo->Size = System::Drawing::Size(741, 352); + this->tabRomEditInfo->TabIndex = 2; + this->tabRomEditInfo->Text = L"ROM登録情報(編集可)"; + this->tabRomEditInfo->UseVisualStyleBackColor = true; + // + // textBox3 + // + this->textBox3->BackColor = System::Drawing::SystemColors::Info; + this->textBox3->Location = System::Drawing::Point(25, 19); + this->textBox3->Name = L"textBox3"; + this->textBox3->ReadOnly = true; + this->textBox3->Size = System::Drawing::Size(687, 19); + this->textBox3->TabIndex = 37; + this->textBox3->Text = L"このタブの情報は、マスターROMの作成に必要です。適宜、変更してください。"; + // + // gboxParental + // + this->gboxParental->Controls->Add(this->labRegion); + this->gboxParental->Controls->Add(this->combRegion); + this->gboxParental->Controls->Add(this->cboxAlwaysPEGIBBFC); + this->gboxParental->Controls->Add(this->labPEGIBBFC2); + this->gboxParental->Controls->Add(this->cboxPEGIBBFC); + this->gboxParental->Controls->Add(this->labParentalRating); + this->gboxParental->Controls->Add(this->cboxOFLC); + this->gboxParental->Controls->Add(this->labOFLC); + this->gboxParental->Controls->Add(this->cboxAlwaysOFLC); + this->gboxParental->Controls->Add(this->labParentalEnable); + this->gboxParental->Controls->Add(this->cboxAlwaysPEGIPRT); + this->gboxParental->Controls->Add(this->labPEGIBBFC); + this->gboxParental->Controls->Add(this->cboxPEGIPRT); + this->gboxParental->Controls->Add(this->combPEGIBBFC); + this->gboxParental->Controls->Add(this->combCERO); + this->gboxParental->Controls->Add(this->labParentalForceEnable); + this->gboxParental->Controls->Add(this->labCERO); + this->gboxParental->Controls->Add(this->combOFLC); + this->gboxParental->Controls->Add(this->cboxAlwaysPEGI); + this->gboxParental->Controls->Add(this->labPEGIPRT); + this->gboxParental->Controls->Add(this->cboxPEGI); + this->gboxParental->Controls->Add(this->combPEGIPRT); + this->gboxParental->Controls->Add(this->combESRB); + this->gboxParental->Controls->Add(this->cboxCERO); + this->gboxParental->Controls->Add(this->labESRB); + this->gboxParental->Controls->Add(this->cboxAlwaysCERO); + this->gboxParental->Controls->Add(this->cboxAlwaysUSK); + this->gboxParental->Controls->Add(this->labPEGI); + this->gboxParental->Controls->Add(this->cboxUSK); + this->gboxParental->Controls->Add(this->combPEGI); + this->gboxParental->Controls->Add(this->combUSK); + this->gboxParental->Controls->Add(this->cboxESRB); + this->gboxParental->Controls->Add(this->labUSK); + this->gboxParental->Controls->Add(this->cboxAlwaysESRB); + this->gboxParental->Location = System::Drawing::Point(252, 60); + this->gboxParental->Name = L"gboxParental"; + this->gboxParental->Size = System::Drawing::Size(440, 272); + this->gboxParental->TabIndex = 33; + this->gboxParental->TabStop = false; + this->gboxParental->Text = L"リージョンとペアレンタルコントロール"; + // + // gboxIcon + // + this->gboxIcon->Controls->Add(this->cboxIsWirelessIcon); + this->gboxIcon->Controls->Add(this->cboxIsWiFiIcon); + this->gboxIcon->Location = System::Drawing::Point(19, 138); + this->gboxIcon->Name = L"gboxIcon"; + this->gboxIcon->Size = System::Drawing::Size(215, 69); + this->gboxIcon->TabIndex = 32; + this->gboxIcon->TabStop = false; + this->gboxIcon->Text = L"アイコン表示"; + // + // gboxEULA + // + this->gboxEULA->Controls->Add(this->cboxIsEULA); + this->gboxEULA->Controls->Add(this->numEULA); + this->gboxEULA->Controls->Add(this->labEULA); + this->gboxEULA->Location = System::Drawing::Point(19, 60); + this->gboxEULA->Name = L"gboxEULA"; + this->gboxEULA->Size = System::Drawing::Size(215, 72); + this->gboxEULA->TabIndex = 31; + this->gboxEULA->TabStop = false; + this->gboxEULA->Text = L"EULA"; + // + // tabPage4 + // + this->tabPage4->Controls->Add(this->textBox4); + this->tabPage4->Controls->Add(this->gboxForeign); + this->tabPage4->Controls->Add(this->tboxCaption); + this->tabPage4->Controls->Add(this->labSubmitVer); + this->tabPage4->Controls->Add(this->labCaption); + this->tabPage4->Controls->Add(this->tboxProductCode2); + this->tabPage4->Controls->Add(this->labCapSubmitVer); + this->tabPage4->Controls->Add(this->gboxUsage); + this->tabPage4->Controls->Add(this->numSubmitVersion); + this->tabPage4->Controls->Add(this->gboxProd); + this->tabPage4->Controls->Add(this->gboxSubmitWay); + this->tabPage4->Controls->Add(this->tboxProductCode1); + this->tabPage4->Controls->Add(this->labSubmiteDate); + this->tabPage4->Controls->Add(this->dateRelease); + this->tabPage4->Controls->Add(this->tboxProductName); + this->tabPage4->Controls->Add(this->labReleaseDate); + this->tabPage4->Controls->Add(this->dateSubmit); + this->tabPage4->Controls->Add(this->labProductCode2); + this->tabPage4->Controls->Add(this->labProductCode); + this->tabPage4->Controls->Add(this->labProductName); + this->tabPage4->Controls->Add(this->labProductCode1); + this->tabPage4->Location = System::Drawing::Point(4, 21); + this->tabPage4->Name = L"tabPage4"; + this->tabPage4->Size = System::Drawing::Size(741, 352); + this->tabPage4->TabIndex = 3; + this->tabPage4->Text = L"提出情報(編集可)"; + this->tabPage4->UseVisualStyleBackColor = true; + // + // textBox4 + // + this->textBox4->BackColor = System::Drawing::SystemColors::Info; + this->textBox4->Location = System::Drawing::Point(24, 19); + this->textBox4->Name = L"textBox4"; + this->textBox4->ReadOnly = true; + this->textBox4->Size = System::Drawing::Size(687, 19); + this->textBox4->TabIndex = 38; + this->textBox4->Text = L"このタブの情報は提出書類の作成に必要です。入力してください。"; + // + // gboxForeign + // + this->gboxForeign->Controls->Add(this->labMultiForeign2); + this->gboxForeign->Controls->Add(this->cboxReleaseForeign); + this->gboxForeign->Controls->Add(this->labMultiForeign1); + this->gboxForeign->Controls->Add(this->tboxProductCode2Foreign1); + this->gboxForeign->Controls->Add(this->tboxProductCode2Foreign3); + this->gboxForeign->Controls->Add(this->labProductCodeForeign); + this->gboxForeign->Controls->Add(this->tboxProductCode2Foreign2); + this->gboxForeign->Controls->Add(this->tboxProductCode1Foreign); + this->gboxForeign->Controls->Add(this->labProductCode2Foreign); + this->gboxForeign->Controls->Add(this->labProductCode1Foreign); + this->gboxForeign->Controls->Add(this->tboxProductNameForeign); + this->gboxForeign->Controls->Add(this->labProductNameForeign); + this->gboxForeign->Location = System::Drawing::Point(362, 107); + this->gboxForeign->Name = L"gboxForeign"; + this->gboxForeign->Size = System::Drawing::Size(349, 141); + this->gboxForeign->TabIndex = 35; + this->gboxForeign->TabStop = false; + this->gboxForeign->Text = L"海外版"; + // + // labMultiForeign2 + // + this->labMultiForeign2->AutoSize = true; + this->labMultiForeign2->Location = System::Drawing::Point(217, 121); + this->labMultiForeign2->Name = L"labMultiForeign2"; + this->labMultiForeign2->Size = System::Drawing::Size(101, 12); + this->labMultiForeign2->TabIndex = 45; + this->labMultiForeign2->Text = L"(複数ある場合のみ)"; + // + // tabPage5 + // + this->tabPage5->Controls->Add(this->textBox5); + this->tabPage5->Controls->Add(this->cboxIsInputPerson2); + this->tabPage5->Controls->Add(this->gboxPerson1); + this->tabPage5->Controls->Add(this->gboxPerson2); + this->tabPage5->Location = System::Drawing::Point(4, 21); + this->tabPage5->Name = L"tabPage5"; + this->tabPage5->Size = System::Drawing::Size(741, 352); + this->tabPage5->TabIndex = 4; + this->tabPage5->Text = L"会社情報(編集可)"; + this->tabPage5->UseVisualStyleBackColor = true; + // + // textBox5 + // + this->textBox5->BackColor = System::Drawing::SystemColors::Info; + this->textBox5->Location = System::Drawing::Point(26, 21); + this->textBox5->Name = L"textBox5"; + this->textBox5->ReadOnly = true; + this->textBox5->Size = System::Drawing::Size(687, 19); + this->textBox5->TabIndex = 39; + this->textBox5->Text = L"このタブの情報は提出書類の作成に必要です。入力してください。"; + // + // tabError + // + this->tabError->Controls->Add(this->textBox6); + this->tabError->Controls->Add(this->gboxErrorTiming); + this->tabError->Controls->Add(this->labWarn); + this->tabError->Controls->Add(this->labError); + this->tabError->Controls->Add(this->gridWarn); + this->tabError->Controls->Add(this->gridError); + this->tabError->Location = System::Drawing::Point(4, 21); + this->tabError->Name = L"tabError"; + this->tabError->Size = System::Drawing::Size(741, 352); + this->tabError->TabIndex = 5; + this->tabError->Text = L"エラー(要修正)"; + this->tabError->UseVisualStyleBackColor = true; + this->tabError->Click += gcnew System::EventHandler(this, &Form1::tabError_Click); + // + // textBox6 + // + this->textBox6->BackColor = System::Drawing::SystemColors::Info; + this->textBox6->Location = System::Drawing::Point(24, 24); + this->textBox6->Name = L"textBox6"; + this->textBox6->ReadOnly = true; + this->textBox6->Size = System::Drawing::Size(533, 19); + this->textBox6->TabIndex = 40; + this->textBox6->Text = L"このタブの各項目はROMデータの問題と入力の誤りを表しています。"; + // + // gboxErrorTiming + // + this->gboxErrorTiming->Controls->Add(this->rErrorCurrent); + this->gboxErrorTiming->Controls->Add(this->rErrorReading); + this->gboxErrorTiming->Location = System::Drawing::Point(573, 11); + this->gboxErrorTiming->Name = L"gboxErrorTiming"; + this->gboxErrorTiming->Size = System::Drawing::Size(148, 71); + this->gboxErrorTiming->TabIndex = 41; + this->gboxErrorTiming->TabStop = false; + this->gboxErrorTiming->Text = L"いつの情報を表示するか"; + // + // rErrorCurrent + // + this->rErrorCurrent->AutoSize = true; + this->rErrorCurrent->Location = System::Drawing::Point(6, 45); + this->rErrorCurrent->Name = L"rErrorCurrent"; + this->rErrorCurrent->Size = System::Drawing::Size(114, 16); + this->rErrorCurrent->TabIndex = 1; + this->rErrorCurrent->TabStop = true; + this->rErrorCurrent->Text = L"現在の入力を反映"; + this->rErrorCurrent->UseVisualStyleBackColor = true; + this->rErrorCurrent->CheckedChanged += gcnew System::EventHandler(this, &Form1::rErrorCurrent_CheckedChanged); + // + // rErrorReading + // + this->rErrorReading->AutoSize = true; + this->rErrorReading->Checked = true; + this->rErrorReading->Location = System::Drawing::Point(6, 18); + this->rErrorReading->Name = L"rErrorReading"; + this->rErrorReading->Size = System::Drawing::Size(134, 16); + this->rErrorReading->TabIndex = 0; + this->rErrorReading->TabStop = true; + this->rErrorReading->Text = L"ROMデータ読み込み時"; + this->rErrorReading->UseVisualStyleBackColor = true; + this->rErrorReading->CheckedChanged += gcnew System::EventHandler(this, &Form1::rErrorReading_CheckedChanged); + // + // labWarn + // + this->labWarn->AutoSize = true; + this->labWarn->ForeColor = System::Drawing::SystemColors::ActiveCaption; + this->labWarn->Location = System::Drawing::Point(22, 213); + this->labWarn->Name = L"labWarn"; + this->labWarn->Size = System::Drawing::Size(331, 12); + this->labWarn->TabIndex = 40; + this->labWarn->Text = L"警告(修正は必須ではありませんが情報に誤りがないかご確認ください)"; + // + // labError + // + this->labError->AutoSize = true; + this->labError->ForeColor = System::Drawing::SystemColors::ActiveCaption; + this->labError->Location = System::Drawing::Point(22, 78); + this->labError->Name = L"labError"; + this->labError->Size = System::Drawing::Size(137, 12); + this->labError->TabIndex = 39; + this->labError->Text = L"エラー(必ず修正してください)"; + // + // gridWarn + // + this->gridWarn->BackgroundColor = System::Drawing::SystemColors::Control; + 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}); + this->gridWarn->GridColor = System::Drawing::SystemColors::Control; + this->gridWarn->Location = System::Drawing::Point(24, 228); + this->gridWarn->Name = L"gridWarn"; + this->gridWarn->ReadOnly = true; + this->gridWarn->RowHeadersVisible = false; + this->gridWarn->RowTemplate->Height = 21; + this->gridWarn->Size = System::Drawing::Size(699, 106); + this->gridWarn->TabIndex = 38; + // + // colWarnName + // + this->colWarnName->HeaderText = L"項目名"; + this->colWarnName->Name = L"colWarnName"; + this->colWarnName->ReadOnly = true; + this->colWarnName->Width = 120; + // + // colWarnBegin + // + this->colWarnBegin->HeaderText = L"開始"; + this->colWarnBegin->Name = L"colWarnBegin"; + this->colWarnBegin->ReadOnly = true; + this->colWarnBegin->Width = 60; + // + // colWarnEnd + // + this->colWarnEnd->HeaderText = L"終了"; + this->colWarnEnd->Name = L"colWarnEnd"; + this->colWarnEnd->ReadOnly = true; + this->colWarnEnd->Width = 60; + // + // colWarnCause + // + this->colWarnCause->AutoSizeMode = System::Windows::Forms::DataGridViewAutoSizeColumnMode::Fill; + this->colWarnCause->HeaderText = L"要因"; + this->colWarnCause->Name = L"colWarnCause"; + this->colWarnCause->ReadOnly = true; + // + // gridError + // + 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}); + this->gridError->GridColor = System::Drawing::SystemColors::Control; + this->gridError->Location = System::Drawing::Point(24, 93); + this->gridError->Name = L"gridError"; + this->gridError->ReadOnly = true; + this->gridError->RowHeadersVisible = false; + this->gridError->RowTemplate->Height = 21; + this->gridError->Size = System::Drawing::Size(699, 103); + this->gridError->TabIndex = 37; + // + // colErrorName + // + this->colErrorName->HeaderText = L"項目名"; + this->colErrorName->Name = L"colErrorName"; + this->colErrorName->ReadOnly = true; + this->colErrorName->Width = 120; + // + // colErrorBegin + // + this->colErrorBegin->HeaderText = L"開始"; + this->colErrorBegin->Name = L"colErrorBegin"; + this->colErrorBegin->ReadOnly = true; + this->colErrorBegin->Width = 60; + // + // colErrorEnd + // + this->colErrorEnd->HeaderText = L"終了"; + this->colErrorEnd->Name = L"colErrorEnd"; + this->colErrorEnd->ReadOnly = true; + this->colErrorEnd->Width = 60; + // + // colErrorCause + // + this->colErrorCause->AutoSizeMode = System::Windows::Forms::DataGridViewAutoSizeColumnMode::Fill; + this->colErrorCause->HeaderText = L"要因"; + this->colErrorCause->Name = L"colErrorCause"; + this->colErrorCause->ReadOnly = true; + // + // labFile + // + this->labFile->AutoSize = true; + this->labFile->Location = System::Drawing::Point(22, 53); + this->labFile->Name = L"labFile"; + this->labFile->Size = System::Drawing::Size(92, 12); + this->labFile->TabIndex = 36; + this->labFile->Text = L"ROMデータファイル"; // // Form1 // this->AutoScaleDimensions = System::Drawing::SizeF(6, 12); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; - this->ClientSize = System::Drawing::Size(825, 702); - this->Controls->Add(this->gboxMakeMaster); - this->Controls->Add(this->butErrorWindow); - this->Controls->Add(this->gboxProd); - this->Controls->Add(this->tabDoc); - this->Controls->Add(this->gboxSelectLang); - this->Controls->Add(this->gboxTWLInfoWritable); - this->Controls->Add(this->tabCheck); - this->Controls->Add(this->gboxFileOpen); - this->Controls->Add(this->gboxCRC); - this->Controls->Add(this->gboxSrl); + this->ClientSize = System::Drawing::Size(777, 519); + this->Controls->Add(this->labFile); + this->Controls->Add(this->tabMain); + this->Controls->Add(this->tboxFile); this->Controls->Add(this->tboxMsg); + this->Controls->Add(this->menuStripAbove); + this->MainMenuStrip = this->menuStripAbove; this->Name = L"Form1"; this->Text = L"TWL MasterEditor"; this->gboxSrl->ResumeLayout(false); this->gboxSrl->PerformLayout(); this->gboxCRC->ResumeLayout(false); this->gboxCRC->PerformLayout(); - this->gboxFileOpen->ResumeLayout(false); - this->gboxFileOpen->PerformLayout(); - this->gboxSelectLang->ResumeLayout(false); - this->gboxSelectLang->PerformLayout(); - this->gboxTWLInfoWritable->ResumeLayout(false); - this->gboxTWLInfoWritable->PerformLayout(); (cli::safe_cast(this->numEULA))->EndInit(); this->gboxPerson2->ResumeLayout(false); this->gboxPerson2->PerformLayout(); @@ -3103,35 +3443,46 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->gboxSubmitWay->ResumeLayout(false); this->gboxSubmitWay->PerformLayout(); (cli::safe_cast(this->numSubmitVersion))->EndInit(); - this->tabDoc->ResumeLayout(false); - this->tabSubmitInfo->ResumeLayout(false); - this->tabSubmitInfo->PerformLayout(); - this->tabForeignInfo->ResumeLayout(false); - this->tabForeignInfo->PerformLayout(); - this->tabCompanyInfo1->ResumeLayout(false); - this->tabCompanyInfo2->ResumeLayout(false); - this->tabCompanyInfo2->PerformLayout(); - this->tabCaption->ResumeLayout(false); - this->tabCaption->PerformLayout(); - this->tabTWLSpec4->ResumeLayout(false); this->gboxShared2Size->ResumeLayout(false); this->gboxShared2Size->PerformLayout(); - this->tabSDK->ResumeLayout(false); - this->tabSDK->PerformLayout(); - this->tabTWLSpec3->ResumeLayout(false); this->gboxTWLExInfo->ResumeLayout(false); this->gboxTWLExInfo->PerformLayout(); - this->tabTWLSpec2->ResumeLayout(false); this->gboxAccess->ResumeLayout(false); this->gboxAccess->PerformLayout(); - this->tabTWLSpec1->ResumeLayout(false); - this->tabTWLSpec1->PerformLayout(); this->gboxTitleID->ResumeLayout(false); this->gboxTitleID->PerformLayout(); - this->tabCheck->ResumeLayout(false); this->gboxProd->ResumeLayout(false); this->gboxProd->PerformLayout(); - this->gboxMakeMaster->ResumeLayout(false); + this->menuStripAbove->ResumeLayout(false); + this->menuStripAbove->PerformLayout(); + this->tabMain->ResumeLayout(false); + this->tabRomInfo->ResumeLayout(false); + this->tabRomInfo->PerformLayout(); + (cli::safe_cast(this->gridLibrary))->EndInit(); + this->tabTWLInfo->ResumeLayout(false); + this->tabTWLInfo->PerformLayout(); + this->gboxExFlags->ResumeLayout(false); + this->gboxExFlags->PerformLayout(); + this->tabRomEditInfo->ResumeLayout(false); + this->tabRomEditInfo->PerformLayout(); + this->gboxParental->ResumeLayout(false); + this->gboxParental->PerformLayout(); + this->gboxIcon->ResumeLayout(false); + this->gboxIcon->PerformLayout(); + this->gboxEULA->ResumeLayout(false); + this->gboxEULA->PerformLayout(); + this->tabPage4->ResumeLayout(false); + this->tabPage4->PerformLayout(); + this->gboxForeign->ResumeLayout(false); + this->gboxForeign->PerformLayout(); + this->tabPage5->ResumeLayout(false); + this->tabPage5->PerformLayout(); + this->tabError->ResumeLayout(false); + this->tabError->PerformLayout(); + this->gboxErrorTiming->ResumeLayout(false); + this->gboxErrorTiming->PerformLayout(); + (cli::safe_cast(this->gridWarn))->EndInit(); + (cli::safe_cast(this->gridError))->EndInit(); this->ResumeLayout(false); this->PerformLayout(); @@ -3217,14 +3568,14 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; switch( result ) { case ECSrlResult::ERROR_PLATFORM: - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) this->errMsg( "本ツールはTWL対応ROM専用です。NTR専用ROMなどのTWL対応ROM以外を読み込むことはできません。" ); else this->errMsg( "This tool can only read TWL ROM. This can't read Other data e.g. NTR limited ROM." ); break; default: - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) this->errMsg( "リードに失敗しました。" ); else this->errMsg( "Reading the file failed." ); @@ -3241,7 +3592,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; u16 crc; if( !getWholeCRCInFile( filename, &crc ) ) { - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) this->errMsg( "CRCの計算に失敗しました。" ); else this->errMsg( "Calc CRC failed." ); @@ -3252,7 +3603,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxWholeCRC->AppendText( "0x" ); this->tboxWholeCRC->AppendText( hcrc->ToString("X") ); - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) this->tboxMsg->Text = "ファイルオープンに成功しました。"; else this->tboxMsg->Text = "Opening the file succeeded."; @@ -3276,13 +3627,13 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // コピーしたファイルにROMヘッダを上書き if( this->hSrl->writeToFile( filename ) != ECSrlResult::NOERROR ) { - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) this->errMsg( "保存に失敗しました。" ); else this->errMsg( "Saving the file failed." ); return; } - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) this->tboxMsg->Text = "保存が成功しました。"; else this->tboxMsg->Text = "Saving the file succeeded."; @@ -3292,29 +3643,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->loadSrl( filename ); } - private: - // エラー専用ウィンドウを開いてMRCエラーと入力エラーを表示 - void openErrorWindowR(void) - { - // ウインドウを新たに開く - if( this->hErrorWindowR->IsDisposed ) - { - this->hErrorWindowR = gcnew FormError; // 閉じられたときだけ再度作成する - } - this->hErrorWindowR->Show(); - this->hErrorWindowR->Select(); - - // 言語設定はメインウィンドウにあわせる - if( this->rSelectJ->Checked == true ) - this->hErrorWindowR->changeJapanese(); - else - this->hErrorWindowR->changeEnglish(); - - // エラー項目をgridViewに追記していく - this->hErrorWindowR->setGridError( this->hSrl->hErrorList, this->rSelectJ->Checked ); - this->hErrorWindowR->setGridWarn( this->hSrl->hWarnList, this->rSelectJ->Checked ); - } - private: // ---------------------------------------------- // フォームの初期設定 @@ -3399,7 +3727,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; if( this->hSrl->hPlatform == nullptr ) { - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) this->errMsg( "プラットホーム指定が不正です。ROMデータのビルド設定を見直してください。" ); else this->errMsg( "Illegal Platform: Please check build settings of the ROM data." ); @@ -3535,10 +3863,9 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; } if( this->hSrl->hLicenseList != nullptr ) { - this->tboxLib->Clear(); for each( RCLicense ^lic in this->hSrl->hLicenseList ) { - this->tboxLib->Text += lic->Publisher + " " + lic->Name + "\r\n"; + this->gridLibrary->Rows->Add( gcnew cli::array{lic->Publisher, lic->Name} ); } } @@ -3621,7 +3948,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxCaptionEx->Clear(); if( (this->hSrl->hHasDSDLPlaySign != nullptr) && (*(this->hSrl->hHasDSDLPlaySign) == true) ) { - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) this->tboxCaptionEx->Text += gcnew System::String( "DSクローンブート対応. " ); else this->tboxCaptionEx->Text += gcnew System::String( "DS Clone Boot. " ); @@ -4085,7 +4412,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; System::String ^prefix; System::String ^suffix; - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) { prefix = gcnew System::String( "ペアレンタルコントロール情報の " ); } @@ -4099,21 +4426,21 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; // 2: 書き込み時チェック(レーティングが未審査なのにフラグが有効になっている) if( type == 0 ) { - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) suffix = gcnew System::String( " のレーティング値が不正です。ひとまず「未審査」にしますので、正しい値を設定してください。" ); else suffix = gcnew System::String( " : Illegal Rating. The value is set to \"Unexamined\" temporarily. Please set the value." ); } else if( type == 1 ) { - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) suffix = gcnew System::String( " のレーティング値が設定されているのに有効フラグが立っていません。設定を確認してください。" ); else suffix = gcnew System::String( " : The rating control flag is NOT enabled, but rating is set. Please retry settings." ); } else if( type == 2 ) { - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) suffix = gcnew System::String( " のレーティングが未審査なのに有効フラグが立っています。設定を確認してください。" ); else suffix = gcnew System::String( " : The rating control flag is enabled, but rating is NOT set. Please retry settings." ); @@ -4206,7 +4533,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->hDeliv->hCompany1 = this->tboxCompany1->Text; this->hDeliv->hDepart1 = this->tboxDepart1->Text; this->hDeliv->hPerson1 = this->tboxPerson1->Text; - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) { this->hDeliv->hFurigana1 = this->tboxFurigana1->Text; } @@ -4224,7 +4551,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->hDeliv->hCompany2 = this->tboxCompany2->Text; this->hDeliv->hDepart2 = this->tboxDepart2->Text; this->hDeliv->hPerson2 = this->tboxPerson2->Text; - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) { this->hDeliv->hFurigana2 = this->tboxFurigana2->Text; } @@ -4317,7 +4644,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; return false; if( this->checkTextForm( this->tboxDepart1->Text, this->labDepart1->Text ) == false ) return false; - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) { if( this->checkTextForm( this->tboxFurigana1->Text, this->labFurigana1->Text ) == false ) return false; @@ -4339,7 +4666,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; return false; if( this->checkTextForm( this->tboxDepart2->Text, this->labDepart2->Text ) == false ) return false; - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) { if( this->checkTextForm( this->tboxFurigana2->Text, this->labFurigana2->Text ) == false ) return false; @@ -4375,7 +4702,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; { System::String ^msg; - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) msg = gcnew System::String( "が入力されていません。やり直してください。" ); else msg = gcnew System::String( " is not set. Please retry setting." ); @@ -4399,7 +4726,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; { System::String ^msg; - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) msg = gcnew System::String( "の値の範囲が不正です。やり直してください。" ); else msg = gcnew System::String( ": Invalidate range of value. Please retry." ); @@ -4476,15 +4803,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; L"256Kbit FRAM", L"2Mbit FLASH", L"4Mbit FLASH", L"8Mbit FLASH", L"なし", L"その他"}); this->combBackup->SelectedIndex = index; - // フロントパネル下部 - this->gboxFileOpen->Text = gcnew System::String( "ROMデータファイルの入出力" ); - this->butOpen->Text = gcnew System::String( "ROMデータを開く" ); - this->butSaveAs->Text = gcnew System::String( "入力情報を反映させて保存" ); - this->butMakeMaster->Text = gcnew System::String( "マスタ提出書類を作成" ); - this->butErrorWindow->Text = gcnew System::String( "ROMチェック結果を表示" ); - // 提出情報タブ - this->tabSubmitInfo->Text = gcnew System::String( "提出情報" ); this->labProductName->Text = gcnew System::String( "製品名" ); this->labProductCode->Text = gcnew System::String( "製品コード" ); this->labReleaseDate->Text = gcnew System::String( "発売予定日" ); @@ -4499,16 +4818,13 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->rUsageOther->Text = gcnew System::String( "その他" ); this->labSubmitVer->Text = gcnew System::String( "提出バージョン" ); this->labCapSubmitVer->Text = gcnew System::String( "* リマスターバージョンが上がると再び0からカウント" ); - // 海外版タブ - this->tabForeignInfo->Text = gcnew System::String( "海外版" ); this->labProductNameForeign->Text = gcnew System::String( "製品名" ); this->labProductCodeForeign->Text = gcnew System::String( "製品コード" ); this->cboxReleaseForeign->Text = gcnew System::String( "海外版を発売する(予定)" ); this->labMultiForeign1->Text = gcnew System::String( "* 複数ある場合のみ" ); this->labMultiForeign2->Text = gcnew System::String( "* 複数ある場合のみ" ); + this->labCaption->Text = gcnew System::String( "備考欄 - その他連絡事項があればご記入ください" ); // 会社情報タブ - this->tabCompanyInfo1->Text = gcnew System::String( "会社情報1" ); - this->tabCompanyInfo2->Text = gcnew System::String( "会社情報2" ); this->gboxPerson1->Text = gcnew System::String( "担当者1" ); this->gboxPerson2->Text = gcnew System::String( "担当者2" ); this->cboxIsInputPerson2->Text = gcnew System::String( "担当者2を入力する" ); @@ -4523,20 +4839,8 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->labFurigana1->Text = gcnew System::String("ふりがな"); this->tboxFurigana2->Enabled = true; this->labFurigana2->Text = gcnew System::String("ふりがな"); - // 備考タブ - this->tabCaption->Text = gcnew System::String( "備考" ); - this->labCaption->Text = gcnew System::String( "備考欄 - その他連絡事項があればご記入ください" ); - - // タブの注意書き - this->labCautionInput->Text = gcnew System::String( "* これらの項目は書類提出に必要な情報です。入力してください。" ); - this->labCautionCheck->Text = gcnew System::String( "* これらの項目はROMデータの確認用です。入力の必要はありません。" ); // TWL仕様 - this->tabTWLSpec1->Text = gcnew System::String( "TWL仕様1" ); - this->tabTWLSpec2->Text = gcnew System::String( "TWL仕様2" ); - this->tabTWLSpec3->Text = gcnew System::String( "TWL仕様3" ); - this->tabTWLSpec4->Text = gcnew System::String( "TWL仕様4" ); - this->tabSDK->Text = gcnew System::String( "SDK" ); this->gboxTWLExInfo->Text = gcnew System::String( "TWL拡張情報" ); this->labNormalRomOffset->Text = gcnew System::String( "TWLノーマル領域ROMオフセット" ); this->labKeyTableRomOffset->Text = gcnew System::String( "TWL専用領域ROMオフセット" ); @@ -4556,7 +4860,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->labCaptionEx->Text = gcnew System::String( "特記事項" ); // ROMデータ編集可能情報 - this->gboxTWLInfoWritable->Text = gcnew System::String( "ROM編集可能情報(必要があれば変更してください)" ); this->labEULA->Text = gcnew System::String( "EULA同意バージョン" ); this->cboxIsEULA->Text = gcnew System::String( "EULA同意" ); this->cboxIsWirelessIcon->Text = gcnew System::String( "DSワイヤレス通信アイコン表示" ); @@ -4648,15 +4951,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; L"256Kbit FRAM", L"2Mbit FLASH", L"4Mbit FLASH", L"8Mbit FLASH", L"Nothing", L"Other"}); this->combBackup->SelectedIndex = index; - // フロントパネル下部 - this->gboxFileOpen->Text = gcnew System::String( "ROM file I/O" ); - this->butOpen->Text = gcnew System::String( "Open a ROM file" ); - this->butSaveAs->Text = gcnew System::String( "Save a ROM file" ); - this->butMakeMaster->Text = gcnew System::String( "Make a submission sheet" ); - this->butErrorWindow->Text = gcnew System::String( "See results of ROM check" ); - // 提出情報タブ - this->tabSubmitInfo->Text = gcnew System::String( "Submission Info." ); this->labProductName->Text = gcnew System::String( "Product name" ); this->labProductCode->Text = gcnew System::String( "Product code" ); this->labReleaseDate->Text = gcnew System::String( "Release date" ); @@ -4671,16 +4966,13 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->rUsageOther->Text = gcnew System::String( "Other" ); this->labSubmitVer->Text = gcnew System::String( "Submission ver." ); this->labCapSubmitVer->Text = gcnew System::String( "* return to 0 when release ver. is updated." ); - // 海外版タブ - this->tabForeignInfo->Text = gcnew System::String( "Foreign ver." ); this->labProductNameForeign->Text = gcnew System::String( "Product name" ); this->labProductCodeForeign->Text = gcnew System::String( "Product code" ); this->cboxReleaseForeign->Text = gcnew System::String( "Foreign ver. is scheduled to go on sale" ); this->labMultiForeign1->Text = gcnew System::String( "* Only release multi ver." ); this->labMultiForeign2->Text = gcnew System::String( "* Only release multi ver." ); + this->labCaption->Text = gcnew System::String( "Remarks item - Please write further information." ); // 会社情報タブ - this->tabCompanyInfo1->Text = gcnew System::String( "Campany1" ); - this->tabCompanyInfo2->Text = gcnew System::String( "Campany2" ); this->gboxPerson1->Text = gcnew System::String( "Account1" ); this->gboxPerson2->Text = gcnew System::String( "Account2" ); this->cboxIsInputPerson2->Text = gcnew System::String( "Input Account2" ); @@ -4697,20 +4989,8 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxFurigana2->Clear(); this->tboxFurigana2->Enabled = false; this->labFurigana2->Text = gcnew System::String(""); - // 備考タブ - this->tabCaption->Text = gcnew System::String( "Remarks" ); - this->labCaption->Text = gcnew System::String( "Remarks item - Please write further information." ); - - // タブの注意書き - this->labCautionInput->Text = gcnew System::String( "* These items are necessary for submission. Please input." ); - this->labCautionCheck->Text = gcnew System::String( "* These items are used for checking ROM data. They are read only." ); // TWL仕様 - this->tabTWLSpec1->Text = gcnew System::String( "TWL Spec.1" ); - this->tabTWLSpec2->Text = gcnew System::String( "TWL Spec.2" ); - this->tabTWLSpec3->Text = gcnew System::String( "TWL Spec.3" ); - this->tabTWLSpec4->Text = gcnew System::String( "TWL Spec.4" ); - this->tabSDK->Text = gcnew System::String( "SDK" ); this->gboxTWLExInfo->Text = gcnew System::String( "TWL Extended Info" ); this->labNormalRomOffset->Text = gcnew System::String( "TWL normal area ROM offset" ); this->labKeyTableRomOffset->Text = gcnew System::String( "TWL secure area ROM offset" ); @@ -4730,7 +5010,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->labCaptionEx->Text = gcnew System::String( "Special note" ); // ROMデータ編集可能情報 - this->gboxTWLInfoWritable->Text = gcnew System::String( "ROM Writable Info.(Please change if necessary.)" ); this->labEULA->Text = gcnew System::String( "EULA agreement ver." ); this->cboxIsEULA->Text = gcnew System::String( "Agree EULA" ); this->cboxIsWirelessIcon->Text = gcnew System::String( "Display an Icon of DS Wireless" ); @@ -4796,88 +5075,83 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->setSrlFormsCaptionEx(); } + // -------------------------------------------------------- + // 読み込み時エラー情報の登録 + // -------------------------------------------------------- + public: + void setGridError( void ) + { + this->gridError->Rows->Clear(); + if( this->hSrl->hErrorList != nullptr ) + { + for each( RCMRCError ^err in this->hSrl->hErrorList ) + { + this->gridError->Rows->Add( err->getAll( this->stripItemJapanese->Checked ) ); + } + } + } + + void setGridWarn( void ) + { + this->gridWarn->Rows->Clear(); + if( this->hSrl->hWarnList != nullptr ) + { + for each( RCMRCError ^err in this->hSrl->hWarnList ) + { + this->gridWarn->Rows->Add( err->getAll( this->stripItemJapanese->Checked ) ); + } + } + } + + // -------------------------------------------------------- + // 読み込み時に修正可能なエラーに現在の入力を重ね合わせ + // -------------------------------------------------------- + public: + void overloadGridError( void ) + { + // listLoの修正可能な情報をlistHiで上書きする(listHiは修正可能な情報のみであることが前提) + this->gridError->Rows->Clear(); + if( this->hSrl->hErrorList != nullptr ) + { + for each( RCMRCError ^err in this->hSrl->hErrorList ) + { + if( !err->EnableModify ) // 修正可能な情報は表示しない + this->gridError->Rows->Add( err->getAll( this->stripItemJapanese->Checked ) ); + } + } + if( this->hErrorList != nullptr ) + { + for each( RCMRCError ^err in this->hErrorList ) + { + this->gridError->Rows->Add( err->getAll( this->stripItemJapanese->Checked ) ); + } + } + } + void overloadGridWarn( void ) + { + // listLoの修正可能な情報をlistHiで上書きする(listHiは修正可能な情報のみであることが前提) + this->gridWarn->Rows->Clear(); + if( this->hSrl->hWarnList != nullptr ) + { + for each( RCMRCError ^err in this->hSrl->hWarnList ) + { + if( !err->EnableModify ) // 修正可能な情報は表示しない + this->gridWarn->Rows->Add( err->getAll( this->stripItemJapanese->Checked ) ); + } + } + if( this->hWarnList != nullptr ) + { + for each( RCMRCError ^err in this->hWarnList ) + { + this->gridWarn->Rows->Add( err->getAll( this->stripItemJapanese->Checked ) ); + } + } + } + ///////////////////////////////////////////// // フォーム操作メソッド ///////////////////////////////////////////// - // 開くボタン - private: - System::Void butOpen_Click(System::Object^ sender, System::EventArgs^ e) - { - System::String^ filename; - - // ドラッグアンドドロップ以外ではダイアログから入力する - { - System::Windows::Forms::OpenFileDialog ^dlg = gcnew (OpenFileDialog); - - dlg->InitialDirectory = "c:\\"; - dlg->Filter = (this->rSelectJ->Checked == true)?"srl形式 (*.srl)|*.srl|All files (*.*)|*.*" - :"srl format (*.srl)|*.srl|All files (*.*)|*.*"; - dlg->FilterIndex = 1; - dlg->RestoreDirectory = true; - - if( dlg->ShowDialog() != System::Windows::Forms::DialogResult::OK ) - { - if( this->rSelectJ->Checked == true ) - this->errMsg( "ファイルオープンがキャンセルされました。" ); - else - this->errMsg( "Opening the file is canceled." ); - return; - } - filename = dlg->FileName; - } - this->loadSrl( filename ); - } // end of butOpen_Click() - - // 名前をつけて保存 - private: - System::Void butSaveAs_Click(System::Object^ sender, System::EventArgs^ e) - { - System::String^ filename; - - // SRLが読み込まれていないときにはリードさせない - if( System::String::IsNullOrEmpty( this->tboxFile->Text ) ) - { - if( this->rSelectJ->Checked == true ) - this->errMsg( "ROMデータファイルがオープンされていません。" ); - else - this->errMsg( "ROM file has not opened yet." ); - return; - } - - // SRL関連フォーム入力をチェックする - if( this->checkSrlForms() == false ) - { - return; - } - - // ダイアログで決めたファイルにSRLを保存 - { - System::Windows::Forms::SaveFileDialog ^dlg = gcnew (SaveFileDialog); - - dlg->InitialDirectory = "c:\\"; - dlg->Filter = (this->rSelectJ->Checked == true)?"srl形式 (*.srl)|*.srl" - :"srl format (*.srl)|*.srl"; - dlg->FilterIndex = 1; - dlg->RestoreDirectory = true; - - if( dlg->ShowDialog() != System::Windows::Forms::DialogResult::OK ) - { - if( this->rSelectJ->Checked == true ) - this->errMsg( "保存がキャンセルされましたのでROMファイルデータは作成(更新)されません。" ); - else - this->errMsg( "ROM file is not updated since saving the file is canceled." ); - return; - } - filename = dlg->FileName; - if( !(dlg->FileName->EndsWith( ".srl" )) ) - { - filename += ".srl"; - } - } - this->saveSrl( filename ); - } // end of butSaveAs_Click() - // ファイルパス表示用テキストボックス private: // ドラッグされてまだマウスのボタンが離されていないとき @@ -4896,7 +5170,7 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; if( System::IO::File::Exists(filename) == false ) { - if( this->rSelectJ->Checked == true ) + if( this->stripItemJapanese->Checked == true ) this->errMsg( "ファイルが存在しませんので開くことができません。" ); else this->errMsg( "The file is not found, therefore the file can not be opened." ); @@ -4906,139 +5180,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->tboxFile->Text = filename; } - // マスタ提出書類を作成ボタン - private: - System::Void butMakeMaster_Click(System::Object^ sender, System::EventArgs^ e) - { - System::String ^delivfile; - ECDeliverableResult result; - System::String ^srlfile; - System::UInt16 ^hcrc; - cli::array ^paths; - - // SRLが読み込まれていないときにはリードさせない - if( System::String::IsNullOrEmpty( this->tboxFile->Text ) ) - { - if( this->rSelectJ->Checked == true ) - this->errMsg( "ROMデータファイルがオープンされていません。" ); - else - this->errMsg( "ROM file has not opened yet." ); - return; - } - - // SRLと書類の両方のフォーム入力をチェックする - if( this->checkSrlForms() == false ) - { - return; - } - if( this->checkDeliverableForms() == false ) - { - return; - } - - // 注意書き - { - System::String ^stmp; - if( this->rSelectJ->Checked == true ) - stmp = "Step1/2: ROMデータファイル(SRL)と提出書類の情報を一致させるため、まず、入力情報を反映させたSRLを作成します。\n(キャンセルされたとき、SRLおよび提出書類は作成されません。)"; - else - stmp = "Step1/2: Firstly, We save ROM file(SRL) because several information in a submission sheet are match those in the SRL.\n(When it is canceled, both the SRL and a submission sheet are not made.)"; - MessageBox::Show( stmp, "Caution", MessageBoxButtons::OK, MessageBoxIcon::Information ); - } - // ダイアログからSrl名を取得する - { - System::Windows::Forms::SaveFileDialog ^dlg = gcnew (SaveFileDialog); - - dlg->InitialDirectory = "c:\\"; - dlg->Filter = "srl形式 (*.srl)|*.srl"; - dlg->FilterIndex = 1; - dlg->RestoreDirectory = true; - - if( dlg->ShowDialog() != System::Windows::Forms::DialogResult::OK ) - { - if( this->rSelectJ->Checked == true ) - this->errMsg( "SRLの保存がキャンセルされましたので提出書類は作成されません。"); - else - this->errMsg( "A submission sheet can not be made, since saving SRL is canceled." ); - return; - } - srlfile = dlg->FileName; - if( !(dlg->FileName->EndsWith( ".srl" )) ) - { - srlfile += ".srl"; - } - } - - // マスタ提出書類に必要な情報をフォームから取得して更新 - this->setSrlProperties(); // 先にSrlを更新しておく - this->setDeliverableProperties(); - - // 注意書き - { - System::String ^stmp; - if( this->rSelectJ->Checked == true ) - stmp = "Step2/2: 続いて提出書類を作成します。\nここでキャンセルされたとき、提出書類はもとよりSRLも作成(更新)されませんのでご注意ください。"; - else - stmp = "Step2/2: Secondly, We should make a submission sheet. \n(CAUTION: When it is canceled, not only a submission sheet is not made, but also the SRL is selected previously.)"; - MessageBox::Show( stmp, "Caution", MessageBoxButtons::OK, MessageBoxIcon::Information ); - } - // ダイアログでファイルパスを決定 - { - System::Windows::Forms::SaveFileDialog ^dlg = gcnew (SaveFileDialog); - - dlg->InitialDirectory = "c:\\"; - dlg->Filter = "xml形式 (*.xml)|*.xml"; - dlg->FilterIndex = 1; - dlg->RestoreDirectory = true; - - if( dlg->ShowDialog() != System::Windows::Forms::DialogResult::OK ) - { - if( this->rSelectJ->Checked == true ) - this->errMsg( "提出書類の作成がキャンセルされました。" ); - else - this->errMsg( "Making a submission sheet is canceled." ); - return; - } - delivfile = dlg->FileName; - if( !(dlg->FileName->EndsWith( ".xml" )) ) - { - delivfile += ".xml"; - } - } - - // SRLを更新 - this->saveSrl( srlfile ); - u16 crc; // SRL全体のCRCを計算する(書類に記述するため) - if( !getWholeCRCInFile( srlfile, &crc ) ) - { - if( this->rSelectJ->Checked == true ) - this->errMsg( "CRCの計算に失敗しました。提出書類の作成をキャンセルします。" ); - else - this->errMsg( "Calc CRC is failed. Therefore, Making a submission sheet is canceled." ); - return; - } - hcrc = gcnew System::UInt16( crc ); - this->tboxWholeCRC->Clear(); - this->tboxWholeCRC->AppendText( "0x" ); - this->tboxWholeCRC->AppendText( hcrc->ToString("X") ); - - // 書類作成 - paths = srlfile->Split(L'\\'); // 余分なパスを削除 - srlfile = paths[ paths->Length - 1 ]; - //result = this->hDeliv->write( delivfile, this->hSrl, hcrc, srlfile, !(this->rSelectJ->Checked) ); - result = this->hDeliv->writeSpreadsheet( delivfile, this->hSrl, hcrc, srlfile, !(this->rSelectJ->Checked) ); - if( result != ECDeliverableResult::NOERROR ) - { - if( this->rSelectJ->Checked == true ) - this->errMsg( "書類の作成に失敗しました。" ); - else - this->errMsg( "Making a submission sheet is failed." ); - return; - } - this->tboxMsg->Text = "書類の作成に成功しました。"; - - } // end of butMakeMaster_Click - // チェックボタンを押したときに他のフォームを有効にする private: System::Void cboxIsInputPerson2_CheckedChanged(System::Object^ sender, System::EventArgs^ e) @@ -5134,20 +5275,6 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; this->maskParentalForms(); } - private: - // 日本語版への切り替え - System::Void rSelectJ_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changeJapanese(); - } - - private: - // 英語版への切り替え - System::Void rSelectE_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changeEnglish(); - } - private: System::Void cboxReleaseForeign_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { @@ -5166,12 +5293,271 @@ private: System::Windows::Forms::GroupBox^ gboxMakeMaster; } } + ///////////////////////////////////////////// + // タイトルバー操作メソッド + ///////////////////////////////////////////// + private: - System::Void butErrorWindow_Click(System::Object^ sender, System::EventArgs^ e) + System::Void stripItemEnglish_Click(System::Object^ sender, System::EventArgs^ e) { - this->openErrorWindowR(); + this->changeEnglish(); + this->stripItemEnglish->Checked = true; + this->stripItemJapanese->Checked = false; } + private: + System::Void stripItemJapanese_Click(System::Object^ sender, System::EventArgs^ e) + { + this->changeJapanese(); + this->stripItemEnglish->Checked = false; + this->stripItemJapanese->Checked = true; + } + + private: + System::Void stripItemOpenRom_Click(System::Object^ sender, System::EventArgs^ e) + { + System::String^ filename; + + // ドラッグアンドドロップ以外ではダイアログから入力する + { + System::Windows::Forms::OpenFileDialog ^dlg = gcnew (OpenFileDialog); + + dlg->InitialDirectory = "c:\\"; + dlg->Filter = (this->stripItemJapanese->Checked == true)?"srl形式 (*.srl)|*.srl|All files (*.*)|*.*" + :"srl format (*.srl)|*.srl|All files (*.*)|*.*"; + dlg->FilterIndex = 1; + dlg->RestoreDirectory = true; + + if( dlg->ShowDialog() != System::Windows::Forms::DialogResult::OK ) + { + if( this->stripItemJapanese->Checked == true ) + this->errMsg( "ファイルオープンがキャンセルされました。" ); + else + this->errMsg( "Opening the file is canceled." ); + return; + } + filename = dlg->FileName; + } + this->loadSrl( filename ); + + // 読み込み時エラーを登録する + this->rErrorReading->Checked = true; + this->setGridError(); + this->setGridWarn(); + } //stripItemOpenRom_Click() + + private: + System::Void stripItemMasterRom_Click(System::Object^ sender, System::EventArgs^ e) + { + System::String^ filename; + + // SRLが読み込まれていないときにはリードさせない + if( System::String::IsNullOrEmpty( this->tboxFile->Text ) ) + { + if( this->stripItemJapanese->Checked == true ) + this->errMsg( "ROMデータファイルがオープンされていません。" ); + else + this->errMsg( "ROM file has not opened yet." ); + return; + } + + // SRL関連フォーム入力をチェックする + if( this->checkSrlForms() == false ) + { + return; + } + + // ダイアログで決めたファイルにSRLを保存 + { + System::Windows::Forms::SaveFileDialog ^dlg = gcnew (SaveFileDialog); + + dlg->InitialDirectory = "c:\\"; + dlg->Filter = (this->stripItemJapanese->Checked == true)?"srl形式 (*.srl)|*.srl" + :"srl format (*.srl)|*.srl"; + dlg->FilterIndex = 1; + dlg->RestoreDirectory = true; + + if( dlg->ShowDialog() != System::Windows::Forms::DialogResult::OK ) + { + if( this->stripItemJapanese->Checked == true ) + this->errMsg( "保存がキャンセルされましたのでROMファイルデータは作成(更新)されません。" ); + else + this->errMsg( "ROM file is not updated since saving the file is canceled." ); + return; + } + filename = dlg->FileName; + if( !(dlg->FileName->EndsWith( ".srl" )) ) + { + filename += ".srl"; + } + } + this->saveSrl( filename ); + } //stripItemMasterRom_Click() + + private: + System::Void stripItemSheet_Click(System::Object^ sender, System::EventArgs^ e) + { + System::String ^delivfile; + ECDeliverableResult result; + System::String ^srlfile; + System::UInt16 ^hcrc; + cli::array ^paths; + + // SRLが読み込まれていないときにはリードさせない + if( System::String::IsNullOrEmpty( this->tboxFile->Text ) ) + { + if( this->stripItemJapanese->Checked == true ) + this->errMsg( "ROMデータファイルがオープンされていません。" ); + else + this->errMsg( "ROM file has not opened yet." ); + return; + } + + // SRLと書類の両方のフォーム入力をチェックする + if( this->checkSrlForms() == false ) + { + return; + } + if( this->checkDeliverableForms() == false ) + { + return; + } + + // 注意書き + { + System::String ^stmp; + if( this->stripItemJapanese->Checked == true ) + stmp = "Step1/2: ROMデータファイル(SRL)と提出書類の情報を一致させるため、まず、入力情報を反映させたSRLを作成します。\n(キャンセルされたとき、SRLおよび提出書類は作成されません。)"; + else + stmp = "Step1/2: Firstly, We save ROM file(SRL) because several information in a submission sheet are match those in the SRL.\n(When it is canceled, both the SRL and a submission sheet are not made.)"; + MessageBox::Show( stmp, "Caution", MessageBoxButtons::OK, MessageBoxIcon::Information ); + } + // ダイアログからSrl名を取得する + { + System::Windows::Forms::SaveFileDialog ^dlg = gcnew (SaveFileDialog); + + dlg->InitialDirectory = "c:\\"; + dlg->Filter = "srl形式 (*.srl)|*.srl"; + dlg->FilterIndex = 1; + dlg->RestoreDirectory = true; + + if( dlg->ShowDialog() != System::Windows::Forms::DialogResult::OK ) + { + if( this->stripItemJapanese->Checked == true ) + this->errMsg( "SRLの保存がキャンセルされましたので提出書類は作成されません。"); + else + this->errMsg( "A submission sheet can not be made, since saving SRL is canceled." ); + return; + } + srlfile = dlg->FileName; + if( !(dlg->FileName->EndsWith( ".srl" )) ) + { + srlfile += ".srl"; + } + } + + // マスタ提出書類に必要な情報をフォームから取得して更新 + this->setSrlProperties(); // 先にSrlを更新しておく + this->setDeliverableProperties(); + + // 注意書き + { + System::String ^stmp; + if( this->stripItemJapanese->Checked == true ) + stmp = "Step2/2: 続いて提出書類を作成します。\nここでキャンセルされたとき、提出書類はもとよりSRLも作成(更新)されませんのでご注意ください。"; + else + stmp = "Step2/2: Secondly, We should make a submission sheet. \n(CAUTION: When it is canceled, not only a submission sheet is not made, but also the SRL is selected previously.)"; + MessageBox::Show( stmp, "Caution", MessageBoxButtons::OK, MessageBoxIcon::Information ); + } + // ダイアログでファイルパスを決定 + { + System::Windows::Forms::SaveFileDialog ^dlg = gcnew (SaveFileDialog); + + dlg->InitialDirectory = "c:\\"; + dlg->Filter = "xml形式 (*.xml)|*.xml"; + dlg->FilterIndex = 1; + dlg->RestoreDirectory = true; + + if( dlg->ShowDialog() != System::Windows::Forms::DialogResult::OK ) + { + if( this->stripItemJapanese->Checked == true ) + this->errMsg( "提出書類の作成がキャンセルされました。" ); + else + this->errMsg( "Making a submission sheet is canceled." ); + return; + } + delivfile = dlg->FileName; + if( !(dlg->FileName->EndsWith( ".xml" )) ) + { + delivfile += ".xml"; + } + } + + // SRLを更新 + this->saveSrl( srlfile ); + u16 crc; // SRL全体のCRCを計算する(書類に記述するため) + if( !getWholeCRCInFile( srlfile, &crc ) ) + { + if( this->stripItemJapanese->Checked == true ) + this->errMsg( "CRCの計算に失敗しました。提出書類の作成をキャンセルします。" ); + else + this->errMsg( "Calc CRC is failed. Therefore, Making a submission sheet is canceled." ); + return; + } + hcrc = gcnew System::UInt16( crc ); + this->tboxWholeCRC->Clear(); + this->tboxWholeCRC->AppendText( "0x" ); + this->tboxWholeCRC->AppendText( hcrc->ToString("X") ); + + // 書類作成 + paths = srlfile->Split(L'\\'); // 余分なパスを削除 + srlfile = paths[ paths->Length - 1 ]; + //result = this->hDeliv->write( delivfile, this->hSrl, hcrc, srlfile, !(this->stripItemJapanese->Checked) ); + result = this->hDeliv->writeSpreadsheet( delivfile, this->hSrl, hcrc, srlfile, !(this->stripItemJapanese->Checked) ); + if( result != ECDeliverableResult::NOERROR ) + { + if( this->stripItemJapanese->Checked == true ) + this->errMsg( "書類の作成に失敗しました。" ); + else + this->errMsg( "Making a submission sheet is failed." ); + return; + } + this->tboxMsg->Text = "書類の作成に成功しました。"; + } //stripItemSheet_Click() + + private: + System::Void rErrorReading_CheckedChanged(System::Object^ sender, System::EventArgs^ e) + { + this->setGridError(); + this->setGridWarn(); + } + + private: + System::Void rErrorCurrent_CheckedChanged(System::Object^ sender, System::EventArgs^ e) + { + this->checkSrlForms(); + this->checkDeliverableForms(); + this->overloadGridError(); + this->overloadGridWarn(); + } + + private: + System::Void tabError_Click(System::Object^ sender, System::EventArgs^ e) + { + // 常に最新情報に更新 + if( this->rErrorReading->Checked == true ) + { + this->setGridError(); + this->setGridWarn(); + } + else + { + this->checkSrlForms(); + this->checkDeliverableForms(); + this->overloadGridError(); + this->overloadGridWarn(); + } + } }; // enf of ref class Form1 } // end of namespace MasterEditorTWL diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX index 5ea0895e..d01916f9 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -117,4 +117,67 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file