フォントチェックを追加。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@415 7061adef-622a-194b-ae81-725974e89856
This commit is contained in:
nishikawa_takeshi 2009-10-26 05:44:17 +00:00
parent fbc24a6c00
commit 3a9581721d
11 changed files with 58 additions and 31 deletions

View File

@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
// 既定値にすることができます:
[assembly:AssemblyVersionAttribute("1.7.*")];
[assembly:AssemblyVersionAttribute("1.8.*")];
[assembly:ComVisible(false)];

View File

@ -3486,6 +3486,23 @@ private: System::Windows::Forms::TextBox^ tboxWarningChinaRating;
// }
//}
// 日本語フォントがあるかどうか調べる
bool hasJapaneseFont(void)
{
System::Drawing::Text::InstalledFontCollection ^ifc = gcnew System::Drawing::Text::InstalledFontCollection();
bool ret = false;
for each( System::Drawing::FontFamily ^ff in ifc->Families )
{
//System::Diagnostics::Debug::WriteLine(ff->Name);
if( ff->Name && (ff->Name->ToUpper()->Equals("MS PGOTHIC") || ff->Name->Equals(" Pゴシック")) )
{
ret = true;
}
}
return ret;
}
private:
// ----------------------------------------------
// 固定ファイル名の取得
@ -3847,6 +3864,12 @@ private: System::Windows::Forms::TextBox^ tboxWarningChinaRating;
}
System::Void stripItemJapanese_Click(System::Object^ sender, System::EventArgs^ e)
{
if( !this->hasJapaneseFont() )
{
this->errMsg( "E_JapaneseFont" );
return;
}
this->stripItemEnglish->Checked = false;
this->stripItemJapanese->Checked = true;
this->changeJapanese();

View File

@ -92,6 +92,10 @@ void Form1::construct(void)
this->stripItemJapanese->Checked = true;
this->stripItemEnglish->Checked = false;
this->changeFormInput("ja");
// 用途の"Internet"を選択不可にする
this->rSubmitInternet->Enabled = false;
this->rSubmitInternet->Visible = false;
}
else
{

View File

@ -56,13 +56,13 @@ void Form1::changeFormInput( System::String ^langname )
this->labArbit4->Visible = true;
// 日本ではInternet提出を認めないので表示を消す
if( this->rSubmitInternet->Checked )
{
this->rSubmitInternet->Checked = false; // Internetが選択されているときに表示を消すとどれも選択されていない状況になるので
this->rSubmitPost->Checked = true; // 必ずどれか1つが選択されているようにしておく
}
this->rSubmitInternet->Enabled = false;
this->rSubmitInternet->Visible = false;
//if( this->rSubmitInternet->Checked )
//{
// this->rSubmitInternet->Checked = false; // Internetが選択されているときに表示を消すとどれも選択されていない状況になるので
// this->rSubmitPost->Checked = true; // 必ずどれか1つが選択されているようにしておく
//}
//this->rSubmitInternet->Enabled = false;
//this->rSubmitInternet->Visible = false;
}
else
{
@ -79,8 +79,8 @@ void Form1::changeFormInput( System::String ^langname )
this->labArbit2->Visible = false;
this->labArbit4->Visible = false;
this->rSubmitInternet->Enabled = true;
this->rSubmitInternet->Visible = true;
//this->rSubmitInternet->Enabled = true;
//this->rSubmitInternet->Visible = true;
}
}

View File

@ -4,9 +4,9 @@
"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
"IsWebType" = "8:FALSE"
"ProjectName" = "8:MasterEditorTWLSetup"
"LanguageId" = "3:1041"
"CodePage" = "3:932"
"UILanguageId" = "3:1041"
"LanguageId" = "3:0"
"CodePage" = "3:1252"
"UILanguageId" = "3:0"
"SccProjectName" = "8:"
"SccLocalPath" = "8:"
"SccAuxPath" = "8:"
@ -57,12 +57,6 @@
}
"Entry"
{
"MsmKey" = "8:_69FDEF4B9A5E47BF87030D77CA500CF1"
"OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_6EC739CA561443E48045379A268C1657"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@ -105,8 +99,14 @@
}
"Entry"
{
"MsmKey" = "8:_EE72447B1EAC4E24A028D3AA3060EF26"
"OwnerKey" = "8:_69FDEF4B9A5E47BF87030D77CA500CF1"
"MsmKey" = "8:_EB97861D2BE24B1889C25826A31A7639"
"OwnerKey" = "8:_F5BECC59B4FF45CA9F9146470B41D52D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_F5BECC59B4FF45CA9F9146470B41D52D"
"OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -402,7 +402,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.6.3476.31697, Culture=en, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3586.25974, Culture=en, processorArchitecture=MSIL"
"ScatterAssemblies"
{
}
@ -468,7 +468,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.6.3476.31697, Culture=ja, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3586.25974, Culture=ja, processorArchitecture=MSIL"
"ScatterAssemblies"
{
}
@ -623,7 +623,7 @@
}
"MsiBootstrapper"
{
"LangId" = "3:1041"
"LangId" = "3:0"
"RequiresElevation" = "11:FALSE"
}
"Product"
@ -631,7 +631,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MasterEditorTWL"
"ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}"
"PackageCode" = "8:{81911C57-DB7E-405D-9943-298C27E682F9}"
"PackageCode" = "8:{1D0B613E-4E5F-46E7-B3E5-76CC6D251B6B}"
"UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE"
@ -1160,11 +1160,11 @@
}
"MergeModule"
{
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_69FDEF4B9A5E47BF87030D77CA500CF1"
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EB97861D2BE24B1889C25826A31A7639"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
"SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"
"SourcePath" = "8:microsoft_vc90_crt_x86.msm"
"Properties"
{
}
@ -1174,11 +1174,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EE72447B1EAC4E24A028D3AA3060EF26"
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F5BECC59B4FF45CA9F9146470B41D52D"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
"SourcePath" = "8:microsoft_vc90_crt_x86.msm"
"SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"
"Properties"
{
}

View File

@ -2,7 +2,7 @@
<message>
<!-- Begin messages appended in ver1.7-->
<E_JapaneseFont>Japanese text display is only supported on PCs that have the MS Gothic Japanese font installed.</E_JapaneseFont>
<E_JapaneseFont>Japanese text display is only supported on PCs that have the MS PGothic Japanese font installed.</E_JapaneseFont>
<!-- End messages appended in ver1.7-->
<!-- common -->

View File

@ -2,7 +2,7 @@
<message>
<!-- 英訳依頼 ver1.7 追加メッセージ ここから -->
<E_JapaneseFont> ゴシック (MS Gothic) フォントがインストールされていないPCでの日本語表示には対応していません。</E_JapaneseFont>
<E_JapaneseFont> ゴシック (MS PGothic) フォントがインストールされていないPCでの日本語表示には対応していません。</E_JapaneseFont>
<!-- 英訳依頼 ver1.7 追加メッセージ ここまで -->
<!-- common -->