From 3e8f0d6c745c81c537bd7826e6ce25aa3afb9ac5 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Mon, 22 Sep 2008 04:28:01 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=83=BC=E3=82=A8?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=82=BF:=E6=8F=90=E5=87=BA=E6=9B=B8?= =?UTF-8?q?=E3=81=AE=E3=81=BF=E3=82=92=E4=BD=9C=E6=88=90=E3=81=99=E3=82=8B?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=81=8C=E6=84=8F=E5=91=B3=E3=81=AA=E3=81=95?= =?UTF-8?q?=E3=81=92=E3=81=A0=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=80=82=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=A7=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88?= =?UTF-8?q?=E8=A8=80=E8=AA=9E=E3=82=92=E5=88=87=E3=82=8A=E6=9B=BF=E3=81=88?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=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@2542 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../tools/MasterEditorTWL/MasterEditorTWL.ncb | Bin 11242496 -> 11242496 bytes .../tools/MasterEditorTWL/MasterEditorTWL.suo | Bin 57344 -> 59392 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 17502 -> 17502 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 192 +++--------------- .../MasterEditorTWL/Form1.resX | 6 - .../MasterEditorTWL/Form_file.cpp | 8 + .../MasterEditorTWL/Form_lang.cpp | 2 - build/tools/MasterEditorTWL/resource/ini.xml | 1 + 8 files changed, 33 insertions(+), 176 deletions(-) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index c3f5af81afa75418570755dbc671a542766fd761..7527361a2ab918bec9ac40864eda51537fe09ad6 100644 GIT binary patch delta 38029 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 delta 7165 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 G9sh4=U&!tN diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index 062c071a005781415c589203a78938d416fc8229..a1c3e3104432d4a90a0ba643bf63f79c164e08fc 100644 GIT binary patch delta 3580 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 delta 267 zcmccD!FaEOaf1b$pbLW`g9U>bg8_pvg9(EXgURGVL*vagY!Td8r1nb3ZvG%I#wh5D zRo5J00S-*5&3mOiSq0s&>hMyW#D^)h`K^8-qp%UsO=xc0TxgijgiT`dUTNvgd?tDz SU4|IC{7qkCm+&?h<^=%p)i789 diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index 0c61f95c..84489851 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -560,7 +560,7 @@ private: System::Windows::Forms::RadioButton^ rIsWiFiIcon; private: System::Windows::Forms::RadioButton^ rIsWirelessIcon; private: System::Windows::Forms::RadioButton^ rIsNoIcon; -private: System::Windows::Forms::ToolStripMenuItem^ stripItemSheetOnly; + @@ -735,9 +735,9 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; /// void InitializeComponent(void) { - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle7 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle8 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle9 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + 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()); this->tboxFile = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -923,7 +923,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; this->stripMaster = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->stripItemSheet = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->stripItemMasterRom = (gcnew System::Windows::Forms::ToolStripMenuItem()); - this->stripItemSheetOnly = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->stripLang = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->stripItemEnglish = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->stripItemJapanese = (gcnew System::Windows::Forms::ToolStripMenuItem()); @@ -2785,8 +2784,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; // // stripMaster // - this->stripMaster->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(3) {this->stripItemSheet, - this->stripItemMasterRom, this->stripItemSheetOnly}); + this->stripMaster->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(2) {this->stripItemSheet, + this->stripItemMasterRom}); this->stripMaster->Name = L"stripMaster"; this->stripMaster->Size = System::Drawing::Size(53, 20); this->stripMaster->Text = L"マスター"; @@ -2805,13 +2804,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; this->stripItemMasterRom->Text = L"マスターROMのみを作成"; this->stripItemMasterRom->Click += gcnew System::EventHandler(this, &Form1::stripItemMasterRom_Click); // - // stripItemSheetOnly - // - this->stripItemSheetOnly->Name = L"stripItemSheetOnly"; - this->stripItemSheetOnly->Size = System::Drawing::Size(232, 22); - this->stripItemSheetOnly->Text = L"提出確認書のみを作成"; - this->stripItemSheetOnly->Click += gcnew System::EventHandler(this, &Form1::stripItemSheetOnly_Click); - // // stripLang // this->stripLang->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(2) {this->stripItemEnglish, @@ -3259,15 +3251,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}); - dataGridViewCellStyle7->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle7->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle7->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + 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))); - dataGridViewCellStyle7->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle7->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle7->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle7->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridWarn->DefaultCellStyle = dataGridViewCellStyle7; + 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; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; this->gridWarn->Location = System::Drawing::Point(24, 228); this->gridWarn->Name = L"gridWarn"; @@ -3307,22 +3299,22 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; // // gridError // - dataGridViewCellStyle8->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle2; 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}); - dataGridViewCellStyle9->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle9->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle9->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + 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, static_cast(128))); - dataGridViewCellStyle9->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle9->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle9->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle9->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridError->DefaultCellStyle = dataGridViewCellStyle9; + 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; this->gridError->GridColor = System::Drawing::SystemColors::Control; this->gridError->Location = System::Drawing::Point(24, 99); this->gridError->Name = L"gridError"; @@ -3856,142 +3848,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; } } //stripItemMasterRom_Click() - private: - System::Void stripItemSheetOnly_Click(System::Object^ sender, System::EventArgs^ e) - { - // SRLが読み込まれていないときにはリードさせない - if( System::String::IsNullOrEmpty( this->tboxFile->Text ) ) - { - this->errMsg( "ROMデータファイルがオープンされていません。", "ROM file has not opened yet." ); - return; - } - System::String ^srlfullpath = this->tboxFile->Text; - - // SRLと書類の両方のフォーム入力をチェックする - this->hErrorList->Clear(); - this->hWarnList->Clear(); - if( this->checkSrlForms() == false ) - { - this->errMsg( "ROMデータに不正な設定があるため提出確認書の作成ができません。", - "A ROM data and a submission sheet can't be saved, since it has illegal info." ); - return; - } - if( this->checkDeliverableForms() == false ) - { - this->errMsg( "入力情報に不足があるため提出確認書を作成できません。", - "Making a submission sheet can't be done, since your input is not enough." ); - return; - } - - // マスタ提出確認書に必要な情報をフォームから取得して更新 - this->setSrlProperties(); // 先にSrlを更新しておく(この時点ではROMヘッダには反映されない) - this->setDeliverableProperties(); - - // CRCを算出したいので一時的なファイルにSRLを保存する - System::String ^tmpfile = "./tmp.srl"; - try - { - this->saveSrlCore( tmpfile ); - } - catch( System::Exception ^ex ) - { - (void)ex; - this->errMsg( "CRCの計算に失敗しました。提出確認書の作成はキャンセルされます。", - "Calc CRC is failed. Therefore, Making a submission sheet is canceled." ); - return; - } - u16 crc; // SRL全体のCRCを計算する(書類に記述するため) - if( !getWholeCRCInFile( tmpfile, &crc ) ) - { - this->errMsg( "CRCの計算に失敗しました。提出確認書の作成はキャンセルされます。", - "Calc CRC is failed. Therefore, Making a submission sheet is canceled." ); - return; - } - System::UInt16 ^hcrc = gcnew System::UInt16( crc ); - System::IO::File::Delete( tmpfile ); - - // 書類に記載するSRL名を提出手順書に従わせる - System::String ^srlfile; - { - srlfile = gcnew System::String(""); - - if( this->cboxRemasterVerE->Checked == true ) - { - srlfile = "T" + this->hSrl->hGameCode + "E" + this->numSubmitVersion->Value.ToString() + ".SRL"; - } - else - { - srlfile = "T" + this->hSrl->hGameCode + this->hSrl->hRomVersion->ToString() + this->numSubmitVersion->Value.ToString() + ".SRL"; - } - } - // 注意書き - { - this->sucMsg( - "マスターROMデータは作成されませんが、書類には現在の入力が反映されます。" - + "\n・書類に記載されるCRCは現在の入力を反映して再計算されるため、読み込んだファイルとは異なる場合があります。" - + "\n・提出確認書に記載されるROMデータファイル名は、提出手順書にしたがい、 \"" + srlfile + "\"となります。", - "A submission sheet description is based on current input information." - + "\n・CRC code described in the sheet may be different from one of input ROM data. " - + "\n・a ROM data file name discribed in the sheet is \"" + srlfile + "\"." - ); - } - - // ダイアログで書類のファイルパスを決定 - System::String ^delivfile; - { - System::Windows::Forms::SaveFileDialog ^dlg = gcnew (SaveFileDialog); - - dlg->InitialDirectory = "c:\\"; - dlg->Filter = "xml形式 (*.xml)|*.xml"; - dlg->FilterIndex = 1; - dlg->RestoreDirectory = true; - - if( dlg->ShowDialog() != System::Windows::Forms::DialogResult::OK ) - { - this->errMsg( "提出確認書の作成がキャンセルされました。", "Making a submission sheet is canceled." ); - return; - } - delivfile = dlg->FileName; - if( !(dlg->FileName->EndsWith( ".xml" )) ) - { - delivfile += ".xml"; - } - } - - // 書類作成 - //result = this->hDeliv->write( delivfile, this->hSrl, hcrc, srlfile, !(this->stripItemJapanese->Checked) ); - ECDeliverableResult result = this->hDeliv->writeSpreadsheet( delivfile, this->hSrl, hcrc, srlfile, !(this->stripItemJapanese->Checked) ); - if( result != ECDeliverableResult::NOERROR ) - { - switch( result ) - { - case ECDeliverableResult::ERROR_FILE_OPEN: - this->errMsg( "提出確認書のテンプレートが開けなかったため、提出確認書の作成に失敗しました。", - "Since a templete of the submission sheet can't be opened, making the sheet is failed." ); - break; - - case ECDeliverableResult::ERROR_FILE_WRITE: - this->errMsg( "提出確認書にデータを書き込みできませんでした。同名ファイルがすでに開かれていないかご確認ください。", - "Writing data into a submission sheet failed. Please check that the file has been opened already." ); - break; - - default: - this->errMsg( "提出確認書の作成に失敗しました。", "Making the submission sheet is failed." ); - break; - } - return; - } - // SRLクラスのプロパティを元に戻すため再リード - ECSrlResult r = this->hSrl->readFromFile( srlfullpath ); // フォームには反映しない - if( r != ECSrlResult::NOERROR ) - { - this->errMsg( "ROMデータファイルの再読み込みに失敗しました。\n再度「ROMデータを開く」を選択してROMデータを読み出してください。", - "Reading the ROM data file failed. \nPlease read a ROM data file again, with \"Open a ROM data file\"" ); - return; - } - this->sucMsg( "提出確認書の保存が成功しました。", "Making the submission sheet file succeeded." ); - } //stripItemSheetOnly_Click() - private: System::Void stripItemSheet_Click(System::Object^ sender, System::EventArgs^ e) { diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX index dbdac4bd..1f0e93fa 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -126,12 +126,6 @@ True - - True - - - True - True diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp index d404af9b..b520a7e2 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_file.cpp @@ -48,6 +48,14 @@ void Form1::loadInit(void) this->readOnly(); } + // タグ + if( MasterEditorTWL::isXmlEqual( root, "lang", "E" ) ) + { + this->stripItemEnglish->Checked = true; + this->stripItemJapanese->Checked = false; + this->changeEnglish(); + } + // タグ System::Boolean bXML = MasterEditorTWL::isXmlEqual( root, "output", "XML" ); diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index e1601121..4c0ee697 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -48,7 +48,6 @@ void Form1::changeJapanese(void) this->stripMaster->Text = gcnew System::String( "マスター" ); this->stripItemSheet->Text = gcnew System::String( "提出確認書とマスターROMを作成する" ); this->stripItemMasterRom->Text = gcnew System::String( "マスターROMのみを作成する" ); - this->stripItemSheetOnly->Text = gcnew System::String( "提出確認書のみを作成する" ); // 入力ファイル this->labFile->Text = gcnew System::String( "ROMデータファイル" ); @@ -271,7 +270,6 @@ void Form1::changeEnglish(void) this->stripMaster->Text = gcnew System::String( "Master" ); this->stripItemSheet->Text = gcnew System::String( "Make a submission sheet and a master ROM data file" ); this->stripItemMasterRom->Text = gcnew System::String( "Make a master ROM data file only" ); - this->stripItemSheetOnly->Text = gcnew System::String( "Make a submission sheet only" ); // 入力ファイル this->labFile->Text = gcnew System::String( "ROM Data File" ); diff --git a/build/tools/MasterEditorTWL/resource/ini.xml b/build/tools/MasterEditorTWL/resource/ini.xml index 50864681..b2f2db6c 100644 --- a/build/tools/MasterEditorTWL/resource/ini.xml +++ b/build/tools/MasterEditorTWL/resource/ini.xml @@ -1,6 +1,7 @@ w + J Sheet OFF