用途の項目を変更。

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

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

@@ -929,7 +929,7 @@
     <value>11, 12</value>
   </data>
   <data name="labNormalRomOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>268, 159</value>
+    <value>268, 167</value>
   </data>
   <data name="labNormalRomOffset.Size" type="System.Drawing.Size, System.Drawing">
     <value>168, 12</value>
@@ -1028,7 +1028,7 @@
     <value>SDカード</value>
   </data>
   <data name="labIsGameCardOn2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>294, 381</value>
+    <value>294, 398</value>
   </data>
   <data name="labIsGameCardOn2.Size" type="System.Drawing.Size, System.Drawing">
     <value>97, 14</value>
@@ -1040,7 +1040,7 @@
     <value>124, 19</value>
   </data>
   <data name="labIsGameCardOn.Location" type="System.Drawing.Point, System.Drawing">
-    <value>287, 398</value>
+    <value>289, 413</value>
   </data>
   <data name="labIsGameCardOn.Size" type="System.Drawing.Size, System.Drawing">
     <value>114, 12</value>
@@ -1208,7 +1208,7 @@
     <value>4, 21</value>
   </data>
   <data name="tabRomInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>772, 423</value>
+    <value>772, 468</value>
   </data>
   <data name="tabRomInfo.Text" xml:space="preserve">
     <value>ROM基本情報</value>
@@ -1223,7 +1223,7 @@
     <value>4, 21</value>
   </data>
   <data name="tabTWLInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>772, 423</value>
+    <value>772, 468</value>
   </data>
   <data name="tabTWLInfo.Text" xml:space="preserve">
     <value>TWL拡張情報</value>
@@ -1256,7 +1256,7 @@
     <value>4, 21</value>
   </data>
   <data name="tabNandSizeInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>772, 423</value>
+    <value>772, 468</value>
   </data>
   <data name="tabNandSizeInfo.Text" xml:space="preserve">
     <value>DSiウェア情報</value>
@@ -1379,7 +1379,7 @@
     <value>4, 21</value>
   </data>
   <data name="tabRomEditInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>772, 423</value>
+    <value>772, 468</value>
   </data>
   <data name="tabRomEditInfo.Text" xml:space="preserve">
     <value>リージョンとレーティング(編集可)</value>
@@ -1442,7 +1442,7 @@
     <value>4, 21</value>
   </data>
   <data name="tabSubmitInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>772, 423</value>
+    <value>772, 468</value>
   </data>
   <data name="tabSubmitInfo.Text" xml:space="preserve">
     <value>提出情報(要入力)</value>
@@ -1450,23 +1450,35 @@
   <data name="gboxPurpose.Text" xml:space="preserve">
     <value>用途</value>
   </data>
-  <data name="gboxPurposeNetwork.Text" xml:space="preserve">
+  <data name="gboxPurposeNand.Text" xml:space="preserve">
-    <value>ネットワーク配信ソフト</value>
+    <value>DSiWare (NANDアプリ)</value>
   </data>
-  <data name="rPurposeDSStation.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="rPurposeNandShop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>92, 16</value>
+    <value>152, 16</value>
   </data>
-  <data name="rPurposeDSStation.Text" xml:space="preserve">
+  <data name="rPurposeNandShop.Text" xml:space="preserve">
-    <value>Touch!Try!DS</value>
+    <value>DSiショップ配信用体験版</value>
+  </data>
+  <data name="rPurposeNandDSCentre.Size" type="System.Drawing.Size, System.Drawing">
+    <value>123, 16</value>
+  </data>
+  <data name="rPurposeNandDSCentre.Text" xml:space="preserve">
+    <value>DS CENTRE体験版</value>
+  </data>
+  <data name="rPurposeNandTouchTryDS.Size" type="System.Drawing.Size, System.Drawing">
+    <value>128, 16</value>
+  </data>
+  <data name="rPurposeNandTouchTryDS.Text" xml:space="preserve">
+    <value>Touch!Try!DS体験版</value>
   </data>
   <data name="rPurposeZone.Size" type="System.Drawing.Size, System.Drawing">
     <value>97, 16</value>
   </data>
   <data name="rPurposeDSiWare.Size" type="System.Drawing.Size, System.Drawing">
-    <value>72, 16</value>
+    <value>120, 16</value>
   </data>
   <data name="rPurposeDSiWare.Text" xml:space="preserve">
-    <value>DSiウェア</value>
+    <value>DSiウェア一般販売</value>
   </data>
   <data name="tboxPurposeOther.Size" type="System.Drawing.Size, System.Drawing">
     <value>349, 19</value>
@@ -1478,13 +1490,25 @@
     <value>その他</value>
   </data>
   <data name="gboxPurposeCard.Text" xml:space="preserve">
-    <value>カード生産ソフト</value>
+    <value>TWLカードアプリ</value>
+  </data>
+  <data name="rPurposeCardDSCentre.Size" type="System.Drawing.Size, System.Drawing">
+    <value>123, 16</value>
+  </data>
+  <data name="rPurposeCardDSCentre.Text" xml:space="preserve">
+    <value>DS CENTRE体験版</value>
   </data>
   <data name="rPurposeCardProduction.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 16</value>
+    <value>137, 16</value>
   </data>
   <data name="rPurposeCardProduction.Text" xml:space="preserve">
-    <value>ゲームカード販売</value>
+    <value>ゲームカード一般販売</value>
+  </data>
+  <data name="rPurposeCardTouchTryDS.Size" type="System.Drawing.Size, System.Drawing">
+    <value>128, 16</value>
+  </data>
+  <data name="rPurposeCardTouchTryDS.Text" xml:space="preserve">
+    <value>Touch!Try!DS体験版</value>
   </data>
   <data name="rPurposeCardDistribution.Size" type="System.Drawing.Size, System.Drawing">
     <value>105, 16</value>
@@ -1523,7 +1547,7 @@
     <value>4, 21</value>
   </data>
   <data name="tabCompanyInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>772, 423</value>
+    <value>772, 468</value>
   </data>
   <data name="tabCompanyInfo.Text" xml:space="preserve">
     <value>会社情報(要入力)</value>
@@ -1538,7 +1562,7 @@
     <value>4, 21</value>
   </data>
   <data name="tabErrorInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>772, 423</value>
+    <value>772, 468</value>
   </data>
   <data name="tabErrorInfo.Text" xml:space="preserve">
     <value>エラー情報</value>
@@ -1610,7 +1634,7 @@
     <value>要因</value>
   </data>
   <data name="labFile.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 50</value>
+    <value>13, 40</value>
   </data>
   <data name="labFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>104, 12</value>

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

@@ -96,11 +96,15 @@ void Form1::setDeliverableProperties(void)
 	cli::array<System::Windows::Forms::RadioButton ^> ^rbuts = gcnew cli::array<System::Windows::Forms::RadioButton ^>
 	{
 		this->rPurposeCardProduction,
+		this->rPurposeCardTouchTryDS,
+		this->rPurposeCardDSCentre,
 		this->rPurposeCardDistribution,
 		this->rPurposeCardKiosk,
 		this->rPurposeDSiWare,
-		this->rPurposeDSStation,
+		this->rPurposeNandTouchTryDS,
-		this->rPurposeZone
+		this->rPurposeNandDSCentre,
+		this->rPurposeNandShop,
+		this->rPurposeZone,
 	};
 	for each( System::Windows::Forms::RadioButton ^r in rbuts )
 	{
@@ -332,12 +336,16 @@ System::Boolean Form1::checkDeliverableForms(void)
 	cli::array<System::Windows::Forms::RadioButton^> ^rbuts = gcnew cli::array<System::Windows::Forms::RadioButton ^>
 	{
 		this->rPurposeCardProduction,
+		this->rPurposeCardTouchTryDS,
+		this->rPurposeCardDSCentre,
 		this->rPurposeCardDistribution,
 		this->rPurposeCardKiosk,
 		this->rPurposeDSiWare,
-		this->rPurposeDSStation,
+		this->rPurposeNandTouchTryDS,
+		this->rPurposeNandDSCentre,
+		this->rPurposeNandShop,
 		this->rPurposeZone,
-		this->rPurposeOther
+		this->rPurposeOther,
 	};
 	this->checkRadioButton( rbuts, "LabelUsage" );
 

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

@@ -483,14 +483,18 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname )
 	resources->ApplyResources(this->colWarnEnd, L"colWarnEnd");
 	resources->ApplyResources(this->colWarnCause, L"colWarnCause");
 	resources->ApplyResources(this->rPurposeCardProduction, L"rPurposeCardProduction");
+	resources->ApplyResources(this->rPurposeCardTouchTryDS, L"rPurposeCardTouchTryDS");
+	resources->ApplyResources(this->rPurposeCardDSCentre, L"rPurposeCardDSCentre");
 	resources->ApplyResources(this->rPurposeCardDistribution, L"rPurposeCardDistribution");
 	resources->ApplyResources(this->rPurposeCardKiosk, L"rPurposeCardKiosk");
 	resources->ApplyResources(this->rPurposeDSiWare, L"rPurposeDSiWare");
-	resources->ApplyResources(this->rPurposeDSStation, L"rPurposeDSStation");
+	resources->ApplyResources(this->rPurposeNandTouchTryDS, L"rPurposeNandTouchTryDS");
+	resources->ApplyResources(this->rPurposeNandDSCentre, L"rPurposeNandDSCentre");
+	resources->ApplyResources(this->rPurposeNandShop, L"rPurposeNandShop");
 	resources->ApplyResources(this->rPurposeZone, L"rPurposeZone");
 	resources->ApplyResources(this->rPurposeOther, L"rPurposeOther");
 	resources->ApplyResources(this->gboxPurposeCard, L"gboxPurposeCard");
-	resources->ApplyResources(this->gboxPurposeNetwork, L"gboxPurposeNetwork");
+	resources->ApplyResources(this->gboxPurposeNand, L"gboxPurposeNand");
 	resources->ApplyResources(this->gboxPurpose, L"gboxPurpose");
 	resources->ApplyResources(this->labPurposeInError, L"labPurposeInError");
 	resources->ApplyResources(this, L"$this");

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

@@ -74,20 +74,28 @@ System::Void Form1::saveTmp( System::String ^filename )
 	cli::array<System::Windows::Forms::RadioButton^> ^rbuts = gcnew cli::array<System::Windows::Forms::RadioButton ^>
 	{
 		this->rPurposeCardProduction,
+		this->rPurposeCardTouchTryDS,
+		this->rPurposeCardDSCentre,
 		this->rPurposeCardDistribution,
 		this->rPurposeCardKiosk,
 		this->rPurposeDSiWare,
-		this->rPurposeDSStation,
+		this->rPurposeNandTouchTryDS,
+		this->rPurposeNandDSCentre,
+		this->rPurposeNandShop,
 		this->rPurposeZone,
 		this->rPurposeOther
 	};
 	cli::array<System::String^> ^strs = gcnew cli::array<System::String^>
 	{
 		"CardProduction",
+		"CardTouchTryDS",
+		"CardDSCentre",
 		"CardDistribution",
 		"CardKiosk",
 		"DSiWare",
-		"DSStation",
+		"NandTouchTryDS",
+		"NandDSCentre",
+		"NandShop",
 		"Zone",
 		"Other"
 	};
@@ -219,20 +227,28 @@ void Form1::loadTmp( System::String ^filename )
 	rbuts = gcnew cli::array<System::Windows::Forms::RadioButton ^>
 	{
 		this->rPurposeCardProduction,
+		this->rPurposeCardTouchTryDS,
+		this->rPurposeCardDSCentre,
 		this->rPurposeCardDistribution,
 		this->rPurposeCardKiosk,
 		this->rPurposeDSiWare,
-		this->rPurposeDSStation,
+		this->rPurposeNandTouchTryDS,
+		this->rPurposeNandDSCentre,
+		this->rPurposeNandShop,
 		this->rPurposeZone,
 		this->rPurposeOther
 	};
 	strs  = gcnew cli::array<System::String^>
 	{
 		"CardProduction",
+		"CardTouchTryDS",
+		"CardDSCentre",
 		"CardDistribution",
 		"CardKiosk",
 		"DSiWare",
-		"DSStation",
+		"NandTouchTryDS",
+		"NandDSCentre",
+		"NandShop",
 		"Zone",
 		"Other"
 	};

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

@@ -127,7 +127,10 @@ bool Form1::isDisplayOneGridErrorForPurpose( RCMrcError ^err )
 	bool is_display = false;
 
 	if( ((err->Purpose & RCMrcError::PurposeType::Production) != (RCMrcError::PurposeType)0) &&
-		(this->rPurposeCardProduction->Checked || this->rPurposeDSiWare->Checked || this->rPurposeOther->Checked) )
+		(this->rPurposeCardProduction->Checked ||
+		this->rPurposeDSiWare->Checked || 
+		this->rPurposeNandShop ||			// ショップ配信体験版は通常版と同じ
+		this->rPurposeOther->Checked) )
 	{
 		is_display = true;
 	}
@@ -142,7 +145,8 @@ bool Form1::isDisplayOneGridErrorForPurpose( RCMrcError ^err )
 		is_display = true;
 	}
 	if( ((err->Purpose & RCMrcError::PurposeType::DSStation) != (RCMrcError::PurposeType)0) &&
-		this->rPurposeDSStation->Checked )
+		(this->rPurposeCardTouchTryDS->Checked || this->rPurposeCardDSCentre->Checked ||
+		 this->rPurposeNandTouchTryDS->Checked || this->rPurposeNandDSCentre->Checked) )
 	{
 		is_display = true;
 	}

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp

@@ -139,6 +139,10 @@ ECSrlResult RCSrl::readFromFile( System::String ^srlfile )
 		}
 	}
 	(void)fclose( fp );
+
+	// 一度でも読み込まれたら true
+	this->IsAlreadyReadOnce = true;
+
 	return (ECSrlResult::NOERROR);
 }
 

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h

@@ -30,6 +30,9 @@ namespace MasterEditorTWL
 		ROM_Header *pRomHeader;
 
 	public:
+		// 一度でも読み込まれたかどうか
+		property System::Boolean  IsAlreadyReadOnce;
+
 		// (GUIに表示される)ROMヘッダ固有情報
 
 		// NTR互換情報 ReadOnly

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <message>
 
-<!-- 英訳依頼 ここから (ver.1.7 追加メッセージ) -->
+<!-- 英訳依頼 ここから (ver.1.8 追加メッセージ) -->
 
 	<!-- TWL Rom Info -->
 	<RomStartAddress>