diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index 2f9685c0..14d05023 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index 22114adb..b4da9d65 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 6e38b05e..5942b1df 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index 3dc60fa3..ad506bdd 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -3530,6 +3530,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemMiddlewareHtml; cli::array^rbuts, cli::array^textCands ); System::Boolean parseTmp( System::Xml::XmlElement ^root, System::String ^xpath, System::Windows::Forms::CheckBox ^cbox ); System::Boolean parseTmp( System::Xml::XmlElement ^root, System::String ^xpath, System::Windows::Forms::TextBox ^tbox ); + System::Boolean parseTmp( System::Xml::XmlElement ^root, System::String ^xpath, System::Windows::Forms::DateTimePicker ^date ); private: // ---------------------------------------------- diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index bcdb0689..a4e81886 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -63,6 +63,8 @@ System::Void Form1::saveTmp( System::String ^filename ) else if( this->rUsageOther->Checked ) MasterEditorTWL::appendXmlTag( doc, form, "Purpose", "Other" ); MasterEditorTWL::appendXmlTag( doc, form, "PurposeOther", this->tboxUsageOther->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "ReleaseDate", this->dateRelease->Value.ToString() ); + MasterEditorTWL::appendXmlTag( doc, form, "SubmitDate", this->dateSubmit->Value.ToString() ); MasterEditorTWL::appendXmlTag( doc, form, "Company1", this->tboxCompany1->Text ); MasterEditorTWL::appendXmlTag( doc, form, "Depart1", this->tboxDepart1->Text ); @@ -99,14 +101,30 @@ System::Void Form1::saveTmp( System::String ^filename ) MasterEditorTWL::appendXmlTag( doc, form, "RatingPEGI_BBFC", this->combPEGI_BBFC->SelectedIndex.ToString() ); MasterEditorTWL::appendXmlTag( doc, form, "RatingOFLC", this->combOFLC->SelectedIndex.ToString() ); - doc->Save( filename ); + try + { + doc->Save( filename ); + } + catch( System::Exception ^ex ) + { + (void)ex; + this->errMsg( "一時情報の保存に失敗しました。", "Saving a temporary file failed." ); + } } //saveTmp() // 一時ファイルの読み出し void Form1::loadTmp( System::String ^filename ) { System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument; - doc->Load( filename ); + try + { + doc->Load( filename ); + } + catch( System::Exception ^ex ) + { + (void)ex; + this->errMsg( "一時情報の読み込みに失敗しました。", "Loading a temporary file failed." ); + } System::Xml::XmlElement ^root = doc->DocumentElement; System::String ^text; @@ -138,6 +156,8 @@ void Form1::loadTmp( System::String ^filename ) this->parseTmp( root, "/MasterEditorTWL/Form/ProductCode2", this->tboxProductCode2 ); this->parseTmp( root, "/MasterEditorTWL/Form/SubmitVersion", this->numSubmitVersion ); this->parseTmp( root, "/MasterEditorTWL/Form/Backup", this->combBackup ); + this->parseTmp( root, "/MasterEditorTWL/Form/ReleaseDate", this->dateRelease ); + this->parseTmp( root, "/MasterEditorTWL/Form/SubmitDate", this->dateSubmit ); this->tboxBackupOther->Enabled = false; this->tboxBackupOther->Clear(); @@ -340,3 +360,23 @@ System::Boolean Form1::parseTmp( System::Xml::XmlElement ^root, System::String ^ tbox->Text = text; return true; } +System::Boolean Form1::parseTmp( System::Xml::XmlElement ^root, System::String ^xpath, System::Windows::Forms::DateTimePicker ^date ) +{ + System::String ^text = MasterEditorTWL::getXPathText( root, xpath ); + if( System::String::IsNullOrEmpty( text ) ) + return false; + + System::Diagnostics::Debug::WriteLine( text ); + + try + { + date->Value = System::DateTime::Parse( text ); + } + catch( System::Exception ^ex ) + { + (void)ex; + date->Value = System::DateTime::Now; + return false; + } + return true; +} diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index 22bb3b7a..8a089aa9 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ