diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index cb6dd0f..ce56407 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 d87bf81..cd998d9 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 51768e1..6d508a2 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 d83119d..625df93 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -673,6 +673,16 @@ private: System::Windows::Forms::TextBox^ tboxGuideNandSizeInfo; private: System::Windows::Forms::TextBox^ tboxSrlSize; +private: System::Windows::Forms::Label^ labBracketR; +private: System::Windows::Forms::Label^ labBracketL; +private: System::Windows::Forms::TextBox^ tboxSumSizeMB; +private: System::Windows::Forms::GroupBox^ gboxDLCategory; +private: System::Windows::Forms::TextBox^ tboxDLCategoryOther; +private: System::Windows::Forms::ComboBox^ combDLCategory; +private: System::Windows::Forms::TextBox^ tboxGuideDLCategory; + + + @@ -953,11 +963,11 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->gboxTWLExInfo = (gcnew System::Windows::Forms::GroupBox()); this->labByte1 = (gcnew System::Windows::Forms::Label()); this->labHex4 = (gcnew System::Windows::Forms::Label()); - this->labHex3 = (gcnew System::Windows::Forms::Label()); this->tboxIsCodec = (gcnew System::Windows::Forms::TextBox()); this->labIsCodec = (gcnew System::Windows::Forms::Label()); this->labKeyTableRomOffset = (gcnew System::Windows::Forms::Label()); this->tboxKeyTableRomOffset = (gcnew System::Windows::Forms::TextBox()); + this->labHex3 = (gcnew System::Windows::Forms::Label()); this->labNormalRomOffset = (gcnew System::Windows::Forms::Label()); this->tboxNormalRomOffset = (gcnew System::Windows::Forms::TextBox()); this->tboxPrivateSize = (gcnew System::Windows::Forms::TextBox()); @@ -1017,9 +1027,24 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->tboxConnectIcon = (gcnew System::Windows::Forms::TextBox()); this->tboxGuideTWLInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxExFlags = (gcnew System::Windows::Forms::GroupBox()); + this->tabRomEditInfo = (gcnew System::Windows::Forms::TabPage()); + this->gboxOtherSpec = (gcnew System::Windows::Forms::GroupBox()); + this->cboxIsUGC = (gcnew System::Windows::Forms::CheckBox()); + this->cboxIsPhotoEx = (gcnew System::Windows::Forms::CheckBox()); + this->butSetBack = (gcnew System::Windows::Forms::Button()); + this->tboxGuideRomEditInfo = (gcnew System::Windows::Forms::TextBox()); + this->gboxParental = (gcnew System::Windows::Forms::GroupBox()); + this->cboxIsUnnecessaryRating = (gcnew System::Windows::Forms::CheckBox()); this->tabNandSizeInfo = (gcnew System::Windows::Forms::TabPage()); + this->tboxGuideDLCategory = (gcnew System::Windows::Forms::TextBox()); + this->gboxDLCategory = (gcnew System::Windows::Forms::GroupBox()); + this->tboxDLCategoryOther = (gcnew System::Windows::Forms::TextBox()); + this->combDLCategory = (gcnew System::Windows::Forms::ComboBox()); this->tboxGuideNandSizeInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxNandSize = (gcnew System::Windows::Forms::GroupBox()); + this->labBracketR = (gcnew System::Windows::Forms::Label()); + this->labBracketL = (gcnew System::Windows::Forms::Label()); + this->tboxSumSizeMB = (gcnew System::Windows::Forms::TextBox()); this->tboxSrlSize = (gcnew System::Windows::Forms::TextBox()); this->labShopBlockUnit = (gcnew System::Windows::Forms::Label()); this->labArrow5 = (gcnew System::Windows::Forms::Label()); @@ -1045,14 +1070,6 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->labSumSize = (gcnew System::Windows::Forms::Label()); this->labSubBannerSize = (gcnew System::Windows::Forms::Label()); this->labTmdSize = (gcnew System::Windows::Forms::Label()); - this->tabRomEditInfo = (gcnew System::Windows::Forms::TabPage()); - this->gboxOtherSpec = (gcnew System::Windows::Forms::GroupBox()); - this->cboxIsUGC = (gcnew System::Windows::Forms::CheckBox()); - this->cboxIsPhotoEx = (gcnew System::Windows::Forms::CheckBox()); - this->butSetBack = (gcnew System::Windows::Forms::Button()); - this->tboxGuideRomEditInfo = (gcnew System::Windows::Forms::TextBox()); - this->gboxParental = (gcnew System::Windows::Forms::GroupBox()); - this->cboxIsUnnecessaryRating = (gcnew System::Windows::Forms::CheckBox()); this->tabSubmitInfo = (gcnew System::Windows::Forms::TabPage()); this->labProductNameLimit = (gcnew System::Windows::Forms::Label()); this->tboxGuideSubmitInfo = (gcnew System::Windows::Forms::TextBox()); @@ -1099,11 +1116,12 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->tabTWLInfo->SuspendLayout(); this->gboxLaunch->SuspendLayout(); this->gboxExFlags->SuspendLayout(); - this->tabNandSizeInfo->SuspendLayout(); - this->gboxNandSize->SuspendLayout(); this->tabRomEditInfo->SuspendLayout(); this->gboxOtherSpec->SuspendLayout(); this->gboxParental->SuspendLayout(); + this->tabNandSizeInfo->SuspendLayout(); + this->gboxDLCategory->SuspendLayout(); + this->gboxNandSize->SuspendLayout(); this->tabSubmitInfo->SuspendLayout(); this->gboxForeign->SuspendLayout(); this->tabCompanyInfo->SuspendLayout(); @@ -1995,11 +2013,6 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; resources->ApplyResources(this->labHex4, L"labHex4"); this->labHex4->Name = L"labHex4"; // - // labHex3 - // - resources->ApplyResources(this->labHex3, L"labHex3"); - this->labHex3->Name = L"labHex3"; - // // tboxIsCodec // resources->ApplyResources(this->tboxIsCodec, L"tboxIsCodec"); @@ -2022,6 +2035,11 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->tboxKeyTableRomOffset->Name = L"tboxKeyTableRomOffset"; this->tboxKeyTableRomOffset->ReadOnly = true; // + // labHex3 + // + resources->ApplyResources(this->labHex3, L"labHex3"); + this->labHex3->Name = L"labHex3"; + // // labNormalRomOffset // resources->ApplyResources(this->labNormalRomOffset, L"labNormalRomOffset"); @@ -2318,8 +2336,8 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; // this->tabMain->Controls->Add(this->tabRomInfo); this->tabMain->Controls->Add(this->tabTWLInfo); - this->tabMain->Controls->Add(this->tabNandSizeInfo); this->tabMain->Controls->Add(this->tabRomEditInfo); + this->tabMain->Controls->Add(this->tabNandSizeInfo); this->tabMain->Controls->Add(this->tabSubmitInfo); this->tabMain->Controls->Add(this->tabCompanyInfo); this->tabMain->Controls->Add(this->tabErrorInfo); @@ -2437,8 +2455,85 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->gboxExFlags->Name = L"gboxExFlags"; this->gboxExFlags->TabStop = false; // + // tabRomEditInfo + // + this->tabRomEditInfo->Controls->Add(this->gboxOtherSpec); + this->tabRomEditInfo->Controls->Add(this->butSetBack); + this->tabRomEditInfo->Controls->Add(this->tboxGuideRomEditInfo); + this->tabRomEditInfo->Controls->Add(this->gboxParental); + resources->ApplyResources(this->tabRomEditInfo, L"tabRomEditInfo"); + this->tabRomEditInfo->Name = L"tabRomEditInfo"; + this->tabRomEditInfo->UseVisualStyleBackColor = true; + // + // gboxOtherSpec + // + this->gboxOtherSpec->Controls->Add(this->cboxIsUGC); + this->gboxOtherSpec->Controls->Add(this->cboxIsPhotoEx); + resources->ApplyResources(this->gboxOtherSpec, L"gboxOtherSpec"); + this->gboxOtherSpec->Name = L"gboxOtherSpec"; + this->gboxOtherSpec->TabStop = false; + // + // cboxIsUGC + // + resources->ApplyResources(this->cboxIsUGC, L"cboxIsUGC"); + this->cboxIsUGC->Name = L"cboxIsUGC"; + this->cboxIsUGC->UseVisualStyleBackColor = true; + // + // cboxIsPhotoEx + // + resources->ApplyResources(this->cboxIsPhotoEx, L"cboxIsPhotoEx"); + this->cboxIsPhotoEx->Name = L"cboxIsPhotoEx"; + this->cboxIsPhotoEx->UseVisualStyleBackColor = true; + // + // butSetBack + // + resources->ApplyResources(this->butSetBack, L"butSetBack"); + this->butSetBack->Name = L"butSetBack"; + this->butSetBack->UseVisualStyleBackColor = true; + this->butSetBack->Click += gcnew System::EventHandler(this, &Form1::butSetBack_Click); + // + // tboxGuideRomEditInfo + // + this->tboxGuideRomEditInfo->BackColor = System::Drawing::SystemColors::Info; + resources->ApplyResources(this->tboxGuideRomEditInfo, L"tboxGuideRomEditInfo"); + this->tboxGuideRomEditInfo->Name = L"tboxGuideRomEditInfo"; + this->tboxGuideRomEditInfo->ReadOnly = true; + // + // gboxParental + // + this->gboxParental->Controls->Add(this->cboxIsUnnecessaryRating); + this->gboxParental->Controls->Add(this->labRegion); + this->gboxParental->Controls->Add(this->combRegion); + this->gboxParental->Controls->Add(this->labParentalRating); + this->gboxParental->Controls->Add(this->labOFLC); + this->gboxParental->Controls->Add(this->labPEGI_BBFC); + this->gboxParental->Controls->Add(this->combPEGI_BBFC); + this->gboxParental->Controls->Add(this->combCERO); + this->gboxParental->Controls->Add(this->labCERO); + this->gboxParental->Controls->Add(this->combOFLC); + this->gboxParental->Controls->Add(this->labPEGI_PRT); + this->gboxParental->Controls->Add(this->combPEGI_PRT); + this->gboxParental->Controls->Add(this->combESRB); + this->gboxParental->Controls->Add(this->labESRB); + this->gboxParental->Controls->Add(this->labPEGI); + this->gboxParental->Controls->Add(this->combPEGI); + this->gboxParental->Controls->Add(this->combUSK); + this->gboxParental->Controls->Add(this->labUSK); + resources->ApplyResources(this->gboxParental, L"gboxParental"); + this->gboxParental->Name = L"gboxParental"; + this->gboxParental->TabStop = false; + // + // cboxIsUnnecessaryRating + // + resources->ApplyResources(this->cboxIsUnnecessaryRating, L"cboxIsUnnecessaryRating"); + this->cboxIsUnnecessaryRating->Name = L"cboxIsUnnecessaryRating"; + this->cboxIsUnnecessaryRating->UseVisualStyleBackColor = true; + this->cboxIsUnnecessaryRating->CheckedChanged += gcnew System::EventHandler(this, &Form1::cboxIsUnnecessaryRating_CheckedChanged); + // // tabNandSizeInfo // + this->tabNandSizeInfo->Controls->Add(this->tboxGuideDLCategory); + this->tabNandSizeInfo->Controls->Add(this->gboxDLCategory); this->tabNandSizeInfo->Controls->Add(this->tboxGuideNandSizeInfo); this->tabNandSizeInfo->Controls->Add(this->labMedia); this->tabNandSizeInfo->Controls->Add(this->tboxMedia); @@ -2447,6 +2542,37 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->tabNandSizeInfo->Name = L"tabNandSizeInfo"; this->tabNandSizeInfo->UseVisualStyleBackColor = true; // + // tboxGuideDLCategory + // + this->tboxGuideDLCategory->BackColor = System::Drawing::SystemColors::Info; + resources->ApplyResources(this->tboxGuideDLCategory, L"tboxGuideDLCategory"); + this->tboxGuideDLCategory->Name = L"tboxGuideDLCategory"; + this->tboxGuideDLCategory->ReadOnly = true; + // + // gboxDLCategory + // + this->gboxDLCategory->Controls->Add(this->tboxDLCategoryOther); + this->gboxDLCategory->Controls->Add(this->combDLCategory); + resources->ApplyResources(this->gboxDLCategory, L"gboxDLCategory"); + this->gboxDLCategory->Name = L"gboxDLCategory"; + this->gboxDLCategory->TabStop = false; + // + // tboxDLCategoryOther + // + resources->ApplyResources(this->tboxDLCategoryOther, L"tboxDLCategoryOther"); + this->tboxDLCategoryOther->Name = L"tboxDLCategoryOther"; + // + // combDLCategory + // + this->combDLCategory->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList; + this->combDLCategory->FormattingEnabled = true; + this->combDLCategory->Items->AddRange(gcnew cli::array< System::Object^ >(6) {resources->GetString(L"combDLCategory.Items"), + resources->GetString(L"combDLCategory.Items1"), resources->GetString(L"combDLCategory.Items2"), resources->GetString(L"combDLCategory.Items3"), + resources->GetString(L"combDLCategory.Items4"), resources->GetString(L"combDLCategory.Items5")}); + resources->ApplyResources(this->combDLCategory, L"combDLCategory"); + this->combDLCategory->Name = L"combDLCategory"; + this->combDLCategory->SelectedIndexChanged += gcnew System::EventHandler(this, &Form1::cboxDLCategory_SelectedIndexChanged); + // // tboxGuideNandSizeInfo // this->tboxGuideNandSizeInfo->BackColor = System::Drawing::SystemColors::Info; @@ -2456,6 +2582,9 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; // // gboxNandSize // + this->gboxNandSize->Controls->Add(this->labBracketR); + this->gboxNandSize->Controls->Add(this->labBracketL); + this->gboxNandSize->Controls->Add(this->tboxSumSizeMB); this->gboxNandSize->Controls->Add(this->tboxSrlSize); this->gboxNandSize->Controls->Add(this->labShopBlockUnit); this->gboxNandSize->Controls->Add(this->labArrow5); @@ -2489,6 +2618,22 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->gboxNandSize->Name = L"gboxNandSize"; this->gboxNandSize->TabStop = false; // + // labBracketR + // + resources->ApplyResources(this->labBracketR, L"labBracketR"); + this->labBracketR->Name = L"labBracketR"; + // + // labBracketL + // + resources->ApplyResources(this->labBracketL, L"labBracketL"); + this->labBracketL->Name = L"labBracketL"; + // + // tboxSumSizeMB + // + resources->ApplyResources(this->tboxSumSizeMB, L"tboxSumSizeMB"); + this->tboxSumSizeMB->Name = L"tboxSumSizeMB"; + this->tboxSumSizeMB->ReadOnly = true; + // // tboxSrlSize // resources->ApplyResources(this->tboxSrlSize, L"tboxSrlSize"); @@ -2624,81 +2769,6 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; resources->ApplyResources(this->labTmdSize, L"labTmdSize"); this->labTmdSize->Name = L"labTmdSize"; // - // tabRomEditInfo - // - this->tabRomEditInfo->Controls->Add(this->gboxOtherSpec); - this->tabRomEditInfo->Controls->Add(this->butSetBack); - this->tabRomEditInfo->Controls->Add(this->tboxGuideRomEditInfo); - this->tabRomEditInfo->Controls->Add(this->gboxParental); - resources->ApplyResources(this->tabRomEditInfo, L"tabRomEditInfo"); - this->tabRomEditInfo->Name = L"tabRomEditInfo"; - this->tabRomEditInfo->UseVisualStyleBackColor = true; - // - // gboxOtherSpec - // - this->gboxOtherSpec->Controls->Add(this->cboxIsUGC); - this->gboxOtherSpec->Controls->Add(this->cboxIsPhotoEx); - resources->ApplyResources(this->gboxOtherSpec, L"gboxOtherSpec"); - this->gboxOtherSpec->Name = L"gboxOtherSpec"; - this->gboxOtherSpec->TabStop = false; - // - // cboxIsUGC - // - resources->ApplyResources(this->cboxIsUGC, L"cboxIsUGC"); - this->cboxIsUGC->Name = L"cboxIsUGC"; - this->cboxIsUGC->UseVisualStyleBackColor = true; - // - // cboxIsPhotoEx - // - resources->ApplyResources(this->cboxIsPhotoEx, L"cboxIsPhotoEx"); - this->cboxIsPhotoEx->Name = L"cboxIsPhotoEx"; - this->cboxIsPhotoEx->UseVisualStyleBackColor = true; - // - // butSetBack - // - resources->ApplyResources(this->butSetBack, L"butSetBack"); - this->butSetBack->Name = L"butSetBack"; - this->butSetBack->UseVisualStyleBackColor = true; - this->butSetBack->Click += gcnew System::EventHandler(this, &Form1::butSetBack_Click); - // - // tboxGuideRomEditInfo - // - this->tboxGuideRomEditInfo->BackColor = System::Drawing::SystemColors::Info; - resources->ApplyResources(this->tboxGuideRomEditInfo, L"tboxGuideRomEditInfo"); - this->tboxGuideRomEditInfo->Name = L"tboxGuideRomEditInfo"; - this->tboxGuideRomEditInfo->ReadOnly = true; - // - // gboxParental - // - this->gboxParental->Controls->Add(this->cboxIsUnnecessaryRating); - this->gboxParental->Controls->Add(this->labRegion); - this->gboxParental->Controls->Add(this->combRegion); - this->gboxParental->Controls->Add(this->labParentalRating); - this->gboxParental->Controls->Add(this->labOFLC); - this->gboxParental->Controls->Add(this->labPEGI_BBFC); - this->gboxParental->Controls->Add(this->combPEGI_BBFC); - this->gboxParental->Controls->Add(this->combCERO); - this->gboxParental->Controls->Add(this->labCERO); - this->gboxParental->Controls->Add(this->combOFLC); - this->gboxParental->Controls->Add(this->labPEGI_PRT); - this->gboxParental->Controls->Add(this->combPEGI_PRT); - this->gboxParental->Controls->Add(this->combESRB); - this->gboxParental->Controls->Add(this->labESRB); - this->gboxParental->Controls->Add(this->labPEGI); - this->gboxParental->Controls->Add(this->combPEGI); - this->gboxParental->Controls->Add(this->combUSK); - this->gboxParental->Controls->Add(this->labUSK); - resources->ApplyResources(this->gboxParental, L"gboxParental"); - this->gboxParental->Name = L"gboxParental"; - this->gboxParental->TabStop = false; - // - // cboxIsUnnecessaryRating - // - resources->ApplyResources(this->cboxIsUnnecessaryRating, L"cboxIsUnnecessaryRating"); - this->cboxIsUnnecessaryRating->Name = L"cboxIsUnnecessaryRating"; - this->cboxIsUnnecessaryRating->UseVisualStyleBackColor = true; - this->cboxIsUnnecessaryRating->CheckedChanged += gcnew System::EventHandler(this, &Form1::cboxIsUnnecessaryRating_CheckedChanged); - // // tabSubmitInfo // this->tabSubmitInfo->Controls->Add(this->labProductNameLimit); @@ -2999,16 +3069,18 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->gboxLaunch->PerformLayout(); this->gboxExFlags->ResumeLayout(false); this->gboxExFlags->PerformLayout(); - this->tabNandSizeInfo->ResumeLayout(false); - this->tabNandSizeInfo->PerformLayout(); - this->gboxNandSize->ResumeLayout(false); - this->gboxNandSize->PerformLayout(); this->tabRomEditInfo->ResumeLayout(false); this->tabRomEditInfo->PerformLayout(); this->gboxOtherSpec->ResumeLayout(false); this->gboxOtherSpec->PerformLayout(); this->gboxParental->ResumeLayout(false); this->gboxParental->PerformLayout(); + this->tabNandSizeInfo->ResumeLayout(false); + this->tabNandSizeInfo->PerformLayout(); + this->gboxDLCategory->ResumeLayout(false); + this->gboxDLCategory->PerformLayout(); + this->gboxNandSize->ResumeLayout(false); + this->gboxNandSize->PerformLayout(); this->tabSubmitInfo->ResumeLayout(false); this->tabSubmitInfo->PerformLayout(); this->gboxForeign->ResumeLayout(false); @@ -3232,6 +3304,20 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; } } + // DL販売カテゴリの表示をカードアプリのとき「なし」にする。 + void maskDLCategoryForms(void) + { + if( !this->hSrl->IsMediaNand ) + { + this->combDLCategory->SelectedIndex = this->combDLCategory->Items->Count - 2; + this->combDLCategory->Enabled = false; + } + else + { + this->combDLCategory->Enabled = true; + } + } + private: // ---------------------------------------------- // 固定ファイル名の取得 @@ -3942,6 +4028,20 @@ private: System::Windows::Forms::TextBox^ tboxSrlSize; this->tboxBackupOther->Clear(); // 前にテキストボックスに書かれていた内容を消去 } } + private: + System::Void cboxDLCategory_SelectedIndexChanged(System::Object^ sender, System::EventArgs^ e) + { + if( this->combDLCategory->SelectedIndex == (this->combDLCategory->Items->Count - 1) ) + { + this->tboxDLCategoryOther->Enabled = true; + } + else + { + this->tboxDLCategoryOther->Enabled = false; + this->tboxDLCategoryOther->Clear(); + } + } + private: // リージョン変更に連動して表示するレーティング団体を変更する System::Void combRegion_SelectedIndexChanged(System::Object^ sender, System::EventArgs^ e) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx index a183fb4..f2003c2 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ROM繝繝ｼ繧ｿ諠蝣ｱ - 73, 12 @@ -163,6 +160,9 @@ 繝ｪ繝槭せ繧ｿ繝ｼ繝舌ｼ繧ｸ繝ｧ繝ｳ + + ROM繝繝ｼ繧ｿ諠蝣ｱ + 79, 12 @@ -364,9 +364,6 @@ 諡蠖楢2繧貞･蜉帙☆繧(莉ｻ諢) - - 諡蠖楢2 - 37, 12 @@ -403,8 +400,8 @@ 雋ｴ遉ｾ蜷 - - 諡蠖楢1 + + 諡蠖楢2 37, 12 @@ -442,8 +439,8 @@ 雋ｴ遉ｾ蜷 - - 逶ｮ逧 + + 諡蠖楢1 54, 16 @@ -469,8 +466,8 @@ 荳闊ｬ雋ｩ螢ｲ逕ｨ - - 謠仙ｺ譁ｹ豕 + + 逶ｮ逧 56, 16 @@ -484,6 +481,9 @@ 驛ｵ騾 + + 謠仙ｺ譁ｹ豕 + 65, 12 @@ -544,15 +544,15 @@ 陬ｽ蜩√さ繝ｼ繝 - - Shared2繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ - 123, 16 Shared2繝輔ぃ繧､繝ｫ菴ｿ逕ｨ + + Shared2繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ + 70, 12 @@ -565,15 +565,15 @@ SDK繝舌ｼ繧ｸ繝ｧ繝ｳ - - TWL諡｡蠑ｵ諠蝣ｱ - 142, 12 TWL蟆ら畑鬆伜沺ROM繧ｪ繝輔そ繝繝 + + TWL諡｡蠑ｵ諠蝣ｱ + 155, 12 @@ -610,9 +610,6 @@ tmp繧ｸ繝｣繝ｳ繝苓ｨｱ蜿ｯ - - 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ - 98, 12 @@ -640,8 +637,11 @@ SD繧ｫ繝ｼ繝 + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + - 260, 62 + 236, 62 74, 12 @@ -658,12 +658,6 @@ ROM謠仙ｺ諠蝣ｱ - - 51, 20 - - - 繝輔ぃ繧､繝ｫ - 211, 22 @@ -685,11 +679,11 @@ 荳譎ゆｿ晏ｭ倥＠縺滓署蜃ｺ諠蝣ｱ繧帝幕縺 - - 53, 20 + + 51, 20 - - 繝槭せ繧ｿ繝ｼ + + 繝輔ぃ繧､繝ｫ 280, 22 @@ -718,17 +712,17 @@ 繝溘ラ繝ｫ繧ｦ繧ｧ繧｢繝ｪ繧ｹ繝医ｮ縺ｿ繧剃ｽ懈舌☆繧(HTML蠖｢蠑) - - ROM蝓ｺ譛ｬ諠蝣ｱ + + 53, 20 + + + 繝槭せ繧ｿ繝ｼ 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯ邱ｨ髮荳榊庄縺ｧ縺吶ゅョ繝ｼ繧ｿ縺ｫ隱､繧翫′縺ゅｋ蝣ｴ蜷医↓縺ｯROM繝繝ｼ繧ｿ縺ｮ菴懈先凾縺ｮ險ｭ螳壹ｒ隕狗峩縺励※縺上□縺輔＞縲 - - TWL諡｡蠑ｵ諠蝣ｱ - - - DSi繝｡繝九Η繝ｼ荳翫〒縺ｮ襍ｷ蜍募宛髯 + + ROM蝓ｺ譛ｬ諠蝣ｱ 173, 12 @@ -736,20 +730,68 @@ DSi繝｡繝九Η繝ｼ荳翫〒縺ｮ騾壻ｿ｡繧｢繧､繧ｳ繝ｳ陦ｨ遉ｺ + + DSi繝｡繝九Η繝ｼ荳翫〒縺ｮ襍ｷ蜍募宛髯 + 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯ邱ｨ髮荳榊庄縺ｧ縺吶ゅョ繝ｼ繧ｿ縺ｫ隱､繧翫′縺ゅｋ蝣ｴ蜷医↓縺ｯROM繝繝ｼ繧ｿ縺ｮ菴懈先凾縺ｮ險ｭ螳壹ｒ隕狗峩縺励※縺上□縺輔＞縲 TWL諡｡蠑ｵ隲ｸ繝輔Λ繧ｰ - - NAND菴ｿ逕ｨ繧ｵ繧､繧ｺ + + TWL諡｡蠑ｵ諠蝣ｱ + + + 210, 16 + + + UGC(User Generated Contents)蟇ｾ蠢 + + + 96, 16 + + + 蜀咏悄莠､謠帛ｯｾ蠢 + + + 縺昴ｮ莉乏OM莉墓ｧ + + + 隱ｭ縺ｿ霎ｼ縺ｿ譎ゅｮ險ｭ螳壹↓謌ｻ縺 + + + 縺薙ｮ繧ｿ繝悶ｮ蜷鬆逶ｮ縺ｸ縺ｮ蜈･蜉帙ｯ謠仙ｺ遒ｺ隱肴嶌縺翫ｈ縺ｳ繝槭せ繧ｿ繝ｼROM縺ｮ菴懈舌ｮ縺溘ａ縺ｫ蠢隕√〒縺吶<newline>縺薙ｌ繧峨ｮ諠蝣ｱ縺ｯ繝槭せ繧ｿ繝ｼROM縺ｮ菴懈先凾縺ｫROM蜀逋ｻ骭ｲ繝繝ｼ繧ｿ縺ｨ縺励※逋ｻ骭ｲ縺輔ｌ縺ｾ縺(縲後◎縺ｮ莉乏OM莉墓ｧ倥阪ｒ髯､縺)縲 + + + 235, 16 + + + 繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ陦ｨ遉ｺ荳崎ｦ (繝繝ｼ繝ｫ鬘槭ｮ縺ｿ驕ｸ謚槫庄) + + + 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ諠蝣ｱ + + + 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ(邱ｨ髮蜿ｯ) + + + 繝｡繝繧｣繧｢縺君AND縺ｮ蝣ｴ蜷医．Si繧ｷ繝ｧ繝繝励〒縺ｮ雋ｩ螢ｲ繧ｫ繝繧ｴ繝ｪ繧帝∈謚槭＠縺ｦ縺上□縺輔＞縲 + + + 辟｡譁 + + + 縺ｪ縺 + + + 縺昴ｮ莉 + + + DSi Ware縺ｮ雋ｩ螢ｲ繧ｫ繝繧ｴ繝ｪ - 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯNAND繧｢繝励Μ縺ｫ繧医▲縺ｦ菴ｿ逕ｨ縺輔ｌ繧亀WL譛ｬ菴灘縺ｮNAND鬆伜沺縺ｮ繧ｵ繧､繧ｺ繧堤｢ｺ隱阪☆繧句ｴ蜷医↓蠢隕√〒縺吶<newline>繧｢繝励Μ縺後ご繝ｼ繝繧ｫ繝ｼ繝牙髄縺代ｮ蝣ｴ蜷医↓縺ｯNAND菴ｿ逕ｨ繧ｵ繧､繧ｺ縺ｮ遒ｺ隱阪ｯ蠢隕√≠繧翫∪縺帙ｓ縲 - - - NAND繧｢繝励Μ縺ｫ繧医▲縺ｦ菴ｿ逕ｨ縺輔ｌ繧起AND鬆伜沺縺ｮ繧ｵ繧､繧ｺ + 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯDSi Ware(NAND繧｢繝励Μ)縺ｫ繧医▲縺ｦ菴ｿ逕ｨ縺輔ｌ繧亀WL譛ｬ菴灘縺ｮNAND鬆伜沺縺ｮ繧ｵ繧､繧ｺ繧堤｢ｺ隱阪☆繧句ｴ蜷医↓蠢隕√〒縺吶<newline>繧｢繝励Μ縺後ご繝ｼ繝繧ｫ繝ｼ繝牙髄縺代ｮ蝣ｴ蜷医↓縺ｯNAND菴ｿ逕ｨ繧ｵ繧､繧ｺ縺ｮ遒ｺ隱阪ｯ蠢隕√≠繧翫∪縺帙ｓ縲 38, 12 @@ -832,41 +874,11 @@ 縺昴ｮ莉悶ヵ繧｡繧､繝ｫ繧ｵ繧､繧ｺ - - 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ(邱ｨ髮蜿ｯ) + + DSi Ware縺ｫ繧医▲縺ｦ菴ｿ逕ｨ縺輔ｌ繧起AND鬆伜沺縺ｮ繧ｵ繧､繧ｺ - - 縺昴ｮ莉乏OM莉墓ｧ - - - 210, 16 - - - UGC(User Generated Contents)蟇ｾ蠢 - - - 96, 16 - - - 蜀咏悄莠､謠帛ｯｾ蠢 - - - 隱ｭ縺ｿ霎ｼ縺ｿ譎ゅｮ險ｭ螳壹↓謌ｻ縺 - - - 縺薙ｮ繧ｿ繝悶ｮ蜷鬆逶ｮ縺ｸ縺ｮ蜈･蜉帙ｯ謠仙ｺ遒ｺ隱肴嶌縺翫ｈ縺ｳ繝槭せ繧ｿ繝ｼROM縺ｮ菴懈舌ｮ縺溘ａ縺ｫ蠢隕√〒縺吶<newline>縺薙ｌ繧峨ｮ諠蝣ｱ縺ｯ繝槭せ繧ｿ繝ｼROM縺ｮ菴懈先凾縺ｫROM蜀逋ｻ骭ｲ繝繝ｼ繧ｿ縺ｨ縺励※逋ｻ骭ｲ縺輔ｌ縺ｾ縺(縲後◎縺ｮ莉乏OM莉墓ｧ倥阪ｒ髯､縺)縲 - - - 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ諠蝣ｱ - - - 235, 16 - - - 繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ陦ｨ遉ｺ荳崎ｦ (繝繝ｼ繝ｫ鬘槭ｮ縺ｿ驕ｸ謚槫庄) - - - 謠仙ｺ諠蝣ｱ(邱ｨ髮蜿ｯ) + + DSi Ware(荳驛ｨ隕∝･蜉) (30譁蟄嶺ｻ･蜀) @@ -874,9 +886,6 @@ 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯ謠仙ｺ遒ｺ隱肴嶌縺ｮ菴懈舌↓蠢隕√〒縺吶ょ･蜉帙＠縺ｦ縺上□縺輔＞縲 - - 豬ｷ螟也沿 - (30譁蟄嶺ｻ･蜀) @@ -886,21 +895,21 @@ (隍謨ｰ縺ゅｋ蝣ｴ蜷医ｮ縺ｿ) - - 莨夂､ｾ諠蝣ｱ(邱ｨ髮蜿ｯ) + + 豬ｷ螟也沿 + + + 謠仙ｺ諠蝣ｱ(隕∝･蜉) 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯ謠仙ｺ遒ｺ隱肴嶌縺ｮ菴懈舌↓蠢隕√〒縺吶ょ･蜉帙＠縺ｦ縺上□縺輔＞縲 - - 繧ｨ繝ｩ繝ｼ諠蝣ｱ + + 莨夂､ｾ諠蝣ｱ(隕∝･蜉) 縺薙ｮ繧ｿ繝悶↓縺ｯ隱ｭ縺ｿ霎ｼ繧薙□ROM繝繝ｼ繧ｿ縺ｮ蝠城｡後→譛ｬ繝励Ο繧ｰ繝ｩ繝縺ｧ縺ｮ蜈･蜉帙Α繧ｹ縺悟玲嫌縺輔ｌ縺ｾ縺吶<newline>襍､譁蟄励ｮ鬆逶ｮ縺ｯ縲∵悽繝励Ο繧ｰ繝ｩ繝縺ｧ菫ｮ豁｣荳榊庄縺ｧ縺吶３OM繝繝ｼ繧ｿ菴懈先凾縺ｮ險ｭ螳壹ｒ縺皮｢ｺ隱阪￥縺縺輔＞縲<newline>髱呈枚蟄励ｮ鬆逶ｮ縺ｯ縲∵悽繝励Ο繧ｰ繝ｩ繝縺ｧ菫ｮ豁｣縺ｧ縺阪∪縺吶′縲∽ｿｮ豁｣縺後槭せ繧ｿ繝ｼROM縺ｫ蜿肴丐縺輔ｌ縺ｾ縺吶<newline>鮟呈枚蟄励ｮ鬆逶ｮ縺ｯ縲∵署蜃ｺ遒ｺ隱肴嶌縺ｫ縺ｮ縺ｿ蜿肴丐縺輔ｌ縲√槭せ繧ｿ繝ｼROM縺ｫ縺ｯ蜿肴丐縺輔ｌ縺ｾ縺帙ｓ縲 - - 縺縺､縺ｮ諠蝣ｱ繧定｡ｨ遉ｺ縺吶ｋ縺 - 114, 16 @@ -913,6 +922,9 @@ ROM繝繝ｼ繧ｿ隱ｭ縺ｿ霎ｼ縺ｿ譎 + + 縺縺､縺ｮ諠蝣ｱ繧定｡ｨ遉ｺ縺吶ｋ縺 + 339, 12 @@ -949,6 +961,9 @@ 隕∝屏 + + 繧ｨ繝ｩ繝ｼ諠蝣ｱ + 92, 12 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index 9858d53..b5d3db4 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -4090,7 +4090,7 @@ gboxNandSize - 19 + 22 True @@ -4120,7 +4120,7 @@ gboxNandSize - 22 + 25 True @@ -4150,7 +4150,7 @@ gboxNandSize - 25 + 28 153, 66 @@ -4174,7 +4174,7 @@ gboxNandSize - 24 + 27 True @@ -4744,7 +4744,7 @@ True - 224, 62 + 194, 62 110, 12 @@ -4765,10 +4765,10 @@ tabNandSizeInfo - 1 + 3 - 340, 59 + 316, 59 96, 19 @@ -4789,7 +4789,7 @@ tabNandSizeInfo - 2 + 4 True @@ -5205,741 +5205,6 @@ 1 - - 24, 11 - - - True - - - 687, 34 - - - 42 - - - These item is necessary for checking NAND size used by NAND Application.<newline>When the Media of application is GameCard, following items is not necessary. - - - tboxGuideNandSizeInfo - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabNandSizeInfo - - - 0 - - - 153, 41 - - - 96, 19 - - - 30 - - - Right - - - tboxSrlSize - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 0 - - - True - - - 392, 213 - - - 40, 12 - - - 29 - - - Blocks - - - labShopBlockUnit - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 1 - - - True - - - NoControl - - - 263, 144 - - - 17, 12 - - - 28 - - - 竊 - - - labArrow5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 2 - - - True - - - NoControl - - - 263, 119 - - - 17, 12 - - - 27 - - - 竊 - - - labArrow4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 3 - - - True - - - NoControl - - - 263, 94 - - - 17, 12 - - - 26 - - - 竊 - - - labArrow3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 4 - - - True - - - NoControl - - - 263, 69 - - - 17, 12 - - - 25 - - - 竊 - - - labArrow2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 5 - - - True - - - 263, 44 - - - 17, 12 - - - 10 - - - 竊 - - - labArrow1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 6 - - - 292, 210 - - - 94, 19 - - - 24 - - - Right - - - tboxShopBlock - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 7 - - - 292, 177 - - - 94, 19 - - - 23 - - - Right - - - tboxSumSize - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 8 - - - 292, 141 - - - 94, 19 - - - 22 - - - Right - - - tboxTmdSizeFS - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 9 - - - 292, 116 - - - 94, 19 - - - 21 - - - Right - - - tboxSubBannerSizeFS - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 10 - - - 292, 91 - - - 94, 19 - - - 20 - - - Right - - - tboxPrivateSizeFS - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 11 - - - 292, 66 - - - 94, 19 - - - 19 - - - Right - - - tboxPublicSizeFS - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 12 - - - 292, 41 - - - 94, 19 - - - 18 - - - Right - - - tboxSrlSizeFS - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 13 - - - 153, 141 - - - 96, 19 - - - 17 - - - Right - - - tboxTmdSize - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 14 - - - 153, 116 - - - 96, 19 - - - 16 - - - Right - - - tboxSubBannerSize - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 15 - - - True - - - 167, 22 - - - 66, 12 - - - 1 - - - Orignal Size - - - labNandSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 16 - - - True - - - 158, 224 - - - 95, 12 - - - 8 - - - (1Block = 128KB) - - - labShopBlock2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 17 - - - True - - - NoControl - - - 307, 22 - - - 62, 12 - - - 0 - - - NAND Size - - - labNandSizeFS - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 18 - - - True - - - 151, 210 - - - 111, 12 - - - 7 - - - Blocks for Download - - - labShopBlock - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 20 - - - True - - - 39, 44 - - - 78, 12 - - - 4 - - - ROM File Size - - - labSrlSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 21 - - - True - - - 121, 189 - - - 165, 12 - - - 5 - - - (NAND Size Used by the ROM) - - - labSumSize2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 23 - - - True - - - 151, 175 - - - 106, 12 - - - 6 - - - Sum of Above Files - - - labSumSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 26 - - - True - - - 39, 119 - - - 89, 12 - - - 3 - - - Sub Banner Size - - - labSubBannerSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 27 - - - True - - - 39, 144 - - - 81, 12 - - - 2 - - - Other File Size - - - labTmdSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxNandSize - - - 28 - - - 122, 93 - - - 484, 245 - - - 9 - - - NAND Size Used by the NAND Application - - - gboxNandSize - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabNandSizeInfo - - - 3 - - - 4, 21 - - - 745, 352 - - - 6 - - - Used Nand Size - - - tabNandSizeInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 2 - True @@ -6142,6 +5407,942 @@ tabMain + 2 + + + 571, 190 + + + True + + + 140, 44 + + + 44 + + + When Media is NAND, please select a category in the DSi Shop + + + tboxGuideDLCategory + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 0 + + + False + + + 19, 62 + + + 121, 19 + + + 1 + + + tboxDLCategoryOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxDLCategory + + + 0 + + + Free + + + DSi Ware 200 + + + DSi Ware 500 + + + DSi Ware Premium + + + No Category + + + Other + + + 19, 36 + + + 121, 20 + + + 0 + + + combDLCategory + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxDLCategory + + + 1 + + + 561, 84 + + + 163, 100 + + + 43 + + + Sale Category + + + gboxDLCategory + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 1 + + + 24, 11 + + + True + + + 687, 34 + + + 42 + + + These item is necessary for checking NAND area size used by DSi Ware(NAND Application).<newline>When the Media of application is GameCard, following items is not necessary. + + + tboxGuideNandSizeInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 2 + + + True + + + MS UI Gothic, 12pt + + + NoControl + + + 502, 179 + + + 13, 16 + + + 44 + + + ) + + + labBracketR + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 0 + + + True + + + MS UI Gothic, 12pt + + + 391, 179 + + + 13, 16 + + + 43 + + + ( + + + labBracketL + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 1 + + + 405, 177 + + + 94, 19 + + + 31 + + + Right + + + tboxSumSizeMB + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 2 + + + 153, 41 + + + 96, 19 + + + 30 + + + Right + + + tboxSrlSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 3 + + + True + + + 392, 213 + + + 40, 12 + + + 29 + + + Blocks + + + labShopBlockUnit + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 4 + + + True + + + NoControl + + + 263, 144 + + + 17, 12 + + + 28 + + + 竊 + + + labArrow5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 5 + + + True + + + NoControl + + + 263, 119 + + + 17, 12 + + + 27 + + + 竊 + + + labArrow4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 6 + + + True + + + NoControl + + + 263, 94 + + + 17, 12 + + + 26 + + + 竊 + + + labArrow3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 7 + + + True + + + NoControl + + + 263, 69 + + + 17, 12 + + + 25 + + + 竊 + + + labArrow2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 8 + + + True + + + 263, 44 + + + 17, 12 + + + 10 + + + 竊 + + + labArrow1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 9 + + + 292, 210 + + + 94, 19 + + + 24 + + + Right + + + tboxShopBlock + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 10 + + + 292, 177 + + + 94, 19 + + + 23 + + + Right + + + tboxSumSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 11 + + + 292, 141 + + + 94, 19 + + + 22 + + + Right + + + tboxTmdSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 12 + + + 292, 116 + + + 94, 19 + + + 21 + + + Right + + + tboxSubBannerSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 13 + + + 292, 91 + + + 94, 19 + + + 20 + + + Right + + + tboxPrivateSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 14 + + + 292, 66 + + + 94, 19 + + + 19 + + + Right + + + tboxPublicSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 15 + + + 292, 41 + + + 94, 19 + + + 18 + + + Right + + + tboxSrlSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 16 + + + 153, 141 + + + 96, 19 + + + 17 + + + Right + + + tboxTmdSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 17 + + + 153, 116 + + + 96, 19 + + + 16 + + + Right + + + tboxSubBannerSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 18 + + + True + + + 167, 22 + + + 66, 12 + + + 1 + + + Orignal Size + + + labNandSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 19 + + + True + + + 158, 224 + + + 95, 12 + + + 8 + + + (1Block = 128KB) + + + labShopBlock2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 20 + + + True + + + NoControl + + + 307, 22 + + + 62, 12 + + + 0 + + + NAND Size + + + labNandSizeFS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 21 + + + True + + + 151, 210 + + + 111, 12 + + + 7 + + + Blocks for Download + + + labShopBlock + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 23 + + + True + + + 39, 44 + + + 78, 12 + + + 4 + + + ROM File Size + + + labSrlSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 24 + + + True + + + 121, 189 + + + 165, 12 + + + 5 + + + (NAND Size Used by the ROM) + + + labSumSize2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 26 + + + True + + + 151, 175 + + + 106, 12 + + + 6 + + + Sum of Above Files + + + labSumSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 29 + + + True + + + 39, 119 + + + 89, 12 + + + 3 + + + Sub Banner Size + + + labSubBannerSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 30 + + + True + + + 39, 144 + + + 81, 12 + + + 2 + + + Other File Size + + + labTmdSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 31 + + + 24, 84 + + + 522, 245 + + + 9 + + + NAND Area Size Used by the DSi Ware + + + gboxNandSize + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 5 + + + 4, 21 + + + 745, 352 + + + 6 + + + DSi Ware (Editable) + + + tabNandSizeInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + 3 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp index b22e8e7..61cb146 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp @@ -81,8 +81,8 @@ void Form1::construct(void) } // 複数行表示の改行を挿入 - this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "", "\r\n" ); this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "", "\r\n" ); + this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "", "\r\n" ); this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); // 言語バージョンにあわせてメニューにチェックを入れる diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 56c6f11..b0803ca 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -188,6 +188,14 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) #endif this->combRegion->SelectedIndex = index; + resources->ApplyResources(this->combDLCategory, L"combDLCategory"); + index = this->combDLCategory->SelectedIndex; + this->combDLCategory->Items->Clear(); + this->combDLCategory->Items->AddRange(gcnew cli::array< System::Object^ >(6) {resources->GetString(L"combDLCategory.Items"), + resources->GetString(L"combDLCategory.Items1"), resources->GetString(L"combDLCategory.Items2"), resources->GetString(L"combDLCategory.Items3"), + resources->GetString(L"combDLCategory.Items4"), resources->GetString(L"combDLCategory.Items5")}); + this->combDLCategory->SelectedIndex = index; + resources->ApplyResources(this->cboxIsInputPerson2, L"cboxIsInputPerson2"); resources->ApplyResources(this->gboxPerson2, L"gboxPerson2"); resources->ApplyResources(this->labArbit4, L"labArbit4"); @@ -347,6 +355,8 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->tboxGuideTWLInfo, L"tboxGuideTWLInfo"); resources->ApplyResources(this->gboxExFlags, L"gboxExFlags"); resources->ApplyResources(this->tabNandSizeInfo, L"tabNandSizeInfo"); + resources->ApplyResources(this->tboxGuideDLCategory, L"tboxGuideDLCategory"); + resources->ApplyResources(this->gboxDLCategory, L"gboxDLCategory"); resources->ApplyResources(this->tboxGuideNandSizeInfo, L"tboxGuideNandSizeInfo"); resources->ApplyResources(this->labShopBlockUnit, L"labShopBlockUnit"); resources->ApplyResources(this->gboxNandSize, L"gboxNandSize"); @@ -416,8 +426,8 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) } // 複数行表示の改行を挿入 - this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "", "\r\n" ); this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "", "\r\n" ); + this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "", "\r\n" ); this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); // バージョンがなくなるので再設定 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 9a97510..653fc63 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -119,13 +119,14 @@ void Form1::setSrlForms(void) this->tboxSubBannerSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->SubBannerSize ); this->tboxTmdSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->TmdSize ); // NANDのクラスタサイズに切り上げた値 - this->tboxSrlSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->SrlSizeRoundUp ); - this->tboxPublicSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->PublicSaveSizeRoundUp ); - this->tboxPrivateSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->PrivateSaveSizeRoundUp ); - this->tboxSubBannerSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->SubBannerSizeRoundUp ); - this->tboxTmdSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->TmdSizeRoundUp ); + this->tboxSrlSizeFS->Text = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->SrlSizeRoundUp ); + this->tboxPublicSizeFS->Text = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->PublicSaveSizeRoundUp ); + this->tboxPrivateSizeFS->Text = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->PrivateSaveSizeRoundUp ); + this->tboxSubBannerSizeFS->Text = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->SubBannerSizeRoundUp ); + this->tboxTmdSizeFS->Text = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->TmdSizeRoundUp ); // 総和 - this->tboxSumSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->NandUsedSize ); + this->tboxSumSize->Text = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->NandUsedSize ); + this->tboxSumSizeMB->Text = MasterEditorTWL::transSizeToStringMB( this->hSrl->hNandUsedSize->NandUsedSize, 2 ); this->tboxShopBlock->Text = this->hSrl->hNandUsedSize->NandUsedSizeBlock.ToString(); // アプリ種別 @@ -231,6 +232,7 @@ void Form1::setSrlForms(void) // ROMヘッダには関係ないが // NANDアプリのときにバックアップメモリを自動的に「なし」にしておく this->maskBackupMemoryForms(); + this->maskDLCategoryForms(); } // setSrlForms() // ---------------------------------------------- diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index ac9fbf6..e52f2fe 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -279,6 +279,7 @@ void Form1::loadTmp( System::String ^filename ) this->maskRatingForms(); // ペアレンタルコントロール情報をリージョンに合わせる this->changeUnnecessaryRatingForms(true); // 一度コンボボックスがenableになるので再設定 this->maskBackupMemoryForms(); // NANDアプリのときのバックアップメモリの自動設定 + this->maskDLCategoryForms(); } //loadTmp() // ---------------------------------------------- diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp index 97d7ecd..bd0db42 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp @@ -109,6 +109,53 @@ System::String^ MasterEditorTWL::transSizeToString( const System::UInt32 size ) return (val.ToString() + " GB"); } +// KBまで +System::String^ MasterEditorTWL::transSizeToStringKB( const System::UInt32 size ) +{ + System::UInt32 val = size; + + // Byte単位 + if( val == 0 ) + { + return val.ToString(); + } + if( val < 1024 ) + { + return (val.ToString() + " Byte"); + } + + // KB単位に変換 + if( (val % 1024) != 0 ) + { + return (val.ToString() + " Byte"); // 端数のときは単位変換しない + } + val = val / 1024; + return (val.ToString() + " KB"); +} + +// MB +// 第2引数で小数点の桁数を指定(それ以下の桁は切り上げ) +System::String^ MasterEditorTWL::transSizeToStringMB( const System::UInt32 size, const System::UInt32 decimals ) +{ + System::UInt32 MB = 1024*1024; + System::UInt32 pow = 1; + System::UInt32 i; + for( i=0; i < decimals; i++ ) + { + pow = pow * 10; + } + + System::UInt32 div = size * pow / MB; // 小数点の位置をずらす + System::UInt32 mod = size * pow % MB; + if( mod > 0 ) // ずらした小数点以下を切り上げ + { + div++; + } + + System::String ^str = ((System::Double)div / (System::Double)pow).ToString("F" + decimals.ToString()); + return (str + " MB"); +} + // ---------------------------------------------------------------------- // 各レーティング団体の設定可能年齢を取得する // diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.h index eef629f..c62f47d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.h @@ -40,6 +40,8 @@ namespace MasterEditorTWL // @ret 文字列(単位つき) // System::String^ transSizeToString( const System::UInt32 size ); + System::String^ transSizeToStringKB( const System::UInt32 size ); + System::String^ transSizeToStringMB( const System::UInt32 size, const System::UInt32 decimals ); // 第2引数で小数点桁数を指定(それ以下の桁は切り上げ) // // 各レーティング団体の設定可能年齢を取得する