From 0938d162240cc44ff1fde1a70e9421d6fdbff84c Mon Sep 17 00:00:00 2001 From: sj84 Date: Tue, 20 Aug 2024 12:38:41 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EC=A0=80=20=ED=8C=A8=EC=8A=A4?= =?UTF-8?q?=EC=9B=8C=EB=93=9C=20=EB=B3=80=EA=B2=BD=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=AF=B8?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EC=8B=9C=20=EB=A9=94=EB=89=B4=EC=A0=91?= =?UTF-8?q?=EA=B7=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/Forms/FormInformation.cs | 2 +- INT69DC_7C/Forms/FormMenu.cs | 28 +++++++++++++++------------- INT69DC_7C/Forms/FormUserEditor.cs | 25 ++++++++++++++++++++++--- INT69DC_7C/Version.txt | 8 ++++++++ 4 files changed, 46 insertions(+), 17 deletions(-) diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index 6b36d2b..b8788b1 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -140,7 +140,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "11.3.0"; + this.labelDisplayVer.Text = "11.4.0"; if(this.ParentForm.SystemConfig.EquipmentMode == 7) this.labelTitleMainboardName.Text = "INT68M-2A"; else diff --git a/INT69DC_7C/Forms/FormMenu.cs b/INT69DC_7C/Forms/FormMenu.cs index 9e19d18..1fe93f2 100644 --- a/INT69DC_7C/Forms/FormMenu.cs +++ b/INT69DC_7C/Forms/FormMenu.cs @@ -495,21 +495,23 @@ namespace INT69DC_7C.Forms break; case DataStore.UserGroup.NotLogin: #region NotLogin - this.buttonInformation.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInformation; - this.buttonDataBackup.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuDataBackup; - this.buttonConfiguration.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuConfiguration; - this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuCommunication; - this.buttonCalibration.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuCalibration; + // true + this.buttonInformation.Enabled = true; + this.buttonDataBackup.Enabled = true; + this.buttonConfiguration.Enabled = true; + this.buttonCommunication.Enabled = true; + this.buttonCalibration.Enabled = true; - this.buttonSysConfig.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuSystem; - this.buttonMotorSetting.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuMotor; - this.buttonUpdate.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuUpdate; - this.buttonFactoryInitialize.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInitialization; - this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuIOTest; - - this.buttonEquipmentSetting.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment; - this.buttonTimeSetting.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuTime; + this.buttonSysConfig.Enabled = true; + this.buttonMotorSetting.Enabled = true; + this.buttonUpdate.Enabled = true; + this.buttonFactoryInitialize.Enabled = true; + this.buttonIOTest.Enabled = true; + this.buttonEquipmentSetting.Enabled = true; + this.buttonTimeSetting.Enabled = true; + + // false this.buttonEquipmentTest.Visible = false; this.buttonOptionSetting.Visible = false; this.buttonUser.Enabled = false; diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs index d686641..f174d66 100644 --- a/INT69DC_7C/Forms/FormUserEditor.cs +++ b/INT69DC_7C/Forms/FormUserEditor.cs @@ -613,10 +613,22 @@ namespace INT69DC_7C.Forms } private void UpdateSelectUserDisplay(UserItem item) { + string pass = ""; this.SetEnableID(false); + // ID this.labelID.Text = item.ID; - this.labelPassword.Text = item.Password; + // Password + if (this.SelectedUserItem.IsFirstPassword == 1) + this.labelPassword.Text = item.Password; + else + { + for (int i = 0; i < item.Password.Length; i++) + pass = pass + '*'; + + this.labelPassword.Text = pass; + } + this.UpdateAccessRightDisplay(item.ActiveLevel); this.buttonSave.Visible = false; @@ -1055,7 +1067,7 @@ namespace INT69DC_7C.Forms private void labelPassword_Click(object sender, EventArgs e) { string value = ""; - DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text); + DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.SelectedUserItem.Password); if (keyboard.ShowDialog() == DialogResult.OK) { value = keyboard.RetStringValue; @@ -1258,12 +1270,19 @@ namespace INT69DC_7C.Forms } else if (index > 0) { - this.SetEnablePassword(false); if (this.ParentForm.SystemConfig.CurrentUser.ID == this.listBoxUserList.Items[index].ToString()) + { + this.SetEnablePassword(true); this.buttonDelete.Visible = false; + this.buttonResetPW.Visible = false; + } else + { + this.SetEnablePassword(false); this.buttonDelete.Visible = true; + this.buttonResetPW.Visible = true; + } UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString()); } diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index 8061bf3..d1a7694 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -15,6 +15,14 @@ 멀티형 8,10,12열 컨베어/스틱 계량기 */ +@ Ver 11.4.0 by LSJ + - 2024.08.20 + - Ver 11.3.0 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - FormMenu + UpdateDisplayMenuAccess() + NotLogin 수정 + @ Ver 11.3.0 by LSJ - 2024.08.14 - Ver 11.2.1 Modify