rvtr/TwlToolsRED
1
Fork 0
mirror of https://github.com/rvtr/TwlToolsRED.git synced 2025-10-31 06:41:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

マスタエディタ:雑多なバグを修正。

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@361 7061adef-622a-194b-ae81-725974e89856
This commit is contained in:
nishikawa_takeshi 2009-07-07 12:28:14 +00:00
parent 6d68267f7a
commit bb61673399
9 changed files with 75 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
View File

Binary file not shown.

BIN
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo
View File

Binary file not shown.

BIN
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
View File

Binary file not shown.

41
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_rominfolist.cpp
View File

@ -56,6 +56,15 @@ static System::Xml::XmlElement^ CreateSDKVersionListElement(System::Xml::XmlDocu
// ======================================================
void Form1::makeRomInfoListXml(System::Xml::XmlDocument ^doc, System::Boolean withError, System::Boolean isCurrent)
{
if( withError )
{
// エラー情報を最新に更新
this->hErrorList->Clear();
this->hWarnList->Clear();
this->checkSrlForms();
this->checkDeliverableForms();
}
System::Xml::XmlElement ^root = doc->CreateElement( "twl-master-editor" );
System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly();
root->SetAttribute( "version", this->getVersion() );
@ -129,11 +138,11 @@ void Form1::makeRomInfoListXml(System::Xml::XmlDocument ^doc, System::Boolean wi
tag->AppendChild( CreateRomInfoListElement(doc, this->labMedia->Text, this->tboxMedia->Text, nullptr) );
if( this->hSrl->IsNAND ) // カードアプリでは不要な情報
{
tag->AppendChild( CreateRomInfoListElement(doc, this->labSrlSize->Text, this->tboxSrlSize->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labPublicSize->Text, this->tboxPublicSize->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labPrivateSize->Text, this->tboxPrivateSize->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labSubBannerSize->Text, this->tboxSubBannerSize->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labTmdSize->Text, this->tboxTmdSize->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labSrlSize->Text, this->tboxSrlSizeFS->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labPublicSize->Text, this->tboxPublicSizeFS->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labPrivateSize->Text, this->tboxPrivateSizeFS->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labSubBannerSize->Text, this->tboxSubBannerSizeFS->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labTmdSize->Text, this->tboxTmdSizeFS->Text, nullptr) );
tag->AppendChild( CreateRomInfoListElement(doc, this->labSumSize->Text + " " + this->labSumSize2->Text,
this->tboxSumSize->Text + " (" + this->tboxSumSizeMB->Text + ")", nullptr) );
}
@ -148,8 +157,26 @@ void Form1::makeRomInfoListXml(System::Xml::XmlDocument ^doc, System::Boolean wi
System::Xml::XmlElement ^tag = doc->CreateElement("info-list");
// リージョン
tag->AppendChild( CreateRomInfoListElement(doc, this->labRegion->Text,
dynamic_cast<System::String^>(this->combRegion->SelectedItem), nullptr) );
System::String ^region = "";
if( this->combRegion->DropDownStyle == System::Windows::Forms::ComboBoxStyle::DropDown )
{
// 中韓のときはリストで選択不可のテキストがコンボボックスに書かれているのでそれを登録
region = this->combRegion->Text;
}
else
{
// WorldWide のときはリストで選択可能な文字列を登録
if( this->combRegion->SelectedIndex < 0 )
{
region = this->isJapanese()?METWL_STRING_UNDEFINED_REGION_J:METWL_STRING_UNDEFINED_REGION_E; // 起こり得ない
}
else
{
// リストで選択されているテキストを登録
region = dynamic_cast<System::String^>(this->combRegion->SelectedItem);
}
}
tag->AppendChild( CreateRomInfoListElement(doc, this->labRegion->Text, region, nullptr) );
section->AppendChild(tag);
// レーティング

7
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp
View File

@ -402,6 +402,13 @@ System::Boolean Form1::checkSrlForms(void)
break;
}
// 韓国は選択できないので特殊な条件となる
if( (this->combRegion->DropDownStyle == System::Windows::Forms::ComboBoxStyle::DropDown)
&& this->hSrl->IsRegionKorea )
{
bKorea = true;
}
// ペアレンタルコントロール
if( this->cboxIsUnnecessaryRating->Checked )
{

BIN
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm
View File

Binary file not shown.

4
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp
View File

@ -452,9 +452,9 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet(
if( hSrl->IsSDRead && hSrl->IsSDWrite )
node->FirstChild->Value = gcnew System::String("Read/Write");
else if( hSrl->IsSDRead )
node->FirstChild->Value = gcnew System::String("Read Only");
node->FirstChild->Value = gcnew System::String("Read");
else if( hSrl->IsSDWrite )
node->FirstChild->Value = gcnew System::String("Write Only");
node->FirstChild->Value = gcnew System::String("Write");
else
node->FirstChild->Value = gcnew System::String("None");
}

5
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp
View File

@ -442,6 +442,11 @@ void RCSrl::setUnnecessaryRatingInfo( u32 region )
System::Collections::Generic::List<int> ^ognlist = MasterEditorTWL::getOgnListInRegion( region );
if( ognlist == nullptr )
{
// 中国のときレーティング団体は存在しないがレーティング表示不要の選択は可能なので警告しておく
if( this->IsUnnecessaryRating )
{
this->hParentalWarnList->Add( this->makeMrcError("UnnecessaryRatingSetting") );
}
return;
}

42
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj
View File

@ -27,6 +27,12 @@
}
"Entry"
{
"MsmKey" = "8:_16461ACF7E294454AE98B7611DB53D71"
"OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_351447BE85794AA58330AD369D8A545D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@ -63,12 +69,6 @@
}
"Entry"
{
"MsmKey" = "8:_70AB37BBE8CA43569FBD2939340E73E5"
"OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@ -99,8 +99,8 @@
}
"Entry"
{
"MsmKey" = "8:_D76DFCAA5D1E46308791E7C21B146970"
"OwnerKey" = "8:_70AB37BBE8CA43569FBD2939340E73E5"
"MsmKey" = "8:_CDF9120ADBEE4B1196851468AC83D61E"
"OwnerKey" = "8:_16461ACF7E294454AE98B7611DB53D71"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -121,6 +121,18 @@
"OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_BFEA9BAA0DBF4332913A71EDE89FC3CD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_7DAFD42678FC4D69A3A6BC6E6726AB10"
"MsmSig" = "8:_UNDEFINED"
}
}
"Configurations"
{
@ -390,7 +402,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.4.3351.35028, Culture=en, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.6.3475.37513, Culture=en, processorArchitecture=MSIL"
"ScatterAssemblies"
{
}
@ -456,7 +468,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.4.3351.35028, Culture=ja, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.6.3475.37513, Culture=ja, processorArchitecture=MSIL"
"ScatterAssemblies"
{
}
@ -619,7 +631,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MasterEditorTWL"
"ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}"
"PackageCode" = "8:{090C6074-3E94-4D36-AF0F-E6CF082E9464}"
"PackageCode" = "8:{26573A94-1263-4CA6-94FD-288609D82D7E}"
"UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE"
@ -1148,11 +1160,11 @@
}
"MergeModule"
{
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_70AB37BBE8CA43569FBD2939340E73E5"
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_16461ACF7E294454AE98B7611DB53D71"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
"SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"
"SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"
"Properties"
{
}
@ -1162,11 +1174,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D76DFCAA5D1E46308791E7C21B146970"
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_CDF9120ADBEE4B1196851468AC83D61E"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
"SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"
"SourcePath" = "8:microsoft_vc90_crt_x86.msm"
"Properties"
{
}