diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 91f6808..302b561 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index e77e65c..850a87a 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 1652563..b4e24fb 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index c66ff4e..525e1ad 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -771,7 +771,12 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; this->stripItemEnglish->Checked = true; } - this->loadInit(); // 設定ファイルの読み込み + // 非表示項目 + this->changeVisibleForms( false ); + + // 設定ファイルの読み込み + this->loadInit(); + this->loadAppendInit(); // 追加設定ファイル } protected: @@ -815,10 +820,10 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; void InitializeComponent(void) { System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(Form1::typeid)); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle1 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle2 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle3 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle4 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle5 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle6 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle7 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle8 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); this->tboxFile = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -2336,15 +2341,15 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, this->colLibName}); - dataGridViewCellStyle1->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle1->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle1->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle5->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle5->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle5->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle1->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle1->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle1->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle1->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle5->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle5->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle5->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle5->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle5; resources->ApplyResources(this->gridLibrary, L"gridLibrary"); this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->ReadOnly = true; @@ -2373,6 +2378,7 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // // tabTWLInfo // + this->tabTWLInfo->Controls->Add(this->cboxIsNormalJump); this->tabTWLInfo->Controls->Add(this->gboxLaunch); this->tabTWLInfo->Controls->Add(this->tboxGuideTWLInfo); this->tabTWLInfo->Controls->Add(this->gboxExFlags); @@ -2413,7 +2419,6 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // // gboxExFlags // - this->gboxExFlags->Controls->Add(this->cboxIsNormalJump); this->gboxExFlags->Controls->Add(this->cboxIsTmpJump); this->gboxExFlags->Controls->Add(this->cboxIsSubBanner); resources->ApplyResources(this->gboxExFlags, L"gboxExFlags"); @@ -2636,15 +2641,15 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; this->gridWarn->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridWarn->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colWarnName, this->colWarnBegin, this->colWarnEnd, this->colWarnCause}); - dataGridViewCellStyle2->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle2->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle2->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle6->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle6->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle6->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle2->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle2->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle2->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle2->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridWarn->DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle6->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle6->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle6->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle6->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridWarn->DefaultCellStyle = dataGridViewCellStyle6; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridWarn, L"gridWarn"); this->gridWarn->Name = L"gridWarn"; @@ -2679,22 +2684,22 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // // gridError // - dataGridViewCellStyle3->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle7->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridError->BackgroundColor = System::Drawing::SystemColors::Control; this->gridError->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridError->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colErrorName, this->colErrorBegin, this->colErrorEnd, this->colErrorCause}); - dataGridViewCellStyle4->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle4->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle4->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle8->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle8->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle8->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle4->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle4->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle4->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle4->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridError->DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle8->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle8->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle8->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle8->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridError->DefaultCellStyle = dataGridViewCellStyle8; this->gridError->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridError, L"gridError"); this->gridError->Name = L"gridError"; @@ -2813,16 +2818,21 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; ///////////////////////////////////////////// private: // ---------------------------------------------- - // ファイルのR/W + // 設定ファイルの読み込み // ---------------------------------------------- - // 設定ファイルの読み込み - void loadInit(void); + void loadInit(void); // 設定ファイル + void loadAppendInit(void); // 追加設定ファイル(内部向け) - // ファイルの読み込み (TAD/SRL読み込みをラップ) + private: + // ---------------------------------------------- + // ROMファイルのR/W + // ---------------------------------------------- + + // ROMファイルの読み込み (TAD/SRL読み込みをラップ) System::Boolean loadRom( System::String ^infile ); - // ファイルの書き出し (SRL書き出しをラップ) + // ROMファイルの書き出し (SRL書き出しをラップ) System::Boolean saveRom( System::String ^outname ); // SRLの読み込み @@ -2849,18 +2859,6 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; return tmpfile; } - // ミドルウェアリストの作成(XML形式) - System::Void makeMiddlewareListXml(System::Xml::XmlDocument^ doc); - - // ミドルウェアリストの書き出し - System::Boolean saveMiddlewareListXml( System::String ^filename ); - - // ミドルウェアリストの書き出し(XML->HTML変換) - System::Boolean saveMiddlewareListHtml( System::String ^filename ); - - // ミドルウェアリストの書き出し(XSL埋め込み) - System::Boolean saveMiddlewareListXmlEmbeddedXsl( System::String ^filename ); - // 提出ファイル名をゲームコードなどから決定 System::String^ getSubmitFilePrefix(void) { @@ -2875,6 +2873,23 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; return prefix; } + private: + // ---------------------------------------------- + // ミドルウェアリストの書き出し + // ---------------------------------------------- + + // XML形式のリストを作成 + System::Void makeMiddlewareListXml(System::Xml::XmlDocument^ doc); + + // XML形式で書き出し + System::Boolean saveMiddlewareListXml( System::String ^filename ); + + // HTML形式で書き出し(XML->HTML変換) + System::Boolean saveMiddlewareListHtml( System::String ^filename ); + + // XSL埋め込みXML形式で書き出し + System::Boolean saveMiddlewareListXmlEmbeddedXsl( System::String ^filename ); + private: // ---------------------------------------------- // 一時ファイルの取り扱い @@ -2900,10 +2915,19 @@ private: System::Windows::Forms::Label^ labIsGameCardOn2; // フォームの初期設定 // ---------------------------------------------- + // 非表示項目の表示切替 + void changeVisibleForms( System::Boolean visible ) + { + this->gboxShared2Size->Visible = visible; + this->cboxIsNormalJump->Visible = visible; + this->tboxIsGameCardOn->Visible = visible; + this->labIsGameCardOn->Visible = visible; + this->labIsGameCardOn2->Visible = visible; + } + // 設定/選択可能なフォームをすべて disable にする void readOnly( void ) { - this->cboxIsEULA->Enabled = false; this->cboxIsUGC->Enabled = false; this->cboxIsPhotoEx->Enabled = false; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index 6b25eaf..a8f20d8 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -140,6 +140,210 @@ 3 + + tboxRemasterVer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 0 + + + tboxRomSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 1 + + + tboxPlatform + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 2 + + + labPlatform + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 3 + + + tboxRomLatency + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 4 + + + labRomSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 5 + + + labRomType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 6 + + + tboxMakerCode + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 7 + + + cboxRemasterVerE + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 8 + + + labMakerCode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 9 + + + labGameCode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 10 + + + tboxGameCode + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 11 + + + labTitleName + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 12 + + + labRemasterVer + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 13 + + + tboxTitleName + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 14 + + + 26, 52 + + + 285, 227 + + + 3 + + + ROM Info. + + + gboxSrl + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 2 + 109, 190 @@ -519,30 +723,6 @@ 14 - - 26, 52 - - - 285, 227 - - - 3 - - - ROM Info. - - - gboxSrl - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 2 - True @@ -648,6 +828,78 @@ 2 + + labRomCRC + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 0 + + + labHeaderCRC + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 1 + + + tboxHeaderCRC + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 2 + + + tboxWholeCRC + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 3 + + + 26, 285 + + + 285, 49 + + + 5 + + + CRC + + + gboxCRC + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 6 + True @@ -744,30 +996,6 @@ 3 - - 26, 285 - - - 285, 49 - - - 5 - - - CRC - - - gboxCRC - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 6 - True @@ -1452,6 +1680,261 @@ 1 + + labArbit4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 0 + + + labArbit3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 1 + + + labNTSC2Sur + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 2 + + + tboxNTSC2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 3 + + + labFax2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 4 + + + labNTSC2Pre + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 5 + + + tboxFax2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 6 + + + tboxMail2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 7 + + + tboxTel2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 8 + + + tboxFurigana2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 9 + + + tboxPerson2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 10 + + + tboxDepart2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 11 + + + labDepart2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 12 + + + tboxCompany2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 13 + + + labMail2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 14 + + + labTel2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 15 + + + labFurigana2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 16 + + + labPerson2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 17 + + + labCompany2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 18 + + + False + + + 377, 88 + + + 347, 234 + + + 14 + + + Contact2 + + + gboxPerson2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCompanyInfo + + + 3 + True @@ -1941,32 +2424,257 @@ 18 - - False + + labArbit2 - - 377, 88 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 347, 234 + + gboxPerson1 - + + 0 + + + labArbit1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 1 + + + labNTSC1Sur + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 2 + + + labFax1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 3 + + + labNTSC1Pre + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 4 + + + tboxNTSC1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 5 + + + tboxFax1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 6 + + + tboxMail1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 7 + + + tboxTel1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 8 + + + tboxFurigana1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 9 + + + tboxPerson1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 10 + + + tboxDepart1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 11 + + + labDepart1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 12 + + + tboxCompany1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 13 + + + labMail1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + 14 - - Contact2 + + labTel1 - - gboxPerson2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxPerson1 + + + 15 + + + labFurigana1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 16 + + + labPerson1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 17 + + + labCompany1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 18 + + + 17, 88 + + + 344, 234 + + + 8 + + + Contact1 + + + gboxPerson1 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabCompanyInfo - - 3 + + 2 True @@ -2457,30 +3165,6 @@ 18 - - 17, 88 - - - 344, 234 - - - 8 - - - Contact1 - - - gboxPerson1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCompanyInfo - - - 2 - 175, 81 @@ -2652,6 +3336,90 @@ 14 + + tboxUsageOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 0 + + + rUsageOther + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 1 + + + rUsageDst + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 2 + + + rUsageSample + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 3 + + + rUsageSale + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 4 + + + 16, 258 + + + 346, 79 + + + 6 + + + Purpose + + + gboxUsage + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 8 + False @@ -2787,29 +3555,53 @@ 4 - - 16, 258 + + rSubmitHand - - 346, 79 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + gboxSubmitWay - - Purpose + + 0 - - gboxUsage + + rSubmitPost - + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSubmitWay + + + 1 + + + 16, 207 + + + 155, 45 + + + 5 + + + How To Submit + + + gboxSubmitWay + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabSubmitInfo - - 8 + + 11 True @@ -2865,30 +3657,6 @@ 1 - - 16, 207 - - - 155, 45 - - - 5 - - - How To Submit - - - gboxSubmitWay - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabSubmitInfo - - - 11 - True @@ -3369,6 +4137,186 @@ 4 + + labShared2Size5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 0 + + + labShared2Size4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 1 + + + labShared2Size3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 2 + + + labShared2Size2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 3 + + + labShared2Size1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 4 + + + labShared2Size0 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 5 + + + tboxShared2Size5 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 6 + + + tboxShared2Size4 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 7 + + + tboxShared2Size3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 8 + + + tboxShared2Size2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 9 + + + tboxShared2Size1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 10 + + + tboxShared2Size0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 11 + + + cboxIsShared2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 12 + + + 545, 147 + + + 181, 197 + + + 1 + + + Size of Shared2 Files + + + gboxShared2Size + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 4 + True @@ -3705,30 +4653,6 @@ 12 - - 545, 147 - - - 181, 197 - - - 1 - - - Size of Shared2 Files - - - gboxShared2Size - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 3 - True @@ -3810,6 +4734,186 @@ 8 + + labByte1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 0 + + + labHex4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 1 + + + labHex3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 2 + + + tboxIsCodec + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 3 + + + labIsCodec + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 4 + + + tboxPrivateSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 5 + + + labPrivateSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 6 + + + labNormalRomOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 7 + + + tboxNormalRomOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 8 + + + labKeyTableRomOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 9 + + + labPublicSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 10 + + + tboxPublicSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 11 + + + tboxKeyTableRomOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 12 + + + 251, 54 + + + 280, 146 + + + 24 + + + TWL Extended Info + + + gboxTWLExInfo + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 5 + True @@ -4152,30 +5256,6 @@ 12 - - 251, 54 - - - 280, 146 - - - 24 - - - TWL Extended Info - - - gboxTWLExInfo - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 4 - True @@ -4204,7 +5284,7 @@ gboxExFlags - 2 + 1 True @@ -4213,7 +5293,7 @@ False - 14, 62 + 559, 122 154, 16 @@ -4231,7 +5311,7 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - gboxExFlags + tabTWLInfo 0 @@ -4264,8 +5344,116 @@ gboxExFlags + 0 + + + labIsGameCardOn2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 0 + + + labAccessOther + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + 1 + + tboxAccessOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 2 + + + tboxIsGameCardOn + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 3 + + + labIsGameCardOn + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 4 + + + cboxIsNAND + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 5 + + + cboxIsSD + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 6 + + + 251, 211 + + + 280, 133 + + + 0 + + + Access Control + + + gboxAccess + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 6 + True @@ -4461,29 +5649,161 @@ 6 - - 251, 211 + + labAppType - - 280, 133 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxTitleID + + 0 - - Access Control + + labMedia - - gboxAccess + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxTitleID + + + 1 + + + tboxAppType + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 2 + + + tboxMedia + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 3 + + + labHex2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 4 + + + tboxTitleIDLo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 5 + + + labTitleIDLo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 6 + + + labTitleIDHi + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 7 + + + tboxTitleIDHi + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 8 + + + tboxAppTypeOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 9 + + + labAppTypeOther + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 10 + + + 12, 54 + + + 225, 174 + + + 23 + + + TitleID + + + gboxTitleID + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabTWLInfo - - 5 + + 7 True @@ -4767,30 +6087,6 @@ 10 - - 12, 54 - - - 225, 174 - - - 23 - - - TitleID - - - gboxTitleID - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 6 - True @@ -4872,6 +6168,36 @@ 0, 0 + + 0, 0 + + + 777, 24 + + + 33 + + + menuStrip1 + + + menuStripAbove + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 36, 20 + + + File + 274, 22 @@ -4893,11 +6219,11 @@ Load a temporary info. saved previously - - 36, 20 + + 52, 20 - - File + + Master 288, 22 @@ -4926,11 +6252,11 @@ Make a middleware list only(HTML format) - - 52, 20 + + 65, 20 - - Master + + Language 119, 22 @@ -4944,35 +6270,464 @@ Japanese - - 65, 20 + + gridLibrary - - Language + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + tabRomInfo - - 777, 24 + + 0 - - 33 + + tboxGuideRomInfo - - menuStrip1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuStripAbove + + tabRomInfo - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - + + 4, 21 + + + 3, 3, 3, 3 + + + 745, 352 + + + 0 + + + ROM Info.(Read Only) + + + tabRomInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 0 + + + labConnectIcon + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxLaunch + + + 0 + + + tboxConnectIcon + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxLaunch + + + 1 + + + 12, 238 + + + 225, 106 + + + 37 + + + Launch Control On DSi Menu + + + gboxLaunch + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 1 + + + 24, 11 + + + 687, 19 + + + 36 + + + This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. + + + tboxGuideTWLInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 2 + + + 545, 54 + + + 181, 64 + + + 35 + + + TWL Extended Flags + + + gboxExFlags + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 3 + + + 4, 21 + + + 3, 3, 3, 3 + + + 745, 352 + + + 1 + + + TWL Info.(Read Only) + + + tabTWLInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 1 + + + gboxOtherSpec + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 0 + + + butSetBack + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 1 + + + tboxGuideRomEditInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 2 + + + gboxParental + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 3 + + + 4, 21 + + + 745, 352 + + + 2 + + + ROM Settings(Editable) + + + tabRomEditInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 2 + + + labProductNameLimit + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 0 + + + tboxGuideSubmitInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 1 + + + gboxForeign + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 2 + + + 4, 21 + + + 745, 352 + + + 3 + + + Submission Info.(Editable) + + + tabSubmitInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 3 + + + tboxGuideCompanyInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCompanyInfo + + + 0 + + + 4, 21 + + + 745, 352 + + + 4 + + + Company Info.(Editable) + + + tabCompanyInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 4 + + + tboxGuideErrorInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 0 + + + gboxErrorTiming + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 1 + + + labWarn + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 2 + + + labError + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 3 + + + gridWarn + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 4 + + + gridError + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 5 + + + 4, 21 + + + 745, 352 + + + 5 + + + Error(Read Only) + + + tabErrorInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 5 + + + 12, 93 + + + 753, 377 + + + 34 + + + tabMain + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 4 + + 2 True @@ -5031,33 +6786,6 @@ 1 - - 4, 21 - - - 3, 3, 3, 3 - - - 745, 352 - - - 0 - - - ROM Info.(Read Only) - - - tabRomInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 0 - True @@ -5106,104 +6834,53 @@ 1 - - 12, 238 + + cboxIsUGC - - 225, 106 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 37 + + gboxOtherSpec - - Launch Control On DSi Menu - - - gboxLaunch - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - + 0 - - 24, 11 + + cboxIsPhotoEx - - 687, 19 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 36 + + gboxOtherSpec - - This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. - - - tboxGuideTWLInfo - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - + 1 - - 545, 54 + + 445, 60 - - 181, 85 + + 266, 90 - - 35 + + 41 - - TWL Extended Flags + + Other ROM Spec. - - gboxExFlags + + gboxOtherSpec - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabTWLInfo + + tabRomEditInfo - - 2 - - - 4, 21 - - - 3, 3, 3, 3 - - - 745, 352 - - - 1 - - - TWL Info.(Read Only) - - - tabTWLInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 1 + + 0 True @@ -5259,30 +6936,6 @@ 1 - - 445, 60 - - - 266, 90 - - - 41 - - - Other ROM Spec. - - - gboxOtherSpec - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomEditInfo - - - 0 - 483, 185 @@ -5358,30 +7011,6 @@ 3 - - 4, 21 - - - 745, 352 - - - 2 - - - ROM Settings(Editable) - - - tabRomEditInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 2 - 237, 75 @@ -5433,6 +7062,54 @@ 1 + + labProductNameLimitForeign + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxForeign + + + 0 + + + labMultiForeign2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxForeign + + + 1 + + + 378, 91 + + + 355, 144 + + + 35 + + + Foreign Ver. + + + gboxForeign + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 2 + 225, 62 @@ -5487,54 +7164,6 @@ 1 - - 378, 91 - - - 355, 144 - - - 35 - - - Foreign Ver. - - - gboxForeign - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabSubmitInfo - - - 2 - - - 4, 21 - - - 745, 352 - - - 3 - - - Submission Info.(Editable) - - - tabSubmitInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 3 - 24, 11 @@ -5559,30 +7188,6 @@ 0 - - 4, 21 - - - 745, 352 - - - 4 - - - Company Info.(Editable) - - - tabCompanyInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 4 - 24, 11 @@ -5610,6 +7215,54 @@ 0 + + rErrorCurrent + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxErrorTiming + + + 0 + + + rErrorReading + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxErrorTiming + + + 1 + + + 551, 11 + + + 172, 71 + + + 41 + + + Error of Timing + + + gboxErrorTiming + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 1 + True @@ -5664,30 +7317,6 @@ 1 - - 551, 11 - - - 172, 71 - - - 41 - - - Error of Timing - - - gboxErrorTiming - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabErrorInfo - - - 1 - True @@ -5850,51 +7479,6 @@ 5 - - 4, 21 - - - 745, 352 - - - 5 - - - Error(Read Only) - - - tabErrorInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 5 - - - 12, 93 - - - 753, 377 - - - 34 - - - tabMain - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - True diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 9d292a7..6d1239d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -21,6 +21,11 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; + +// ---------------------------------------------- +// [sheet <= Form] +// 提出確認書にフォームを反映 +// ---------------------------------------------- void Form1::setDeliverableProperties(void) { // 提出情報 @@ -297,7 +302,6 @@ void Form1::setDeliverableProperties(void) // ---------------------------------------------- // マスタ書類情報(SRL影響なし)のフォームチェック // ---------------------------------------------- - System::Boolean Form1::checkDeliverableForms(void) { // 不正な場合はダイアログで注意してreturn diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp index c9e4c77..11258a6 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp @@ -1,5 +1,5 @@ // ---------------------------------------------- -// ファイルのR/W +// ROMファイルのR/W // ---------------------------------------------- #include "stdafx.h" @@ -22,10 +22,10 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; + // ---------------------------------------------- // ファイルの読み込み (TAD/SRL読み込みをラップ) // ---------------------------------------------- - System::Boolean Form1::loadRom( System::String ^infile ) { System::Boolean result = false; @@ -45,7 +45,6 @@ System::Boolean Form1::loadRom( System::String ^infile ) // ---------------------------------------------- // ファイルの書き出し (TAD/SRL書き出しをラップ) // ---------------------------------------------- - System::Boolean Form1::saveRom( System::String ^outfile ) { System::Boolean result = false; @@ -66,7 +65,6 @@ System::Boolean Form1::saveRom( System::String ^outfile ) // ---------------------------------------------- // tadの読み込み // ---------------------------------------------- - System::Boolean Form1::loadTad( System::String ^tadfile ) { // tadファイルを変換したSRLを一時ファイルに保存 @@ -88,7 +86,6 @@ System::Boolean Form1::loadTad( System::String ^tadfile ) // ---------------------------------------------- // SRLの読み込み // ---------------------------------------------- - System::Boolean Form1::loadSrl( System::String ^srlfile ) { ECSrlResult result = this->hSrl->readFromFile( srlfile ); @@ -150,7 +147,6 @@ System::Boolean Form1::loadSrl( System::String ^srlfile ) // ---------------------------------------------- // SRLの保存 // ---------------------------------------------- - System::Boolean Form1::saveSrl( System::String ^infile, System::String ^outfile ) { if( !System::IO::File::Exists( infile ) ) @@ -187,259 +183,3 @@ System::Boolean Form1::saveSrlCore( System::String ^infile, System::String ^outf } return true; } - -// ---------------------------------------------- -// ミドルウェアリストの作成 -// ---------------------------------------------- - -System::Void Form1::makeMiddlewareListXml(System::Xml::XmlDocument^ doc) -{ - System::Xml::XmlElement ^root = doc->CreateElement( "twl-master-editor" ); - System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly(); - root->SetAttribute( "version", this->getVersion() ); - doc->AppendChild( root ); - - // ゲーム情報 - System::Xml::XmlElement ^game = doc->CreateElement( "game" ); - root->AppendChild( game ); - if( System::String::IsNullOrEmpty( this->tboxProductName->Text ) ) - { - MasterEditorTWL::appendXmlTag( doc, game, "product-name", this->tboxTitleName->Text ); // 製品名が未入力のときはソフトタイトルで代用 - } - else - { - MasterEditorTWL::appendXmlTag( doc, game, "product-name", this->tboxProductName->Text ); - } - MasterEditorTWL::appendXmlTag( doc, game, "title-name", this->tboxTitleName->Text ); - MasterEditorTWL::appendXmlTag( doc, game, "game-code", this->tboxGameCode->Text ); - MasterEditorTWL::appendXmlTag( doc, game, "rom-version", this->tboxRemasterVer->Text ); - MasterEditorTWL::appendXmlTag( doc, game, "submit-version", System::Decimal::ToByte(this->numSubmitVersion->Value).ToString("X") ); - - // ミドルウェアリスト - System::Xml::XmlElement ^midlist = doc->CreateElement( "middleware-list" ); - root->AppendChild( midlist ); - if( this->hSrl->hLicenseList != nullptr ) - { - for each( RCLicense ^lic in this->hSrl->hLicenseList ) - { - System::Xml::XmlElement ^mid = doc->CreateElement( "middleware" ); - MasterEditorTWL::appendXmlTag( doc, mid, "publisher", lic->Publisher ); - MasterEditorTWL::appendXmlTag( doc, mid, "name", lic->Name ); - midlist->AppendChild( mid ); - } - } -} - -// ---------------------------------------------- -// ミドルウェアリストの保存(XML) -// ---------------------------------------------- - -System::Boolean Form1::saveMiddlewareListXml( System::String ^filename ) -{ - System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); - doc->AppendChild( doc->CreateXmlDeclaration("1.0","UTF-8",nullptr) ); - - this->makeMiddlewareListXml( doc ); - - try - { - doc->Save( filename ); - } - catch ( System::Exception ^ex ) - { - (void)ex; - return false; - } - return true; -} - -// ---------------------------------------------- -// ミドルウェアリストの保存(XSL埋め込みXML) -// ---------------------------------------------- - -System::Boolean Form1::saveMiddlewareListXmlEmbeddedXsl( System::String ^filename ) -{ - System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); - doc->AppendChild( doc->CreateXmlDeclaration("1.0","UTF-8",nullptr) ); - - // XSLを埋め込むための宣言たち - System::Xml::XmlProcessingInstruction ^proc = doc->CreateProcessingInstruction( "xml-stylesheet", "type='text/xml' href='#stylesheet'" ); - doc->AppendChild( proc ); - System::Xml::XmlDocumentType ^doctype = doc->CreateDocumentType( "twl-master-editor", nullptr, nullptr, "" ); - doc->AppendChild( doctype ); - - this->makeMiddlewareListXml( doc ); - - // 埋め込みスタイルシート - System::Xml::XmlDocument ^xsl = gcnew System::Xml::XmlDocument(); - System::Xml::XmlElement ^root = doc->DocumentElement; - try - { - xsl->Load("../resource/middleware_e.xsl"); - root->AppendChild( doc->ImportNode(xsl->DocumentElement, true) ); - } - catch ( System::Exception ^ex ) - { - (void)ex; - return false; - } - - try - { - doc->Save( filename ); - } - catch ( System::Exception ^ex ) - { - (void)ex; - return false; - } - return true; -} - -// ---------------------------------------------- -// ミドルウェアリストの保存(XML->HTML変換) -// ---------------------------------------------- - -System::Boolean Form1::saveMiddlewareListHtml( System::String ^filename ) -{ - System::Xml::Xsl::XslCompiledTransform ^xslt = gcnew System::Xml::Xsl::XslCompiledTransform; - System::String ^tmpxml = gcnew System::String( "middleware-tmp.xml" ); - - if( !saveMiddlewareListXml(tmpxml) ) - { - return false; - } - - try - { - xslt->Load("../resource/middleware.xsl"); - xslt->Transform( tmpxml, filename ); - } - catch (System::Exception ^s) - { - (void)s; - System::IO::File::Delete( tmpxml ); - return false; - } - System::IO::File::Delete( tmpxml ); - return true; -} - -// ---------------------------------------------- -// 設定ファイルの読み込み -// ---------------------------------------------- - -void Form1::loadInit(void) -{ - System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); - - // xmlファイルの読み込み - try - { - doc->Load( "../resource/ini.xml" ); - } - catch( System::IO::FileNotFoundException ^s ) - { - (void)s; - this->errMsg( "設定ファイルが見つかりません。", "Setting file is not found." ); - return; - } - catch( System::Exception ^s ) - { - (void)s; - this->errMsg( "設定ファイルを開くことができませんでした。", "Setting file can't be opened." ); - return; - } - - // タグ : ルート - System::Xml::XmlElement ^root = doc->DocumentElement; - - // タグ - System::Boolean bReadOnly = MasterEditorTWL::isXmlEqual( root, "rw", "r" ); - this->IsReadOnly = bReadOnly; - if( bReadOnly ) - { - this->readOnly(); - } - - // タグ - if( MasterEditorTWL::isXmlEqual( root, "lang", "E" ) ) - { - this->stripItemEnglish->Checked = true; - this->stripItemJapanese->Checked = false; - this->changeEnglish(); - } - - // タグ - System::Boolean bXML = MasterEditorTWL::isXmlEqual( root, "output", "XML" ); - - // タグ - System::Boolean bCheck = MasterEditorTWL::isXmlEqual( root, "spcheck", "ON" ); - - if( bCheck ) // チェックするときのみ追加チェック項目を設定 - { - // チェックするかどうか - this->hSrl->hMrcSpecialList->IsCheck = true; - - // SDK - try - { - u32 major = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/major" ) ); - u32 minor = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/minor" ) ); - u32 relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/relstep" ) ); - u32 sdkver = (major << 24) | (minor << 16) | (relstep & 0xFFFF); - this->hSrl->hMrcSpecialList->SDKVer = sdkver; - } - catch ( System::Exception ^ex ) - { - (void)ex; - this->errMsg( "設定ファイル中のSDKバージョンが読み込めませんでした。バージョンは0とみなされます。", - "SDK ver. can't be read from setting file. Therefore it is set by 0." ); - this->hSrl->hMrcSpecialList->SDKVer = 0; - } - - // Shared2File - try - { - System::Int32 i; - for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ ) - { - u32 size = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/shared2/size" + i.ToString() ) ); - this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = size; - } - } - catch ( System::Exception ^ex ) - { - (void)ex; - this->errMsg( "設定ファイル中のShared2ファイルサイズが読み込めませんでした。サイズはすべて0とみなされます。", - "One of shared2 file sizes can't be read from setting file. Therefore they are set by 0." ); - System::Int32 i; - for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ ) - { - this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = 0; - } - } - } //if( bCheck ) - - if( bReadOnly || bXML | bCheck ) - { - System::String ^msgJ = gcnew System::String("[動作モード]"); - System::String ^msgE = gcnew System::String("[Processing Mode]"); - if( bReadOnly ) - { - msgJ += "\nリードオンリーモード"; - msgE += "\nRead Only Mode"; - } - if( bXML ) - { - msgJ += "\nXML出力モード"; - msgE += "\nXML Output Mode"; - } - if( bCheck ) - { - msgJ += "\n追加チェックモード"; - msgE += "\nExtra Check Mode"; - } - this->sucMsg( msgJ, msgE ); - } -} // loadInit() diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp new file mode 100644 index 0000000..d3cbcd5 --- /dev/null +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp @@ -0,0 +1,150 @@ +// ---------------------------------------------- +// 設定ファイルの読み込み +// ---------------------------------------------- + +#include "stdafx.h" +#include +#include "common.h" +#include "srl.h" +#include "deliverable.h" +#include "crc_whole.h" +#include "utility.h" +#include "lang.h" +#include "split_tad.h" +#include "FormError.h" +#include "Form1.h" + +using namespace System; +using namespace System::ComponentModel; +using namespace System::Collections; +using namespace System::Windows::Forms; +using namespace System::Data; +using namespace System::Drawing; +using namespace MasterEditorTWL; + + +// ---------------------------------------------- +// 通常設定ファイルの読み込み +// ---------------------------------------------- + +void Form1::loadInit(void) +{ + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); + + // xmlファイルの読み込み + try + { + doc->Load( "../resource/ini.xml" ); + } + catch( System::IO::FileNotFoundException ^s ) + { + (void)s; + this->errMsg( "設定ファイルが見つかりません。", "Setting file is not found." ); + return; + } + catch( System::Exception ^s ) + { + (void)s; + this->errMsg( "設定ファイルを開くことができませんでした。", "Setting file can't be opened." ); + return; + } + + // タグ : ルート + System::Xml::XmlElement ^root = doc->DocumentElement; + + // タグ + System::Boolean bReadOnly = MasterEditorTWL::isXmlEqual( root, "rw", "r" ); + this->IsReadOnly = bReadOnly; + if( bReadOnly ) + { + this->readOnly(); + } +} // loadInit() + + +// ---------------------------------------------- +// 追加設定ファイルの読み込み +// ---------------------------------------------- + +void Form1::loadAppendInit(void) +{ + System::String ^initfile = "../resource/append_ini.xml"; + + // 通常は存在しない + if( !System::IO::File::Exists( initfile ) ) + { + return; + } + + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); + try + { + doc->Load( initfile ); + } + catch( System::IO::FileNotFoundException ^s ) + { + (void)s; + this->errMsg( "追加設定ファイルが見つかりません。", "Setting file is not found." ); + return; + } + catch( System::Exception ^s ) + { + (void)s; + this->errMsg( "追加設定ファイルを開くことができませんでした。", "Setting file can't be opened." ); + return; + } + System::Xml::XmlElement ^root = doc->DocumentElement; + + // タグ + System::Boolean bVisible = MasterEditorTWL::isXmlEqual( root, "visible", "ON" ); + this->changeVisibleForms( bVisible ); + + // タグ + System::Boolean bCheck = MasterEditorTWL::isXmlEqual( root, "spcheck", "ON" ); + + if( bCheck ) // チェックするときのみ追加チェック項目を設定 + { + // チェックするかどうか + this->hSrl->hMrcSpecialList->IsCheck = true; + + // SDK + try + { + u32 major = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/major" ) ); + u32 minor = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/minor" ) ); + u32 relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/relstep" ) ); + u32 sdkver = (major << 24) | (minor << 16) | (relstep & 0xFFFF); + this->hSrl->hMrcSpecialList->SDKVer = sdkver; + } + catch ( System::Exception ^ex ) + { + (void)ex; + this->errMsg( "設定ファイル中のSDKバージョンが読み込めませんでした。バージョンは0とみなされます。", + "SDK ver. can't be read from setting file. Therefore it is set by 0." ); + this->hSrl->hMrcSpecialList->SDKVer = 0; + } + + // Shared2File + try + { + System::Int32 i; + for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ ) + { + u32 size = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/shared2/size" + i.ToString() ) ); + this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = size; + } + } + catch ( System::Exception ^ex ) + { + (void)ex; + this->errMsg( "設定ファイル中のShared2ファイルサイズが読み込めませんでした。サイズはすべて0とみなされます。", + "One of shared2 file sizes can't be read from setting file. Therefore they are set by 0." ); + System::Int32 i; + for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ ) + { + this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = 0; + } + } + } //if( bCheck ) + +} // loadAppendInit() \ No newline at end of file diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 2c4632c..20edf81 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -21,7 +21,10 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; -// 日本語版と英語版でテキストボックスの文字列制限が変わる +// ---------------------------------------------- +// テキストボックスの文字列制限を変える +// (日本語版と英語版で文字列制限を変えたい) +// ---------------------------------------------- void Form1::changeMaxLength( System::Windows::Forms::TextBox ^tbox, System::Int32 maxlen ) { if( tbox->Text->Length > maxlen ) @@ -30,7 +33,9 @@ void Form1::changeMaxLength( System::Windows::Forms::TextBox ^tbox, System::Int3 tbox->MaxLength = maxlen; } +// ---------------------------------------------- // 日本語版への切り替え +// ---------------------------------------------- void Form1::changeJapanese(void) { // 入力文字数制限を変更する @@ -41,7 +46,9 @@ void Form1::changeJapanese(void) this->changeLanguage( "ja" ); } +// ---------------------------------------------- // 英語版への切り替え +// ---------------------------------------------- void Form1::changeEnglish(void) { this->changeMaxLength( this->tboxCompany1, 40 ); @@ -51,7 +58,9 @@ void Form1::changeEnglish(void) this->changeLanguage( "en" ); } +// ---------------------------------------------- // 言語リソース切り替え +// ---------------------------------------------- void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) { int index; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp new file mode 100644 index 0000000..aec5d8c --- /dev/null +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp @@ -0,0 +1,156 @@ +// ---------------------------------------------- +// ミドルウェアリストの書き出し +// ---------------------------------------------- + +#include "stdafx.h" +#include +#include "common.h" +#include "srl.h" +#include "deliverable.h" +#include "crc_whole.h" +#include "utility.h" +#include "lang.h" +#include "split_tad.h" +#include "FormError.h" +#include "Form1.h" + +using namespace System; +using namespace System::ComponentModel; +using namespace System::Collections; +using namespace System::Windows::Forms; +using namespace System::Data; +using namespace System::Drawing; +using namespace MasterEditorTWL; + +// ---------------------------------------------- +// XML形式のリストを作成 +// ---------------------------------------------- +System::Void Form1::makeMiddlewareListXml(System::Xml::XmlDocument^ doc) +{ + System::Xml::XmlElement ^root = doc->CreateElement( "twl-master-editor" ); + System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly(); + root->SetAttribute( "version", this->getVersion() ); + doc->AppendChild( root ); + + // ゲーム情報 + System::Xml::XmlElement ^game = doc->CreateElement( "game" ); + root->AppendChild( game ); + if( System::String::IsNullOrEmpty( this->tboxProductName->Text ) ) + { + MasterEditorTWL::appendXmlTag( doc, game, "product-name", this->tboxTitleName->Text ); // 製品名が未入力のときはソフトタイトルで代用 + } + else + { + MasterEditorTWL::appendXmlTag( doc, game, "product-name", this->tboxProductName->Text ); + } + MasterEditorTWL::appendXmlTag( doc, game, "title-name", this->tboxTitleName->Text ); + MasterEditorTWL::appendXmlTag( doc, game, "game-code", this->tboxGameCode->Text ); + MasterEditorTWL::appendXmlTag( doc, game, "rom-version", this->tboxRemasterVer->Text ); + MasterEditorTWL::appendXmlTag( doc, game, "submit-version", System::Decimal::ToByte(this->numSubmitVersion->Value).ToString("X") ); + + // ミドルウェアリスト + System::Xml::XmlElement ^midlist = doc->CreateElement( "middleware-list" ); + root->AppendChild( midlist ); + if( this->hSrl->hLicenseList != nullptr ) + { + for each( RCLicense ^lic in this->hSrl->hLicenseList ) + { + System::Xml::XmlElement ^mid = doc->CreateElement( "middleware" ); + MasterEditorTWL::appendXmlTag( doc, mid, "publisher", lic->Publisher ); + MasterEditorTWL::appendXmlTag( doc, mid, "name", lic->Name ); + midlist->AppendChild( mid ); + } + } +} + +// ---------------------------------------------- +// XML形式で書き出し +// ---------------------------------------------- +System::Boolean Form1::saveMiddlewareListXml( System::String ^filename ) +{ + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); + doc->AppendChild( doc->CreateXmlDeclaration("1.0","UTF-8",nullptr) ); + + this->makeMiddlewareListXml( doc ); + + try + { + doc->Save( filename ); + } + catch ( System::Exception ^ex ) + { + (void)ex; + return false; + } + return true; +} + +// ---------------------------------------------- +// XSL埋め込みXML形式で書き出し +// ---------------------------------------------- +System::Boolean Form1::saveMiddlewareListXmlEmbeddedXsl( System::String ^filename ) +{ + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); + doc->AppendChild( doc->CreateXmlDeclaration("1.0","UTF-8",nullptr) ); + + // XSLを埋め込むための宣言たち + System::Xml::XmlProcessingInstruction ^proc = doc->CreateProcessingInstruction( "xml-stylesheet", "type='text/xml' href='#stylesheet'" ); + doc->AppendChild( proc ); + System::Xml::XmlDocumentType ^doctype = doc->CreateDocumentType( "twl-master-editor", nullptr, nullptr, "" ); + doc->AppendChild( doctype ); + + this->makeMiddlewareListXml( doc ); + + // 埋め込みスタイルシート + System::Xml::XmlDocument ^xsl = gcnew System::Xml::XmlDocument(); + System::Xml::XmlElement ^root = doc->DocumentElement; + try + { + xsl->Load("../resource/middleware_e.xsl"); + root->AppendChild( doc->ImportNode(xsl->DocumentElement, true) ); + } + catch ( System::Exception ^ex ) + { + (void)ex; + return false; + } + + try + { + doc->Save( filename ); + } + catch ( System::Exception ^ex ) + { + (void)ex; + return false; + } + return true; +} + +// ---------------------------------------------- +// HTML形式で書き出し(XML->HTML変換) +// ---------------------------------------------- +System::Boolean Form1::saveMiddlewareListHtml( System::String ^filename ) +{ + System::Xml::Xsl::XslCompiledTransform ^xslt = gcnew System::Xml::Xsl::XslCompiledTransform; + System::String ^tmpxml = gcnew System::String( "middleware-tmp.xml" ); + + if( !saveMiddlewareListXml(tmpxml) ) + { + return false; + } + + try + { + xslt->Load("../resource/middleware.xsl"); + xslt->Transform( tmpxml, filename ); + } + catch (System::Exception ^s) + { + (void)s; + System::IO::File::Delete( tmpxml ); + return false; + } + System::IO::File::Delete( tmpxml ); + return true; +} diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index d37e2f7..662adad 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -21,8 +21,12 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; -// ROM情報をフォームから取得してSRLクラスのプロパティに反映させる +// ---------------------------------------------- +// [SRL <= Form] +// ROM情報をフォームから取得して +// SRLクラスのプロパティに反映させる // (ROMヘッダへの反映やCRCと署名の再計算をしない) +// ---------------------------------------------- void Form1::setSrlProperties(void) { // ROMヘッダの[0,0x160)の領域はRead Onlyで変更しない @@ -34,7 +38,11 @@ void Form1::setSrlProperties(void) this->setParentalSrlProperties(); } //setSrlProperties() -// SRLのROM情報をフォームに反映させる(ファイルが読み込まれていることが前提) +// ---------------------------------------------- +// [SRL => Form] +// SRLのROM情報をフォームに反映させる +// (ファイルが読み込まれていることが前提) +// ---------------------------------------------- void Form1::setSrlForms(void) { // NTR互換情報 @@ -217,7 +225,11 @@ void Form1::setSrlForms(void) } } // setSrlForms() -// SRLの特殊な設定をフォームにセットする(言語切り替えで表示を変えたいので独立させる) +// ---------------------------------------------- +// [SRL => Form] +// SRLの特殊な設定をフォームにセットする +// (言語切り替えで表示を変えたいので独立させる) +// ---------------------------------------------- void Form1::setSrlFormsTextBox() { if( !this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon ) @@ -283,7 +295,9 @@ void Form1::setSrlFormsTextBox() } } // setSrlFormsTextBox() +// ---------------------------------------------- // フォームの入力をチェックする +// ---------------------------------------------- System::Boolean Form1::checkSrlForms(void) { // リージョン diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index b9fdc11..42c50af 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -21,7 +21,10 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; + +// ---------------------------------------------- // 一時保存 +// ---------------------------------------------- System::Void Form1::saveTmp( System::String ^filename ) { System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); @@ -107,7 +110,9 @@ System::Void Form1::saveTmp( System::String ^filename ) } } //saveTmp() +// ---------------------------------------------- // 一時ファイルの読み込み +// ---------------------------------------------- void Form1::loadTmp( System::String ^filename ) { System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument; @@ -243,7 +248,9 @@ void Form1::loadTmp( System::String ^filename ) } //loadTmp() +// ---------------------------------------------- // 一時保存情報をフォーム情報に変換 +// ---------------------------------------------- System::Boolean Form1::parseTmp( System::Xml::XmlElement ^root, System::String ^xpath, System::Windows::Forms::ComboBox ^comb ) { // コンボボックスの保存情報 - インデックスの範囲に含まれるか調べる(含まれない場合は-1) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj index 7431d98..4e1c03f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj @@ -219,10 +219,18 @@ RelativePath=".\Form_file.cpp" > + + + + diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 885438d..3c38492 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -340,13 +340,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( else node->FirstChild->Value = nullptr; } - if( node->FirstChild->Value->Equals( "TagIsWL" ) ) - { - if( hSrl->IsWL ) - node->FirstChild->Value = gcnew System::String("○"); - else - node->FirstChild->Value = nullptr; - } if( node->FirstChild->Value->Equals( "TagIsSD" ) ) { if( hSrl->IsSD ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml new file mode 100644 index 0000000..535b053 --- /dev/null +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml @@ -0,0 +1,18 @@ + + + ON + ON + + 5 + 0 + 20200 + + + 0 + 0 + 0 + 0 + 0 + 0 + + diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml index 60e26ef..ce60798 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml @@ -1,22 +1,6 @@ w - J - Sheet - OFF - - 5 - 0 - 20200 - - - 0 - 0 - 0 - 0 - 0 - 0 - 787f 16017f