diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 5c12563..6ed0b3f 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 46043a3..0fde91c 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 70b8e39..24b81ef 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/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 7818a27..c1f08d9 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -4705,7 +4705,7 @@ private: System::Windows::Forms::TextBox^ tboxPurposeInError; this->rPurposeZone }; - if( this->hSrl->IsMediaNand ) + if( this->hSrl->IsMediaNand ) // SRLが読み込まれていないときにはfalseであることが保証されている { for each( System::Windows::Forms::RadioButton ^r in rbutsCard ) { @@ -4736,6 +4736,8 @@ private: System::Windows::Forms::TextBox^ tboxPurposeInError; } } + // SRLのリージョンによって選択可能な項目をマスクする + // 日本向けでは"店頭試遊台(単独型)"をなくす if( this->hSrl->IsRegionJapan ) { @@ -4755,6 +4757,51 @@ private: System::Windows::Forms::TextBox^ tboxPurposeInError; } } + // さらにリージョンのコンボボックスによって選択可能な項目をマスクする + + // 日本リージョンの場合には"店頭体験版(単独型)"を非表示にする + if( this->combRegion->SelectedIndex == 0 ) + { + this->rPurposeCardKiosk->Enabled = false; + if( this->rPurposeCardKiosk->Checked ) + { + this->changePurposeForms( this->rPurposeOther ); + } + } + else + { + if( !System::String::IsNullOrEmpty(this->tboxFile->Text) && this->hSrl->IsMediaNand ) + { + this->rPurposeCardKiosk->Enabled = false; // すでにメディアによってマスクされているときには選択不可 + } + else + { + this->rPurposeCardKiosk->Enabled = true; + } + } + + // 英語版では"Touch!Try!DS"をなくす + if( (this->combRegion->SelectedIndex == 1) || + (this->combRegion->SelectedIndex == 5) || + (this->combRegion->SelectedIndex == 6) ) + { + this->rPurposeDSStation->Enabled = false; + if( this->rPurposeDSStation->Checked ) + { + this->changePurposeForms(this->rPurposeOther); + } + } + else + { + if( !System::String::IsNullOrEmpty(this->tboxFile->Text) && this->hSrl->IsMediaNand ) + { + this->rPurposeDSStation->Enabled = false; + } + else + { + this->rPurposeDSStation->Enabled = true; + } + } } //maskPurposeForms() private: @@ -4957,6 +5004,9 @@ private: System::Windows::Forms::TextBox^ tboxPurposeInError; // コンボボックスをチェック System::Boolean checkComboBoxIndex( System::Windows::Forms::ComboBox ^box, System::String ^tag, System::Boolean isAffectRom ); + // ラジオボタンをチェック + System::Boolean checkRadioButton( cli::array ^rbuts, System::String ^tag ); + // ----------------------------------------------------------------- // 提出情報(SRLに影響しない箇所のみ)とフォーム間のデータのやりとり // ----------------------------------------------------------------- @@ -5763,36 +5813,7 @@ private: System::Windows::Forms::TextBox^ tboxPurposeInError; this->changeUnnecessaryRatingForms(false); // 一度コンボボックスがenableになるので再設定 // リージョン変更によって表示する「用途」を変更する - - // 日本リージョンの場合には"店頭体験版(単独型)"を非表示にする - if( this->combRegion->SelectedIndex == 0 ) - { - this->rPurposeCardKiosk->Enabled = false; - if( this->rPurposeCardKiosk->Checked ) - { - this->changePurposeForms( this->rPurposeOther ); - } - } - else - { - this->rPurposeCardKiosk->Enabled = true; - } - - // 英語版では"Touch!Try!DS"をなくす - if( (this->combRegion->SelectedIndex == 1) || - (this->combRegion->SelectedIndex == 5) || - (this->combRegion->SelectedIndex == 6) ) - { - this->rPurposeDSStation->Enabled = false; - if( this->rPurposeDSStation->Checked ) - { - this->changePurposeForms(this->rPurposeOther); - } - } - else - { - this->rPurposeDSStation->Enabled = true; - } + this->maskPurposeForms(); } private: // レーティング表示不要が選択されたときにレーティングを選択不可にする diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 0352b14..45bcf51 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -327,6 +327,20 @@ System::Boolean Form1::checkDeliverableForms(void) this->checkTextForm( this->tboxPurposeOther->Text, "LabelUsage" ); } + //「用途」の項目はグループボックスの機能を使っておらず + // もしかしたらチェック漏れが発生するかもしれないのでチェックが入っているかを調べておく + cli::array ^rbuts = gcnew cli::array + { + this->rPurposeCardProduction, + this->rPurposeCardDistribution, + this->rPurposeCardKiosk, + this->rPurposeDSiWare, + this->rPurposeDSStation, + this->rPurposeZone, + this->rPurposeOther + }; + this->checkRadioButton( rbuts, "LabelUsage" ); + // 会社情報 this->checkTextForm( this->tboxPerson1->Text, "LabelPerson1" ); this->checkTextForm( this->tboxCompany1->Text, "LabelCompany1" ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index 08fe563..53b583b 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -349,6 +349,7 @@ void Form1::loadTmp( System::String ^filename ) this->maskRatingForms(); // ペアレンタルコントロール情報をリージョンに合わせる this->changeUnnecessaryRatingForms(true); // 一度コンボボックスがenableになるので再設定 this->maskBackupMemoryForms(); // NANDアプリのときのバックアップメモリの自動設定 + this->maskPurposeForms(); //this->maskDLCategoryForms(); } //loadTmp() diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp index 2b31819..b59cc65 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp @@ -74,10 +74,33 @@ System::Boolean Form1::checkComboBoxIndex( System::Windows::Forms::ComboBox ^box System::String ^msgE = this->hMsg->getMessage("ComboBoxInput", "E"); this->hErrorList->Add( gcnew RCMrcError( labelJ, 0, 0, msgJ, labelE, msgE, true, isAffectRom, RCMrcError::PurposeType::Common ) ); + return false; } return true; } +// ラジオボタンをチェック +System::Boolean Form1::checkRadioButton( cli::array ^rbuts, System::String ^tag ) +{ + bool checked = false; + for each( System::Windows::Forms::RadioButton ^r in rbuts ) + { + if( r->Checked ) + { + checked = true; + } + } + if( !checked ) + { + System::String ^labelJ = this->hMsg->getMessage(tag,"J"); + System::String ^labelE = this->hMsg->getMessage(tag,"E"); + System::String ^msgJ = this->hMsg->getMessage("RadioButtonInput", "J"); + System::String ^msgE = this->hMsg->getMessage("RadioButtonInput", "E"); + this->hErrorList->Add( gcnew RCMrcError( labelJ, 0, 0, msgJ, labelE, msgE, true, false, RCMrcError::PurposeType::Common ) ); + return false; + } + return true; +} // -------------------------------------------------------- // エラー情報の登録 diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml index a653ec5..c4f0400 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml @@ -102,12 +102,13 @@ Exception:{0} Insufficient input: Input data. Insufficient input: Illegal value. Insufficient input: Select data. +Insufficient input: Select data. Product Name Product Code Product Code(Region Code) Product Name(Foreign Version) Product Code(Foreign Version) -Usage +Purpose Backup Memory Contact1 Furigana diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_j.xml index 4fd9192..5b323ba 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_j.xml @@ -102,12 +102,13 @@ 蜈・蜉帶シ上l: 蜈・蜉帙@縺ヲ縺上□縺輔>縲 蜈・蜉帶シ上l: 蛟、縺御ク肴ュ」縺ァ縺吶 蜈・蜉帶シ上l: 驕ク謚槭@縺ヲ縺上□縺輔>縲 +蜈・蜉帶シ上l: 驕ク謚槭@縺ヲ縺上□縺輔>縲 陬ス蜩∝錐 陬ス蜩√さ繝シ繝 陬ス蜩√さ繝シ繝(莉募髄蝨ー莉墓ァ倥さ繝シ繝) 陬ス蜩∝錐(豬キ螟也沿) 陬ス蜩√さ繝シ繝(豬キ螟也沿) -逶ョ逧 +逕ィ騾 繝舌ャ繧ッ繧「繝繝励Γ繝「繝ェ 縺疲ー丞錐(諡蠖楢1) 縺オ繧翫′縺ェ(諡蠖楢1)