chojy
/
INT69DB_2A
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A

master
sj84 2025-03-14 10:01:58 +09:00
parent 488ae8a8c2 2bbe2fe17f
commit 455c980959
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INT69DB_2A/Controls/ControlUserSetting.cs
View File

@ -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)
{

18
INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs
View File

@ -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

4
INT69DB_2A/Forms/FormMain.cs
View File

@ -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)
{

4
INT69DB_2A/Forms/FormUserEditor.cs
View File

@ -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)
{

6
INT69DB_2A/Forms/FormUserGroupEditor.cs
View File

@ -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)
{