マスタエディタ:製品技術部向けオプションでのShared2ファイルのサイズチェックのバグを修正。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2637 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
nishikawa_takeshi 2008-10-17 04:50:20 +00:00
parent 366b86ca56
commit 7083dc8198
5 changed files with 15 additions and 3 deletions

View File

@ -40,6 +40,9 @@ namespace MasterEditorTWL {
// 書類出力モード(ーマルXML or XML Spread Sheet) // 書類出力モード(ーマルXML or XML Spread Sheet)
System::Boolean ^hIsSpreadSheet; System::Boolean ^hIsSpreadSheet;
// リードオンリーモード
System::Boolean ^hIsReadOnly;
// 入力エラー情報 // 入力エラー情報
System::Collections::Generic::List<RCMrcError ^> ^hErrorList; System::Collections::Generic::List<RCMrcError ^> ^hErrorList;
System::Collections::Generic::List<RCMrcError ^> ^hWarnList; System::Collections::Generic::List<RCMrcError ^> ^hWarnList;
@ -688,6 +691,7 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx;
// デフォルト値 // デフォルト値
this->hIsSpreadSheet = gcnew System::Boolean( true ); this->hIsSpreadSheet = gcnew System::Boolean( true );
this->hIsReadOnly = gcnew System::Boolean( false );
this->dateRelease->Value = System::DateTime::Now; this->dateRelease->Value = System::DateTime::Now;
this->dateSubmit->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) #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->cboxIsUGC->Enabled = false;
this->cboxIsPhotoEx->Enabled = false; this->cboxIsPhotoEx->Enabled = false;
this->butSetBack->Enabled = false;
this->combRegion->Enabled = false;
this->combCERO->Enabled = false; this->combCERO->Enabled = false;
this->combESRB->Enabled = false; this->combESRB->Enabled = false;
this->combUSK->Enabled = false; this->combUSK->Enabled = false;

View File

@ -49,6 +49,7 @@ void Form1::loadInit(void)
// <rw>タグ // <rw>タグ
System::Boolean bReadOnly = MasterEditorTWL::isXmlEqual( root, "rw", "r" ); System::Boolean bReadOnly = MasterEditorTWL::isXmlEqual( root, "rw", "r" );
this->hIsReadOnly = System::Boolean( bReadOnly );
if( bReadOnly ) if( bReadOnly )
{ {
this->readOnly(); this->readOnly();
@ -96,7 +97,7 @@ void Form1::loadInit(void)
System::Int32 i; System::Int32 i;
for( i=0; i < METWL_NUMOF_SHARED2FILES; 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 ); this->hSrl->hMrcSpecialList->hShared2SizeArray[i] = gcnew System::UInt32( size );
} }
} }
@ -115,8 +116,8 @@ void Form1::loadInit(void)
if( bReadOnly || bXML | bCheck ) if( bReadOnly || bXML | bCheck )
{ {
System::String ^msgJ = gcnew System::String("動作モード:"); System::String ^msgJ = gcnew System::String("[動作モード]");
System::String ^msgE = gcnew System::String("Processing Mode:"); System::String ^msgE = gcnew System::String("[Processing Mode]");
if( bReadOnly ) if( bReadOnly )
{ {
msgJ += "\nリードオンリーモード"; msgJ += "\nリードオンリーモード";
@ -166,6 +167,10 @@ System::Void Form1::loadSrl( System::String ^filename )
// GUIにROM情報を格納 // GUIにROM情報を格納
this->setSrlForms(); this->setSrlForms();
if( *(this->hIsReadOnly) )
{
this->readOnly(); // リードオンリーモードのときフォームをEnableにする
}
// SRLに登録されないROM仕様のフォーム情報も戻るボタンで読み込み時の状態に戻したいが // SRLに登録されないROM仕様のフォーム情報も戻るボタンで読み込み時の状態に戻したいが
// 読み込み時の状態をSRLに保存しておけないので退避しておく // 読み込み時の状態をSRLに保存しておけないので退避しておく
@ -194,6 +199,7 @@ System::Void Form1::loadSrl( System::String ^filename )
// "ROM data include error. Please look the tab \"Setting Error\"." ); // "ROM data include error. Please look the tab \"Setting Error\"." );
// return; // return;
//} //}
return; return;
} // loadSrl() } // loadSrl()