マスタエディタ:

・仕向地コードのコンボボックスを削除。提出確認書からも削除。
・英語のときにふりがなとNTSCのラベルを非表示にする。
・英語のときに一時情報の読み込み時に入力不可の項目が入力可になってしまう問題を修正。

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

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

@@ -35,7 +35,6 @@ void Form1::setDeliverableProperties(void)
 	this->hDeliv->hProductName     = this->tboxProductName->Text;
 	this->hDeliv->hProductCode1    = this->tboxProductCode1->Text;
 	this->hDeliv->hProductCode2    = this->tboxProductCode2->Text;
-	this->hDeliv->hCountryCode     = this->combCountryCode->SelectedItem->ToString();
 	this->hDeliv->IsReleaseForeign = this->cboxReleaseForeign->Checked;
 	if( this->cboxReleaseForeign->Checked == true )
 	{
@@ -296,7 +295,6 @@ System::Boolean Form1::checkDeliverableForms(void)
 	this->checkTextForm( this->tboxProductName->Text, "LabelProductName" );	// SRL作成には問題のないエラー
 	this->checkTextForm( this->tboxProductCode1->Text, "LabelProductCode" );
 	this->checkTextForm( this->tboxProductCode2->Text, "LabelProductCode" );
-	this->checkComboBoxIndex( this->combCountryCode, "LabelCountryCode", false );
 	if( this->cboxReleaseForeign->Checked == true )
 	{
 		this->checkTextForm( this->tboxProductNameForeign->Text, "LabelProductNameForeign" );

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

@@ -46,6 +46,14 @@ void Form1::changeFormInput( System::String ^langname )
 		this->tboxNTSC1->Enabled     = true;
 		this->tboxFurigana2->Enabled = true;
 		this->tboxNTSC2->Enabled     = true;
+		this->labFurigana1->Visible  = true;
+		this->labNTSC1Pre->Visible   = true;
+		this->labNTSC1Sur->Visible   = true;
+		this->labFurigana2->Visible  = true;
+		this->labNTSC2Pre->Visible   = true;
+		this->labNTSC2Sur->Visible   = true;
+		this->labArbit2->Visible     = true;
+		this->labArbit4->Visible     = true;
 
 		// 日本ではInternet提出を認めない
 		if( this->rSubmitInternet->Checked )
@@ -70,6 +78,14 @@ void Form1::changeFormInput( System::String ^langname )
 		this->tboxNTSC1->Enabled     = false;
 		this->tboxFurigana2->Enabled = false;
 		this->tboxNTSC2->Enabled     = false;
+		this->labFurigana1->Visible  = false;
+		this->labNTSC1Pre->Visible   = false;
+		this->labNTSC1Sur->Visible   = false;
+		this->labFurigana2->Visible  = false;
+		this->labNTSC2Pre->Visible   = false;
+		this->labNTSC2Sur->Visible   = false;
+		this->labArbit2->Visible     = false;
+		this->labArbit4->Visible     = false;
 
 		this->rSubmitInternet->Enabled = true;
 		this->rSubmitInternet->Visible = true;

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp

@@ -47,7 +47,6 @@ System::Void Form1::saveTmp( System::String ^filename )
 	MasterEditorTWL::appendXmlTag( doc, form, "ProductName", this->tboxProductName->Text );
 	MasterEditorTWL::appendXmlTag( doc, form, "ProductCode1", this->tboxProductCode1->Text );
 	MasterEditorTWL::appendXmlTag( doc, form, "ProductCode2", this->tboxProductCode2->Text );
-	MasterEditorTWL::appendXmlTag( doc, form, "CountryCode", this->combCountryCode->SelectedIndex.ToString() );
 	MasterEditorTWL::appendXmlTag( doc, form, "ProductNameForeign", this->tboxProductNameForeign->Text );
 	MasterEditorTWL::appendXmlTag( doc, form, "ProductCode1Foreign", this->tboxProductCode1Foreign->Text );
 	MasterEditorTWL::appendXmlTag( doc, form, "ProductCode2Foreign1", this->tboxProductCode2Foreign1->Text );
@@ -145,26 +144,10 @@ void Form1::loadTmp( System::String ^filename )
 		}
 	}
 
-	// Œ¾Œê
-	text = MasterEditorTWL::getXPathText( root, "/MasterEditorTWL/Lang" );
-	if( !System::String::IsNullOrEmpty(text) && text->Equals("E") )
-	{
-		this->stripItemEnglish->Checked  = true;
-		this->stripItemJapanese->Checked = false;
-		this->changeEnglish();
-	}
-	else
-	{
-		this->stripItemEnglish->Checked  = false;
-		this->stripItemJapanese->Checked = true;
-		this->changeJapanese();
-	}
-
 	// フォーム
 	this->parseTmp( root, "/MasterEditorTWL/Form/ProductName", this->tboxProductName );
 	this->parseTmp( root, "/MasterEditorTWL/Form/ProductCode1", this->tboxProductCode1 );
 	this->parseTmp( root, "/MasterEditorTWL/Form/ProductCode2", this->tboxProductCode2 );
-	this->parseTmp( root, "/MasterEditorTWL/Form/CountryCode", this->combCountryCode );
 	this->parseTmp( root, "/MasterEditorTWL/Form/SubmitVersion", this->numSubmitVersion );
 	this->parseTmp( root, "/MasterEditorTWL/Form/ReleaseDate", this->dateRelease );
 	this->parseTmp( root, "/MasterEditorTWL/Form/SubmitDate",  this->dateSubmit );
@@ -296,6 +279,21 @@ void Form1::loadTmp( System::String ^filename )
 	this->parseTmp( root, "/MasterEditorTWL/Form/IsUGC", this->cboxIsUGC );
 	this->parseTmp( root, "/MasterEditorTWL/Form/IsPhotoEx", this->cboxIsPhotoEx );
 
+	// Œ¾Œê
+	text = MasterEditorTWL::getXPathText( root, "/MasterEditorTWL/Lang" );
+	if( !System::String::IsNullOrEmpty(text) && text->Equals("E") )
+	{
+		this->stripItemEnglish->Checked  = true;
+		this->stripItemJapanese->Checked = false;
+		this->changeEnglish();
+	}
+	else
+	{
+		this->stripItemEnglish->Checked  = false;
+		this->stripItemJapanese->Checked = true;
+		this->changeJapanese();
+	}
+
 	this->maskRatingForms();	// ペアレンタルコントロール情報をリージョンに合わせる
 	this->changeUnnecessaryRatingForms(true);	// 一度コンボボックスがenableになるので再設定
 	this->maskBackupMemoryForms();				// NANDアプリのときのバックアップメモリの自動設定

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp

@@ -157,10 +157,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet(
 			{
 				node->FirstChild->Value = this->hProductCode2;
 			}
-			if( node->FirstChild->Value->Equals( "TagCountryCode" ) )
-			{
-				node->FirstChild->Value = this->hCountryCode;
-			}
 			if( node->FirstChild->Value->Equals( "TagReleaseForeign" ) )
 			{
 				if( this->IsReleaseForeign )

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

@@ -45,7 +45,6 @@ namespace MasterEditorTWL
 		property System::String ^hProductName;		// 製品名
 		property System::String ^hProductCode1;		// 製品コード
 		property System::String ^hProductCode2;		// 製品コード
-		property System::String ^hCountryCode;		// 国コード
 		property System::Int32   ReleaseYear;		// 発売予定日
 		property System::Int32   ReleaseMonth;
 		property System::Int32   ReleaseDay;

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj

@@ -4,9 +4,9 @@
 "ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
 "IsWebType" = "8:FALSE"
 "ProjectName" = "8:MasterEditorTWLSetup"
-"LanguageId" = "3:1041"
+"LanguageId" = "3:0"
-"CodePage" = "3:932"
+"CodePage" = "3:1252"
-"UILanguageId" = "3:1041"
+"UILanguageId" = "3:0"
 "SccProjectName" = "8:"
 "SccLocalPath" = "8:"
 "SccAuxPath" = "8:"
@@ -21,12 +21,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_2AD05C0A1E52441597D15CAAAF745B3A"
-        "OwnerKey" = "8:_8F5FF58428C449DE9B2A3CB4C4665D0C"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_351447BE85794AA58330AD369D8A545D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -75,12 +69,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_8F5FF58428C449DE9B2A3CB4C4665D0C"
-        "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_A3417E9C9F294832AE49B5BDAF95E373"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -97,24 +85,6 @@
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_BFEA9BAA0DBF4332913A71EDE89FC3CD"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_7DAFD42678FC4D69A3A6BC6E6726AB10"
-        "MsmSig" = "8:_UNDEFINED"
-        }
     }
     "Configurations"
     {
@@ -545,7 +515,7 @@
         }
         "MsiBootstrapper"
         {
-        "LangId" = "3:1041"
+        "LangId" = "3:0"
         "RequiresElevation" = "11:FALSE"
         }
         "Product"
@@ -1082,34 +1052,6 @@
         }
         "MergeModule"
         {
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_2AD05C0A1E52441597D15CAAAF745B3A"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:microsoft_vc90_crt_x86.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_8F5FF58428C449DE9B2A3CB4C4665D0C"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
         }
         "ProjectOutput"
         {