マスタエディタ:DSi WareのNAND消費サイズのMByte表示(小数第3位を切り上げ)を追加。販売のしかた(200/500/Premium...)の選択コンボボックス追加。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@125 7061adef-622a-194b-ae81-725974e89856

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)

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="gboxSrl.Text" xml:space="preserve">
-    <value>ROMデータ情報</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="labPlatform.Size" type="System.Drawing.Size, System.Drawing">
     <value>73, 12</value>
@@ -163,6 +160,9 @@
   <data name="labRemasterVer.Text" xml:space="preserve">
     <value>リマスターバージョン</value>
   </data>
+  <data name="gboxSrl.Text" xml:space="preserve">
+    <value>ROMデータ情報</value>
+  </data>
   <data name="labBackup.Size" type="System.Drawing.Size, System.Drawing">
     <value>79, 12</value>
   </data>
@@ -364,9 +364,6 @@
   <data name="cboxIsInputPerson2.Text" xml:space="preserve">
     <value>担当者2を入力する(任意)</value>
   </data>
-  <data name="gboxPerson2.Text" xml:space="preserve">
-    <value>担当者2</value>
-  </data>
   <data name="labArbit4.Size" type="System.Drawing.Size, System.Drawing">
     <value>37, 12</value>
   </data>
@@ -403,8 +400,8 @@
   <data name="labCompany2.Text" xml:space="preserve">
     <value>貴社名</value>
   </data>
-  <data name="gboxPerson1.Text" xml:space="preserve">
+  <data name="gboxPerson2.Text" xml:space="preserve">
-    <value>担当者1</value>
+    <value>担当者2</value>
   </data>
   <data name="labArbit2.Size" type="System.Drawing.Size, System.Drawing">
     <value>37, 12</value>
@@ -442,8 +439,8 @@
   <data name="labCompany1.Text" xml:space="preserve">
     <value>貴社名</value>
   </data>
-  <data name="gboxUsage.Text" xml:space="preserve">
+  <data name="gboxPerson1.Text" xml:space="preserve">
-    <value>目的</value>
+    <value>担当者1</value>
   </data>
   <data name="rUsageOther.Size" type="System.Drawing.Size, System.Drawing">
     <value>54, 16</value>
@@ -469,8 +466,8 @@
   <data name="rUsageSale.Text" xml:space="preserve">
     <value>一般販売用</value>
   </data>
-  <data name="gboxSubmitWay.Text" xml:space="preserve">
+  <data name="gboxUsage.Text" xml:space="preserve">
-    <value>提出方法</value>
+    <value>目的</value>
   </data>
   <data name="rSubmitHand.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 16</value>
@@ -484,6 +481,9 @@
   <data name="rSubmitPost.Text" xml:space="preserve">
     <value>郵送</value>
   </data>
+  <data name="gboxSubmitWay.Text" xml:space="preserve">
+    <value>提出方法</value>
+  </data>
   <data name="labSubmiteDate.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 12</value>
   </data>
@@ -544,15 +544,15 @@
   <data name="labProductCodeForeign.Text" xml:space="preserve">
     <value>製品コード</value>
   </data>
-  <data name="gboxShared2Size.Text" xml:space="preserve">
-    <value>Shared2ファイルサイズ</value>
-  </data>
   <data name="cboxIsShared2.Size" type="System.Drawing.Size, System.Drawing">
     <value>123, 16</value>
   </data>
   <data name="cboxIsShared2.Text" xml:space="preserve">
     <value>Shared2ファイル使用</value>
   </data>
+  <data name="gboxShared2Size.Text" xml:space="preserve">
+    <value>Shared2ファイルサイズ</value>
+  </data>
   <data name="labLib.Size" type="System.Drawing.Size, System.Drawing">
     <value>70, 12</value>
   </data>
@@ -565,15 +565,15 @@
   <data name="labSDK.Text" xml:space="preserve">
     <value>SDKバージョン</value>
   </data>
-  <data name="gboxTWLExInfo.Text" xml:space="preserve">
-    <value>TWL拡張情報</value>
-  </data>
   <data name="labKeyTableRomOffset.Size" type="System.Drawing.Size, System.Drawing">
     <value>142, 12</value>
   </data>
   <data name="labKeyTableRomOffset.Text" xml:space="preserve">
     <value>TWL専用領域ROMオフセット</value>
   </data>
+  <data name="gboxTWLExInfo.Text" xml:space="preserve">
+    <value>TWL拡張情報</value>
+  </data>
   <data name="labNormalRomOffset.Size" type="System.Drawing.Size, System.Drawing">
     <value>155, 12</value>
   </data>
@@ -610,9 +610,6 @@
   <data name="cboxIsTmpJump.Text" xml:space="preserve">
     <value>tmpジャンプ許可</value>
   </data>
-  <data name="gboxAccess.Text" xml:space="preserve">
-    <value>アクセスコントロール情報</value>
-  </data>
   <data name="labIsGameCardOn2.Size" type="System.Drawing.Size, System.Drawing">
     <value>98, 12</value>
   </data>
@@ -640,8 +637,11 @@
   <data name="cboxIsSD.Text" xml:space="preserve">
     <value>SDカード</value>
   </data>
+  <data name="gboxAccess.Text" xml:space="preserve">
+    <value>アクセスコントロール情報</value>
+  </data>
   <data name="labMedia.Location" type="System.Drawing.Point, System.Drawing">
-    <value>260, 62</value>
+    <value>236, 62</value>
   </data>
   <data name="labMedia.Size" type="System.Drawing.Size, System.Drawing">
     <value>74, 12</value>
@@ -658,12 +658,6 @@
   <data name="gboxProd.Text" xml:space="preserve">
     <value>ROM提出情報</value>
   </data>
-  <data name="stripFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 20</value>
-  </data>
-  <data name="stripFile.Text" xml:space="preserve">
-    <value>ファイル</value>
-  </data>
   <data name="stripItemOpenRom.Size" type="System.Drawing.Size, System.Drawing">
     <value>211, 22</value>
   </data>
@@ -685,11 +679,11 @@
   <data name="stripItemLoadTemp.Text" xml:space="preserve">
     <value>一時保存した提出情報を開く</value>
   </data>
-  <data name="stripMaster.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="stripFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 20</value>
+    <value>51, 20</value>
   </data>
-  <data name="stripMaster.Text" xml:space="preserve">
+  <data name="stripFile.Text" xml:space="preserve">
-    <value>マスター</value>
+    <value>ファイル</value>
   </data>
   <data name="stripItemSheet.Size" type="System.Drawing.Size, System.Drawing">
     <value>280, 22</value>
@@ -718,17 +712,17 @@
   <data name="stripItemMiddlewareHtml.Text" xml:space="preserve">
     <value>ミドルウェアリストのみを作成する(HTML形式)</value>
   </data>
-  <data name="tabRomInfo.Text" xml:space="preserve">
+  <data name="stripMaster.Size" type="System.Drawing.Size, System.Drawing">
-    <value>ROM基本情報</value>
+    <value>53, 20</value>
+  </data>
+  <data name="stripMaster.Text" xml:space="preserve">
+    <value>マスター</value>
   </data>
   <data name="tboxGuideRomInfo.Text" xml:space="preserve">
     <value>このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。</value>
   </data>
-  <data name="tabTWLInfo.Text" xml:space="preserve">
+  <data name="tabRomInfo.Text" xml:space="preserve">
-    <value>TWL拡張情報</value>
+    <value>ROM基本情報</value>
-  </data>
-  <data name="gboxLaunch.Text" xml:space="preserve">
-    <value>DSiメニュー上での起動制限</value>
   </data>
   <data name="labConnectIcon.Size" type="System.Drawing.Size, System.Drawing">
     <value>173, 12</value>
@@ -736,20 +730,68 @@
   <data name="labConnectIcon.Text" xml:space="preserve">
     <value>DSiメニュー上での通信アイコン表示</value>
   </data>
+  <data name="gboxLaunch.Text" xml:space="preserve">
+    <value>DSiメニュー上での起動制限</value>
+  </data>
   <data name="tboxGuideTWLInfo.Text" xml:space="preserve">
     <value>このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。</value>
   </data>
   <data name="gboxExFlags.Text" xml:space="preserve">
     <value>TWL拡張諸フラグ</value>
   </data>
-  <data name="tabNandSizeInfo.Text" xml:space="preserve">
+  <data name="tabTWLInfo.Text" xml:space="preserve">
-    <value>NAND使用サイズ</value>
+    <value>TWL拡張情報</value>
+  </data>
+  <data name="cboxIsUGC.Size" type="System.Drawing.Size, System.Drawing">
+    <value>210, 16</value>
+  </data>
+  <data name="cboxIsUGC.Text" xml:space="preserve">
+    <value>UGC(User Generated Contents)対応</value>
+  </data>
+  <data name="cboxIsPhotoEx.Size" type="System.Drawing.Size, System.Drawing">
+    <value>96, 16</value>
+  </data>
+  <data name="cboxIsPhotoEx.Text" xml:space="preserve">
+    <value>写真交換対応</value>
+  </data>
+  <data name="gboxOtherSpec.Text" xml:space="preserve">
+    <value>その他ROM仕様</value>
+  </data>
+  <data name="butSetBack.Text" xml:space="preserve">
+    <value>読み込み時の設定に戻す</value>
+  </data>
+  <data name="tboxGuideRomEditInfo.Text" xml:space="preserve">
+    <value>このタブの各項目への入力は提出確認書およびマスターROMの作成のために必要です。&lt;newline&gt;これらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM仕様」を除く)。</value>
+  </data>
+  <data name="cboxIsUnnecessaryRating.Size" type="System.Drawing.Size, System.Drawing">
+    <value>235, 16</value>
+  </data>
+  <data name="cboxIsUnnecessaryRating.Text" xml:space="preserve">
+    <value>レーティング表示不要 (ツール類のみ選択可)</value>
+  </data>
+  <data name="gboxParental.Text" xml:space="preserve">
+    <value>リージョンとレーティング情報</value>
+  </data>
+  <data name="tabRomEditInfo.Text" xml:space="preserve">
+    <value>リージョンとレーティング(編集可)</value>
+  </data>
+  <data name="tboxGuideDLCategory.Text" xml:space="preserve">
+    <value>メディアがNANDの場合、DSiショップでの販売カテゴリを選択してください。</value>
+  </data>
+  <data name="combDLCategory.Items" xml:space="preserve">
+    <value>無料</value>
+  </data>
+  <data name="combDLCategory.Items4" xml:space="preserve">
+    <value>なし</value>
+  </data>
+  <data name="combDLCategory.Items5" xml:space="preserve">
+    <value>その他</value>
+  </data>
+  <data name="gboxDLCategory.Text" xml:space="preserve">
+    <value>DSi Wareの販売カテゴリ</value>
   </data>
   <data name="tboxGuideNandSizeInfo.Text" xml:space="preserve">
-    <value>このタブの情報はNANDアプリによって使用されるTWL本体内のNAND領域のサイズを確認する場合に必要です。&lt;newline&gt;アプリがゲームカード向けの場合にはNAND使用サイズの確認は必要ありません。</value>
+    <value>このタブの情報はDSi Ware(NANDアプリ)によって使用されるTWL本体内のNAND領域のサイズを確認する場合に必要です。&lt;newline&gt;アプリがゲームカード向けの場合にはNAND使用サイズの確認は必要ありません。</value>
-  </data>
-  <data name="gboxNandSize.Text" xml:space="preserve">
-    <value>NANDアプリによって使用されるNAND領域のサイズ</value>
   </data>
   <data name="labShopBlockUnit.Size" type="System.Drawing.Size, System.Drawing">
     <value>38, 12</value>
@@ -832,41 +874,11 @@
   <data name="labTmdSize.Text" xml:space="preserve">
     <value>その他ファイルサイズ</value>
   </data>
-  <data name="tabRomEditInfo.Text" xml:space="preserve">
+  <data name="gboxNandSize.Text" xml:space="preserve">
-    <value>リージョンとレーティング(編集可)</value>
+    <value>DSi Wareによって使用されるNAND領域のサイズ</value>
   </data>
-  <data name="gboxOtherSpec.Text" xml:space="preserve">
+  <data name="tabNandSizeInfo.Text" xml:space="preserve">
-    <value>その他ROM仕様</value>
+    <value>DSi Ware(一部要入力)</value>
-  </data>
-  <data name="cboxIsUGC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>210, 16</value>
-  </data>
-  <data name="cboxIsUGC.Text" xml:space="preserve">
-    <value>UGC(User Generated Contents)対応</value>
-  </data>
-  <data name="cboxIsPhotoEx.Size" type="System.Drawing.Size, System.Drawing">
-    <value>96, 16</value>
-  </data>
-  <data name="cboxIsPhotoEx.Text" xml:space="preserve">
-    <value>写真交換対応</value>
-  </data>
-  <data name="butSetBack.Text" xml:space="preserve">
-    <value>読み込み時の設定に戻す</value>
-  </data>
-  <data name="tboxGuideRomEditInfo.Text" xml:space="preserve">
-    <value>このタブの各項目への入力は提出確認書およびマスターROMの作成のために必要です。&lt;newline&gt;これらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM仕様」を除く)。</value>
-  </data>
-  <data name="gboxParental.Text" xml:space="preserve">
-    <value>リージョンとレーティング情報</value>
-  </data>
-  <data name="cboxIsUnnecessaryRating.Size" type="System.Drawing.Size, System.Drawing">
-    <value>235, 16</value>
-  </data>
-  <data name="cboxIsUnnecessaryRating.Text" xml:space="preserve">
-    <value>レーティング表示不要 (ツール類のみ選択可)</value>
-  </data>
-  <data name="tabSubmitInfo.Text" xml:space="preserve">
-    <value>提出情報(編集可)</value>
   </data>
   <data name="labProductNameLimit.Text" xml:space="preserve">
     <value>(30文字以内)</value>
@@ -874,9 +886,6 @@
   <data name="tboxGuideSubmitInfo.Text" xml:space="preserve">
     <value>このタブの情報は提出確認書の作成に必要です。入力してください。</value>
   </data>
-  <data name="gboxForeign.Text" xml:space="preserve">
-    <value>海外版</value>
-  </data>
   <data name="labProductNameLimitForeign.Text" xml:space="preserve">
     <value>(30文字以内)</value>
   </data>
@@ -886,21 +895,21 @@
   <data name="labMultiForeign2.Text" xml:space="preserve">
     <value>(複数ある場合のみ)</value>
   </data>
-  <data name="tabCompanyInfo.Text" xml:space="preserve">
+  <data name="gboxForeign.Text" xml:space="preserve">
-    <value>会社情報(編集可)</value>
+    <value>海外版</value>
+  </data>
+  <data name="tabSubmitInfo.Text" xml:space="preserve">
+    <value>提出情報(要入力)</value>
   </data>
   <data name="tboxGuideCompanyInfo.Text" xml:space="preserve">
     <value>このタブの情報は提出確認書の作成に必要です。入力してください。</value>
   </data>
-  <data name="tabErrorInfo.Text" xml:space="preserve">
+  <data name="tabCompanyInfo.Text" xml:space="preserve">
-    <value>エラー情報</value>
+    <value>会社情報(要入力)</value>
   </data>
   <data name="tboxGuideErrorInfo.Text" xml:space="preserve">
     <value>このタブには読み込んだROMデータの問題と本プログラムでの入力ミスが列挙されます。&lt;newline&gt;赤文字の項目は、本プログラムで修正不可です。ROMデータ作成時の設定をご確認ください。&lt;newline&gt;青文字の項目は、本プログラムで修正できますが、修正がマスターROMに反映されます。&lt;newline&gt;黒文字の項目は、提出確認書にのみ反映され、マスターROMには反映されません。</value>
   </data>
-  <data name="gboxErrorTiming.Text" xml:space="preserve">
-    <value>いつの情報を表示するか</value>
-  </data>
   <data name="rErrorCurrent.Size" type="System.Drawing.Size, System.Drawing">
     <value>114, 16</value>
   </data>
@@ -913,6 +922,9 @@
   <data name="rErrorReading.Text" xml:space="preserve">
     <value>ROMデータ読み込み時</value>
   </data>
+  <data name="gboxErrorTiming.Text" xml:space="preserve">
+    <value>いつの情報を表示するか</value>
+  </data>
   <data name="labWarn.Size" type="System.Drawing.Size, System.Drawing">
     <value>339, 12</value>
   </data>
@@ -949,6 +961,9 @@
   <data name="colErrorCause.HeaderText" xml:space="preserve">
     <value>要因</value>
   </data>
+  <data name="tabErrorInfo.Text" xml:space="preserve">
+    <value>エラー情報</value>
+  </data>
   <data name="labFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>92, 12</value>
   </data>

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp

@@ -81,8 +81,8 @@ void Form1::construct(void)
 	}
 
 	// 複数行表示の改行を挿入
-	this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "<newline>", "\r\n" );
 	this->tboxGuideRomEditInfo->Text  = this->tboxGuideRomEditInfo->Text->Replace( "<newline>", "\r\n" );
+	this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "<newline>", "\r\n" );
 	this->tboxGuideErrorInfo->Text    = this->tboxGuideErrorInfo->Text->Replace( "<newline>", "\r\n" );
 
 	// 言語バージョンにあわせてメニューにチェックを入れる

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( "<newline>", "\r\n" );
 	this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "<newline>", "\r\n" );
+	this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "<newline>", "\r\n" );
 	this->tboxGuideErrorInfo->Text   = this->tboxGuideErrorInfo->Text->Replace( "<newline>", "\r\n" );
 
 	// バージョンがなくなるので再設定

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->tboxSrlSizeFS->Text       = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->SrlSizeRoundUp );
-	this->tboxPublicSizeFS->Text    = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->PublicSaveSizeRoundUp );
+	this->tboxPublicSizeFS->Text    = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->PublicSaveSizeRoundUp );
-	this->tboxPrivateSizeFS->Text   = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->PrivateSaveSizeRoundUp );
+	this->tboxPrivateSizeFS->Text   = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->PrivateSaveSizeRoundUp );
-	this->tboxSubBannerSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->SubBannerSizeRoundUp );
+	this->tboxSubBannerSizeFS->Text = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->SubBannerSizeRoundUp );
-	this->tboxTmdSizeFS->Text       = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->TmdSizeRoundUp );
+	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()
 
 // ----------------------------------------------

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()
 
 // ----------------------------------------------

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");
+}
+
 // ----------------------------------------------------------------------
 // 各レーティング団体の設定可能年齢を取得する
 //

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引数で小数点桁数を指定(それ以下の桁は切り上げ)
 
 	//
 	// 各レーティング団体の設定可能年齢を取得する