diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
index 154a6f9..65c0e5d 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo
index 927c6a8..13f1174 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
index defb2f4..1ee867e 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp
index d1077a7..b64a60c 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp
@@ -237,7 +237,7 @@ System::String^ Form1::setDeliverableRatingOgnProperties( System::Windows::Forms
System::String ^str;
if( this->cboxIsUnnecessaryRating->Checked )
{
- if( box->Visible )
+ if( box->FlatStyle == System::Windows::Forms::FlatStyle::Standard )
{
str = System::String::Copy( box->Text ); // テキスト入力可になっているので取得できるはず
}
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp
index 7d39a2f..f459193 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp
@@ -56,7 +56,11 @@ System::Boolean Form1::saveRom( System::String ^outfile )
// 一時ファイルにSRLを書き出しているのでその一時ファイルから出力ファイルを作成
System::String ^tmpsrl = this->getSplitTadTmpFilename();
result = this->saveSrl( tmpsrl, outfile );
- System::IO::File::Delete( tmpsrl );
+ if( result )
+ {
+ System::IO::File::Delete( tmpsrl );
+ this->IsLoadTad = false; // 出力したSRLが次のソースとなる
+ }
}
else
{
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp
index 28ab3c9..6501103 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp
@@ -277,6 +277,11 @@ void Form1::enableRating( System::Windows::Forms::ComboBox ^comb,
{
lab2->Visible = true;
}
+ // 本来は不必要な設定
+ //「レーティング表示不要」でEnableをfalseにするのでリージョンに含まれているのかどうかを知る術がない
+ // (Visibleは親タブが変わると勝手にFalseになってしまう)
+ // そのため無関係な設定を変えることでリージョンに含まれていることを表現する
+ comb->FlatStyle = System::Windows::Forms::FlatStyle::Standard;
}
// ペアレンタルコントロール情報を編集できなくする
@@ -292,6 +297,7 @@ void Form1::disableRating( System::Windows::Forms::ComboBox ^comb,
{
lab2->Visible = false;
}
+ comb->FlatStyle = System::Windows::Forms::FlatStyle::Popup; // Disableを表現
}
// 「レーティング表示不要」と表示して編集できなくする
@@ -320,7 +326,7 @@ void Form1::necessaryRating( System::Windows::Forms::ComboBox ^comb, System::Boo
{
comb->SelectedIndex = -1; // 読み込みの場合にはコンボボックスを初期化しない(せっかく読み込んだ情報を消してしまうため)
}
- comb->Enabled = true; // 編集不可能にする
+ comb->Enabled = true; // 編集可能にする
}
// end of file
\ No newline at end of file
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm
index 9570a0a..87bd6ba 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml
index 813a109..6e04fb4 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml
@@ -69,6 +69,28 @@
+
+
-
-