マスタエディタ:GUIレイアウト変更。EULAフラグと通信アイコンフラグを設定できないようにした。NANDアプリのときにバックアップメモリの選択を自動的に「なし」にするようにした。

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

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h

@@ -403,7 +403,7 @@ private: System::Windows::Forms::Label^  labNormalRomOffset;
 private: System::Windows::Forms::TextBox^  tboxNormalRomOffset;
 private: System::Windows::Forms::CheckBox^  cboxIsSubBanner;
 private: System::Windows::Forms::Label^  labKeyTableRomOffset;
-private: System::Windows::Forms::CheckBox^  cboxIsWL;
+
 private: System::Windows::Forms::TextBox^  tboxPrivateSize;
 private: System::Windows::Forms::Label^  labPrivateSize;
 private: System::Windows::Forms::TextBox^  tboxKeyTableRomOffset;
@@ -484,8 +484,8 @@ private: System::Windows::Forms::GroupBox^  gboxExFlags;
 
 
 
-private: System::Windows::Forms::GroupBox^  gboxEULA;
+
-private: System::Windows::Forms::GroupBox^  gboxIcon;
+
 private: System::Windows::Forms::GroupBox^  gboxParental;
 private: System::Windows::Forms::TextBox^  tboxGuideRomInfo;
 private: System::Windows::Forms::TextBox^  tboxGuideTWLInfo;
@@ -563,12 +563,12 @@ private: System::Windows::Forms::TextBox^  tboxAppType;
 private: System::Windows::Forms::TextBox^  tboxMedia;
 private: System::Windows::Forms::Label^  labProductNameLimit;
 private: System::Windows::Forms::Label^  labProductNameLimitForeign;
-private: System::Windows::Forms::RadioButton^  rIsWiFiIcon;
 
 
 
-private: System::Windows::Forms::RadioButton^  rIsWirelessIcon;
+
-private: System::Windows::Forms::RadioButton^  rIsNoIcon;
+
+
 
 
 
@@ -607,6 +607,17 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnName;
 private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnBegin;
 private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnEnd;
 private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
+private: System::Windows::Forms::GroupBox^  gboxLaunch;
+private: System::Windows::Forms::Label^  labConnectIcon;
+private: System::Windows::Forms::TextBox^  tboxConnectIcon;
+private: System::Windows::Forms::Label^  labIsGameCardOn2;
+
+
+
+
+
+
+
 
 
 
@@ -951,19 +962,19 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->labHex3 = (gcnew System::Windows::Forms::Label());
 			this->tboxIsCodec = (gcnew System::Windows::Forms::TextBox());
 			this->labIsCodec = (gcnew System::Windows::Forms::Label());
+			this->tboxPrivateSize = (gcnew System::Windows::Forms::TextBox());
+			this->labPrivateSize = (gcnew System::Windows::Forms::Label());
 			this->labNormalRomOffset = (gcnew System::Windows::Forms::Label());
 			this->tboxNormalRomOffset = (gcnew System::Windows::Forms::TextBox());
 			this->labKeyTableRomOffset = (gcnew System::Windows::Forms::Label());
-			this->tboxPrivateSize = (gcnew System::Windows::Forms::TextBox());
-			this->labPrivateSize = (gcnew System::Windows::Forms::Label());
-			this->tboxKeyTableRomOffset = (gcnew System::Windows::Forms::TextBox());
 			this->labPublicSize = (gcnew System::Windows::Forms::Label());
 			this->tboxPublicSize = (gcnew System::Windows::Forms::TextBox());
+			this->tboxKeyTableRomOffset = (gcnew System::Windows::Forms::TextBox());
 			this->cboxIsSubBanner = (gcnew System::Windows::Forms::CheckBox());
-			this->cboxIsWL = (gcnew System::Windows::Forms::CheckBox());
 			this->cboxIsNormalJump = (gcnew System::Windows::Forms::CheckBox());
 			this->cboxIsTmpJump = (gcnew System::Windows::Forms::CheckBox());
 			this->gboxAccess = (gcnew System::Windows::Forms::GroupBox());
+			this->labIsGameCardOn2 = (gcnew System::Windows::Forms::Label());
 			this->labAccessOther = (gcnew System::Windows::Forms::Label());
 			this->tboxAccessOther = (gcnew System::Windows::Forms::TextBox());
 			this->tboxIsGameCardOn = (gcnew System::Windows::Forms::TextBox());
@@ -1007,6 +1018,9 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->colLibName = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn());
 			this->tboxGuideRomInfo = (gcnew System::Windows::Forms::TextBox());
 			this->tabTWLInfo = (gcnew System::Windows::Forms::TabPage());
+			this->gboxLaunch = (gcnew System::Windows::Forms::GroupBox());
+			this->labConnectIcon = (gcnew System::Windows::Forms::Label());
+			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());
@@ -1016,11 +1030,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->butSetBack = (gcnew System::Windows::Forms::Button());
 			this->tboxGuideRomEditInfo = (gcnew System::Windows::Forms::TextBox());
 			this->gboxParental = (gcnew System::Windows::Forms::GroupBox());
-			this->gboxIcon = (gcnew System::Windows::Forms::GroupBox());
-			this->rIsNoIcon = (gcnew System::Windows::Forms::RadioButton());
-			this->rIsWiFiIcon = (gcnew System::Windows::Forms::RadioButton());
-			this->rIsWirelessIcon = (gcnew System::Windows::Forms::RadioButton());
-			this->gboxEULA = (gcnew System::Windows::Forms::GroupBox());
 			this->tabSubmitInfo = (gcnew System::Windows::Forms::TabPage());
 			this->labProductNameLimit = (gcnew System::Windows::Forms::Label());
 			this->tboxGuideSubmitInfo = (gcnew System::Windows::Forms::TextBox());
@@ -1065,12 +1074,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->tabRomInfo->SuspendLayout();
 			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->gridLibrary))->BeginInit();
 			this->tabTWLInfo->SuspendLayout();
+			this->gboxLaunch->SuspendLayout();
 			this->gboxExFlags->SuspendLayout();
 			this->tabRomEditInfo->SuspendLayout();
 			this->gboxOtherSpec->SuspendLayout();
 			this->gboxParental->SuspendLayout();
-			this->gboxIcon->SuspendLayout();
-			this->gboxEULA->SuspendLayout();
 			this->tabSubmitInfo->SuspendLayout();
 			this->gboxForeign->SuspendLayout();
 			this->tabCompanyInfo->SuspendLayout();
@@ -1950,14 +1958,14 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->gboxTWLExInfo->Controls->Add(this->labHex3);
 			this->gboxTWLExInfo->Controls->Add(this->tboxIsCodec);
 			this->gboxTWLExInfo->Controls->Add(this->labIsCodec);
+			this->gboxTWLExInfo->Controls->Add(this->tboxPrivateSize);
+			this->gboxTWLExInfo->Controls->Add(this->labPrivateSize);
 			this->gboxTWLExInfo->Controls->Add(this->labNormalRomOffset);
 			this->gboxTWLExInfo->Controls->Add(this->tboxNormalRomOffset);
 			this->gboxTWLExInfo->Controls->Add(this->labKeyTableRomOffset);
-			this->gboxTWLExInfo->Controls->Add(this->tboxPrivateSize);
-			this->gboxTWLExInfo->Controls->Add(this->labPrivateSize);
-			this->gboxTWLExInfo->Controls->Add(this->tboxKeyTableRomOffset);
 			this->gboxTWLExInfo->Controls->Add(this->labPublicSize);
 			this->gboxTWLExInfo->Controls->Add(this->tboxPublicSize);
+			this->gboxTWLExInfo->Controls->Add(this->tboxKeyTableRomOffset);
 			resources->ApplyResources(this->gboxTWLExInfo, L"gboxTWLExInfo");
 			this->gboxTWLExInfo->Name = L"gboxTWLExInfo";
 			this->gboxTWLExInfo->TabStop = false;
@@ -1988,6 +1996,17 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			resources->ApplyResources(this->labIsCodec, L"labIsCodec");
 			this->labIsCodec->Name = L"labIsCodec";
 			// 
+			// tboxPrivateSize
+			// 
+			resources->ApplyResources(this->tboxPrivateSize, L"tboxPrivateSize");
+			this->tboxPrivateSize->Name = L"tboxPrivateSize";
+			this->tboxPrivateSize->ReadOnly = true;
+			// 
+			// labPrivateSize
+			// 
+			resources->ApplyResources(this->labPrivateSize, L"labPrivateSize");
+			this->labPrivateSize->Name = L"labPrivateSize";
+			// 
 			// labNormalRomOffset
 			// 
 			resources->ApplyResources(this->labNormalRomOffset, L"labNormalRomOffset");
@@ -2004,23 +2023,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			resources->ApplyResources(this->labKeyTableRomOffset, L"labKeyTableRomOffset");
 			this->labKeyTableRomOffset->Name = L"labKeyTableRomOffset";
 			// 
-			// tboxPrivateSize
-			// 
-			resources->ApplyResources(this->tboxPrivateSize, L"tboxPrivateSize");
-			this->tboxPrivateSize->Name = L"tboxPrivateSize";
-			this->tboxPrivateSize->ReadOnly = true;
-			// 
-			// labPrivateSize
-			// 
-			resources->ApplyResources(this->labPrivateSize, L"labPrivateSize");
-			this->labPrivateSize->Name = L"labPrivateSize";
-			// 
-			// tboxKeyTableRomOffset
-			// 
-			resources->ApplyResources(this->tboxKeyTableRomOffset, L"tboxKeyTableRomOffset");
-			this->tboxKeyTableRomOffset->Name = L"tboxKeyTableRomOffset";
-			this->tboxKeyTableRomOffset->ReadOnly = true;
-			// 
 			// labPublicSize
 			// 
 			resources->ApplyResources(this->labPublicSize, L"labPublicSize");
@@ -2032,18 +2034,18 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->tboxPublicSize->Name = L"tboxPublicSize";
 			this->tboxPublicSize->ReadOnly = true;
 			// 
+			// tboxKeyTableRomOffset
+			// 
+			resources->ApplyResources(this->tboxKeyTableRomOffset, L"tboxKeyTableRomOffset");
+			this->tboxKeyTableRomOffset->Name = L"tboxKeyTableRomOffset";
+			this->tboxKeyTableRomOffset->ReadOnly = true;
+			// 
 			// cboxIsSubBanner
 			// 
 			resources->ApplyResources(this->cboxIsSubBanner, L"cboxIsSubBanner");
 			this->cboxIsSubBanner->Name = L"cboxIsSubBanner";
 			this->cboxIsSubBanner->UseVisualStyleBackColor = true;
 			// 
-			// cboxIsWL
-			// 
-			resources->ApplyResources(this->cboxIsWL, L"cboxIsWL");
-			this->cboxIsWL->Name = L"cboxIsWL";
-			this->cboxIsWL->UseVisualStyleBackColor = true;
-			// 
 			// cboxIsNormalJump
 			// 
 			resources->ApplyResources(this->cboxIsNormalJump, L"cboxIsNormalJump");
@@ -2058,6 +2060,7 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			// 
 			// gboxAccess
 			// 
+			this->gboxAccess->Controls->Add(this->labIsGameCardOn2);
 			this->gboxAccess->Controls->Add(this->labAccessOther);
 			this->gboxAccess->Controls->Add(this->tboxAccessOther);
 			this->gboxAccess->Controls->Add(this->tboxIsGameCardOn);
@@ -2068,6 +2071,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->gboxAccess->Name = L"gboxAccess";
 			this->gboxAccess->TabStop = false;
 			// 
+			// labIsGameCardOn2
+			// 
+			resources->ApplyResources(this->labIsGameCardOn2, L"labIsGameCardOn2");
+			this->labIsGameCardOn2->Name = L"labIsGameCardOn2";
+			// 
 			// labAccessOther
 			// 
 			resources->ApplyResources(this->labAccessOther, L"labAccessOther");
@@ -2365,6 +2373,7 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			// 
 			// tabTWLInfo
 			// 
+			this->tabTWLInfo->Controls->Add(this->gboxLaunch);
 			this->tabTWLInfo->Controls->Add(this->tboxGuideTWLInfo);
 			this->tabTWLInfo->Controls->Add(this->gboxExFlags);
 			this->tabTWLInfo->Controls->Add(this->gboxShared2Size);
@@ -2375,6 +2384,26 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->tabTWLInfo->Name = L"tabTWLInfo";
 			this->tabTWLInfo->UseVisualStyleBackColor = true;
 			// 
+			// gboxLaunch
+			// 
+			this->gboxLaunch->Controls->Add(this->labConnectIcon);
+			this->gboxLaunch->Controls->Add(this->tboxConnectIcon);
+			this->gboxLaunch->Controls->Add(this->cboxIsEULA);
+			resources->ApplyResources(this->gboxLaunch, L"gboxLaunch");
+			this->gboxLaunch->Name = L"gboxLaunch";
+			this->gboxLaunch->TabStop = false;
+			// 
+			// labConnectIcon
+			// 
+			resources->ApplyResources(this->labConnectIcon, L"labConnectIcon");
+			this->labConnectIcon->Name = L"labConnectIcon";
+			// 
+			// tboxConnectIcon
+			// 
+			resources->ApplyResources(this->tboxConnectIcon, L"tboxConnectIcon");
+			this->tboxConnectIcon->Name = L"tboxConnectIcon";
+			this->tboxConnectIcon->ReadOnly = true;
+			// 
 			// tboxGuideTWLInfo
 			// 
 			this->tboxGuideTWLInfo->BackColor = System::Drawing::SystemColors::Info;
@@ -2386,7 +2415,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			// 
 			this->gboxExFlags->Controls->Add(this->cboxIsNormalJump);
 			this->gboxExFlags->Controls->Add(this->cboxIsTmpJump);
-			this->gboxExFlags->Controls->Add(this->cboxIsWL);
 			this->gboxExFlags->Controls->Add(this->cboxIsSubBanner);
 			resources->ApplyResources(this->gboxExFlags, L"gboxExFlags");
 			this->gboxExFlags->Name = L"gboxExFlags";
@@ -2398,8 +2426,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->tabRomEditInfo->Controls->Add(this->butSetBack);
 			this->tabRomEditInfo->Controls->Add(this->tboxGuideRomEditInfo);
 			this->tabRomEditInfo->Controls->Add(this->gboxParental);
-			this->tabRomEditInfo->Controls->Add(this->gboxIcon);
-			this->tabRomEditInfo->Controls->Add(this->gboxEULA);
 			resources->ApplyResources(this->tabRomEditInfo, L"tabRomEditInfo");
 			this->tabRomEditInfo->Name = L"tabRomEditInfo";
 			this->tabRomEditInfo->UseVisualStyleBackColor = true;
@@ -2461,42 +2487,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->gboxParental->Name = L"gboxParental";
 			this->gboxParental->TabStop = false;
 			// 
-			// gboxIcon
-			// 
-			this->gboxIcon->Controls->Add(this->rIsNoIcon);
-			this->gboxIcon->Controls->Add(this->rIsWiFiIcon);
-			this->gboxIcon->Controls->Add(this->rIsWirelessIcon);
-			resources->ApplyResources(this->gboxIcon, L"gboxIcon");
-			this->gboxIcon->Name = L"gboxIcon";
-			this->gboxIcon->TabStop = false;
-			// 
-			// rIsNoIcon
-			// 
-			resources->ApplyResources(this->rIsNoIcon, L"rIsNoIcon");
-			this->rIsNoIcon->Checked = true;
-			this->rIsNoIcon->Name = L"rIsNoIcon";
-			this->rIsNoIcon->TabStop = true;
-			this->rIsNoIcon->UseVisualStyleBackColor = true;
-			// 
-			// rIsWiFiIcon
-			// 
-			resources->ApplyResources(this->rIsWiFiIcon, L"rIsWiFiIcon");
-			this->rIsWiFiIcon->Name = L"rIsWiFiIcon";
-			this->rIsWiFiIcon->UseVisualStyleBackColor = true;
-			// 
-			// rIsWirelessIcon
-			// 
-			resources->ApplyResources(this->rIsWirelessIcon, L"rIsWirelessIcon");
-			this->rIsWirelessIcon->Name = L"rIsWirelessIcon";
-			this->rIsWirelessIcon->UseVisualStyleBackColor = true;
-			// 
-			// gboxEULA
-			// 
-			this->gboxEULA->Controls->Add(this->cboxIsEULA);
-			resources->ApplyResources(this->gboxEULA, L"gboxEULA");
-			this->gboxEULA->Name = L"gboxEULA";
-			this->gboxEULA->TabStop = false;
-			// 
 			// tabSubmitInfo
 			// 
 			this->tabSubmitInfo->Controls->Add(this->labProductNameLimit);
@@ -2790,6 +2780,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->gridLibrary))->EndInit();
 			this->tabTWLInfo->ResumeLayout(false);
 			this->tabTWLInfo->PerformLayout();
+			this->gboxLaunch->ResumeLayout(false);
+			this->gboxLaunch->PerformLayout();
 			this->gboxExFlags->ResumeLayout(false);
 			this->gboxExFlags->PerformLayout();
 			this->tabRomEditInfo->ResumeLayout(false);
@@ -2798,10 +2790,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 			this->gboxOtherSpec->PerformLayout();
 			this->gboxParental->ResumeLayout(false);
 			this->gboxParental->PerformLayout();
-			this->gboxIcon->ResumeLayout(false);
-			this->gboxIcon->PerformLayout();
-			this->gboxEULA->ResumeLayout(false);
-			this->gboxEULA->PerformLayout();
 			this->tabSubmitInfo->ResumeLayout(false);
 			this->tabSubmitInfo->PerformLayout();
 			this->gboxForeign->ResumeLayout(false);
@@ -2916,9 +2904,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 		void readOnly( void )
 		{
 			this->cboxIsEULA->Enabled = false;
-			this->rIsWirelessIcon->Enabled = false;
-			this->rIsWiFiIcon->Enabled     = false;
-			this->rIsNoIcon->Enabled       = false;
 			this->cboxIsUGC->Enabled       = false;
 			this->cboxIsPhotoEx->Enabled   = false;
 
@@ -2974,8 +2959,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 		// SRLのROM情報をフォームに反映させる(ファイルが読み込まれていることが前提)
 		void setSrlForms(void);
 
-		// SRLの特殊な設定をフォームにセットする(言語切り替えで表示を変えたいので独立させる)
+		// ROM情報のうちテキストボックスを更新する(言語切り替えで表示を変えたいので独立させる)
-		void setSrlFormsCaptionEx();
+		void setSrlFormsTextBox();
 
 		// フォームの入力をチェックする
 		System::Boolean checkSrlForms(void);
@@ -3623,25 +3608,14 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^  colWarnCause;
 				return;
 
 			// 編集可能情報を読み込み時の設定に戻す
-			this->cboxIsEULA->Checked = this->hSrl->IsEULA;
-			if( ( this->hSrl->IsWiFiIcon &&  this->hSrl->IsWirelessIcon) ||
-				(!this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon) )
-			{
-				this->rIsNoIcon->Checked = true;
-			}
-			else if( this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon )
-			{
-				this->rIsWiFiIcon->Checked = true;
-			}
-			else
-			{
-				this->rIsWirelessIcon->Checked = true;
-			}
 			this->setRegionForms();
 			this->setParentalForms();
 			this->loadOtherForms();		// SRLに登録されていないROM仕様のフォームも戻す
 		}
 
+
+
+
 }; // enf of ref class Form1
 
 } // end of namespace MasterEditorTWL

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

@@ -341,10 +341,10 @@
     <value>リージョン</value>
   </data>
   <data name="cboxIsEULA.Size" type="System.Drawing.Size, System.Drawing">
-    <value>157, 16</value>
+    <value>213, 16</value>
   </data>
   <data name="cboxIsEULA.Text" xml:space="preserve">
-    <value>EULAへの同意を必要とする</value>
+    <value>EULA(利用規約)への同意を必要とする</value>
   </data>
   <data name="combRegion.Items" xml:space="preserve">
     <value>日本のみ</value>
@@ -589,12 +589,6 @@
   <data name="cboxIsSubBanner.Text" xml:space="preserve">
     <value>サブバナーファイル有効</value>
   </data>
-  <data name="cboxIsWL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>155, 16</value>
-  </data>
-  <data name="cboxIsWL.Text" xml:space="preserve">
-    <value>NTRホワイトリスト署名有効</value>
-  </data>
   <data name="cboxIsNormalJump.Size" type="System.Drawing.Size, System.Drawing">
     <value>121, 16</value>
   </data>
@@ -607,6 +601,12 @@
   <data name="cboxIsTmpJump.Text" xml:space="preserve">
     <value>tmpジャンプ許可</value>
   </data>
+  <data name="labIsGameCardOn2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>98, 12</value>
+  </data>
+  <data name="labIsGameCardOn2.Text" xml:space="preserve">
+    <value>(NANDアプリからの)</value>
+  </data>
   <data name="labAccessOther.Size" type="System.Drawing.Size, System.Drawing">
     <value>36, 12</value>
   </data>
@@ -614,10 +614,10 @@
     <value>その他</value>
   </data>
   <data name="labIsGameCardOn.Size" type="System.Drawing.Size, System.Drawing">
-    <value>87, 12</value>
+    <value>99, 12</value>
   </data>
   <data name="labIsGameCardOn.Text" xml:space="preserve">
-    <value>ゲームカード電源</value>
+    <value>ゲームカードアクセス</value>
   </data>
   <data name="cboxIsNAND.Size" type="System.Drawing.Size, System.Drawing">
     <value>121, 16</value>
@@ -706,6 +706,12 @@
   <data name="tabRomInfo.Text" xml:space="preserve">
     <value>ROM基本情報(確認用)</value>
   </data>
+  <data name="labConnectIcon.Size" type="System.Drawing.Size, System.Drawing">
+    <value>173, 12</value>
+  </data>
+  <data name="labConnectIcon.Text" xml:space="preserve">
+    <value>DSiメニュー上での通信アイコン表示</value>
+  </data>
   <data name="tboxGuideTWLInfo.Text" xml:space="preserve">
     <value>このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。</value>
   </data>
@@ -739,30 +745,6 @@
   <data name="gboxParental.Text" xml:space="preserve">
     <value>リージョンとレーティング情報</value>
   </data>
-  <data name="rIsNoIcon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 16</value>
-  </data>
-  <data name="rIsNoIcon.Text" xml:space="preserve">
-    <value>通信アイコンを表示しない</value>
-  </data>
-  <data name="rIsWiFiIcon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>134, 16</value>
-  </data>
-  <data name="rIsWiFiIcon.Text" xml:space="preserve">
-    <value>Wi-Fi通信アイコン表示</value>
-  </data>
-  <data name="rIsWirelessIcon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>167, 16</value>
-  </data>
-  <data name="rIsWirelessIcon.Text" xml:space="preserve">
-    <value>DSワイヤレス通信アイコン表示</value>
-  </data>
-  <data name="gboxIcon.Text" xml:space="preserve">
-    <value>メニュー上での通信アイコン表示</value>
-  </data>
-  <data name="gboxEULA.Text" xml:space="preserve">
-    <value>EULA(利用規約)</value>
-  </data>
   <data name="tabRomEditInfo.Text" xml:space="preserve">
     <value>ROM登録情報(編集可)</value>
   </data>

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

@@ -39,13 +39,6 @@ void Form1::changeJapanese(void)
 	this->changeMaxLength( this->tboxPerson1,  15 );
 
 	this->changeLanguage( "ja" );
-
-	// 特殊な設定用のテキストボックスの表記を変更
-	this->setSrlFormsCaptionEx();
-
-	// 複数行表示の改行を挿入
-	this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "<newline>", "\r\n" );
-	this->tboxGuideErrorInfo->Text   = this->tboxGuideErrorInfo->Text->Replace( "<newline>", "\r\n" );
 }
 
 // 英語版への切り替え
@@ -56,11 +49,6 @@ void  Form1::changeEnglish(void)
 	this->changeMaxLength( this->tboxPerson1,  30 );
 
 	this->changeLanguage( "en" );
-
-	this->setSrlFormsCaptionEx();
-
-	this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "<newline>", "\r\n" );
-	this->tboxGuideErrorInfo->Text   = this->tboxGuideErrorInfo->Text->Replace( "<newline>", "\r\n" );
 }
 
 // 言語リソース切り替え
@@ -298,7 +286,6 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname )
 	resources->ApplyResources(this->labPublicSize, L"labPublicSize");
 	resources->ApplyResources(this->tboxPublicSize, L"tboxPublicSize");
 	resources->ApplyResources(this->cboxIsSubBanner, L"cboxIsSubBanner");
-	resources->ApplyResources(this->cboxIsWL, L"cboxIsWL");
 	resources->ApplyResources(this->cboxIsNormalJump, L"cboxIsNormalJump");
 	resources->ApplyResources(this->cboxIsTmpJump, L"cboxIsTmpJump");
 	resources->ApplyResources(this->gboxAccess, L"gboxAccess");
@@ -306,6 +293,7 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname )
 	resources->ApplyResources(this->tboxAccessOther, L"tboxAccessOther");
 	resources->ApplyResources(this->tboxIsGameCardOn, L"tboxIsGameCardOn");
 	resources->ApplyResources(this->labIsGameCardOn, L"labIsGameCardOn");
+	resources->ApplyResources(this->labIsGameCardOn2, L"labIsGameCardOn2");
 	resources->ApplyResources(this->cboxIsNAND, L"cboxIsNAND");
 	resources->ApplyResources(this->cboxIsSD, L"cboxIsSD");
 	resources->ApplyResources(this->gboxTitleID, L"gboxTitleID");
@@ -345,6 +333,8 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname )
 	resources->ApplyResources(this->colLibName, L"colLibName");
 	resources->ApplyResources(this->tboxGuideRomInfo, L"tboxGuideRomInfo");
 	resources->ApplyResources(this->tabTWLInfo, L"tabTWLInfo");
+	resources->ApplyResources(this->gboxLaunch, L"gboxLaunch");
+	resources->ApplyResources(this->labConnectIcon, L"labConnectIcon");
 	resources->ApplyResources(this->tboxGuideTWLInfo, L"tboxGuideTWLInfo");
 	resources->ApplyResources(this->gboxExFlags, L"gboxExFlags");
 	resources->ApplyResources(this->tabRomEditInfo, L"tabRomEditInfo");
@@ -354,11 +344,6 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname )
 	resources->ApplyResources(this->butSetBack, L"butSetBack");
 	resources->ApplyResources(this->tboxGuideRomEditInfo, L"tboxGuideRomEditInfo");
 	resources->ApplyResources(this->gboxParental, L"gboxParental");
-	resources->ApplyResources(this->gboxIcon, L"gboxIcon");
-	resources->ApplyResources(this->rIsNoIcon, L"rIsNoIcon");
-	resources->ApplyResources(this->rIsWiFiIcon, L"rIsWiFiIcon");
-	resources->ApplyResources(this->rIsWirelessIcon, L"rIsWirelessIcon");
-	resources->ApplyResources(this->gboxEULA, L"gboxEULA");
 	resources->ApplyResources(this->tabSubmitInfo, L"tabSubmitInfo");
 	resources->ApplyResources(this->labProductNameLimit, L"labProductNameLimit");
 	resources->ApplyResources(this->tboxGuideSubmitInfo, L"tboxGuideSubmitInfo");
@@ -387,6 +372,16 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname )
 	resources->ApplyResources(this->colWarnEnd, L"colWarnEnd");
 	resources->ApplyResources(this->colWarnCause, L"colWarnCause");
 	resources->ApplyResources(this, L"$this");
+
+	// テキストボックスの表記を変更
+	if( !System::String::IsNullOrEmpty( this->tboxFile->Text ) )
+	{
+		this->setSrlFormsTextBox();
+	}
+
+	// 複数行表示の改行を挿入
+	this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "<newline>", "\r\n" );
+	this->tboxGuideErrorInfo->Text   = this->tboxGuideErrorInfo->Text->Replace( "<newline>", "\r\n" );
 }
 
 // end of file

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

@@ -27,11 +27,6 @@ void Form1::setSrlProperties(void)
 {
 	// ROMヘッダの[0,0x160)の領域はRead Onlyで変更しない
 
-	// TWL拡張領域のいくつかの情報をROMヘッダに反映させる
-	this->hSrl->IsEULA         = this->cboxIsEULA->Checked;
-	this->hSrl->IsWiFiIcon     = this->rIsWiFiIcon->Checked;
-	this->hSrl->IsWirelessIcon = this->rIsWirelessIcon->Checked;
-
 	// リージョン
 	this->setRegionSrlPropaties();
 
@@ -79,7 +74,6 @@ void Form1::setSrlForms(void)
 	this->cboxIsNormalJump->Checked = this->hSrl->IsNormalJump;
 	this->cboxIsTmpJump->Checked    = this->hSrl->IsTmpJump;
 	this->cboxIsSubBanner->Checked  = this->hSrl->IsSubBanner;
-	this->cboxIsWL->Checked         = this->hSrl->IsWL;
 	if( this->hSrl->IsCodecTWL == true )
 	{
 		this->tboxIsCodec->Text = gcnew System::String( "TWL" );
@@ -174,8 +168,11 @@ void Form1::setSrlForms(void)
 	}
 	this->tboxAccessOther->Text = acc;
 
+	// 起動制限
+	this->cboxIsEULA->Checked = this->hSrl->IsEULA;
+
 	// 特殊な設定をテキストボックスに反映
-	this->setSrlFormsCaptionEx();
+	this->setSrlFormsTextBox();
 
 	// SDKバージョンとライブラリ
 	this->tboxSDK->Clear();
@@ -204,31 +201,54 @@ void Form1::setSrlForms(void)
 	}
 
 	// 編集可能情報
-	this->cboxIsEULA->Checked = this->hSrl->IsEULA;
+	this->setRegionForms();
-	if( ( this->hSrl->IsWiFiIcon &&  this->hSrl->IsWirelessIcon) ||
+	this->setParentalForms();			// ペアレンタルコントロール関連
-		(!this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon) )
+
+	// ROMヘッダには関係ないが
+	// NANDアプリのときにバックアップメモリを自動的に「なし」にしておく
+	if( this->hSrl->IsMediaNand )
 	{
-		this->rIsNoIcon->Checked = true;
+		this->combBackup->SelectedIndex = this->combBackup->Items->Count - 2;
-	}
+		this->combBackup->Enabled = false;
-	else if( this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon )
-	{
-		this->rIsWiFiIcon->Checked = true;
 	}
 	else
 	{
-		this->rIsWirelessIcon->Checked = true;
+		this->combBackup->Enabled = true;
 	}
-	this->setRegionForms();
-	this->setParentalForms();			// ペアレンタルコントロール関連
 } // setSrlForms()
 
 // SRLの特殊な設定をフォームにセットする(言語切り替えで表示を変えたいので独立させる)
-void Form1::setSrlFormsCaptionEx()
+void Form1::setSrlFormsTextBox()
 {
-	if( System::String::IsNullOrEmpty( this->tboxFile->Text ) )
+	if( !this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon )
 	{
-		return;
+		if( this->isJapanese() )
+			this->tboxConnectIcon->Text = "アイコンを表示しない";
+		else
+			this->tboxConnectIcon->Text = "No Icon";
 	}
+	else if( this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon )
+	{
+		if( this->isJapanese() )
+			this->tboxConnectIcon->Text = "Wi-Fiコネクションアイコン";
+		else
+			this->tboxConnectIcon->Text = "Wi-Fi Connection Icon";
+	}
+	else if( !this->hSrl->IsWiFiIcon && this->hSrl->IsWirelessIcon )
+	{
+		if( this->isJapanese() )
+			this->tboxConnectIcon->Text = "ワイヤレス通信アイコン";
+		else
+			this->tboxConnectIcon->Text = "Wireless Icon";
+	}
+	else
+	{
+		if( this->isJapanese() )
+			this->tboxConnectIcon->Text = "不正な設定";
+		else
+			this->tboxConnectIcon->Text = "Illegal Setting";
+	}
+
 	System::String ^appother = gcnew System::String("");
 	if( !this->hSrl->IsLaunch )
 	{
@@ -261,7 +281,7 @@ void Form1::setSrlFormsCaptionEx()
 		else
 			this->tboxCaptionEx->Text += gcnew System::String( "SDFC Register Accessible.\r\n" );
 	}
-} // setSrlFormsCaptionEx()
+} // setSrlFormsTextBox()
 
 // フォームの入力をチェックする
 System::Boolean Form1::checkSrlForms(void)

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

@@ -84,14 +84,6 @@ System::Void Form1::saveTmp( System::String ^filename )
 	MasterEditorTWL::appendXmlTag( doc, form, "Mail2", this->tboxMail2->Text );
 	MasterEditorTWL::appendXmlTag( doc, form, "NTSC2", this->tboxNTSC2->Text );
 
-	if( this->rIsWirelessIcon->Checked )
-		MasterEditorTWL::appendXmlTag( doc, form, "DisplayIcon", "Wireless" );
-	else if( this->rIsWiFiIcon->Checked )
-		MasterEditorTWL::appendXmlTag( doc, form, "DisplayIcon", "WiFi" );
-	else
-		MasterEditorTWL::appendXmlTag( doc, form, "DisplayIcon", "None" );
-
-	MasterEditorTWL::appendXmlTag( doc, form, "IsEULA", (this->cboxIsEULA->Checked)?"Y":"N" );
 	MasterEditorTWL::appendXmlTag( doc, form, "Region", this->combRegion->SelectedIndex.ToString() );
 	MasterEditorTWL::appendXmlTag( doc, form, "RatingCERO", this->combCERO->SelectedIndex.ToString() );
 	MasterEditorTWL::appendXmlTag( doc, form, "RatingESRB", this->combESRB->SelectedIndex.ToString() );
@@ -159,9 +151,10 @@ void Form1::loadTmp( System::String ^filename )
 	this->parseTmp( root, "/MasterEditorTWL/Form/ProductCode1", this->tboxProductCode1 );
 	this->parseTmp( root, "/MasterEditorTWL/Form/ProductCode2", this->tboxProductCode2 );
 	this->parseTmp( root, "/MasterEditorTWL/Form/SubmitVersion", this->numSubmitVersion );
-	this->parseTmp( root, "/MasterEditorTWL/Form/Backup", this->combBackup );
 	this->parseTmp( root, "/MasterEditorTWL/Form/ReleaseDate", this->dateRelease );
 	this->parseTmp( root, "/MasterEditorTWL/Form/SubmitDate",  this->dateSubmit );
+	this->parseTmp( root, "/MasterEditorTWL/Form/Backup", this->combBackup );
+	this->combBackup->Enabled = true;
 
 	this->tboxBackupOther->Enabled = false;
 	this->tboxBackupOther->Clear();
@@ -234,11 +227,6 @@ void Form1::loadTmp( System::String ^filename )
 	this->parseTmp( root, "/MasterEditorTWL/Form/Mail2", this->tboxMail2 );
 	this->parseTmp( root, "/MasterEditorTWL/Form/NTSC2", this->tboxNTSC2 );
 
-	rbuts = gcnew cli::array<System::Windows::Forms::RadioButton^>{this->rIsWirelessIcon, this->rIsWiFiIcon, this->rIsNoIcon};
-	strs  = gcnew cli::array<System::String^>{"Wireless","WiFi","None"};
-	this->parseTmp( root, "/MasterEditorTWL/Form/DisplayIcon", rbuts, strs );
-
-	this->parseTmp( root, "/MasterEditorTWL/Form/IsEULA", this->cboxIsEULA );
 	this->parseTmp( root, "/MasterEditorTWL/Form/Region", this->combRegion );
 	this->parseTmp( root, "/MasterEditorTWL/Form/RatingCERO", this->combCERO );
 	this->parseTmp( root, "/MasterEditorTWL/Form/RatingESRB", this->combESRB );

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

@@ -1420,14 +1420,24 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
 		}
 	}
 
+	if( this->IsWL )
+	{
+		this->hErrorList->Add( gcnew RCMrcError( 
+			"TWL拡張諸フラグ", 0x1bf, 0x1bf, 
+			"本来、立つはずのないフラグが立てられています。ビルド時の設定をご確認ください。",
+			"TWL Extended Flag",
+			"Unavailable flag is set. Please check building option.",
+			false, true ) );
+	}
+
 	if( this->IsWiFiIcon && this->IsWirelessIcon )
 	{
 		this->hErrorList->Add( gcnew RCMrcError( 
 			"アイコン表示フラグ", 0x1bf, 0x1bf, 
-			"ワイヤレス通信アイコンとWi-Fi通信アイコンは同時に表示できません。設定を無視して読み込みます。",
+			"ワイヤレス通信アイコンとWi-Fi通信アイコンは同時に表示できません。",
-			"Icon Displaying",
+			"Icon Displaying Flag",
-			"Icon displayed on menu is either Wireless Icon or Wi-Fi Icon. This setting was ignored in reading.",
+			"Icon displayed on menu is either Wireless Icon or Wi-Fi Connection Icon.",
-			true, true ) );		// 修正可能
+			false, true ) );
 	}
 
 	if( !this->IsMediaNand )	// カードアプリのときのみ

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

@@ -298,12 +298,12 @@ namespace MasterEditorTWL
 		property System::Boolean  IsOldDevEncrypt;	// 旧開発用暗号フラグが立っている
 		property System::Boolean  IsSCFGAccess;		// SCFGレジスタをロックしている
 
-		// TWL拡張フラグ 一部編集可能
+		// TWL拡張フラグ Read Only
 		property System::Boolean IsCodecTWL;
-		property System::Boolean IsEULA;			// 編集可能
+		property System::Boolean IsEULA;
 		property System::Boolean IsSubBanner;
-		property System::Boolean IsWiFiIcon;		// 編集可能
+		property System::Boolean IsWiFiIcon;
-		property System::Boolean IsWirelessIcon;	// 編集可能
+		property System::Boolean IsWirelessIcon;
 		property System::Boolean IsWL;
 
 		// TWLアクセスコントロール Read Only