diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 1c72dc0..ba7359b 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index a608061..b3ff263 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 95a1996..ee07bcd 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 21b2706..fc8a2f6 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -4508,6 +4508,10 @@ private: System::Windows::Forms::RadioButton^ rPurposeCardTouchTryDS; 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 ); + // 会社情報の保存と読み出し + System::Void saveCompany( System::String ^filename ); + System::Void loadCompany( System::String ^filename ); + private: // ---------------------------------------------- // フォームの設定変更 @@ -4905,6 +4909,11 @@ private: System::Windows::Forms::RadioButton^ rPurposeCardTouchTryDS; { return (this->getResDir() + "rominfolist.xsl"); } + // 会社情報のXML + System::String^ getCompanyInfoFile(void) + { + return (this->getBinDir() + "company.xml"); + } private: // ---------------------------------------------- diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp index b289d93..47a771f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp @@ -119,6 +119,9 @@ void Form1::construct(void) // 引数処理 this->handleArgs(); //System::Diagnostics::Debug::WriteLine( "constructed" ); + + // 会社情報の自動読み出し + this->loadCompany( this->getCompanyInfoFile() ); } @@ -127,6 +130,9 @@ void Form1::construct(void) // ---------------------------------------------- void Form1::destruct(void) { + // 会社情報の自動保存 + this->saveCompany( this->getCompanyInfoFile() ); + // TAD読み出しの際に作成される一時SRLファイルを削除(書き出しをせずに終了したときに起こりうる) System::String ^srlfile = this->getSplitTadTmpFile(); if( System::IO::File::Exists( srlfile ) ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index 0464a92..eef1ff6 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -161,6 +161,7 @@ void Form1::loadTmp( System::String ^filename ) { (void)ex; this->errMsg( "E_LoadTemp" ); + return; } System::Xml::XmlElement ^root = doc->DocumentElement; System::String ^text; @@ -276,14 +277,6 @@ void Form1::loadTmp( System::String ^filename ) this->parseTmp( root, "/MasterEditorTWL/Form/InputPerson2", this->cboxIsInputPerson2 ); this->gboxPerson2->Enabled = false; - this->tboxCompany2->Enabled = false; - this->tboxDepart2->Enabled = false; - this->tboxPerson2->Enabled = false; - this->tboxFurigana2->Enabled = false; - this->tboxTel2->Enabled = false; - this->tboxFax2->Enabled = false; - this->tboxMail2->Enabled = false; - this->tboxNTSC2->Enabled = false; this->tboxCompany2->Clear(); this->tboxDepart2->Clear(); this->tboxPerson2->Clear(); @@ -295,14 +288,6 @@ void Form1::loadTmp( System::String ^filename ) if( this->cboxIsInputPerson2->Checked ) { this->gboxPerson2->Enabled = true; - this->tboxCompany2->Enabled = true; - this->tboxDepart2->Enabled = true; - this->tboxPerson2->Enabled = true; - this->tboxFurigana2->Enabled = true; - this->tboxTel2->Enabled = true; - this->tboxFax2->Enabled = true; - this->tboxMail2->Enabled = true; - this->tboxNTSC2->Enabled = true; this->parseTmp( root, "/MasterEditorTWL/Form/Company2", this->tboxCompany2 ); this->parseTmp( root, "/MasterEditorTWL/Form/Depart2", this->tboxDepart2 ); this->parseTmp( root, "/MasterEditorTWL/Form/Name2", this->tboxPerson2 ); @@ -349,6 +334,105 @@ void Form1::loadTmp( System::String ^filename ) //this->maskDLCategoryForms(); } //loadTmp() +// ---------------------------------------------- +// 会社情報の保存 +// ---------------------------------------------- +System::Void Form1::saveCompany( System::String ^filename ) +{ + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); + + doc->AppendChild( doc->CreateXmlDeclaration("1.0","UTF-8",nullptr) ); + System::Xml::XmlElement ^root = doc->CreateElement( "MasterEditorTWL" ); + doc->AppendChild( root ); + + // フォーム + System::Xml::XmlElement ^form = doc->CreateElement( "CompanyInfo" ); + root->AppendChild( form ); + + MasterEditorTWL::appendXmlTag( doc, form, "Company1", this->tboxCompany1->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Depart1", this->tboxDepart1->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Name1", this->tboxPerson1->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Furigana1", this->tboxFurigana1->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Tel1", this->tboxTel1->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Fax1", this->tboxFax1->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Mail1", this->tboxMail1->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "NTSC1", this->tboxNTSC1->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "InputPerson2", (this->cboxIsInputPerson2->Checked)?"Y":"N" ); + MasterEditorTWL::appendXmlTag( doc, form, "Company2", this->tboxCompany2->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Depart2", this->tboxDepart2->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Name2", this->tboxPerson2->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Furigana2", this->tboxFurigana2->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Tel2", this->tboxTel2->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Fax2", this->tboxFax2->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Mail2", this->tboxMail2->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "NTSC2", this->tboxNTSC2->Text ); + + // バージョン + MasterEditorTWL::appendXmlTag( doc, root, "MasterEditorVersion", this->getVersion() ); + + try + { + doc->Save( filename ); + } + catch( System::Exception ^ex ) + { + (void)ex; + return; // ファイルがないとき何もしない + } +} //saveTmp() + +// ---------------------------------------------- +// 会社情報の読み込み +// ---------------------------------------------- +void Form1::loadCompany( System::String ^filename ) +{ + System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument; + try + { + doc->Load( filename ); + } + catch( System::Exception ^ex ) + { + (void)ex; + return; // ファイルがないとき何もしない + } + + System::Xml::XmlElement ^root = doc->DocumentElement; + + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Company1", this->tboxCompany1 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Depart1", this->tboxDepart1 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Name1", this->tboxPerson1 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Furigana1", this->tboxFurigana1 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Tel1", this->tboxTel1 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Fax1", this->tboxFax1 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Mail1", this->tboxMail1 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/NTSC1", this->tboxNTSC1 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/InputPerson2", this->cboxIsInputPerson2 ); + + this->gboxPerson2->Enabled = false; + this->tboxCompany2->Clear(); + this->tboxDepart2->Clear(); + this->tboxPerson2->Clear(); + this->tboxFurigana2->Clear(); + this->tboxTel2->Clear(); + this->tboxFax2->Clear(); + this->tboxMail2->Clear(); + this->tboxNTSC2->Clear(); + if( this->cboxIsInputPerson2->Checked ) + { + this->gboxPerson2->Enabled = true; + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Company2", this->tboxCompany2 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Depart2", this->tboxDepart2 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Name2", this->tboxPerson2 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Furigana2", this->tboxFurigana2 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Tel2", this->tboxTel2 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Fax2", this->tboxFax2 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/Mail2", this->tboxMail2 ); + this->parseTmp( root, "/MasterEditorTWL/CompanyInfo/NTSC2", this->tboxNTSC2 ); + } +} //loadCompany() + + // ---------------------------------------------- // 一時保存情報をフォーム情報に変換 // ---------------------------------------------- diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index 1186e61..ff377a0 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj index f528c99..2093584 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj @@ -81,6 +81,12 @@ } "Entry" { + "MsmKey" = "8:_9081D70FB535474FA8789DC9AFE4637C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_A3417E9C9F294832AE49B5BDAF95E373" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -99,40 +105,10 @@ } "Entry" { - "MsmKey" = "8:_EB97861D2BE24B1889C25826A31A7639" - "OwnerKey" = "8:_F5BECC59B4FF45CA9F9146470B41D52D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F5BECC59B4FF45CA9F9146470B41D52D" - "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_FE56DE664C36410FB05BBF909ADE9DBE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "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" { @@ -444,6 +420,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9081D70FB535474FA8789DC9AFE4637C" + { + "SourcePath" = "8:..\\company.xml" + "TargetName" = "8:company.xml" + "Tag" = "8:" + "Folder" = "8:_1494B8B199184797B9C812877A4DFB7F" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3417E9C9F294832AE49B5BDAF95E373" { "SourcePath" = "8:..\\resource\\ini.xml" @@ -1160,34 +1156,6 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EB97861D2BE24B1889C25826A31A7639" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_crt_x86.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F5BECC59B4FF45CA9F9146470B41D52D" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } } "ProjectOutput" { diff --git a/build/tools/MasterEditor/MasterEditorTWL/company.xml b/build/tools/MasterEditor/MasterEditorTWL/company.xml new file mode 100644 index 0000000..220a021 --- /dev/null +++ b/build/tools/MasterEditor/MasterEditorTWL/company.xml @@ -0,0 +1,7 @@ +ｻｿ + + + N + + 1.8 + \ No newline at end of file diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 20db7f5..6c31e0f 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml and b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index eec7ee0..9e7bc17 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -34,12 +34,6 @@ 282bFalseTrue - - DWC繝ｩ繧､繝悶Λ繝ｪ - 髢狗匱逕ｨ繧ｵ繝ｼ繝舌↓繧｢繧ｯ繧ｻ繧ｹ縺吶ｋ髢｢謨ｰ縺御ｽｿ逕ｨ縺輔ｌ縺ｦ縺縺ｾ縺吶 - 282bFalseTrue - - 繝繧､繧ｸ繧ｧ繧ｹ繝 繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ縺後ム繧､繧ｸ繧ｧ繧ｹ繝医ｮ蟇ｾ雎｡遽蝗ｲ繧医ｊ繧ょｰ上＆縺上↑縺｣縺ｦ縺縺ｾ縺吶３OM譛ｫ蟆ｾ縺ｮ繝代ョ繧｣繝ｳ繧ｰ繧СOM縺ｮ荳驛ｨ縺悟炎髯､縺輔ｌ縺ｦ縺繧句庄閭ｽ諤ｧ縺後≠繧翫∪縺吶