マスタエディタ:国コードのコンボボックスを新規に追加。

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

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

@@ -35,6 +35,7 @@ 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 )
 	{
@@ -300,6 +301,7 @@ System::Boolean Form1::checkDeliverableForms(void)
 	{
 		this->checkTextForm( this->tboxUsageOther->Text, LANG_USAGE_J, LANG_USAGE_E, false );
 	}
+	this->checkBoxIndex( this->combCountryCode, LANG_PRODUCT_CODE_J, LANG_PRODUCT_CODE_E, false );
 
 	// ‰ïŽÐ<C5BD>î•ñ
 	this->checkTextForm( this->tboxPerson1->Text, LANG_PERSON_J, LANG_PERSON_E, false );

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

@@ -47,6 +47,7 @@ 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 );
@@ -163,6 +164,7 @@ void Form1::loadTmp( System::String ^filename )
 	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 );

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

@@ -157,6 +157,10 @@ 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,6 +45,7 @@ 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;