Privateセーブデータの用途欄を追加．

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

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

@@ -1085,7 +1085,7 @@
     <value>その他アプリ情報</value>
   </data>
   <data name="labMedia.Location" type="System.Drawing.Point, System.Drawing">
-    <value>245, 103</value>
+    <value>252, 103</value>
   </data>
   <data name="labMedia.Size" type="System.Drawing.Size, System.Drawing">
     <value>88, 12</value>
@@ -1267,6 +1267,15 @@
   <data name="gboxNandSize.Text" xml:space="preserve">
     <value>DSiウェアによる本体NANDメモリの使用量</value>
   </data>
+  <data name="labPrivateSaveDataPurpose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>144, 12</value>
+  </data>
+  <data name="labPrivateSaveDataPurpose.Text" xml:space="preserve">
+    <value>Privateセーブデータの用途</value>
+  </data>
+  <data name="tboxPrivateSaveDataPurpose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>250, 19</value>
+  </data>
   <data name="tboxSumSizeMB.Size" type="System.Drawing.Size, System.Drawing">
     <value>94, 19</value>
   </data>

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp

@@ -253,6 +253,22 @@ void Form1::setDeliverableProperties(void)
 	// SRLには登録されないROM仕様
 	this->hDeliv->IsUGC     = this->cboxIsUGC->Checked;
 	this->hDeliv->IsPhotoEx = this->cboxIsPhotoEx->Checked;
+
+	if( !this->tboxPrivateSaveDataPurpose->Enabled )
+	{
+		if( this->isJapanese() )
+		{
+			this->hDeliv->hPrivateSaveDataPurpose = "‚È‚µ";
+		}
+		else
+		{
+			this->hDeliv->hPrivateSaveDataPurpose = "None";
+		}
+	}
+	else
+	{
+		this->hDeliv->hPrivateSaveDataPurpose = this->tboxPrivateSaveDataPurpose->Text;
+	}
 }
 
 // ----------------------------------------------
@@ -375,6 +391,11 @@ System::Boolean Form1::checkDeliverableForms(void)
 		this->checkTextForm( this->tboxBackupOther->Text, "LabelBackup" );
 	}
 
+	if( this->tboxPrivateSaveDataPurpose->Enabled )
+	{
+		this->checkTextForm( this->tboxPrivateSaveDataPurpose->Text, "PrivateSaveDataPurposeTitle", "PrivateSaveDataPurposeMsg" );
+	}
+
 	// ひととおりエラー登録をした後で
 	// 書類上のエラー(SRLバイナリには影響しない)が存在するかチェック
 	return this->isValidOnlyDeliverable();

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp

@@ -492,6 +492,8 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname )
 	resources->ApplyResources(this->gboxPurposeNand, L"gboxPurposeNand");
 	resources->ApplyResources(this->gboxPurpose, L"gboxPurpose");
 	resources->ApplyResources(this->labPurposeInError, L"labPurposeInError");
+	resources->ApplyResources(this->labPrivateSaveDataPurpose, L"labPrivateSaveDataPurpose");
+	resources->ApplyResources(this->tboxWarningPrivateSaveDataPurpose, L"tboxWarningPrivateSaveDataPurpose");
 	resources->ApplyResources(this, L"$this");
 
 	// テキストボックスの表記を変更
@@ -528,6 +530,19 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname )
 		this->unnecessaryRating( this->combGRB );
 	}
 
+	// 「Privateセーブデータの用途」欄の表示切り替え
+	if( !this->tboxPrivateSaveDataPurpose->Enabled )
+	{
+		if( this->isJapanese() )
+		{
+			this->tboxPrivateSaveDataPurpose->Text = "なし";
+		}
+		else
+		{
+			this->tboxPrivateSaveDataPurpose->Text = "None";
+		}
+	}
+
 	// フォームのEnableやVisibleを切り替え
 	this->changeFormInput( langname );
 

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp

@@ -162,6 +162,24 @@ void Form1::setSrlForms(void)
 	//this->tboxSumSizeMB->Text       = MasterEditorTWL::transSizeToStringMB( this->hSrl->hNandUsedSize->NandUsedSize, 2 );
 	this->tboxSumSizeMB->Text       = MasterEditorTWL::transSizeToStringMB( this->hSrl->hNandUsedSize->NandUsedSize );
 
+	// Privateセーブデータの用途
+	if( this->hSrl->IsMediaNand && (this->hSrl->hNandUsedSize->PrivateSaveSize != 0) )
+	{
+		this->tboxPrivateSaveDataPurpose->Enabled = true;
+	}
+	else
+	{
+		this->tboxPrivateSaveDataPurpose->Enabled = false;
+		if( this->isJapanese() )
+		{
+			this->tboxPrivateSaveDataPurpose->Text = "なし";
+		}
+		else
+		{
+			this->tboxPrivateSaveDataPurpose->Text = "None";
+		}
+	}
+
 	// アプリ種別
 	if( this->hSrl->IsMediaNand )
 	{

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp

@@ -36,6 +36,21 @@ System::Boolean Form1::checkTextForm( System::String ^formtext, System::String ^
 	}
 	return true;
 }
+System::Boolean Form1::checkTextForm( System::String ^formtext, System::String ^title_tag, System::String ^msg_tag )
+{
+	System::String ^tmp = formtext->Replace( " ", "" );		// スペースのみの文字列もエラー
+	if( (formtext == nullptr) || formtext->Equals("") || tmp->Equals("") )
+	{
+		System::String ^labelJ = this->hMsg->getMessage(title_tag,"J");
+		System::String ^labelE = this->hMsg->getMessage(title_tag,"E");
+		System::String ^msgJ = this->hMsg->getMessage(msg_tag, "J");
+		System::String ^msgE = this->hMsg->getMessage(msg_tag, "E");
+		this->hErrorList->Add( gcnew RCMrcError( labelJ, 0, 0, msgJ, labelE, msgE, true, false, RCMrcError::PurposeType::Common ) );
+		return false;
+	}
+	return true;
+}
+
 // 数値入力が正常かどうかチェック
 System::Boolean Form1::checkNumRange( System::Int32 val, System::Int32 min, System::Int32 max, System::String ^tag )
 {

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h

@@ -105,6 +105,9 @@ namespace MasterEditorTWL
 		property System::Boolean  IsUGC;
 		property System::Boolean  IsPhotoEx;
 
+		// Privateセーブデータの用途
+		property System::String ^hPrivateSaveDataPurpose;
+
 		// プログラムのバージョン
 		property System::String  ^hMasterEditorVersion;
 

build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml

@@ -129,4 +129,7 @@ Exception:{0}
 <RatingPendingSelect>{0}: A "Rating Pending" has been specified. Re-submit when examination is finished.</RatingPendingSelect>
 <RatingUnnecessarySelect>Selected if rating does not need to be shown. This choice can only be selected when the software is a kind of tool and not a game. Contact support@noa.com to determine if the rating does not need to be displayed.</RatingUnnecessarySelect>
 
+<PrivateSaveDataPurposeTitle>Privateセーブデータの用途</PrivateSaveDataPurposeTitle>
+<PrivateSaveDataPurposeMsg>Privateセーブデータを使用する場合には、用途欄に理由、用途を明記してください。</PrivateSaveDataPurposeMsg>
+
 </message>

build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_j.xml

@@ -129,4 +129,7 @@
 <RatingPendingSelect>{0}: 審査中であると指定されています。審査が決まりしだい、再提出してください。</RatingPendingSelect>
 <RatingUnnecessarySelect>レーティング表示が不要であると設定されています。この指定は、ソフトがゲームでないツール類のときのみ選択可能です。レーティング表示が不要であるかどうかは弊社窓口にご相談ください。</RatingUnnecessarySelect>
 
+<PrivateSaveDataPurposeTitle>Privateセーブデータの用途</PrivateSaveDataPurposeTitle>
+<PrivateSaveDataPurposeMsg>Privateセーブデータを使用する場合には、用途欄に理由、用途を明記してください。</PrivateSaveDataPurposeMsg>
+
 </message>