From 091bcc55de2194276c03534ad4e89b01f83098a2 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Thu, 25 Sep 2008 05:45:25 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=BF:FINALROM=E3=83=93=E3=83=AB=E3=83=89=E3=81=98?= =?UTF-8?q?=E3=82=83=E3=81=AA=E3=81=84=E3=81=A8=E3=81=8D=E3=81=AB=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E3=81=A8=E3=81=97=E3=81=A6?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8BDEBUG=E3=82=92?= =?UTF-8?q?=E8=B5=A4=E6=96=87=E5=AD=97=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2549 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../tools/MasterEditorTWL/MasterEditorTWL.ncb | Bin 11242496 -> 11258880 bytes .../tools/MasterEditorTWL/MasterEditorTWL.suo | Bin 57856 -> 57344 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 11564 -> 17502 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 156 ++++++------------ .../MasterEditorTWL/Form_pctl.cpp | 82 ++++++++- .../MasterEditorTWL/Form_srl.cpp | 5 + 6 files changed, 141 insertions(+), 102 deletions(-) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index 9b25ac07f38c0224011217c92b6e5097e15b618a..6af778b8c8aebaafb1f25b3ca8107e1c98974086 100644 GIT binary patch delta 33116 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 A1poj5 diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index 21ccc21a34639a5034cc541315529330437fc5d9..0b42579ef0f82b160071f3971340e3a708b0d209 100644 GIT binary patch delta 3387 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 diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 9405014104e8044675732e597d8296f470a5c048..92fcd773a9608b378884cc4af432f1aba527ac19 100644 GIT binary patch delta 1829 zcmcIlOH30{6um7_ph=Nmp``)F!I+Y0c@(H%R3g7fj35vxeqx2vBBA_Bi|B%Gj8S4@ z^tmR1xKuQm4H`8rbz!23ZrKYO7rM~Ih38G_bQp>|Gnvo3_uO+o@7+6(FKpa4J@Z*g z8p%ubxV*%uftvAb<`Ytba>Me%;_RYniqa%?;u%%HJrtxFn&CyZ8he~#G)@uRF}hA^ zO)HmdrTk{8l%rwyO;8A!IUTBouewUpi1L)L0N5tsBh6Q%)6F4{h+e0~7=TR>wtHzK zG)z-8wufz4%_OAP@}JJKbbOVg$Ux*ek9QPYBUtUkUvcX4;l<7h<(RF@l(E8FvP)Sj z7!=BeJ<7jmHU*X6dB?N!V>AkXVOmgHY~7hnz{l4L+W4oeLjGodc4ri!%^}$kQug4v zfLo$EibEQr0c>R)Nd)nI7Su7is%nFfi_(it1)hJb{Kj89DsmS{rb8t2`;LJud0Xyv z6z2|U@+N-NQD%~Puce%S$SM^vBm}?S_b7bG6rgj|L*3L)z0`q&1wO=;)Me6y5t9sL z2nCNLqdLTk0|@41j>2BX>XJ?#ghb|j7Q6Dbz#$6On6bvE3I}uea?x9ULMq_P4oP`f z){&P9t$eAP6*Nso8f8M7HfL09$=xPbBl(OLh;&3$9F?k7<`1k3+Fc-}^XPU2Q24s8Xi3oOPG;wtT5lVLsn)(UJz8 zp(PDkLrW&Lm(@8liGyP3NrQ2^A9dxyLHb9R3I-l<+Viy(d6CoQ(^jOgKkOZQz^dbg zBZqrDD7;7Yy20KrjzN#}YX1UcA-ghs@6c+xELXq7%cS6aSaT zRK&@Yxz}2pkjPE_R124W42vmLeVVRew4~+z*oQetQ)5O#!|R7j6xcyvqCky9GljJe z)n>Sx=m>sCjp|C2Ojyp~?-2!Z45KP$RUNg90C>H%q&G<(1xWm^#5_w_VYgjbbuVTA1#TRMga7~l delta 255 zcmccD!MG-BgBhEk0fQMBS}+(hm@*hJm`pA-G~Qgpwu^1@Dqfk*3j~Z9v8dTA9lQC1 zya-6j9E)}@#W2>%a$IbaEm)6Co*>OLd4ZF_swiA~ts+>(jAh#`kTk0F_%fT3XXR{NDK0MOkvJ^%m! diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index 9107edd0..2b5fe8d2 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -530,8 +530,8 @@ private: System::Windows::Forms::RadioButton^ rErrorReading; private: System::Windows::Forms::Label^ labMultiForeign2; private: System::Windows::Forms::DataGridView^ gridLibrary; -private: System::Windows::Forms::DataGridViewTextBoxColumn^ colLibPublisher; -private: System::Windows::Forms::DataGridViewTextBoxColumn^ colLibName; + + @@ -577,6 +577,12 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorName; private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorBegin; private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorEnd; private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colLibPublisher; +private: System::Windows::Forms::DataGridViewTextBoxColumn^ colLibName; + + + + @@ -738,6 +744,7 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle1 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle2 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle3 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle4 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); this->tboxFile = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -929,8 +936,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; this->tabMain = (gcnew System::Windows::Forms::TabControl()); this->tabRomInfo = (gcnew System::Windows::Forms::TabPage()); this->gridLibrary = (gcnew System::Windows::Forms::DataGridView()); - this->colLibPublisher = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); - this->colLibName = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); this->tboxGuideRomInfo = (gcnew System::Windows::Forms::TextBox()); this->tabTWLInfo = (gcnew System::Windows::Forms::TabPage()); this->tboxGuideTWLInfo = (gcnew System::Windows::Forms::TextBox()); @@ -971,6 +976,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; this->colErrorCause = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); this->labFile = (gcnew System::Windows::Forms::Label()); this->labAssemblyVersion = (gcnew System::Windows::Forms::Label()); + this->colLibPublisher = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->colLibName = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); this->gboxSrl->SuspendLayout(); this->gboxCRC->SuspendLayout(); this->gboxPerson2->SuspendLayout(); @@ -2864,29 +2871,28 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; // // gridLibrary // + this->gridLibrary->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridLibrary->BackgroundColor = System::Drawing::SystemColors::Control; this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, this->colLibName}); + dataGridViewCellStyle1->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle1->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle1->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + static_cast(128))); + dataGridViewCellStyle1->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle1->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle1->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle1->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle1; this->gridLibrary->Location = System::Drawing::Point(337, 189); this->gridLibrary->Name = L"gridLibrary"; + this->gridLibrary->ReadOnly = true; this->gridLibrary->RowHeadersVisible = false; this->gridLibrary->RowTemplate->Height = 21; this->gridLibrary->Size = System::Drawing::Size(374, 145); this->gridLibrary->TabIndex = 36; // - // colLibPublisher - // - this->colLibPublisher->HeaderText = L"Publisher"; - this->colLibPublisher->Name = L"colLibPublisher"; - // - // colLibName - // - this->colLibName->AutoSizeMode = System::Windows::Forms::DataGridViewAutoSizeColumnMode::Fill; - this->colLibName->HeaderText = L"Library Name"; - this->colLibName->Name = L"colLibName"; - this->colLibName->ReadOnly = true; - // // tboxGuideRomInfo // this->tboxGuideRomInfo->BackColor = System::Drawing::SystemColors::Info; @@ -3251,15 +3257,15 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; this->gridWarn->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridWarn->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colWarnName, this->colWarnBegin, this->colWarnEnd, this->colWarnCause}); - dataGridViewCellStyle1->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle1->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle1->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle2->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle2->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle2->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle1->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle1->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle1->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle1->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridWarn->DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle2->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle2->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle2->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridWarn->DefaultCellStyle = dataGridViewCellStyle2; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; this->gridWarn->Location = System::Drawing::Point(24, 228); this->gridWarn->Name = L"gridWarn"; @@ -3299,22 +3305,22 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; // // gridError // - dataGridViewCellStyle2->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle3->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridError->BackgroundColor = System::Drawing::SystemColors::Control; this->gridError->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridError->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colErrorName, this->colErrorBegin, this->colErrorEnd, this->colErrorCause}); - dataGridViewCellStyle3->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle3->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle3->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle4->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle4->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle4->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle3->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle3->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle3->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle3->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridError->DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle4->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle4->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle4->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle4->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridError->DefaultCellStyle = dataGridViewCellStyle4; this->gridError->GridColor = System::Drawing::SystemColors::Control; this->gridError->Location = System::Drawing::Point(24, 99); this->gridError->Name = L"gridError"; @@ -3371,6 +3377,19 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; this->labAssemblyVersion->TabIndex = 37; this->labAssemblyVersion->Text = L"ver.0.0.00000.00000"; // + // colLibPublisher + // + this->colLibPublisher->HeaderText = L"Publisher"; + this->colLibPublisher->Name = L"colLibPublisher"; + this->colLibPublisher->ReadOnly = true; + // + // colLibName + // + this->colLibName->AutoSizeMode = System::Windows::Forms::DataGridViewAutoSizeColumnMode::Fill; + this->colLibName->HeaderText = L"Library Name"; + this->colLibName->Name = L"colLibName"; + this->colLibName->ReadOnly = true; + // // Form1 // this->AutoScaleDimensions = System::Drawing::SizeF(6, 12); @@ -3528,75 +3547,10 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; // --------------------------------------------------------------------- // フォーム入力をSRLに反映させる - void setRegionSrlPropaties(void) - { - this->hSrl->hIsRegionJapan = gcnew System::Boolean(false); - this->hSrl->hIsRegionAmerica = gcnew System::Boolean(false); - this->hSrl->hIsRegionEurope = gcnew System::Boolean(false); - this->hSrl->hIsRegionAustralia = gcnew System::Boolean(false); - switch( this->combRegion->SelectedIndex ) - { - case 0: - this->hSrl->hIsRegionJapan = gcnew System::Boolean(true); - break; - - case 1: - this->hSrl->hIsRegionAmerica = gcnew System::Boolean(true); - break; - - case 2: - this->hSrl->hIsRegionEurope = gcnew System::Boolean(true); - break; - - case 3: - this->hSrl->hIsRegionAustralia = gcnew System::Boolean(true); - break; - - case 4: - this->hSrl->hIsRegionEurope = gcnew System::Boolean(true); - this->hSrl->hIsRegionAustralia = gcnew System::Boolean(true); - break; - -#if defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) - case 5: - this->hSrl->hIsRegionJapan = gcnew System::Boolean(true); - this->hSrl->hIsRegionAmerica = gcnew System::Boolean(true); - this->hSrl->hIsRegionEurope = gcnew System::Boolean(true); - this->hSrl->hIsRegionAustralia = gcnew System::Boolean(true); - break; -#endif //defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) - default: - break; - } - } + void setRegionSrlPropaties(void); // SRL情報をフォームに反映させる - void setRegionForms(void) - { - System::Boolean isJapan = *(this->hSrl->hIsRegionJapan); // リージョン - System::Boolean isAmerica = *(this->hSrl->hIsRegionAmerica); - System::Boolean isEurope = *(this->hSrl->hIsRegionEurope); - System::Boolean isAustralia = *(this->hSrl->hIsRegionAustralia); - System::Int32 index; - if( isJapan && !isAmerica && !isEurope && !isAustralia ) - index = 0; - else if( !isJapan && isAmerica && !isEurope && !isAustralia ) - index = 1; - else if( !isJapan && !isAmerica && isEurope && !isAustralia ) - index = 2; - else if( !isJapan && !isAmerica && !isEurope && isAustralia ) - index = 3; - else if( !isJapan && !isAmerica && isEurope && isAustralia ) - index = 4; - else - index = -1; // 不正 -#if defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) - if( isJapan && isAmerica && isEurope && isAustralia ) - index = 5; -#endif - this->combRegion->SelectedIndex = index; - this->maskParentalForms(); // ペアレンタルコントロール用フォームの表示/非表示切り替え - } + void setRegionForms(void); private: // --------------------------------------------------------------------- diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp index d1d64cea..bd7d8102 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp @@ -1,5 +1,5 @@ // --------------------------------------------------------------------- -// ペアレンタルコントロール設定は複雑なので外部ファイルに切り出す +// リージョンとペアレンタルコントロール設定 // --------------------------------------------------------------------- #include "stdafx.h" @@ -21,6 +21,86 @@ using namespace System::Data; using namespace System::Drawing; using namespace MasterEditorTWL; +// --------------------------------------------------------------------- +// リージョン設定は複雑なので別に切り出す +// --------------------------------------------------------------------- + +// フォーム入力をSRLに反映させる +void Form1::setRegionSrlPropaties(void) +{ + this->hSrl->hIsRegionJapan = gcnew System::Boolean(false); + this->hSrl->hIsRegionAmerica = gcnew System::Boolean(false); + this->hSrl->hIsRegionEurope = gcnew System::Boolean(false); + this->hSrl->hIsRegionAustralia = gcnew System::Boolean(false); + switch( this->combRegion->SelectedIndex ) + { + case 0: + this->hSrl->hIsRegionJapan = gcnew System::Boolean(true); + break; + + case 1: + this->hSrl->hIsRegionAmerica = gcnew System::Boolean(true); + break; + + case 2: + this->hSrl->hIsRegionEurope = gcnew System::Boolean(true); + break; + + case 3: + this->hSrl->hIsRegionAustralia = gcnew System::Boolean(true); + break; + + case 4: + this->hSrl->hIsRegionEurope = gcnew System::Boolean(true); + this->hSrl->hIsRegionAustralia = gcnew System::Boolean(true); + break; + +#if defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) + case 5: + this->hSrl->hIsRegionJapan = gcnew System::Boolean(true); + this->hSrl->hIsRegionAmerica = gcnew System::Boolean(true); + this->hSrl->hIsRegionEurope = gcnew System::Boolean(true); + this->hSrl->hIsRegionAustralia = gcnew System::Boolean(true); + break; +#endif //defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) + default: + break; + } +} + +// --------------------------------------------------------------------- +// ペアレンタルコントロール設定は複雑なので別に切り出す +// --------------------------------------------------------------------- + +// SRL情報をフォームに反映させる +void Form1::setRegionForms(void) +{ + System::Boolean isJapan = *(this->hSrl->hIsRegionJapan); // リージョン + System::Boolean isAmerica = *(this->hSrl->hIsRegionAmerica); + System::Boolean isEurope = *(this->hSrl->hIsRegionEurope); + System::Boolean isAustralia = *(this->hSrl->hIsRegionAustralia); + System::Int32 index; + if( isJapan && !isAmerica && !isEurope && !isAustralia ) + index = 0; + else if( !isJapan && isAmerica && !isEurope && !isAustralia ) + index = 1; + else if( !isJapan && !isAmerica && isEurope && !isAustralia ) + index = 2; + else if( !isJapan && !isAmerica && !isEurope && isAustralia ) + index = 3; + else if( !isJapan && !isAmerica && isEurope && isAustralia ) + index = 4; + else + index = -1; // 不正 +#if defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) + if( isJapan && isAmerica && isEurope && isAustralia ) + index = 5; +#endif + this->combRegion->SelectedIndex = index; + this->maskParentalForms(); // ペアレンタルコントロール用フォームの表示/非表示切り替え +} + + // フォーム入力をSRLに反映させる void Form1::setParentalSrlProperties(void) { diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 686179bd..82410074 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -192,6 +192,11 @@ void Form1::setSrlForms(void) for each( RCLicense ^lic in this->hSrl->hLicenseList ) { this->gridLibrary->Rows->Add( gcnew cli::array{lic->Publisher, lic->Name} ); + if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->Equals( "DEBUG" ) ) + { + System::Int32 last = this->gridLibrary->Rows->Count - 2; // 追加直後の行 + this->gridLibrary->Rows[ last ]->DefaultCellStyle->ForeColor = System::Drawing::Color::Red; + } } }