From 87c56b939966dc935354c5ad8115f41a7abeda45 Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Wed, 16 Aug 2023 10:52:36 +0900 Subject: [PATCH] =?UTF-8?q?Part11=20=EC=B6=94=EA=B0=80=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DB_2A/Forms/FormUserEditor.Designer.cs | 54 ++---------------- INT69DB_2A/Forms/FormUserEditor.cs | 10 ---- .../Forms/FormUserGroupEditor.Designer.cs | 2 +- .../Release/Refactor/INT69DB_2A_ImageDll.dll | Bin 32256 -> 32256 bytes 4 files changed, 7 insertions(+), 59 deletions(-) diff --git a/INT69DB_2A/Forms/FormUserEditor.Designer.cs b/INT69DB_2A/Forms/FormUserEditor.Designer.cs index 2f59968..8950efd 100644 --- a/INT69DB_2A/Forms/FormUserEditor.Designer.cs +++ b/INT69DB_2A/Forms/FormUserEditor.Designer.cs @@ -53,7 +53,6 @@ this.labelTitleExpiryDateOfAccount = new SmartX.SmartLabel(); this.labelTitleAccessRight = new SmartX.SmartLabel(); this.smartGroupBox2 = new SmartX.SmartGroupBox(); - this.labelEquipment = new SmartX.SmartLabel(); this.labelMenu = new SmartX.SmartLabel(); this.labelMain = new SmartX.SmartLabel(); this.labelViewer = new SmartX.SmartLabel(); @@ -63,7 +62,6 @@ this.labelMotor = new SmartX.SmartLabel(); this.labelSystem = new SmartX.SmartLabel(); this.labelDataBackup = new SmartX.SmartLabel(); - this.labelUser = new SmartX.SmartLabel(); this.labelCalibration = new SmartX.SmartLabel(); this.labelCommunication = new SmartX.SmartLabel(); this.labelTime = new SmartX.SmartLabel(); @@ -572,7 +570,6 @@ // this.smartGroupBox2.BackPictureBox = this.smartForm1; this.smartGroupBox2.BackPictureBox1 = null; - this.smartGroupBox2.Controls.Add(this.labelEquipment); this.smartGroupBox2.Controls.Add(this.labelMenu); this.smartGroupBox2.Controls.Add(this.labelMain); this.smartGroupBox2.Controls.Add(this.labelViewer); @@ -582,7 +579,6 @@ this.smartGroupBox2.Controls.Add(this.labelMotor); this.smartGroupBox2.Controls.Add(this.labelSystem); this.smartGroupBox2.Controls.Add(this.labelDataBackup); - this.smartGroupBox2.Controls.Add(this.labelUser); this.smartGroupBox2.Controls.Add(this.labelCalibration); this.smartGroupBox2.Controls.Add(this.labelCommunication); this.smartGroupBox2.Controls.Add(this.labelTime); @@ -607,24 +603,6 @@ this.smartGroupBox2.Text = "Access right"; this.smartGroupBox2.TextColor = System.Drawing.Color.Black; // - // labelEquipment - // - this.labelEquipment.BackPictureBox = this.smartForm1; - this.labelEquipment.BackPictureBox1 = null; - this.labelEquipment.BackPictureBox2 = null; - this.labelEquipment.BorderColor = System.Drawing.Color.Black; - this.labelEquipment.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelEquipment.InitVisible = true; - this.labelEquipment.LineSpacing = 0F; - this.labelEquipment.Location = new System.Drawing.Point(279, 94); - this.labelEquipment.Name = "labelEquipment"; - this.labelEquipment.Size = new System.Drawing.Size(125, 18); - this.labelEquipment.TabIndex = 243; - this.labelEquipment.Text = "Equipment"; - this.labelEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelEquipment.Wordwrap = false; - // // labelMenu // this.labelMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41))))); @@ -676,7 +654,7 @@ this.labelViewer.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelViewer.InitVisible = true; this.labelViewer.LineSpacing = 0F; - this.labelViewer.Location = new System.Drawing.Point(410, 142); + this.labelViewer.Location = new System.Drawing.Point(410, 94); this.labelViewer.Name = "labelViewer"; this.labelViewer.Size = new System.Drawing.Size(125, 18); this.labelViewer.TabIndex = 240; @@ -694,7 +672,7 @@ this.labelStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelStatistics.InitVisible = true; this.labelStatistics.LineSpacing = 0F; - this.labelStatistics.Location = new System.Drawing.Point(410, 118); + this.labelStatistics.Location = new System.Drawing.Point(410, 70); this.labelStatistics.Name = "labelStatistics"; this.labelStatistics.Size = new System.Drawing.Size(125, 18); this.labelStatistics.TabIndex = 239; @@ -712,7 +690,7 @@ this.labelUpdate.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelUpdate.InitVisible = true; this.labelUpdate.LineSpacing = 0F; - this.labelUpdate.Location = new System.Drawing.Point(279, 118); + this.labelUpdate.Location = new System.Drawing.Point(279, 94); this.labelUpdate.Name = "labelUpdate"; this.labelUpdate.Size = new System.Drawing.Size(125, 18); this.labelUpdate.TabIndex = 238; @@ -784,7 +762,7 @@ this.labelDataBackup.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelDataBackup.InitVisible = true; this.labelDataBackup.LineSpacing = 0F; - this.labelDataBackup.Location = new System.Drawing.Point(410, 94); + this.labelDataBackup.Location = new System.Drawing.Point(410, 46); this.labelDataBackup.Name = "labelDataBackup"; this.labelDataBackup.Size = new System.Drawing.Size(125, 18); this.labelDataBackup.TabIndex = 234; @@ -793,24 +771,6 @@ this.labelDataBackup.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelDataBackup.Wordwrap = false; // - // labelUser - // - this.labelUser.BackPictureBox = this.smartForm1; - this.labelUser.BackPictureBox1 = null; - this.labelUser.BackPictureBox2 = null; - this.labelUser.BorderColor = System.Drawing.Color.Black; - this.labelUser.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUser.InitVisible = true; - this.labelUser.LineSpacing = 0F; - this.labelUser.Location = new System.Drawing.Point(410, 70); - this.labelUser.Name = "labelUser"; - this.labelUser.Size = new System.Drawing.Size(125, 18); - this.labelUser.TabIndex = 233; - this.labelUser.Text = "User"; - this.labelUser.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelUser.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelUser.Wordwrap = false; - // // labelCalibration // this.labelCalibration.BackPictureBox = this.smartForm1; @@ -858,7 +818,7 @@ this.labelTime.ForeColor = System.Drawing.Color.Black; this.labelTime.InitVisible = true; this.labelTime.LineSpacing = 0F; - this.labelTime.Location = new System.Drawing.Point(410, 46); + this.labelTime.Location = new System.Drawing.Point(279, 142); this.labelTime.Name = "labelTime"; this.labelTime.Size = new System.Drawing.Size(125, 18); this.labelTime.TabIndex = 230; @@ -876,7 +836,7 @@ this.labelInitialization.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelInitialization.InitVisible = true; this.labelInitialization.LineSpacing = 0F; - this.labelInitialization.Location = new System.Drawing.Point(279, 142); + this.labelInitialization.Location = new System.Drawing.Point(279, 118); this.labelInitialization.Name = "labelInitialization"; this.labelInitialization.Size = new System.Drawing.Size(125, 18); this.labelInitialization.TabIndex = 229; @@ -1305,7 +1265,6 @@ private SmartX.SmartLabel labelMotor; private SmartX.SmartLabel labelSystem; private SmartX.SmartLabel labelDataBackup; - private SmartX.SmartLabel labelUser; private SmartX.SmartLabel labelCalibration; private SmartX.SmartLabel labelCommunication; private SmartX.SmartLabel labelTime; @@ -1318,7 +1277,6 @@ private SmartX.SmartLabel labelStatistics; private SmartX.SmartLabel labelMenu; private SmartX.SmartLabel labelMain; - private SmartX.SmartLabel labelEquipment; private System.Windows.Forms.ComboBox comboBoxAccessRight; private SmartX.SmartLabel labelExpiryDateOfPassword; private SmartX.SmartLabel labelExpiryDateOfAccount; diff --git a/INT69DB_2A/Forms/FormUserEditor.cs b/INT69DB_2A/Forms/FormUserEditor.cs index 2724119..7ccd2d4 100644 --- a/INT69DB_2A/Forms/FormUserEditor.cs +++ b/INT69DB_2A/Forms/FormUserEditor.cs @@ -379,11 +379,9 @@ namespace INT69DB_2A.Forms this.labelSystem.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuSystem); this.labelMotor.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuMotor); this.labelIOTest.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuIOTest); - this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment); this.labelUpdate.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuUpdate); this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuInitialization); this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuTime); - this.labelUser.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuUser); this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuDataBackup); this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics); this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuViewer); @@ -401,11 +399,9 @@ namespace INT69DB_2A.Forms this.labelSystem.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuSystem); this.labelMotor.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuMotor); this.labelIOTest.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuIOTest); - this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment); this.labelUpdate.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuUpdate); this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuInitialization); this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuTime); - this.labelUser.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuUser); this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuDataBackup); this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics); this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuViewer); @@ -423,11 +419,9 @@ namespace INT69DB_2A.Forms this.labelSystem.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuSystem); this.labelMotor.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuMotor); this.labelIOTest.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest); - this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuEquipment); this.labelUpdate.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuUpdate); this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization); this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuTime); - this.labelUser.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuUser); this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuDataBackup); this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics); this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer); @@ -446,11 +440,9 @@ namespace INT69DB_2A.Forms this.labelSystem.ForeColor = Color.Black; this.labelMotor.ForeColor = Color.Black; this.labelIOTest.ForeColor = Color.Black; - this.labelEquipment.ForeColor = Color.Black; this.labelUpdate.ForeColor = Color.Black; this.labelInitialization.ForeColor = Color.Black; this.labelTime.ForeColor = Color.Black; - this.labelUser.ForeColor = Color.Black; this.labelDataBackup.ForeColor = Color.Black; this.labelStatistics.ForeColor = Color.Black; this.labelViewer.ForeColor = Color.Black; @@ -649,11 +641,9 @@ namespace INT69DB_2A.Forms this.labelSystem.ForeColor = this.ReturnColor(item.IsMenuSystem); this.labelMotor.ForeColor = this.ReturnColor(item.IsMenuMotor); this.labelIOTest.ForeColor = this.ReturnColor(item.IsMenuIOTest); - this.labelEquipment.ForeColor = this.ReturnColor(item.IsMenuEquipment); this.labelUpdate.ForeColor = this.ReturnColor(item.IsMenuUpdate); this.labelInitialization.ForeColor = this.ReturnColor(item.IsMenuInitialization); this.labelTime.ForeColor = this.ReturnColor(item.IsMenuTime); - this.labelUser.ForeColor = this.ReturnColor(item.IsMenuUser); this.labelDataBackup.ForeColor = this.ReturnColor(item.IsMenuDataBackup); this.labelStatistics.ForeColor = this.ReturnColor(item.IsMenuStatistics); this.labelViewer.ForeColor = this.ReturnColor(item.IsMenuViewer); diff --git a/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs b/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs index ab2c4ff..90ce863 100644 --- a/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs +++ b/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs @@ -2334,7 +2334,7 @@ this.labelTitleIOTest.Name = "labelTitleIOTest"; this.labelTitleIOTest.Size = new System.Drawing.Size(200, 20); this.labelTitleIOTest.TabIndex = 748; - this.labelTitleIOTest.Text = "IO Test"; + this.labelTitleIOTest.Text = "I/O Test"; this.labelTitleIOTest.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelTitleIOTest.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitleIOTest.Wordwrap = false; diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/Refactor/INT69DB_2A_ImageDll.dll b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/Refactor/INT69DB_2A_ImageDll.dll index 5a902d195a7eecc6a61e8be8bfde25a6634813bd..c276e3d454e2dbca66875da828077b1613190e6c 100644 GIT binary patch delta 125 zcmZqp!`SeLaY6^PwdS3T-P`q9wkWE4Z+0_ivllR_D-_;3XPd($SGh|^Y`FJqzLUR! zgIm>miy{L9BLk40JiX#OuLXl1gCT<@gAs!}+{{?> GpAi71f+bV{ delta 125 zcmZqp!`SeLaY6_4j;@;HArX!Gn!c1Bd8$?L1EQAIWzmT@s|W~}+o F2msaCD02V+