diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index edb42cae..fe09aafa 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index e447ad27..643de470 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index daf8b5f3..9333bf59 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index b9500cdf..7d7b5d6e 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -40,6 +40,9 @@ namespace MasterEditorTWL { // 書類出力モード(ノーマルXML or XML Spread Sheet) System::Boolean ^hIsSpreadSheet; + // リードオンリーモード + System::Boolean ^hIsReadOnly; + // 入力エラー情報 System::Collections::Generic::List ^hErrorList; System::Collections::Generic::List ^hWarnList; @@ -688,6 +691,7 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx; // デフォルト値 this->hIsSpreadSheet = gcnew System::Boolean( true ); + this->hIsReadOnly = gcnew System::Boolean( false ); this->dateRelease->Value = System::DateTime::Now; this->dateSubmit->Value = System::DateTime::Now; #if defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) @@ -3609,6 +3613,8 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx; this->cboxIsUGC->Enabled = false; this->cboxIsPhotoEx->Enabled = false; + this->butSetBack->Enabled = false; + this->combRegion->Enabled = false; this->combCERO->Enabled = false; this->combESRB->Enabled = false; this->combUSK->Enabled = false; diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp index 4de999fd..b486b3aa 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp @@ -49,6 +49,7 @@ void Form1::loadInit(void) // タグ System::Boolean bReadOnly = MasterEditorTWL::isXmlEqual( root, "rw", "r" ); + this->hIsReadOnly = System::Boolean( bReadOnly ); if( bReadOnly ) { this->readOnly(); @@ -96,7 +97,7 @@ void Form1::loadInit(void) System::Int32 i; for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ ) { - u8 size = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/shared2/size" + i.ToString() ) ); + u32 size = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/shared2/size" + i.ToString() ) ); this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = gcnew System::UInt32( size ); } } @@ -115,8 +116,8 @@ void Form1::loadInit(void) if( bReadOnly || bXML | bCheck ) { - System::String ^msgJ = gcnew System::String("動作モード:"); - System::String ^msgE = gcnew System::String("Processing Mode:"); + System::String ^msgJ = gcnew System::String("[動作モード]"); + System::String ^msgE = gcnew System::String("[Processing Mode]"); if( bReadOnly ) { msgJ += "\nリードオンリーモード"; @@ -166,6 +167,10 @@ System::Void Form1::loadSrl( System::String ^filename ) // GUIにROM情報を格納 this->setSrlForms(); + if( *(this->hIsReadOnly) ) + { + this->readOnly(); // リードオンリーモードのときフォームをEnableにする + } // SRLに登録されないROM仕様のフォーム情報も戻るボタンで読み込み時の状態に戻したいが // 読み込み時の状態をSRLに保存しておけないので退避しておく @@ -194,6 +199,7 @@ System::Void Form1::loadSrl( System::String ^filename ) // "ROM data include error. Please look the tab \"Setting Error\"." ); // return; //} + return; } // loadSrl()