diff --git a/INT69DB_2A/Controls/ControlUserSetting.cs b/INT69DB_2A/Controls/ControlUserSetting.cs index 1847926..94b5d86 100644 --- a/INT69DB_2A/Controls/ControlUserSetting.cs +++ b/INT69DB_2A/Controls/ControlUserSetting.cs @@ -176,7 +176,7 @@ namespace INT69DB_2A.Controls private void labelPassword_Click(object sender, EventArgs e) { string value = ""; - DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text); + DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text, this.ParentForm.ParentForm.SystemConfig.Language); if (keyboard.ShowDialog() == DialogResult.OK) { diff --git a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs index 272446f..fe6002c 100644 --- a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs +++ b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs @@ -16,7 +16,7 @@ namespace INT69DB_2A.DialogForms #endregion #region Constructor - public DialogFormUserEditorKeyboard(string value) + public DialogFormUserEditorKeyboard(string value, DataStore.LanguageID language) { InitializeComponent(); @@ -25,6 +25,22 @@ namespace INT69DB_2A.DialogForms this.InitializeControl(); this.DefaultSetting(); + + switch (language) + { + case DataStore.LanguageID.Korean: + this.labelTitle.Text = "입력"; + break; + case DataStore.LanguageID.English: + this.labelTitle.Text = "Type"; + break; + case DataStore.LanguageID.Chinese: + this.labelTitle.Text = "输入"; + break; + default: + this.labelTitle.Text = "Type"; + break; + } } #endregion diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs index 8ff7a43..c345d09 100644 --- a/INT69DB_2A/Forms/FormMain.cs +++ b/INT69DB_2A/Forms/FormMain.cs @@ -3270,6 +3270,10 @@ namespace INT69DB_2A.Forms public void UartCom3Write(string data) { this.smartSerialPortCom3.WriteFrame(data, SmartSerialPort.CODETYPES.ASCIICODE); + + // 로그 + //if (this.IsCom3LogOpen == true) + //this.smartFileCom3Log.WriteString(string.Format("COM3 Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, data)); } private int UartCom3Write(string command, string id, string address, string data) { diff --git a/INT69DB_2A/Forms/FormUserEditor.cs b/INT69DB_2A/Forms/FormUserEditor.cs index 4b81e1d..485cca0 100644 --- a/INT69DB_2A/Forms/FormUserEditor.cs +++ b/INT69DB_2A/Forms/FormUserEditor.cs @@ -1032,7 +1032,7 @@ namespace INT69DB_2A.Forms private void labelID_Click(object sender, EventArgs e) { string value = ""; - DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelID.Text); + DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelID.Text, this.ParentForm.SystemConfig.Language); if (keyboard.ShowDialog() == DialogResult.OK) { @@ -1050,7 +1050,7 @@ namespace INT69DB_2A.Forms private void labelPassword_Click(object sender, EventArgs e) { string value = ""; - DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.SelectedUserItem.Password); + DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.SelectedUserItem.Password, this.ParentForm.SystemConfig.Language); if (keyboard.ShowDialog() == DialogResult.OK) { diff --git a/INT69DB_2A/Forms/FormUserGroupEditor.cs b/INT69DB_2A/Forms/FormUserGroupEditor.cs index 6e651b8..0e10f94 100644 --- a/INT69DB_2A/Forms/FormUserGroupEditor.cs +++ b/INT69DB_2A/Forms/FormUserGroupEditor.cs @@ -620,7 +620,7 @@ namespace INT69DB_2A.Forms before = this.labelLevel1Name.Text; - DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel1Name.Text); + DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel1Name.Text, this.ParentForm.SystemConfig.Language); if (keyboard.ShowDialog() == DialogResult.OK) { @@ -641,7 +641,7 @@ namespace INT69DB_2A.Forms before = this.labelLevel2Name.Text; - DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel2Name.Text); + DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel2Name.Text, this.ParentForm.SystemConfig.Language); if (keyboard.ShowDialog() == DialogResult.OK) { @@ -662,7 +662,7 @@ namespace INT69DB_2A.Forms before = this.labelLevel3Name.Text; - DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel3Name.Text); + DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel3Name.Text, this.ParentForm.SystemConfig.Language); if (keyboard.ShowDialog() == DialogResult.OK) {