diff --git a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.Designer.cs b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.Designer.cs index ff9bbe5..2d0a2ff 100644 --- a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.Designer.cs +++ b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.Designer.cs @@ -42,7 +42,6 @@ this.checkBoxDefaultMainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxDefaultMainClear = new SmartX.SmartCheckBox(); this.checkBoxDefaultMenuEquipmentLog = new SmartX.SmartCheckBox(); - this.checkBoxDefaultMainWeightSetting = new SmartX.SmartCheckBox(); this.checkBoxDefaultMenuCheckLog = new SmartX.SmartCheckBox(); this.checkBoxDefaultMenuStatus = new SmartX.SmartCheckBox(); this.checkBoxDefaultMenuAlarmList = new SmartX.SmartCheckBox(); @@ -56,11 +55,10 @@ this.checkBoxL3MenuIOTest = new SmartX.SmartCheckBox(); this.checkBoxL3MainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxL3MainClear = new SmartX.SmartCheckBox(); - this.checkBoxL3MenuEquipmentLog = new SmartX.SmartCheckBox(); - this.checkBoxL3MainWeightSetting = new SmartX.SmartCheckBox(); - this.checkBoxL3MenuCheckLog = new SmartX.SmartCheckBox(); + this.checkBoxL3MenuHistoryLog = new SmartX.SmartCheckBox(); + this.checkBoxL3MenuInspectionLog = new SmartX.SmartCheckBox(); this.checkBoxL3MenuStatus = new SmartX.SmartCheckBox(); - this.checkBoxL3MenuAlarmList = new SmartX.SmartCheckBox(); + this.checkBoxL3MenuAlarmLog = new SmartX.SmartCheckBox(); this.checkBoxL3MenuInformation = new SmartX.SmartCheckBox(); this.groupBoxLevel2 = new SmartX.SmartGroupBox(); this.textBoxLevel2 = new System.Windows.Forms.TextBox(); @@ -71,11 +69,10 @@ this.checkBoxL2MenuIOTest = new SmartX.SmartCheckBox(); this.checkBoxL2MainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxL2MainClear = new SmartX.SmartCheckBox(); - this.checkBoxL2MenuEquipmentLog = new SmartX.SmartCheckBox(); - this.checkBoxL2MainWeightSetting = new SmartX.SmartCheckBox(); - this.checkBoxL2MenuCheckLog = new SmartX.SmartCheckBox(); + this.checkBoxL2MenuHistoryLog = new SmartX.SmartCheckBox(); + this.checkBoxL2MenuInspectionLog = new SmartX.SmartCheckBox(); this.checkBoxL2MenuStatus = new SmartX.SmartCheckBox(); - this.checkBoxL2MenuAlarmList = new SmartX.SmartCheckBox(); + this.checkBoxL2MenuAlarmLog = new SmartX.SmartCheckBox(); this.checkBoxL2MenuInformation = new SmartX.SmartCheckBox(); this.groupBoxLevel1 = new SmartX.SmartGroupBox(); this.textBoxLevel1 = new System.Windows.Forms.TextBox(); @@ -86,23 +83,21 @@ this.checkBoxL1MenuIOTest = new SmartX.SmartCheckBox(); this.checkBoxL1MainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxL1MainClear = new SmartX.SmartCheckBox(); - this.checkBoxL1MenuEquipmentLog = new SmartX.SmartCheckBox(); - this.checkBoxL1MainWeightSetting = new SmartX.SmartCheckBox(); - this.checkBoxL1MenuCheckLog = new SmartX.SmartCheckBox(); + this.checkBoxL1MenuHistoryLog = new SmartX.SmartCheckBox(); + this.checkBoxL1MenuInspectionLog = new SmartX.SmartCheckBox(); this.checkBoxL1MenuStatus = new SmartX.SmartCheckBox(); - this.checkBoxL1MenuAlarmList = new SmartX.SmartCheckBox(); + this.checkBoxL1MenuAlarmLog = new SmartX.SmartCheckBox(); this.checkBoxL1MenuInformation = new SmartX.SmartCheckBox(); this.labelTitleMenuStatus = new SmartX.SmartLabel(); this.labelTitleMenuInformation = new SmartX.SmartLabel(); - this.labelTitleMenuAlarmList = new SmartX.SmartLabel(); - this.labelTitleMenuCheckLog = new SmartX.SmartLabel(); - this.labelTitleMenuEquipmentLog = new SmartX.SmartLabel(); + this.labelTitleMenuAlarmLog = new SmartX.SmartLabel(); + this.labelTitleMenuInspectionLog = new SmartX.SmartLabel(); + this.labelTitleMenuHistoryLog = new SmartX.SmartLabel(); this.labelTitleMenuIOTest = new SmartX.SmartLabel(); this.labelTitleMenuUserSetting = new SmartX.SmartLabel(); this.labelTitleMenuProduct = new SmartX.SmartLabel(); this.labelTitleMainSubMenu = new SmartX.SmartLabel(); this.labelTitleMainClear = new SmartX.SmartLabel(); - this.labelTitleMainWeightSetting = new SmartX.SmartLabel(); this.labelTitleMainProductChange = new SmartX.SmartLabel(); this.buttonSave = new SmartX.SmartButton(); this.labelTitleMain = new SmartX.SmartLabel(); @@ -128,15 +123,14 @@ this.smartGroupBox1.Controls.Add(this.groupBoxLevel1); this.smartGroupBox1.Controls.Add(this.labelTitleMenuStatus); this.smartGroupBox1.Controls.Add(this.labelTitleMenuInformation); - this.smartGroupBox1.Controls.Add(this.labelTitleMenuAlarmList); - this.smartGroupBox1.Controls.Add(this.labelTitleMenuCheckLog); - this.smartGroupBox1.Controls.Add(this.labelTitleMenuEquipmentLog); + this.smartGroupBox1.Controls.Add(this.labelTitleMenuAlarmLog); + this.smartGroupBox1.Controls.Add(this.labelTitleMenuInspectionLog); + this.smartGroupBox1.Controls.Add(this.labelTitleMenuHistoryLog); this.smartGroupBox1.Controls.Add(this.labelTitleMenuIOTest); this.smartGroupBox1.Controls.Add(this.labelTitleMenuUserSetting); this.smartGroupBox1.Controls.Add(this.labelTitleMenuProduct); this.smartGroupBox1.Controls.Add(this.labelTitleMainSubMenu); this.smartGroupBox1.Controls.Add(this.labelTitleMainClear); - this.smartGroupBox1.Controls.Add(this.labelTitleMainWeightSetting); this.smartGroupBox1.Controls.Add(this.labelTitleMainProductChange); this.smartGroupBox1.Controls.Add(this.buttonSave); this.smartGroupBox1.Controls.Add(this.labelTitleMain); @@ -242,7 +236,7 @@ this.labelTitleMenuUserGroupEditor.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuUserGroupEditor.LineSpacing = 0F; - this.labelTitleMenuUserGroupEditor.Location = new System.Drawing.Point(158, 370); + this.labelTitleMenuUserGroupEditor.Location = new System.Drawing.Point(158, 341); this.labelTitleMenuUserGroupEditor.Name = "labelTitleMenuUserGroupEditor"; this.labelTitleMenuUserGroupEditor.OverlapOptimize = true; this.labelTitleMenuUserGroupEditor.PasswordChar = '\0'; @@ -270,7 +264,6 @@ this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMainSubMenu); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMainClear); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMenuEquipmentLog); - this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMainWeightSetting); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMenuCheckLog); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMenuStatus); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMenuAlarmList); @@ -302,7 +295,7 @@ this.checkBoxDefaultMenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuUserGroupEditor.ImageCheckBox = null; this.checkBoxDefaultMenuUserGroupEditor.ImageUnCheckBox = null; - this.checkBoxDefaultMenuUserGroupEditor.Location = new System.Drawing.Point(48, 272); + this.checkBoxDefaultMenuUserGroupEditor.Location = new System.Drawing.Point(48, 243); this.checkBoxDefaultMenuUserGroupEditor.Name = "checkBoxDefaultMenuUserGroupEditor"; this.checkBoxDefaultMenuUserGroupEditor.OverlapOptimize = true; this.checkBoxDefaultMenuUserGroupEditor.Size = new System.Drawing.Size(23, 23); @@ -347,7 +340,7 @@ this.checkBoxDefaultMenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuUserSetting.ImageCheckBox = null; this.checkBoxDefaultMenuUserSetting.ImageUnCheckBox = null; - this.checkBoxDefaultMenuUserSetting.Location = new System.Drawing.Point(48, 243); + this.checkBoxDefaultMenuUserSetting.Location = new System.Drawing.Point(48, 214); this.checkBoxDefaultMenuUserSetting.Name = "checkBoxDefaultMenuUserSetting"; this.checkBoxDefaultMenuUserSetting.OverlapOptimize = true; this.checkBoxDefaultMenuUserSetting.Size = new System.Drawing.Size(23, 23); @@ -370,7 +363,7 @@ this.checkBoxDefaultMenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuProduct.ImageCheckBox = null; this.checkBoxDefaultMenuProduct.ImageUnCheckBox = null; - this.checkBoxDefaultMenuProduct.Location = new System.Drawing.Point(48, 214); + this.checkBoxDefaultMenuProduct.Location = new System.Drawing.Point(48, 185); this.checkBoxDefaultMenuProduct.Name = "checkBoxDefaultMenuProduct"; this.checkBoxDefaultMenuProduct.OverlapOptimize = true; this.checkBoxDefaultMenuProduct.Size = new System.Drawing.Size(23, 23); @@ -393,7 +386,7 @@ this.checkBoxDefaultMenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuIOTest.ImageCheckBox = null; this.checkBoxDefaultMenuIOTest.ImageUnCheckBox = null; - this.checkBoxDefaultMenuIOTest.Location = new System.Drawing.Point(48, 301); + this.checkBoxDefaultMenuIOTest.Location = new System.Drawing.Point(48, 272); this.checkBoxDefaultMenuIOTest.Name = "checkBoxDefaultMenuIOTest"; this.checkBoxDefaultMenuIOTest.OverlapOptimize = true; this.checkBoxDefaultMenuIOTest.Size = new System.Drawing.Size(23, 23); @@ -415,7 +408,7 @@ this.checkBoxDefaultMainSubMenu.CheckLineWidth = 3; this.checkBoxDefaultMainSubMenu.ImageCheckBox = null; this.checkBoxDefaultMainSubMenu.ImageUnCheckBox = null; - this.checkBoxDefaultMainSubMenu.Location = new System.Drawing.Point(48, 153); + this.checkBoxDefaultMainSubMenu.Location = new System.Drawing.Point(48, 124); this.checkBoxDefaultMainSubMenu.Name = "checkBoxDefaultMainSubMenu"; this.checkBoxDefaultMainSubMenu.OverlapOptimize = true; this.checkBoxDefaultMainSubMenu.Size = new System.Drawing.Size(23, 23); @@ -437,7 +430,7 @@ this.checkBoxDefaultMainClear.CheckLineWidth = 3; this.checkBoxDefaultMainClear.ImageCheckBox = null; this.checkBoxDefaultMainClear.ImageUnCheckBox = null; - this.checkBoxDefaultMainClear.Location = new System.Drawing.Point(48, 124); + this.checkBoxDefaultMainClear.Location = new System.Drawing.Point(48, 95); this.checkBoxDefaultMainClear.Name = "checkBoxDefaultMainClear"; this.checkBoxDefaultMainClear.OverlapOptimize = true; this.checkBoxDefaultMainClear.Size = new System.Drawing.Size(23, 23); @@ -460,7 +453,7 @@ this.checkBoxDefaultMenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuEquipmentLog.ImageCheckBox = null; this.checkBoxDefaultMenuEquipmentLog.ImageUnCheckBox = null; - this.checkBoxDefaultMenuEquipmentLog.Location = new System.Drawing.Point(48, 330); + this.checkBoxDefaultMenuEquipmentLog.Location = new System.Drawing.Point(48, 301); this.checkBoxDefaultMenuEquipmentLog.Name = "checkBoxDefaultMenuEquipmentLog"; this.checkBoxDefaultMenuEquipmentLog.OverlapOptimize = true; this.checkBoxDefaultMenuEquipmentLog.Size = new System.Drawing.Size(23, 23); @@ -470,28 +463,6 @@ this.checkBoxDefaultMenuEquipmentLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxDefaultMenuEquipmentLog.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxDefaultMainWeightSetting - // - this.checkBoxDefaultMainWeightSetting.BackGround = this.groupBoxDefault; - this.checkBoxDefaultMainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxDefaultMainWeightSetting.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxDefaultMainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxDefaultMainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxDefaultMainWeightSetting.CheckBoxSymbolSize = 20; - this.checkBoxDefaultMainWeightSetting.Checked = false; - this.checkBoxDefaultMainWeightSetting.CheckLineWidth = 3; - this.checkBoxDefaultMainWeightSetting.ImageCheckBox = null; - this.checkBoxDefaultMainWeightSetting.ImageUnCheckBox = null; - this.checkBoxDefaultMainWeightSetting.Location = new System.Drawing.Point(48, 95); - this.checkBoxDefaultMainWeightSetting.Name = "checkBoxDefaultMainWeightSetting"; - this.checkBoxDefaultMainWeightSetting.OverlapOptimize = true; - this.checkBoxDefaultMainWeightSetting.Size = new System.Drawing.Size(23, 23); - this.checkBoxDefaultMainWeightSetting.TabIndex = 1; - this.checkBoxDefaultMainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxDefaultMainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxDefaultMainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxDefaultMainWeightSetting.Click += new System.EventHandler(this.checkBox_Click); - // // checkBoxDefaultMenuCheckLog // this.checkBoxDefaultMenuCheckLog.BackGround = this.groupBoxDefault; @@ -505,7 +476,7 @@ this.checkBoxDefaultMenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuCheckLog.ImageCheckBox = null; this.checkBoxDefaultMenuCheckLog.ImageUnCheckBox = null; - this.checkBoxDefaultMenuCheckLog.Location = new System.Drawing.Point(48, 359); + this.checkBoxDefaultMenuCheckLog.Location = new System.Drawing.Point(48, 330); this.checkBoxDefaultMenuCheckLog.Name = "checkBoxDefaultMenuCheckLog"; this.checkBoxDefaultMenuCheckLog.OverlapOptimize = true; this.checkBoxDefaultMenuCheckLog.Size = new System.Drawing.Size(23, 23); @@ -528,7 +499,7 @@ this.checkBoxDefaultMenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuStatus.ImageCheckBox = null; this.checkBoxDefaultMenuStatus.ImageUnCheckBox = null; - this.checkBoxDefaultMenuStatus.Location = new System.Drawing.Point(48, 446); + this.checkBoxDefaultMenuStatus.Location = new System.Drawing.Point(48, 417); this.checkBoxDefaultMenuStatus.Name = "checkBoxDefaultMenuStatus"; this.checkBoxDefaultMenuStatus.OverlapOptimize = true; this.checkBoxDefaultMenuStatus.Size = new System.Drawing.Size(23, 23); @@ -551,7 +522,7 @@ this.checkBoxDefaultMenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuAlarmList.ImageCheckBox = null; this.checkBoxDefaultMenuAlarmList.ImageUnCheckBox = null; - this.checkBoxDefaultMenuAlarmList.Location = new System.Drawing.Point(48, 388); + this.checkBoxDefaultMenuAlarmList.Location = new System.Drawing.Point(48, 359); this.checkBoxDefaultMenuAlarmList.Name = "checkBoxDefaultMenuAlarmList"; this.checkBoxDefaultMenuAlarmList.OverlapOptimize = true; this.checkBoxDefaultMenuAlarmList.Size = new System.Drawing.Size(23, 23); @@ -574,7 +545,7 @@ this.checkBoxDefaultMenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuInformation.ImageCheckBox = null; this.checkBoxDefaultMenuInformation.ImageUnCheckBox = null; - this.checkBoxDefaultMenuInformation.Location = new System.Drawing.Point(48, 417); + this.checkBoxDefaultMenuInformation.Location = new System.Drawing.Point(48, 388); this.checkBoxDefaultMenuInformation.Name = "checkBoxDefaultMenuInformation"; this.checkBoxDefaultMenuInformation.OverlapOptimize = true; this.checkBoxDefaultMenuInformation.Size = new System.Drawing.Size(23, 23); @@ -597,11 +568,10 @@ this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuIOTest); this.groupBoxLevel3.Controls.Add(this.checkBoxL3MainSubMenu); this.groupBoxLevel3.Controls.Add(this.checkBoxL3MainClear); - this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuEquipmentLog); - this.groupBoxLevel3.Controls.Add(this.checkBoxL3MainWeightSetting); - this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuCheckLog); + this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuHistoryLog); + this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuInspectionLog); this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuStatus); - this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuAlarmList); + this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuAlarmLog); this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuInformation); this.groupBoxLevel3.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.groupBoxLevel3.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); @@ -641,7 +611,7 @@ this.checkBoxL3MenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuUserGroupEditor.ImageCheckBox = null; this.checkBoxL3MenuUserGroupEditor.ImageUnCheckBox = null; - this.checkBoxL3MenuUserGroupEditor.Location = new System.Drawing.Point(48, 272); + this.checkBoxL3MenuUserGroupEditor.Location = new System.Drawing.Point(48, 247); this.checkBoxL3MenuUserGroupEditor.Name = "checkBoxL3MenuUserGroupEditor"; this.checkBoxL3MenuUserGroupEditor.OverlapOptimize = true; this.checkBoxL3MenuUserGroupEditor.Size = new System.Drawing.Size(23, 23); @@ -663,7 +633,7 @@ this.checkBoxL3MainProductChange.CheckLineWidth = 3; this.checkBoxL3MainProductChange.ImageCheckBox = null; this.checkBoxL3MainProductChange.ImageUnCheckBox = null; - this.checkBoxL3MainProductChange.Location = new System.Drawing.Point(48, 66); + this.checkBoxL3MainProductChange.Location = new System.Drawing.Point(48, 70); this.checkBoxL3MainProductChange.Name = "checkBoxL3MainProductChange"; this.checkBoxL3MainProductChange.OverlapOptimize = true; this.checkBoxL3MainProductChange.Size = new System.Drawing.Size(23, 23); @@ -686,7 +656,7 @@ this.checkBoxL3MenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuUserSetting.ImageCheckBox = null; this.checkBoxL3MenuUserSetting.ImageUnCheckBox = null; - this.checkBoxL3MenuUserSetting.Location = new System.Drawing.Point(48, 243); + this.checkBoxL3MenuUserSetting.Location = new System.Drawing.Point(48, 218); this.checkBoxL3MenuUserSetting.Name = "checkBoxL3MenuUserSetting"; this.checkBoxL3MenuUserSetting.OverlapOptimize = true; this.checkBoxL3MenuUserSetting.Size = new System.Drawing.Size(23, 23); @@ -709,7 +679,7 @@ this.checkBoxL3MenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuProduct.ImageCheckBox = null; this.checkBoxL3MenuProduct.ImageUnCheckBox = null; - this.checkBoxL3MenuProduct.Location = new System.Drawing.Point(48, 214); + this.checkBoxL3MenuProduct.Location = new System.Drawing.Point(48, 189); this.checkBoxL3MenuProduct.Name = "checkBoxL3MenuProduct"; this.checkBoxL3MenuProduct.OverlapOptimize = true; this.checkBoxL3MenuProduct.Size = new System.Drawing.Size(23, 23); @@ -732,7 +702,7 @@ this.checkBoxL3MenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuIOTest.ImageCheckBox = null; this.checkBoxL3MenuIOTest.ImageUnCheckBox = null; - this.checkBoxL3MenuIOTest.Location = new System.Drawing.Point(48, 301); + this.checkBoxL3MenuIOTest.Location = new System.Drawing.Point(48, 276); this.checkBoxL3MenuIOTest.Name = "checkBoxL3MenuIOTest"; this.checkBoxL3MenuIOTest.OverlapOptimize = true; this.checkBoxL3MenuIOTest.Size = new System.Drawing.Size(23, 23); @@ -754,7 +724,7 @@ this.checkBoxL3MainSubMenu.CheckLineWidth = 3; this.checkBoxL3MainSubMenu.ImageCheckBox = null; this.checkBoxL3MainSubMenu.ImageUnCheckBox = null; - this.checkBoxL3MainSubMenu.Location = new System.Drawing.Point(48, 153); + this.checkBoxL3MainSubMenu.Location = new System.Drawing.Point(48, 128); this.checkBoxL3MainSubMenu.Name = "checkBoxL3MainSubMenu"; this.checkBoxL3MainSubMenu.OverlapOptimize = true; this.checkBoxL3MainSubMenu.Size = new System.Drawing.Size(23, 23); @@ -776,7 +746,7 @@ this.checkBoxL3MainClear.CheckLineWidth = 3; this.checkBoxL3MainClear.ImageCheckBox = null; this.checkBoxL3MainClear.ImageUnCheckBox = null; - this.checkBoxL3MainClear.Location = new System.Drawing.Point(48, 124); + this.checkBoxL3MainClear.Location = new System.Drawing.Point(48, 99); this.checkBoxL3MainClear.Name = "checkBoxL3MainClear"; this.checkBoxL3MainClear.OverlapOptimize = true; this.checkBoxL3MainClear.Size = new System.Drawing.Size(23, 23); @@ -786,73 +756,51 @@ this.checkBoxL3MainClear.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL3MainClear.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL3MenuEquipmentLog + // checkBoxL3MenuHistoryLog // - this.checkBoxL3MenuEquipmentLog.BackGround = this.groupBoxLevel3; - this.checkBoxL3MenuEquipmentLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL3MenuEquipmentLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL3MenuEquipmentLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL3MenuEquipmentLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL3MenuEquipmentLog.CheckBoxSymbolSize = 20; - this.checkBoxL3MenuEquipmentLog.Checked = false; - this.checkBoxL3MenuEquipmentLog.CheckLineWidth = 3; - this.checkBoxL3MenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL3MenuEquipmentLog.ImageCheckBox = null; - this.checkBoxL3MenuEquipmentLog.ImageUnCheckBox = null; - this.checkBoxL3MenuEquipmentLog.Location = new System.Drawing.Point(48, 330); - this.checkBoxL3MenuEquipmentLog.Name = "checkBoxL3MenuEquipmentLog"; - this.checkBoxL3MenuEquipmentLog.OverlapOptimize = true; - this.checkBoxL3MenuEquipmentLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL3MenuEquipmentLog.TabIndex = 110; - this.checkBoxL3MenuEquipmentLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL3MenuEquipmentLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL3MenuEquipmentLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL3MenuEquipmentLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL3MenuHistoryLog.BackGround = this.groupBoxLevel3; + this.checkBoxL3MenuHistoryLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL3MenuHistoryLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL3MenuHistoryLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL3MenuHistoryLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL3MenuHistoryLog.CheckBoxSymbolSize = 20; + this.checkBoxL3MenuHistoryLog.Checked = false; + this.checkBoxL3MenuHistoryLog.CheckLineWidth = 3; + this.checkBoxL3MenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL3MenuHistoryLog.ImageCheckBox = null; + this.checkBoxL3MenuHistoryLog.ImageUnCheckBox = null; + this.checkBoxL3MenuHistoryLog.Location = new System.Drawing.Point(48, 305); + this.checkBoxL3MenuHistoryLog.Name = "checkBoxL3MenuHistoryLog"; + this.checkBoxL3MenuHistoryLog.OverlapOptimize = true; + this.checkBoxL3MenuHistoryLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL3MenuHistoryLog.TabIndex = 110; + this.checkBoxL3MenuHistoryLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL3MenuHistoryLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL3MenuHistoryLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL3MenuHistoryLog.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL3MainWeightSetting + // checkBoxL3MenuInspectionLog // - this.checkBoxL3MainWeightSetting.BackGround = this.groupBoxLevel3; - this.checkBoxL3MainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL3MainWeightSetting.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL3MainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL3MainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL3MainWeightSetting.CheckBoxSymbolSize = 20; - this.checkBoxL3MainWeightSetting.Checked = false; - this.checkBoxL3MainWeightSetting.CheckLineWidth = 3; - this.checkBoxL3MainWeightSetting.ImageCheckBox = null; - this.checkBoxL3MainWeightSetting.ImageUnCheckBox = null; - this.checkBoxL3MainWeightSetting.Location = new System.Drawing.Point(48, 95); - this.checkBoxL3MainWeightSetting.Name = "checkBoxL3MainWeightSetting"; - this.checkBoxL3MainWeightSetting.OverlapOptimize = true; - this.checkBoxL3MainWeightSetting.Size = new System.Drawing.Size(23, 23); - this.checkBoxL3MainWeightSetting.TabIndex = 1; - this.checkBoxL3MainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL3MainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL3MainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL3MainWeightSetting.Click += new System.EventHandler(this.checkBox_Click); - // - // checkBoxL3MenuCheckLog - // - this.checkBoxL3MenuCheckLog.BackGround = this.groupBoxLevel3; - this.checkBoxL3MenuCheckLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL3MenuCheckLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL3MenuCheckLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL3MenuCheckLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL3MenuCheckLog.CheckBoxSymbolSize = 20; - this.checkBoxL3MenuCheckLog.Checked = false; - this.checkBoxL3MenuCheckLog.CheckLineWidth = 3; - this.checkBoxL3MenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL3MenuCheckLog.ImageCheckBox = null; - this.checkBoxL3MenuCheckLog.ImageUnCheckBox = null; - this.checkBoxL3MenuCheckLog.Location = new System.Drawing.Point(48, 359); - this.checkBoxL3MenuCheckLog.Name = "checkBoxL3MenuCheckLog"; - this.checkBoxL3MenuCheckLog.OverlapOptimize = true; - this.checkBoxL3MenuCheckLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL3MenuCheckLog.TabIndex = 111; - this.checkBoxL3MenuCheckLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL3MenuCheckLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL3MenuCheckLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL3MenuCheckLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL3MenuInspectionLog.BackGround = this.groupBoxLevel3; + this.checkBoxL3MenuInspectionLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL3MenuInspectionLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL3MenuInspectionLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL3MenuInspectionLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL3MenuInspectionLog.CheckBoxSymbolSize = 20; + this.checkBoxL3MenuInspectionLog.Checked = false; + this.checkBoxL3MenuInspectionLog.CheckLineWidth = 3; + this.checkBoxL3MenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL3MenuInspectionLog.ImageCheckBox = null; + this.checkBoxL3MenuInspectionLog.ImageUnCheckBox = null; + this.checkBoxL3MenuInspectionLog.Location = new System.Drawing.Point(48, 334); + this.checkBoxL3MenuInspectionLog.Name = "checkBoxL3MenuInspectionLog"; + this.checkBoxL3MenuInspectionLog.OverlapOptimize = true; + this.checkBoxL3MenuInspectionLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL3MenuInspectionLog.TabIndex = 111; + this.checkBoxL3MenuInspectionLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL3MenuInspectionLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL3MenuInspectionLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL3MenuInspectionLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL3MenuStatus // @@ -867,7 +815,7 @@ this.checkBoxL3MenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuStatus.ImageCheckBox = null; this.checkBoxL3MenuStatus.ImageUnCheckBox = null; - this.checkBoxL3MenuStatus.Location = new System.Drawing.Point(48, 446); + this.checkBoxL3MenuStatus.Location = new System.Drawing.Point(48, 421); this.checkBoxL3MenuStatus.Name = "checkBoxL3MenuStatus"; this.checkBoxL3MenuStatus.OverlapOptimize = true; this.checkBoxL3MenuStatus.Size = new System.Drawing.Size(23, 23); @@ -877,28 +825,28 @@ this.checkBoxL3MenuStatus.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL3MenuStatus.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL3MenuAlarmList + // checkBoxL3MenuAlarmLog // - this.checkBoxL3MenuAlarmList.BackGround = this.groupBoxLevel3; - this.checkBoxL3MenuAlarmList.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL3MenuAlarmList.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL3MenuAlarmList.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL3MenuAlarmList.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL3MenuAlarmList.CheckBoxSymbolSize = 20; - this.checkBoxL3MenuAlarmList.Checked = false; - this.checkBoxL3MenuAlarmList.CheckLineWidth = 3; - this.checkBoxL3MenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL3MenuAlarmList.ImageCheckBox = null; - this.checkBoxL3MenuAlarmList.ImageUnCheckBox = null; - this.checkBoxL3MenuAlarmList.Location = new System.Drawing.Point(48, 388); - this.checkBoxL3MenuAlarmList.Name = "checkBoxL3MenuAlarmList"; - this.checkBoxL3MenuAlarmList.OverlapOptimize = true; - this.checkBoxL3MenuAlarmList.Size = new System.Drawing.Size(23, 23); - this.checkBoxL3MenuAlarmList.TabIndex = 114; - this.checkBoxL3MenuAlarmList.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL3MenuAlarmList.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL3MenuAlarmList.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL3MenuAlarmList.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL3MenuAlarmLog.BackGround = this.groupBoxLevel3; + this.checkBoxL3MenuAlarmLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL3MenuAlarmLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL3MenuAlarmLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL3MenuAlarmLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL3MenuAlarmLog.CheckBoxSymbolSize = 20; + this.checkBoxL3MenuAlarmLog.Checked = false; + this.checkBoxL3MenuAlarmLog.CheckLineWidth = 3; + this.checkBoxL3MenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL3MenuAlarmLog.ImageCheckBox = null; + this.checkBoxL3MenuAlarmLog.ImageUnCheckBox = null; + this.checkBoxL3MenuAlarmLog.Location = new System.Drawing.Point(48, 363); + this.checkBoxL3MenuAlarmLog.Name = "checkBoxL3MenuAlarmLog"; + this.checkBoxL3MenuAlarmLog.OverlapOptimize = true; + this.checkBoxL3MenuAlarmLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL3MenuAlarmLog.TabIndex = 114; + this.checkBoxL3MenuAlarmLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL3MenuAlarmLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL3MenuAlarmLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL3MenuAlarmLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL3MenuInformation // @@ -913,7 +861,7 @@ this.checkBoxL3MenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuInformation.ImageCheckBox = null; this.checkBoxL3MenuInformation.ImageUnCheckBox = null; - this.checkBoxL3MenuInformation.Location = new System.Drawing.Point(48, 417); + this.checkBoxL3MenuInformation.Location = new System.Drawing.Point(48, 392); this.checkBoxL3MenuInformation.Name = "checkBoxL3MenuInformation"; this.checkBoxL3MenuInformation.OverlapOptimize = true; this.checkBoxL3MenuInformation.Size = new System.Drawing.Size(23, 23); @@ -936,11 +884,10 @@ this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuIOTest); this.groupBoxLevel2.Controls.Add(this.checkBoxL2MainSubMenu); this.groupBoxLevel2.Controls.Add(this.checkBoxL2MainClear); - this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuEquipmentLog); - this.groupBoxLevel2.Controls.Add(this.checkBoxL2MainWeightSetting); - this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuCheckLog); + this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuHistoryLog); + this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuInspectionLog); this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuStatus); - this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuAlarmList); + this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuAlarmLog); this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuInformation); this.groupBoxLevel2.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.groupBoxLevel2.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); @@ -980,7 +927,7 @@ this.checkBoxL2MenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuUserGroupEditor.ImageCheckBox = null; this.checkBoxL2MenuUserGroupEditor.ImageUnCheckBox = null; - this.checkBoxL2MenuUserGroupEditor.Location = new System.Drawing.Point(51, 272); + this.checkBoxL2MenuUserGroupEditor.Location = new System.Drawing.Point(51, 247); this.checkBoxL2MenuUserGroupEditor.Name = "checkBoxL2MenuUserGroupEditor"; this.checkBoxL2MenuUserGroupEditor.OverlapOptimize = true; this.checkBoxL2MenuUserGroupEditor.Size = new System.Drawing.Size(23, 23); @@ -1002,7 +949,7 @@ this.checkBoxL2MainProductChange.CheckLineWidth = 3; this.checkBoxL2MainProductChange.ImageCheckBox = null; this.checkBoxL2MainProductChange.ImageUnCheckBox = null; - this.checkBoxL2MainProductChange.Location = new System.Drawing.Point(51, 66); + this.checkBoxL2MainProductChange.Location = new System.Drawing.Point(51, 70); this.checkBoxL2MainProductChange.Name = "checkBoxL2MainProductChange"; this.checkBoxL2MainProductChange.OverlapOptimize = true; this.checkBoxL2MainProductChange.Size = new System.Drawing.Size(23, 23); @@ -1025,7 +972,7 @@ this.checkBoxL2MenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuUserSetting.ImageCheckBox = null; this.checkBoxL2MenuUserSetting.ImageUnCheckBox = null; - this.checkBoxL2MenuUserSetting.Location = new System.Drawing.Point(51, 243); + this.checkBoxL2MenuUserSetting.Location = new System.Drawing.Point(51, 218); this.checkBoxL2MenuUserSetting.Name = "checkBoxL2MenuUserSetting"; this.checkBoxL2MenuUserSetting.OverlapOptimize = true; this.checkBoxL2MenuUserSetting.Size = new System.Drawing.Size(23, 23); @@ -1048,7 +995,7 @@ this.checkBoxL2MenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuProduct.ImageCheckBox = null; this.checkBoxL2MenuProduct.ImageUnCheckBox = null; - this.checkBoxL2MenuProduct.Location = new System.Drawing.Point(51, 214); + this.checkBoxL2MenuProduct.Location = new System.Drawing.Point(51, 189); this.checkBoxL2MenuProduct.Name = "checkBoxL2MenuProduct"; this.checkBoxL2MenuProduct.OverlapOptimize = true; this.checkBoxL2MenuProduct.Size = new System.Drawing.Size(23, 23); @@ -1071,7 +1018,7 @@ this.checkBoxL2MenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuIOTest.ImageCheckBox = null; this.checkBoxL2MenuIOTest.ImageUnCheckBox = null; - this.checkBoxL2MenuIOTest.Location = new System.Drawing.Point(51, 301); + this.checkBoxL2MenuIOTest.Location = new System.Drawing.Point(51, 276); this.checkBoxL2MenuIOTest.Name = "checkBoxL2MenuIOTest"; this.checkBoxL2MenuIOTest.OverlapOptimize = true; this.checkBoxL2MenuIOTest.Size = new System.Drawing.Size(23, 23); @@ -1093,7 +1040,7 @@ this.checkBoxL2MainSubMenu.CheckLineWidth = 3; this.checkBoxL2MainSubMenu.ImageCheckBox = null; this.checkBoxL2MainSubMenu.ImageUnCheckBox = null; - this.checkBoxL2MainSubMenu.Location = new System.Drawing.Point(51, 153); + this.checkBoxL2MainSubMenu.Location = new System.Drawing.Point(51, 128); this.checkBoxL2MainSubMenu.Name = "checkBoxL2MainSubMenu"; this.checkBoxL2MainSubMenu.OverlapOptimize = true; this.checkBoxL2MainSubMenu.Size = new System.Drawing.Size(23, 23); @@ -1115,7 +1062,7 @@ this.checkBoxL2MainClear.CheckLineWidth = 3; this.checkBoxL2MainClear.ImageCheckBox = null; this.checkBoxL2MainClear.ImageUnCheckBox = null; - this.checkBoxL2MainClear.Location = new System.Drawing.Point(51, 124); + this.checkBoxL2MainClear.Location = new System.Drawing.Point(51, 99); this.checkBoxL2MainClear.Name = "checkBoxL2MainClear"; this.checkBoxL2MainClear.OverlapOptimize = true; this.checkBoxL2MainClear.Size = new System.Drawing.Size(23, 23); @@ -1125,73 +1072,51 @@ this.checkBoxL2MainClear.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL2MainClear.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL2MenuEquipmentLog + // checkBoxL2MenuHistoryLog // - this.checkBoxL2MenuEquipmentLog.BackGround = this.groupBoxLevel2; - this.checkBoxL2MenuEquipmentLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL2MenuEquipmentLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL2MenuEquipmentLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL2MenuEquipmentLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL2MenuEquipmentLog.CheckBoxSymbolSize = 20; - this.checkBoxL2MenuEquipmentLog.Checked = false; - this.checkBoxL2MenuEquipmentLog.CheckLineWidth = 3; - this.checkBoxL2MenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL2MenuEquipmentLog.ImageCheckBox = null; - this.checkBoxL2MenuEquipmentLog.ImageUnCheckBox = null; - this.checkBoxL2MenuEquipmentLog.Location = new System.Drawing.Point(51, 330); - this.checkBoxL2MenuEquipmentLog.Name = "checkBoxL2MenuEquipmentLog"; - this.checkBoxL2MenuEquipmentLog.OverlapOptimize = true; - this.checkBoxL2MenuEquipmentLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL2MenuEquipmentLog.TabIndex = 110; - this.checkBoxL2MenuEquipmentLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL2MenuEquipmentLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL2MenuEquipmentLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL2MenuEquipmentLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL2MenuHistoryLog.BackGround = this.groupBoxLevel2; + this.checkBoxL2MenuHistoryLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL2MenuHistoryLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL2MenuHistoryLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL2MenuHistoryLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL2MenuHistoryLog.CheckBoxSymbolSize = 20; + this.checkBoxL2MenuHistoryLog.Checked = false; + this.checkBoxL2MenuHistoryLog.CheckLineWidth = 3; + this.checkBoxL2MenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL2MenuHistoryLog.ImageCheckBox = null; + this.checkBoxL2MenuHistoryLog.ImageUnCheckBox = null; + this.checkBoxL2MenuHistoryLog.Location = new System.Drawing.Point(51, 305); + this.checkBoxL2MenuHistoryLog.Name = "checkBoxL2MenuHistoryLog"; + this.checkBoxL2MenuHistoryLog.OverlapOptimize = true; + this.checkBoxL2MenuHistoryLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL2MenuHistoryLog.TabIndex = 110; + this.checkBoxL2MenuHistoryLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL2MenuHistoryLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL2MenuHistoryLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL2MenuHistoryLog.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL2MainWeightSetting + // checkBoxL2MenuInspectionLog // - this.checkBoxL2MainWeightSetting.BackGround = this.groupBoxLevel2; - this.checkBoxL2MainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL2MainWeightSetting.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL2MainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL2MainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL2MainWeightSetting.CheckBoxSymbolSize = 20; - this.checkBoxL2MainWeightSetting.Checked = false; - this.checkBoxL2MainWeightSetting.CheckLineWidth = 3; - this.checkBoxL2MainWeightSetting.ImageCheckBox = null; - this.checkBoxL2MainWeightSetting.ImageUnCheckBox = null; - this.checkBoxL2MainWeightSetting.Location = new System.Drawing.Point(51, 95); - this.checkBoxL2MainWeightSetting.Name = "checkBoxL2MainWeightSetting"; - this.checkBoxL2MainWeightSetting.OverlapOptimize = true; - this.checkBoxL2MainWeightSetting.Size = new System.Drawing.Size(23, 23); - this.checkBoxL2MainWeightSetting.TabIndex = 1; - this.checkBoxL2MainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL2MainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL2MainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL2MainWeightSetting.Click += new System.EventHandler(this.checkBox_Click); - // - // checkBoxL2MenuCheckLog - // - this.checkBoxL2MenuCheckLog.BackGround = this.groupBoxLevel2; - this.checkBoxL2MenuCheckLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL2MenuCheckLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL2MenuCheckLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL2MenuCheckLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL2MenuCheckLog.CheckBoxSymbolSize = 20; - this.checkBoxL2MenuCheckLog.Checked = false; - this.checkBoxL2MenuCheckLog.CheckLineWidth = 3; - this.checkBoxL2MenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL2MenuCheckLog.ImageCheckBox = null; - this.checkBoxL2MenuCheckLog.ImageUnCheckBox = null; - this.checkBoxL2MenuCheckLog.Location = new System.Drawing.Point(51, 359); - this.checkBoxL2MenuCheckLog.Name = "checkBoxL2MenuCheckLog"; - this.checkBoxL2MenuCheckLog.OverlapOptimize = true; - this.checkBoxL2MenuCheckLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL2MenuCheckLog.TabIndex = 111; - this.checkBoxL2MenuCheckLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL2MenuCheckLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL2MenuCheckLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL2MenuCheckLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL2MenuInspectionLog.BackGround = this.groupBoxLevel2; + this.checkBoxL2MenuInspectionLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL2MenuInspectionLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL2MenuInspectionLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL2MenuInspectionLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL2MenuInspectionLog.CheckBoxSymbolSize = 20; + this.checkBoxL2MenuInspectionLog.Checked = false; + this.checkBoxL2MenuInspectionLog.CheckLineWidth = 3; + this.checkBoxL2MenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL2MenuInspectionLog.ImageCheckBox = null; + this.checkBoxL2MenuInspectionLog.ImageUnCheckBox = null; + this.checkBoxL2MenuInspectionLog.Location = new System.Drawing.Point(51, 334); + this.checkBoxL2MenuInspectionLog.Name = "checkBoxL2MenuInspectionLog"; + this.checkBoxL2MenuInspectionLog.OverlapOptimize = true; + this.checkBoxL2MenuInspectionLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL2MenuInspectionLog.TabIndex = 111; + this.checkBoxL2MenuInspectionLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL2MenuInspectionLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL2MenuInspectionLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL2MenuInspectionLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL2MenuStatus // @@ -1206,7 +1131,7 @@ this.checkBoxL2MenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuStatus.ImageCheckBox = null; this.checkBoxL2MenuStatus.ImageUnCheckBox = null; - this.checkBoxL2MenuStatus.Location = new System.Drawing.Point(51, 446); + this.checkBoxL2MenuStatus.Location = new System.Drawing.Point(51, 421); this.checkBoxL2MenuStatus.Name = "checkBoxL2MenuStatus"; this.checkBoxL2MenuStatus.OverlapOptimize = true; this.checkBoxL2MenuStatus.Size = new System.Drawing.Size(23, 23); @@ -1216,28 +1141,28 @@ this.checkBoxL2MenuStatus.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL2MenuStatus.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL2MenuAlarmList + // checkBoxL2MenuAlarmLog // - this.checkBoxL2MenuAlarmList.BackGround = this.groupBoxLevel2; - this.checkBoxL2MenuAlarmList.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL2MenuAlarmList.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL2MenuAlarmList.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL2MenuAlarmList.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL2MenuAlarmList.CheckBoxSymbolSize = 20; - this.checkBoxL2MenuAlarmList.Checked = false; - this.checkBoxL2MenuAlarmList.CheckLineWidth = 3; - this.checkBoxL2MenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL2MenuAlarmList.ImageCheckBox = null; - this.checkBoxL2MenuAlarmList.ImageUnCheckBox = null; - this.checkBoxL2MenuAlarmList.Location = new System.Drawing.Point(51, 388); - this.checkBoxL2MenuAlarmList.Name = "checkBoxL2MenuAlarmList"; - this.checkBoxL2MenuAlarmList.OverlapOptimize = true; - this.checkBoxL2MenuAlarmList.Size = new System.Drawing.Size(23, 23); - this.checkBoxL2MenuAlarmList.TabIndex = 114; - this.checkBoxL2MenuAlarmList.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL2MenuAlarmList.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL2MenuAlarmList.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL2MenuAlarmList.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL2MenuAlarmLog.BackGround = this.groupBoxLevel2; + this.checkBoxL2MenuAlarmLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL2MenuAlarmLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL2MenuAlarmLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL2MenuAlarmLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL2MenuAlarmLog.CheckBoxSymbolSize = 20; + this.checkBoxL2MenuAlarmLog.Checked = false; + this.checkBoxL2MenuAlarmLog.CheckLineWidth = 3; + this.checkBoxL2MenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL2MenuAlarmLog.ImageCheckBox = null; + this.checkBoxL2MenuAlarmLog.ImageUnCheckBox = null; + this.checkBoxL2MenuAlarmLog.Location = new System.Drawing.Point(51, 363); + this.checkBoxL2MenuAlarmLog.Name = "checkBoxL2MenuAlarmLog"; + this.checkBoxL2MenuAlarmLog.OverlapOptimize = true; + this.checkBoxL2MenuAlarmLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL2MenuAlarmLog.TabIndex = 114; + this.checkBoxL2MenuAlarmLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL2MenuAlarmLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL2MenuAlarmLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL2MenuAlarmLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL2MenuInformation // @@ -1252,7 +1177,7 @@ this.checkBoxL2MenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuInformation.ImageCheckBox = null; this.checkBoxL2MenuInformation.ImageUnCheckBox = null; - this.checkBoxL2MenuInformation.Location = new System.Drawing.Point(51, 417); + this.checkBoxL2MenuInformation.Location = new System.Drawing.Point(51, 392); this.checkBoxL2MenuInformation.Name = "checkBoxL2MenuInformation"; this.checkBoxL2MenuInformation.OverlapOptimize = true; this.checkBoxL2MenuInformation.Size = new System.Drawing.Size(23, 23); @@ -1275,11 +1200,10 @@ this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuIOTest); this.groupBoxLevel1.Controls.Add(this.checkBoxL1MainSubMenu); this.groupBoxLevel1.Controls.Add(this.checkBoxL1MainClear); - this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuEquipmentLog); - this.groupBoxLevel1.Controls.Add(this.checkBoxL1MainWeightSetting); - this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuCheckLog); + this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuHistoryLog); + this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuInspectionLog); this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuStatus); - this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuAlarmList); + this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuAlarmLog); this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuInformation); this.groupBoxLevel1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.groupBoxLevel1.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); @@ -1319,7 +1243,7 @@ this.checkBoxL1MenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuUserGroupEditor.ImageCheckBox = null; this.checkBoxL1MenuUserGroupEditor.ImageUnCheckBox = null; - this.checkBoxL1MenuUserGroupEditor.Location = new System.Drawing.Point(50, 272); + this.checkBoxL1MenuUserGroupEditor.Location = new System.Drawing.Point(50, 243); this.checkBoxL1MenuUserGroupEditor.Name = "checkBoxL1MenuUserGroupEditor"; this.checkBoxL1MenuUserGroupEditor.OverlapOptimize = true; this.checkBoxL1MenuUserGroupEditor.Size = new System.Drawing.Size(23, 23); @@ -1364,7 +1288,7 @@ this.checkBoxL1MenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuUserSetting.ImageCheckBox = null; this.checkBoxL1MenuUserSetting.ImageUnCheckBox = null; - this.checkBoxL1MenuUserSetting.Location = new System.Drawing.Point(50, 243); + this.checkBoxL1MenuUserSetting.Location = new System.Drawing.Point(50, 214); this.checkBoxL1MenuUserSetting.Name = "checkBoxL1MenuUserSetting"; this.checkBoxL1MenuUserSetting.OverlapOptimize = true; this.checkBoxL1MenuUserSetting.Size = new System.Drawing.Size(23, 23); @@ -1387,7 +1311,7 @@ this.checkBoxL1MenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuProduct.ImageCheckBox = null; this.checkBoxL1MenuProduct.ImageUnCheckBox = null; - this.checkBoxL1MenuProduct.Location = new System.Drawing.Point(50, 214); + this.checkBoxL1MenuProduct.Location = new System.Drawing.Point(50, 185); this.checkBoxL1MenuProduct.Name = "checkBoxL1MenuProduct"; this.checkBoxL1MenuProduct.OverlapOptimize = true; this.checkBoxL1MenuProduct.Size = new System.Drawing.Size(23, 23); @@ -1410,7 +1334,7 @@ this.checkBoxL1MenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuIOTest.ImageCheckBox = null; this.checkBoxL1MenuIOTest.ImageUnCheckBox = null; - this.checkBoxL1MenuIOTest.Location = new System.Drawing.Point(50, 301); + this.checkBoxL1MenuIOTest.Location = new System.Drawing.Point(50, 272); this.checkBoxL1MenuIOTest.Name = "checkBoxL1MenuIOTest"; this.checkBoxL1MenuIOTest.OverlapOptimize = true; this.checkBoxL1MenuIOTest.Size = new System.Drawing.Size(23, 23); @@ -1432,7 +1356,7 @@ this.checkBoxL1MainSubMenu.CheckLineWidth = 3; this.checkBoxL1MainSubMenu.ImageCheckBox = null; this.checkBoxL1MainSubMenu.ImageUnCheckBox = null; - this.checkBoxL1MainSubMenu.Location = new System.Drawing.Point(50, 157); + this.checkBoxL1MainSubMenu.Location = new System.Drawing.Point(50, 128); this.checkBoxL1MainSubMenu.Name = "checkBoxL1MainSubMenu"; this.checkBoxL1MainSubMenu.OverlapOptimize = true; this.checkBoxL1MainSubMenu.Size = new System.Drawing.Size(23, 23); @@ -1454,7 +1378,7 @@ this.checkBoxL1MainClear.CheckLineWidth = 3; this.checkBoxL1MainClear.ImageCheckBox = null; this.checkBoxL1MainClear.ImageUnCheckBox = null; - this.checkBoxL1MainClear.Location = new System.Drawing.Point(50, 128); + this.checkBoxL1MainClear.Location = new System.Drawing.Point(50, 99); this.checkBoxL1MainClear.Name = "checkBoxL1MainClear"; this.checkBoxL1MainClear.OverlapOptimize = true; this.checkBoxL1MainClear.Size = new System.Drawing.Size(23, 23); @@ -1464,73 +1388,51 @@ this.checkBoxL1MainClear.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL1MainClear.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL1MenuEquipmentLog + // checkBoxL1MenuHistoryLog // - this.checkBoxL1MenuEquipmentLog.BackGround = this.groupBoxLevel1; - this.checkBoxL1MenuEquipmentLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL1MenuEquipmentLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL1MenuEquipmentLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL1MenuEquipmentLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL1MenuEquipmentLog.CheckBoxSymbolSize = 20; - this.checkBoxL1MenuEquipmentLog.Checked = false; - this.checkBoxL1MenuEquipmentLog.CheckLineWidth = 3; - this.checkBoxL1MenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL1MenuEquipmentLog.ImageCheckBox = null; - this.checkBoxL1MenuEquipmentLog.ImageUnCheckBox = null; - this.checkBoxL1MenuEquipmentLog.Location = new System.Drawing.Point(50, 330); - this.checkBoxL1MenuEquipmentLog.Name = "checkBoxL1MenuEquipmentLog"; - this.checkBoxL1MenuEquipmentLog.OverlapOptimize = true; - this.checkBoxL1MenuEquipmentLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL1MenuEquipmentLog.TabIndex = 110; - this.checkBoxL1MenuEquipmentLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL1MenuEquipmentLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL1MenuEquipmentLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL1MenuEquipmentLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL1MenuHistoryLog.BackGround = this.groupBoxLevel1; + this.checkBoxL1MenuHistoryLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL1MenuHistoryLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL1MenuHistoryLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL1MenuHistoryLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL1MenuHistoryLog.CheckBoxSymbolSize = 20; + this.checkBoxL1MenuHistoryLog.Checked = false; + this.checkBoxL1MenuHistoryLog.CheckLineWidth = 3; + this.checkBoxL1MenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL1MenuHistoryLog.ImageCheckBox = null; + this.checkBoxL1MenuHistoryLog.ImageUnCheckBox = null; + this.checkBoxL1MenuHistoryLog.Location = new System.Drawing.Point(50, 301); + this.checkBoxL1MenuHistoryLog.Name = "checkBoxL1MenuHistoryLog"; + this.checkBoxL1MenuHistoryLog.OverlapOptimize = true; + this.checkBoxL1MenuHistoryLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL1MenuHistoryLog.TabIndex = 110; + this.checkBoxL1MenuHistoryLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL1MenuHistoryLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL1MenuHistoryLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL1MenuHistoryLog.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL1MainWeightSetting + // checkBoxL1MenuInspectionLog // - this.checkBoxL1MainWeightSetting.BackGround = this.groupBoxLevel1; - this.checkBoxL1MainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL1MainWeightSetting.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL1MainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL1MainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL1MainWeightSetting.CheckBoxSymbolSize = 20; - this.checkBoxL1MainWeightSetting.Checked = false; - this.checkBoxL1MainWeightSetting.CheckLineWidth = 3; - this.checkBoxL1MainWeightSetting.ImageCheckBox = null; - this.checkBoxL1MainWeightSetting.ImageUnCheckBox = null; - this.checkBoxL1MainWeightSetting.Location = new System.Drawing.Point(50, 99); - this.checkBoxL1MainWeightSetting.Name = "checkBoxL1MainWeightSetting"; - this.checkBoxL1MainWeightSetting.OverlapOptimize = true; - this.checkBoxL1MainWeightSetting.Size = new System.Drawing.Size(23, 23); - this.checkBoxL1MainWeightSetting.TabIndex = 1; - this.checkBoxL1MainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL1MainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL1MainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL1MainWeightSetting.Click += new System.EventHandler(this.checkBox_Click); - // - // checkBoxL1MenuCheckLog - // - this.checkBoxL1MenuCheckLog.BackGround = this.groupBoxLevel1; - this.checkBoxL1MenuCheckLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL1MenuCheckLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL1MenuCheckLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL1MenuCheckLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL1MenuCheckLog.CheckBoxSymbolSize = 20; - this.checkBoxL1MenuCheckLog.Checked = false; - this.checkBoxL1MenuCheckLog.CheckLineWidth = 3; - this.checkBoxL1MenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL1MenuCheckLog.ImageCheckBox = null; - this.checkBoxL1MenuCheckLog.ImageUnCheckBox = null; - this.checkBoxL1MenuCheckLog.Location = new System.Drawing.Point(50, 359); - this.checkBoxL1MenuCheckLog.Name = "checkBoxL1MenuCheckLog"; - this.checkBoxL1MenuCheckLog.OverlapOptimize = true; - this.checkBoxL1MenuCheckLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL1MenuCheckLog.TabIndex = 111; - this.checkBoxL1MenuCheckLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL1MenuCheckLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL1MenuCheckLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL1MenuCheckLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL1MenuInspectionLog.BackGround = this.groupBoxLevel1; + this.checkBoxL1MenuInspectionLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL1MenuInspectionLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL1MenuInspectionLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL1MenuInspectionLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL1MenuInspectionLog.CheckBoxSymbolSize = 20; + this.checkBoxL1MenuInspectionLog.Checked = false; + this.checkBoxL1MenuInspectionLog.CheckLineWidth = 3; + this.checkBoxL1MenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL1MenuInspectionLog.ImageCheckBox = null; + this.checkBoxL1MenuInspectionLog.ImageUnCheckBox = null; + this.checkBoxL1MenuInspectionLog.Location = new System.Drawing.Point(50, 330); + this.checkBoxL1MenuInspectionLog.Name = "checkBoxL1MenuInspectionLog"; + this.checkBoxL1MenuInspectionLog.OverlapOptimize = true; + this.checkBoxL1MenuInspectionLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL1MenuInspectionLog.TabIndex = 111; + this.checkBoxL1MenuInspectionLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL1MenuInspectionLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL1MenuInspectionLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL1MenuInspectionLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL1MenuStatus // @@ -1545,7 +1447,7 @@ this.checkBoxL1MenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuStatus.ImageCheckBox = null; this.checkBoxL1MenuStatus.ImageUnCheckBox = null; - this.checkBoxL1MenuStatus.Location = new System.Drawing.Point(50, 446); + this.checkBoxL1MenuStatus.Location = new System.Drawing.Point(50, 417); this.checkBoxL1MenuStatus.Name = "checkBoxL1MenuStatus"; this.checkBoxL1MenuStatus.OverlapOptimize = true; this.checkBoxL1MenuStatus.Size = new System.Drawing.Size(23, 23); @@ -1555,28 +1457,28 @@ this.checkBoxL1MenuStatus.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL1MenuStatus.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL1MenuAlarmList + // checkBoxL1MenuAlarmLog // - this.checkBoxL1MenuAlarmList.BackGround = this.groupBoxLevel1; - this.checkBoxL1MenuAlarmList.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL1MenuAlarmList.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL1MenuAlarmList.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL1MenuAlarmList.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL1MenuAlarmList.CheckBoxSymbolSize = 20; - this.checkBoxL1MenuAlarmList.Checked = false; - this.checkBoxL1MenuAlarmList.CheckLineWidth = 3; - this.checkBoxL1MenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL1MenuAlarmList.ImageCheckBox = null; - this.checkBoxL1MenuAlarmList.ImageUnCheckBox = null; - this.checkBoxL1MenuAlarmList.Location = new System.Drawing.Point(50, 388); - this.checkBoxL1MenuAlarmList.Name = "checkBoxL1MenuAlarmList"; - this.checkBoxL1MenuAlarmList.OverlapOptimize = true; - this.checkBoxL1MenuAlarmList.Size = new System.Drawing.Size(23, 23); - this.checkBoxL1MenuAlarmList.TabIndex = 114; - this.checkBoxL1MenuAlarmList.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL1MenuAlarmList.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL1MenuAlarmList.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL1MenuAlarmList.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL1MenuAlarmLog.BackGround = this.groupBoxLevel1; + this.checkBoxL1MenuAlarmLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL1MenuAlarmLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL1MenuAlarmLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL1MenuAlarmLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL1MenuAlarmLog.CheckBoxSymbolSize = 20; + this.checkBoxL1MenuAlarmLog.Checked = false; + this.checkBoxL1MenuAlarmLog.CheckLineWidth = 3; + this.checkBoxL1MenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL1MenuAlarmLog.ImageCheckBox = null; + this.checkBoxL1MenuAlarmLog.ImageUnCheckBox = null; + this.checkBoxL1MenuAlarmLog.Location = new System.Drawing.Point(50, 359); + this.checkBoxL1MenuAlarmLog.Name = "checkBoxL1MenuAlarmLog"; + this.checkBoxL1MenuAlarmLog.OverlapOptimize = true; + this.checkBoxL1MenuAlarmLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL1MenuAlarmLog.TabIndex = 114; + this.checkBoxL1MenuAlarmLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL1MenuAlarmLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL1MenuAlarmLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL1MenuAlarmLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL1MenuInformation // @@ -1591,7 +1493,7 @@ this.checkBoxL1MenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuInformation.ImageCheckBox = null; this.checkBoxL1MenuInformation.ImageUnCheckBox = null; - this.checkBoxL1MenuInformation.Location = new System.Drawing.Point(50, 417); + this.checkBoxL1MenuInformation.Location = new System.Drawing.Point(50, 388); this.checkBoxL1MenuInformation.Name = "checkBoxL1MenuInformation"; this.checkBoxL1MenuInformation.OverlapOptimize = true; this.checkBoxL1MenuInformation.Size = new System.Drawing.Size(23, 23); @@ -1609,7 +1511,7 @@ this.labelTitleMenuStatus.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuStatus.LineSpacing = 0F; - this.labelTitleMenuStatus.Location = new System.Drawing.Point(158, 544); + this.labelTitleMenuStatus.Location = new System.Drawing.Point(158, 515); this.labelTitleMenuStatus.Name = "labelTitleMenuStatus"; this.labelTitleMenuStatus.OverlapOptimize = true; this.labelTitleMenuStatus.PasswordChar = '\0'; @@ -1632,7 +1534,7 @@ this.labelTitleMenuInformation.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuInformation.LineSpacing = 0F; - this.labelTitleMenuInformation.Location = new System.Drawing.Point(158, 515); + this.labelTitleMenuInformation.Location = new System.Drawing.Point(158, 486); this.labelTitleMenuInformation.Name = "labelTitleMenuInformation"; this.labelTitleMenuInformation.OverlapOptimize = true; this.labelTitleMenuInformation.PasswordChar = '\0'; @@ -1647,74 +1549,74 @@ this.labelTitleMenuInformation.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitleMenuInformation.Wordwrap = false; // - // labelTitleMenuAlarmList + // labelTitleMenuAlarmLog // - this.labelTitleMenuAlarmList.BackGround = null; - this.labelTitleMenuAlarmList.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.labelTitleMenuAlarmList.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuAlarmList.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleMenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleMenuAlarmList.LineSpacing = 0F; - this.labelTitleMenuAlarmList.Location = new System.Drawing.Point(158, 486); - this.labelTitleMenuAlarmList.Name = "labelTitleMenuAlarmList"; - this.labelTitleMenuAlarmList.OverlapOptimize = true; - this.labelTitleMenuAlarmList.PasswordChar = '\0'; - this.labelTitleMenuAlarmList.Radius = 3; - this.labelTitleMenuAlarmList.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelTitleMenuAlarmList.Size = new System.Drawing.Size(132, 23); - this.labelTitleMenuAlarmList.TabIndex = 134; - this.labelTitleMenuAlarmList.Text = "Alarm list"; - this.labelTitleMenuAlarmList.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuAlarmList.TextColorDisable = System.Drawing.Color.Gray; - this.labelTitleMenuAlarmList.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelTitleMenuAlarmList.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleMenuAlarmList.Wordwrap = false; + this.labelTitleMenuAlarmLog.BackGround = null; + this.labelTitleMenuAlarmLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.labelTitleMenuAlarmLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuAlarmLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleMenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleMenuAlarmLog.LineSpacing = 0F; + this.labelTitleMenuAlarmLog.Location = new System.Drawing.Point(158, 457); + this.labelTitleMenuAlarmLog.Name = "labelTitleMenuAlarmLog"; + this.labelTitleMenuAlarmLog.OverlapOptimize = true; + this.labelTitleMenuAlarmLog.PasswordChar = '\0'; + this.labelTitleMenuAlarmLog.Radius = 3; + this.labelTitleMenuAlarmLog.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelTitleMenuAlarmLog.Size = new System.Drawing.Size(132, 23); + this.labelTitleMenuAlarmLog.TabIndex = 134; + this.labelTitleMenuAlarmLog.Text = "Alarm log"; + this.labelTitleMenuAlarmLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuAlarmLog.TextColorDisable = System.Drawing.Color.Gray; + this.labelTitleMenuAlarmLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleMenuAlarmLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleMenuAlarmLog.Wordwrap = false; // - // labelTitleMenuCheckLog + // labelTitleMenuInspectionLog // - this.labelTitleMenuCheckLog.BackGround = null; - this.labelTitleMenuCheckLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.labelTitleMenuCheckLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuCheckLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleMenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleMenuCheckLog.LineSpacing = 0F; - this.labelTitleMenuCheckLog.Location = new System.Drawing.Point(158, 457); - this.labelTitleMenuCheckLog.Name = "labelTitleMenuCheckLog"; - this.labelTitleMenuCheckLog.OverlapOptimize = true; - this.labelTitleMenuCheckLog.PasswordChar = '\0'; - this.labelTitleMenuCheckLog.Radius = 3; - this.labelTitleMenuCheckLog.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelTitleMenuCheckLog.Size = new System.Drawing.Size(132, 23); - this.labelTitleMenuCheckLog.TabIndex = 133; - this.labelTitleMenuCheckLog.Text = "Inspection log"; - this.labelTitleMenuCheckLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuCheckLog.TextColorDisable = System.Drawing.Color.Gray; - this.labelTitleMenuCheckLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelTitleMenuCheckLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleMenuCheckLog.Wordwrap = false; + this.labelTitleMenuInspectionLog.BackGround = null; + this.labelTitleMenuInspectionLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.labelTitleMenuInspectionLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuInspectionLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleMenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleMenuInspectionLog.LineSpacing = 0F; + this.labelTitleMenuInspectionLog.Location = new System.Drawing.Point(158, 428); + this.labelTitleMenuInspectionLog.Name = "labelTitleMenuInspectionLog"; + this.labelTitleMenuInspectionLog.OverlapOptimize = true; + this.labelTitleMenuInspectionLog.PasswordChar = '\0'; + this.labelTitleMenuInspectionLog.Radius = 3; + this.labelTitleMenuInspectionLog.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelTitleMenuInspectionLog.Size = new System.Drawing.Size(132, 23); + this.labelTitleMenuInspectionLog.TabIndex = 133; + this.labelTitleMenuInspectionLog.Text = "Inspection log"; + this.labelTitleMenuInspectionLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuInspectionLog.TextColorDisable = System.Drawing.Color.Gray; + this.labelTitleMenuInspectionLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleMenuInspectionLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleMenuInspectionLog.Wordwrap = false; // - // labelTitleMenuEquipmentLog + // labelTitleMenuHistoryLog // - this.labelTitleMenuEquipmentLog.BackGround = null; - this.labelTitleMenuEquipmentLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.labelTitleMenuEquipmentLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuEquipmentLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleMenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleMenuEquipmentLog.LineSpacing = 0F; - this.labelTitleMenuEquipmentLog.Location = new System.Drawing.Point(158, 428); - this.labelTitleMenuEquipmentLog.Name = "labelTitleMenuEquipmentLog"; - this.labelTitleMenuEquipmentLog.OverlapOptimize = true; - this.labelTitleMenuEquipmentLog.PasswordChar = '\0'; - this.labelTitleMenuEquipmentLog.Radius = 3; - this.labelTitleMenuEquipmentLog.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelTitleMenuEquipmentLog.Size = new System.Drawing.Size(132, 23); - this.labelTitleMenuEquipmentLog.TabIndex = 132; - this.labelTitleMenuEquipmentLog.Text = "Equipment log"; - this.labelTitleMenuEquipmentLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuEquipmentLog.TextColorDisable = System.Drawing.Color.Gray; - this.labelTitleMenuEquipmentLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelTitleMenuEquipmentLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleMenuEquipmentLog.Wordwrap = false; + this.labelTitleMenuHistoryLog.BackGround = null; + this.labelTitleMenuHistoryLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.labelTitleMenuHistoryLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuHistoryLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleMenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleMenuHistoryLog.LineSpacing = 0F; + this.labelTitleMenuHistoryLog.Location = new System.Drawing.Point(158, 399); + this.labelTitleMenuHistoryLog.Name = "labelTitleMenuHistoryLog"; + this.labelTitleMenuHistoryLog.OverlapOptimize = true; + this.labelTitleMenuHistoryLog.PasswordChar = '\0'; + this.labelTitleMenuHistoryLog.Radius = 3; + this.labelTitleMenuHistoryLog.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelTitleMenuHistoryLog.Size = new System.Drawing.Size(132, 23); + this.labelTitleMenuHistoryLog.TabIndex = 132; + this.labelTitleMenuHistoryLog.Text = "History log"; + this.labelTitleMenuHistoryLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuHistoryLog.TextColorDisable = System.Drawing.Color.Gray; + this.labelTitleMenuHistoryLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleMenuHistoryLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleMenuHistoryLog.Wordwrap = false; // // labelTitleMenuIOTest // @@ -1724,7 +1626,7 @@ this.labelTitleMenuIOTest.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuIOTest.LineSpacing = 0F; - this.labelTitleMenuIOTest.Location = new System.Drawing.Point(158, 399); + this.labelTitleMenuIOTest.Location = new System.Drawing.Point(158, 370); this.labelTitleMenuIOTest.Name = "labelTitleMenuIOTest"; this.labelTitleMenuIOTest.OverlapOptimize = true; this.labelTitleMenuIOTest.PasswordChar = '\0'; @@ -1747,7 +1649,7 @@ this.labelTitleMenuUserSetting.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuUserSetting.LineSpacing = 0F; - this.labelTitleMenuUserSetting.Location = new System.Drawing.Point(158, 341); + this.labelTitleMenuUserSetting.Location = new System.Drawing.Point(158, 312); this.labelTitleMenuUserSetting.Name = "labelTitleMenuUserSetting"; this.labelTitleMenuUserSetting.OverlapOptimize = true; this.labelTitleMenuUserSetting.PasswordChar = '\0'; @@ -1770,7 +1672,7 @@ this.labelTitleMenuProduct.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuProduct.LineSpacing = 0F; - this.labelTitleMenuProduct.Location = new System.Drawing.Point(158, 312); + this.labelTitleMenuProduct.Location = new System.Drawing.Point(158, 283); this.labelTitleMenuProduct.Name = "labelTitleMenuProduct"; this.labelTitleMenuProduct.OverlapOptimize = true; this.labelTitleMenuProduct.PasswordChar = '\0'; @@ -1793,7 +1695,7 @@ this.labelTitleMainSubMenu.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMainSubMenu.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMainSubMenu.LineSpacing = 0F; - this.labelTitleMainSubMenu.Location = new System.Drawing.Point(158, 255); + this.labelTitleMainSubMenu.Location = new System.Drawing.Point(158, 226); this.labelTitleMainSubMenu.Name = "labelTitleMainSubMenu"; this.labelTitleMainSubMenu.OverlapOptimize = true; this.labelTitleMainSubMenu.PasswordChar = '\0'; @@ -1816,7 +1718,7 @@ this.labelTitleMainClear.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMainClear.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMainClear.LineSpacing = 0F; - this.labelTitleMainClear.Location = new System.Drawing.Point(158, 226); + this.labelTitleMainClear.Location = new System.Drawing.Point(158, 197); this.labelTitleMainClear.Name = "labelTitleMainClear"; this.labelTitleMainClear.OverlapOptimize = true; this.labelTitleMainClear.PasswordChar = '\0'; @@ -1831,29 +1733,6 @@ this.labelTitleMainClear.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitleMainClear.Wordwrap = false; // - // labelTitleMainWeightSetting - // - this.labelTitleMainWeightSetting.BackGround = null; - this.labelTitleMainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.labelTitleMainWeightSetting.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMainWeightSetting.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleMainWeightSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleMainWeightSetting.LineSpacing = 0F; - this.labelTitleMainWeightSetting.Location = new System.Drawing.Point(158, 197); - this.labelTitleMainWeightSetting.Name = "labelTitleMainWeightSetting"; - this.labelTitleMainWeightSetting.OverlapOptimize = true; - this.labelTitleMainWeightSetting.PasswordChar = '\0'; - this.labelTitleMainWeightSetting.Radius = 3; - this.labelTitleMainWeightSetting.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelTitleMainWeightSetting.Size = new System.Drawing.Size(132, 23); - this.labelTitleMainWeightSetting.TabIndex = 123; - this.labelTitleMainWeightSetting.Text = "Change weight"; - this.labelTitleMainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.labelTitleMainWeightSetting.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelTitleMainWeightSetting.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleMainWeightSetting.Wordwrap = false; - // // labelTitleMainProductChange // this.labelTitleMainProductChange.BackGround = null; @@ -1943,7 +1822,7 @@ this.labelTitleMenu.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenu.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.labelTitleMenu.LineSpacing = 0F; - this.labelTitleMenu.Location = new System.Drawing.Point(158, 283); + this.labelTitleMenu.Location = new System.Drawing.Point(158, 254); this.labelTitleMenu.Name = "labelTitleMenu"; this.labelTitleMenu.OverlapOptimize = true; this.labelTitleMenu.PasswordChar = '\0'; @@ -1979,10 +1858,10 @@ private SmartX.SmartGroupBox smartGroupBox1; private SmartX.SmartButton buttonSave; private SmartX.SmartCheckBox checkBoxL1MenuInformation; - private SmartX.SmartCheckBox checkBoxL1MenuAlarmList; + private SmartX.SmartCheckBox checkBoxL1MenuAlarmLog; private SmartX.SmartCheckBox checkBoxL1MenuStatus; - private SmartX.SmartCheckBox checkBoxL1MenuCheckLog; - private SmartX.SmartCheckBox checkBoxL1MenuEquipmentLog; + private SmartX.SmartCheckBox checkBoxL1MenuInspectionLog; + private SmartX.SmartCheckBox checkBoxL1MenuHistoryLog; private SmartX.SmartCheckBox checkBoxL1MenuIOTest; private SmartX.SmartLabel labelTitleMenu; private SmartX.SmartLabel labelTitleMain; @@ -1990,20 +1869,18 @@ private SmartX.SmartCheckBox checkBoxL1MenuProduct; private SmartX.SmartCheckBox checkBoxL1MainSubMenu; private SmartX.SmartCheckBox checkBoxL1MainClear; - private SmartX.SmartCheckBox checkBoxL1MainWeightSetting; private SmartX.SmartCheckBox checkBoxL1MainProductChange; private SmartX.SmartLabel labelTitleMainProductChange; private SmartX.SmartLabel labelTitleMenuStatus; private SmartX.SmartLabel labelTitleMenuInformation; - private SmartX.SmartLabel labelTitleMenuAlarmList; - private SmartX.SmartLabel labelTitleMenuCheckLog; - private SmartX.SmartLabel labelTitleMenuEquipmentLog; + private SmartX.SmartLabel labelTitleMenuAlarmLog; + private SmartX.SmartLabel labelTitleMenuInspectionLog; + private SmartX.SmartLabel labelTitleMenuHistoryLog; private SmartX.SmartLabel labelTitleMenuIOTest; private SmartX.SmartLabel labelTitleMenuUserSetting; private SmartX.SmartLabel labelTitleMenuProduct; private SmartX.SmartLabel labelTitleMainSubMenu; private SmartX.SmartLabel labelTitleMainClear; - private SmartX.SmartLabel labelTitleMainWeightSetting; private SmartX.SmartGroupBox groupBoxDefault; private SmartX.SmartCheckBox checkBoxDefaultMainProductChange; private SmartX.SmartCheckBox checkBoxDefaultMenuUserSetting; @@ -2012,7 +1889,6 @@ private SmartX.SmartCheckBox checkBoxDefaultMainSubMenu; private SmartX.SmartCheckBox checkBoxDefaultMainClear; private SmartX.SmartCheckBox checkBoxDefaultMenuEquipmentLog; - private SmartX.SmartCheckBox checkBoxDefaultMainWeightSetting; private SmartX.SmartCheckBox checkBoxDefaultMenuCheckLog; private SmartX.SmartCheckBox checkBoxDefaultMenuStatus; private SmartX.SmartCheckBox checkBoxDefaultMenuAlarmList; @@ -2024,11 +1900,10 @@ private SmartX.SmartCheckBox checkBoxL3MenuIOTest; private SmartX.SmartCheckBox checkBoxL3MainSubMenu; private SmartX.SmartCheckBox checkBoxL3MainClear; - private SmartX.SmartCheckBox checkBoxL3MenuEquipmentLog; - private SmartX.SmartCheckBox checkBoxL3MainWeightSetting; - private SmartX.SmartCheckBox checkBoxL3MenuCheckLog; + private SmartX.SmartCheckBox checkBoxL3MenuHistoryLog; + private SmartX.SmartCheckBox checkBoxL3MenuInspectionLog; private SmartX.SmartCheckBox checkBoxL3MenuStatus; - private SmartX.SmartCheckBox checkBoxL3MenuAlarmList; + private SmartX.SmartCheckBox checkBoxL3MenuAlarmLog; private SmartX.SmartCheckBox checkBoxL3MenuInformation; private SmartX.SmartGroupBox groupBoxLevel2; private SmartX.SmartCheckBox checkBoxL2MainProductChange; @@ -2037,11 +1912,10 @@ private SmartX.SmartCheckBox checkBoxL2MenuIOTest; private SmartX.SmartCheckBox checkBoxL2MainSubMenu; private SmartX.SmartCheckBox checkBoxL2MainClear; - private SmartX.SmartCheckBox checkBoxL2MenuEquipmentLog; - private SmartX.SmartCheckBox checkBoxL2MainWeightSetting; - private SmartX.SmartCheckBox checkBoxL2MenuCheckLog; + private SmartX.SmartCheckBox checkBoxL2MenuHistoryLog; + private SmartX.SmartCheckBox checkBoxL2MenuInspectionLog; private SmartX.SmartCheckBox checkBoxL2MenuStatus; - private SmartX.SmartCheckBox checkBoxL2MenuAlarmList; + private SmartX.SmartCheckBox checkBoxL2MenuAlarmLog; private SmartX.SmartCheckBox checkBoxL2MenuInformation; private SmartX.SmartGroupBox groupBoxLevel1; private SmartX.SmartCheckBox checkBoxDefaultMenuUserGroupEditor; diff --git a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs index 3c7fb8f..52a1f14 100644 --- a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs +++ b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs @@ -73,7 +73,6 @@ namespace INT_PT002.Controls #region Level1 this.checkBoxL1MainProductChange.Checked = group.Level1.IsMainDisplayProductChange; - this.checkBoxL1MainWeightSetting.Checked = group.Level1.IsMainDisplayWeightSetting; this.checkBoxL1MainClear.Checked = group.Level1.IsMainDisplayClear; this.checkBoxL1MainSubMenu.Checked = group.Level1.IsMainDisplaySubMenu; @@ -81,16 +80,15 @@ namespace INT_PT002.Controls this.checkBoxL1MenuUserSetting.Checked = group.Level1.IsMenuUserSetting; this.checkBoxL1MenuUserGroupEditor.Checked = group.Level1.IsMenuUserGroupEditor; this.checkBoxL1MenuIOTest.Checked = group.Level1.IsMenuIOTest; - this.checkBoxL1MenuEquipmentLog.Checked = group.Level1.IsMenuEquipmentLog; - this.checkBoxL1MenuCheckLog.Checked = group.Level1.IsMenuCheckLog; - this.checkBoxL1MenuAlarmList.Checked = group.Level1.IsMenuAlarmList; + this.checkBoxL1MenuHistoryLog.Checked = group.Level1.IsMenuHistoryLog; + this.checkBoxL1MenuInspectionLog.Checked = group.Level1.IsMenuInspectionLog; + this.checkBoxL1MenuAlarmLog.Checked = group.Level1.IsMenuAlarmLog; this.checkBoxL1MenuInformation.Checked = group.Level1.IsMenuInformation; this.checkBoxL1MenuStatus.Checked = group.Level1.IsMenuStatus; #endregion #region Level2 this.checkBoxL2MainProductChange.Checked = group.Level2.IsMainDisplayProductChange; - this.checkBoxL2MainWeightSetting.Checked = group.Level2.IsMainDisplayWeightSetting; this.checkBoxL2MainClear.Checked = group.Level2.IsMainDisplayClear; this.checkBoxL2MainSubMenu.Checked = group.Level2.IsMainDisplaySubMenu; @@ -98,16 +96,15 @@ namespace INT_PT002.Controls this.checkBoxL2MenuUserSetting.Checked = group.Level2.IsMenuUserSetting; this.checkBoxL2MenuUserGroupEditor.Checked = group.Level2.IsMenuUserGroupEditor; this.checkBoxL2MenuIOTest.Checked = group.Level2.IsMenuIOTest; - this.checkBoxL2MenuEquipmentLog.Checked = group.Level2.IsMenuEquipmentLog; - this.checkBoxL2MenuCheckLog.Checked = group.Level2.IsMenuCheckLog; - this.checkBoxL2MenuAlarmList.Checked = group.Level2.IsMenuAlarmList; + this.checkBoxL2MenuHistoryLog.Checked = group.Level2.IsMenuHistoryLog; + this.checkBoxL2MenuInspectionLog.Checked = group.Level2.IsMenuInspectionLog; + this.checkBoxL2MenuAlarmLog.Checked = group.Level2.IsMenuAlarmLog; this.checkBoxL2MenuInformation.Checked = group.Level2.IsMenuInformation; this.checkBoxL2MenuStatus.Checked = group.Level2.IsMenuStatus; #endregion #region Level3 this.checkBoxL3MainProductChange.Checked = group.Level3.IsMainDisplayProductChange; - this.checkBoxL3MainWeightSetting.Checked = group.Level3.IsMainDisplayWeightSetting; this.checkBoxL3MainClear.Checked = group.Level3.IsMainDisplayClear; this.checkBoxL3MainSubMenu.Checked = group.Level3.IsMainDisplaySubMenu; @@ -115,16 +112,15 @@ namespace INT_PT002.Controls this.checkBoxL3MenuUserSetting.Checked = group.Level3.IsMenuUserSetting; this.checkBoxL3MenuUserGroupEditor.Checked = group.Level3.IsMenuUserGroupEditor; this.checkBoxL3MenuIOTest.Checked = group.Level3.IsMenuIOTest; - this.checkBoxL3MenuEquipmentLog.Checked = group.Level3.IsMenuEquipmentLog; - this.checkBoxL3MenuCheckLog.Checked = group.Level3.IsMenuCheckLog; - this.checkBoxL3MenuAlarmList.Checked = group.Level3.IsMenuAlarmList; + this.checkBoxL3MenuHistoryLog.Checked = group.Level3.IsMenuHistoryLog; + this.checkBoxL3MenuInspectionLog.Checked = group.Level3.IsMenuInspectionLog; + this.checkBoxL3MenuAlarmLog.Checked = group.Level3.IsMenuAlarmLog; this.checkBoxL3MenuInformation.Checked = group.Level3.IsMenuInformation; this.checkBoxL3MenuStatus.Checked = group.Level3.IsMenuStatus; #endregion #region Default this.checkBoxDefaultMainProductChange.Checked = group.Default.IsMainDisplayProductChange; - this.checkBoxDefaultMainWeightSetting.Checked = group.Default.IsMainDisplayWeightSetting; this.checkBoxDefaultMainClear.Checked = group.Default.IsMainDisplayClear; this.checkBoxDefaultMainSubMenu.Checked = group.Default.IsMainDisplaySubMenu; @@ -132,9 +128,9 @@ namespace INT_PT002.Controls this.checkBoxDefaultMenuUserSetting.Checked = group.Default.IsMenuUserSetting; this.checkBoxDefaultMenuUserGroupEditor.Checked = group.Default.IsMenuUserGroupEditor; this.checkBoxDefaultMenuIOTest.Checked = group.Default.IsMenuIOTest; - this.checkBoxDefaultMenuEquipmentLog.Checked = group.Default.IsMenuEquipmentLog; - this.checkBoxDefaultMenuCheckLog.Checked = group.Default.IsMenuCheckLog; - this.checkBoxDefaultMenuAlarmList.Checked = group.Default.IsMenuAlarmList; + this.checkBoxDefaultMenuEquipmentLog.Checked = group.Default.IsMenuHistoryLog; + this.checkBoxDefaultMenuCheckLog.Checked = group.Default.IsMenuInspectionLog; + this.checkBoxDefaultMenuAlarmList.Checked = group.Default.IsMenuAlarmLog; this.checkBoxDefaultMenuInformation.Checked = group.Default.IsMenuInformation; this.checkBoxDefaultMenuStatus.Checked = group.Default.IsMenuStatus; #endregion @@ -299,7 +295,6 @@ namespace INT_PT002.Controls { #region Level1 this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayProductChange = this.checkBoxL1MainProductChange.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayWeightSetting = this.checkBoxL1MainWeightSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayClear = this.checkBoxL1MainClear.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplaySubMenu = this.checkBoxL1MainSubMenu.Checked; @@ -307,16 +302,15 @@ namespace INT_PT002.Controls this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuUserSetting = this.checkBoxL1MenuUserSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuUserGroupEditor = this.checkBoxL1MenuUserGroupEditor.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuIOTest = this.checkBoxL1MenuIOTest.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuEquipmentLog = this.checkBoxL1MenuEquipmentLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuCheckLog = this.checkBoxL1MenuCheckLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmList = this.checkBoxL1MenuAlarmList.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuHistoryLog = this.checkBoxL1MenuHistoryLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInspectionLog = this.checkBoxL1MenuInspectionLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmLog = this.checkBoxL1MenuAlarmLog.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInformation = this.checkBoxL1MenuInformation.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuStatus = this.checkBoxL1MenuStatus.Checked; #endregion #region Level2 this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayProductChange = this.checkBoxL2MainProductChange.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayWeightSetting = this.checkBoxL2MainWeightSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayClear = this.checkBoxL2MainClear.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplaySubMenu = this.checkBoxL2MainSubMenu.Checked; @@ -324,16 +318,15 @@ namespace INT_PT002.Controls this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuUserSetting = this.checkBoxL2MenuUserSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuUserGroupEditor = this.checkBoxL2MenuUserGroupEditor.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuIOTest = this.checkBoxL2MenuIOTest.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuEquipmentLog = this.checkBoxL2MenuEquipmentLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuCheckLog = this.checkBoxL2MenuCheckLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmList = this.checkBoxL2MenuAlarmList.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuHistoryLog = this.checkBoxL2MenuHistoryLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuInspectionLog = this.checkBoxL2MenuInspectionLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmLog = this.checkBoxL2MenuAlarmLog.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuInformation = this.checkBoxL2MenuInformation.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuStatus = this.checkBoxL2MenuStatus.Checked; #endregion #region Level3 this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayProductChange = this.checkBoxL3MainProductChange.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayWeightSetting = this.checkBoxL3MainWeightSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayClear = this.checkBoxL3MainClear.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplaySubMenu = this.checkBoxL3MainSubMenu.Checked; @@ -341,16 +334,15 @@ namespace INT_PT002.Controls this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuUserSetting = this.checkBoxL3MenuUserSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuUserGroupEditor = this.checkBoxL3MenuUserGroupEditor.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest = this.checkBoxL3MenuIOTest.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuEquipmentLog = this.checkBoxL3MenuEquipmentLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuCheckLog = this.checkBoxL3MenuCheckLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmList = this.checkBoxL3MenuAlarmList.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuHistoryLog = this.checkBoxL3MenuHistoryLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuInspectionLog = this.checkBoxL3MenuInspectionLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog = this.checkBoxL3MenuAlarmLog.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuInformation = this.checkBoxL3MenuInformation.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuStatus = this.checkBoxL3MenuStatus.Checked; #endregion #region Default this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMainDisplayProductChange = this.checkBoxDefaultMainProductChange.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMainDisplayWeightSetting = this.checkBoxDefaultMainWeightSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMainDisplayClear = this.checkBoxDefaultMainClear.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMainDisplaySubMenu = this.checkBoxDefaultMainSubMenu.Checked; @@ -358,9 +350,9 @@ namespace INT_PT002.Controls this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuUserSetting = this.checkBoxDefaultMenuUserSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuUserGroupEditor = this.checkBoxDefaultMenuUserGroupEditor.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuIOTest = this.checkBoxDefaultMenuIOTest.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuEquipmentLog = this.checkBoxDefaultMenuEquipmentLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuCheckLog = this.checkBoxDefaultMenuCheckLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuAlarmList = this.checkBoxDefaultMenuAlarmList.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuHistoryLog = this.checkBoxDefaultMenuEquipmentLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuInspectionLog = this.checkBoxDefaultMenuCheckLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuAlarmLog = this.checkBoxDefaultMenuAlarmList.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuInformation = this.checkBoxDefaultMenuInformation.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuStatus = this.checkBoxDefaultMenuStatus.Checked; #endregion diff --git a/INT_PT002/Controls/User/ControlMenuUserUserEditor.Designer.cs b/INT_PT002/Controls/User/ControlMenuUserUserEditor.Designer.cs index 4708948..7ca4bea 100644 --- a/INT_PT002/Controls/User/ControlMenuUserUserEditor.Designer.cs +++ b/INT_PT002/Controls/User/ControlMenuUserUserEditor.Designer.cs @@ -57,7 +57,6 @@ this.checkBoxMenuProduct = new SmartX.SmartCheckBox(); this.checkBoxMainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxMainClear = new SmartX.SmartCheckBox(); - this.checkBoxMainWeightSetting = new SmartX.SmartCheckBox(); this.checkBoxMainProductChange = new SmartX.SmartCheckBox(); this.labelExpiryDateOfPassword2 = new SmartX.SmartLabel(); this.labelExpiryDateOfAccount2 = new SmartX.SmartLabel(); @@ -589,7 +588,6 @@ this.groupBoxAccessRight.Controls.Add(this.checkBoxMenuProduct); this.groupBoxAccessRight.Controls.Add(this.checkBoxMainSubMenu); this.groupBoxAccessRight.Controls.Add(this.checkBoxMainClear); - this.groupBoxAccessRight.Controls.Add(this.checkBoxMainWeightSetting); this.groupBoxAccessRight.Controls.Add(this.checkBoxMainProductChange); this.groupBoxAccessRight.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.groupBoxAccessRight.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); @@ -879,7 +877,7 @@ this.checkBoxMainSubMenu.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxMainSubMenu.ImageCheckBox = null; this.checkBoxMainSubMenu.ImageUnCheckBox = null; - this.checkBoxMainSubMenu.Location = new System.Drawing.Point(64, 148); + this.checkBoxMainSubMenu.Location = new System.Drawing.Point(64, 119); this.checkBoxMainSubMenu.Name = "checkBoxMainSubMenu"; this.checkBoxMainSubMenu.OverlapOptimize = true; this.checkBoxMainSubMenu.Size = new System.Drawing.Size(150, 23); @@ -888,6 +886,7 @@ this.checkBoxMainSubMenu.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.checkBoxMainSubMenu.TextColorDisable = System.Drawing.Color.Black; this.checkBoxMainSubMenu.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxMainSubMenu.Visible = false; // // checkBoxMainClear // @@ -903,7 +902,7 @@ this.checkBoxMainClear.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxMainClear.ImageCheckBox = null; this.checkBoxMainClear.ImageUnCheckBox = null; - this.checkBoxMainClear.Location = new System.Drawing.Point(64, 119); + this.checkBoxMainClear.Location = new System.Drawing.Point(64, 90); this.checkBoxMainClear.Name = "checkBoxMainClear"; this.checkBoxMainClear.OverlapOptimize = true; this.checkBoxMainClear.Size = new System.Drawing.Size(150, 23); @@ -913,30 +912,6 @@ this.checkBoxMainClear.TextColorDisable = System.Drawing.Color.Black; this.checkBoxMainClear.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; // - // checkBoxMainWeightSetting - // - this.checkBoxMainWeightSetting.BackGround = this.groupBoxAccessRight; - this.checkBoxMainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxMainWeightSetting.CheckBoxBackColor = System.Drawing.Color.LightGray; - this.checkBoxMainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxMainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxMainWeightSetting.CheckBoxSymbolSize = 14; - this.checkBoxMainWeightSetting.Checked = false; - this.checkBoxMainWeightSetting.CheckLineWidth = 3; - this.checkBoxMainWeightSetting.Enabled = false; - this.checkBoxMainWeightSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxMainWeightSetting.ImageCheckBox = null; - this.checkBoxMainWeightSetting.ImageUnCheckBox = null; - this.checkBoxMainWeightSetting.Location = new System.Drawing.Point(64, 90); - this.checkBoxMainWeightSetting.Name = "checkBoxMainWeightSetting"; - this.checkBoxMainWeightSetting.OverlapOptimize = true; - this.checkBoxMainWeightSetting.Size = new System.Drawing.Size(150, 23); - this.checkBoxMainWeightSetting.TabIndex = 1; - this.checkBoxMainWeightSetting.Text = "Change weight"; - this.checkBoxMainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.checkBoxMainWeightSetting.TextColorDisable = System.Drawing.Color.Black; - this.checkBoxMainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - // // checkBoxMainProductChange // this.checkBoxMainProductChange.BackGround = this.groupBoxAccessRight; @@ -1418,7 +1393,6 @@ private SmartX.SmartCheckBox checkBoxMenuProduct; private SmartX.SmartCheckBox checkBoxMainSubMenu; private SmartX.SmartCheckBox checkBoxMainClear; - private SmartX.SmartCheckBox checkBoxMainWeightSetting; private SmartX.SmartCheckBox checkBoxMainProductChange; private SmartX.SmartCheckBox checkBoxMenuInformation; private SmartX.SmartCheckBox checkBoxMenuAlarmList; diff --git a/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs b/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs index faf6259..50d9f68 100644 --- a/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs +++ b/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs @@ -205,21 +205,20 @@ namespace INT_PT002.Controls menuId.fMenu = new bool[UserManager.USER_MENU_ID_MAX]; menuId.fMenu[0] = this.checkBoxMainProductChange.Checked; - menuId.fMenu[1] = this.checkBoxMainWeightSetting.Checked; - menuId.fMenu[2] = this.checkBoxMainClear.Checked; - menuId.fMenu[3] = this.checkBoxMainSubMenu.Checked; + menuId.fMenu[1] = this.checkBoxMainClear.Checked; + menuId.fMenu[2] = this.checkBoxMainSubMenu.Checked; - menuId.fMenu[4] = this.checkBoxMenuProduct.Checked; - menuId.fMenu[5] = this.checkBoxMenuUserSetting.Checked; - menuId.fMenu[6] = this.checkBoxMenuUserGroupEditor.Checked; - menuId.fMenu[7] = this.checkBoxMenuIOTest.Checked; - menuId.fMenu[8] = this.checkBoxMenuEquipmentLog.Checked; - menuId.fMenu[9] = this.checkBoxMenuCheckLog.Checked; - menuId.fMenu[10] = this.checkBoxMenuAlarmList.Checked; - menuId.fMenu[11] = this.checkBoxMenuInformation.Checked; - menuId.fMenu[12] = this.checkBoxMenuStatus.Checked; + menuId.fMenu[3] = this.checkBoxMenuProduct.Checked; + menuId.fMenu[4] = this.checkBoxMenuUserSetting.Checked; + menuId.fMenu[5] = this.checkBoxMenuUserGroupEditor.Checked; + menuId.fMenu[6] = this.checkBoxMenuIOTest.Checked; + menuId.fMenu[7] = this.checkBoxMenuEquipmentLog.Checked; + menuId.fMenu[8] = this.checkBoxMenuCheckLog.Checked; + menuId.fMenu[9] = this.checkBoxMenuAlarmList.Checked; + menuId.fMenu[10] = this.checkBoxMenuInformation.Checked; + menuId.fMenu[11] = this.checkBoxMenuStatus.Checked; - for (int i = 13; i < UserManager.USER_MENU_ID_MAX - 12; i++) + for (int i = 12; i < UserManager.USER_MENU_ID_MAX - 11; i++) menuId.fMenu[i] = false; if (this.buttonLevel1.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) @@ -268,10 +267,6 @@ namespace INT_PT002.Controls } private void CheckBoxCheckedAsLevel(Define.E_UserGroup level) { - this.buttonLevel1.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel2.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel3.Click -= new EventHandler(this.buttonLevel_Click); - switch (level) { case Define.E_UserGroup.f0_Level1: @@ -282,7 +277,6 @@ namespace INT_PT002.Controls this.labelAccessRight.Text = this.ParentForm.ParentForm.SystemConfig.LEVEL1_NAME; this.checkBoxMainProductChange.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayProductChange; - this.checkBoxMainWeightSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayWeightSetting; this.checkBoxMainClear.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayClear; this.checkBoxMainSubMenu.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplaySubMenu; @@ -290,9 +284,9 @@ namespace INT_PT002.Controls this.checkBoxMenuUserSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuUserSetting; this.checkBoxMenuUserGroupEditor.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuUserGroupEditor; this.checkBoxMenuIOTest.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuIOTest; - this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuEquipmentLog; - this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuCheckLog; - this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmList; + this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuHistoryLog; + this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInspectionLog; + this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmLog; this.checkBoxMenuInformation.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInformation; this.checkBoxMenuStatus.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuStatus; break; @@ -304,7 +298,6 @@ namespace INT_PT002.Controls this.labelAccessRight.Text = this.ParentForm.ParentForm.SystemConfig.LEVEL2_NAME; this.checkBoxMainProductChange.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayProductChange; - this.checkBoxMainWeightSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayWeightSetting; this.checkBoxMainClear.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayClear; this.checkBoxMainSubMenu.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplaySubMenu; @@ -312,9 +305,9 @@ namespace INT_PT002.Controls this.checkBoxMenuUserSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuUserSetting; this.checkBoxMenuUserGroupEditor.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuUserGroupEditor; this.checkBoxMenuIOTest.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuIOTest; - this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuEquipmentLog; - this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuCheckLog; - this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmList; + this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuHistoryLog; + this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuInspectionLog; + this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmLog; this.checkBoxMenuInformation.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuInformation; this.checkBoxMenuStatus.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuStatus; break; @@ -326,7 +319,6 @@ namespace INT_PT002.Controls this.labelAccessRight.Text = this.ParentForm.ParentForm.SystemConfig.LEVEL3_NAME; this.checkBoxMainProductChange.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayProductChange; - this.checkBoxMainWeightSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayWeightSetting; this.checkBoxMainClear.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayClear; this.checkBoxMainSubMenu.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplaySubMenu; @@ -334,19 +326,15 @@ namespace INT_PT002.Controls this.checkBoxMenuUserSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuUserSetting; this.checkBoxMenuUserGroupEditor.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuUserGroupEditor; this.checkBoxMenuIOTest.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest; - this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuEquipmentLog; - this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuCheckLog; - this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmList; + this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuHistoryLog; + this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuInspectionLog; + this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog; this.checkBoxMenuInformation.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuInformation; this.checkBoxMenuStatus.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuStatus; break; default: break; } - - this.buttonLevel1.Click += new EventHandler(this.buttonLevel_Click); - this.buttonLevel2.Click += new EventHandler(this.buttonLevel_Click); - this.buttonLevel3.Click += new EventHandler(this.buttonLevel_Click); } private void UpdateInitializeUserDisplay(SystemConfiguration system) @@ -355,8 +343,8 @@ namespace INT_PT002.Controls this.textBoxID.Text = ""; this.textBoxPassword.Text = ""; - this.labelExpiryDateOfAccount.Text = "000"; - this.labelExpiryDateOfPassword.Text = "00"; + this.labelExpiryDateOfAccount.Text = "180"; + this.labelExpiryDateOfPassword.Text = "90"; this.labelExpiryDateOfAccount2.Text = "yyyy.mm.DD"; this.labelExpiryDateOfPassword2.Text = "yyyy.mm.DD"; this.labelAutomaticLogoutTime.Text = "0"; @@ -367,7 +355,6 @@ namespace INT_PT002.Controls this.buttonLevel3.ButtonText = system.LEVEL3_NAME; this.checkBoxMainProductChange.Checked = false; - this.checkBoxMainWeightSetting.Checked = false; this.checkBoxMainClear.Checked = false; this.checkBoxMainSubMenu.Checked = false; @@ -381,18 +368,10 @@ namespace INT_PT002.Controls this.checkBoxMenuInformation.Checked = false; this.checkBoxMenuStatus.Checked = false; - this.buttonLevel1.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel2.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel3.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel1.ButtonUp(); this.buttonLevel2.ButtonUp(); this.buttonLevel3.ButtonUp(); - this.buttonLevel1.Click += new EventHandler(this.buttonLevel_Click); - this.buttonLevel2.Click += new EventHandler(this.buttonLevel_Click); - this.buttonLevel3.Click += new EventHandler(this.buttonLevel_Click); - this.buttonDelete.Enabled = false; } public void UpdateLevelNameDisplay(SystemConfiguration system) @@ -758,7 +737,7 @@ namespace INT_PT002.Controls if (index != -1) { - if (this.ParentForm.ParentForm.SystemConfig.CURRENT_USER.ID == this.listBoxUserList.Items[index]) + if (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.ID == this.listBoxUserList.Items[index] || index == 0) this.buttonDelete.Enabled = false; else this.buttonDelete.Enabled = true; diff --git a/INT_PT002/DataStore/SystemConfiguration.cs b/INT_PT002/DataStore/SystemConfiguration.cs index f48cbe9..079a28b 100644 --- a/INT_PT002/DataStore/SystemConfiguration.cs +++ b/INT_PT002/DataStore/SystemConfiguration.cs @@ -17,7 +17,6 @@ namespace INT_PT002.DataStore private int m_RECIPE_NUMBER; private Define.E_LanguageID m_LANGUAGE; - private UserItem m_CURRENT_USER; private int m_CHART1_DRAW_STEP; private int m_CHART2_DRAW_STEP; @@ -71,11 +70,6 @@ namespace INT_PT002.DataStore get { return this.m_LANGUAGE; } set { this.m_LANGUAGE = value; } } - public UserItem CURRENT_USER - { - get { return this.m_CURRENT_USER; } - set { this.m_CURRENT_USER = value; } - } public int CHART1_DRAW_STEP { @@ -168,7 +162,6 @@ namespace INT_PT002.DataStore this.RECIPE_NUMBER = 1; this.LANGUAGE = Define.E_LanguageID.Korean; - this.CURRENT_USER = new UserItem(); this.CHART1_DRAW_STEP = 4; this.CHART2_DRAW_STEP = 2; @@ -541,7 +534,6 @@ namespace INT_PT002.DataStore { #region Field private bool m_IsMainDisplayProductChange; - private bool m_IsMainDisplayWeightSetting; private bool m_IsMainDisplayClear; private bool m_IsMainDisplaySubMenu; @@ -549,9 +541,9 @@ namespace INT_PT002.DataStore private bool m_IsMenuUserSetting; private bool m_IsMenuUserGroupEditor; private bool m_IsMenuIOTest; - private bool m_IsMenuEquipmentLog; - private bool m_IsMenuCheckLog; - private bool m_IsMenuAlarmList; + private bool m_IsMenuHistoryLog; + private bool m_IsMenuInspectionLog; + private bool m_IsMenuAlarmLog; private bool m_IsMenuInformation; private bool m_IsMenuStatus; #endregion @@ -569,11 +561,6 @@ namespace INT_PT002.DataStore get { return this.m_IsMainDisplayProductChange; } set { this.m_IsMainDisplayProductChange = value; } } - public bool IsMainDisplayWeightSetting - { - get { return this.m_IsMainDisplayWeightSetting; } - set { this.m_IsMainDisplayWeightSetting = value; } - } public bool IsMainDisplayClear { get { return this.m_IsMainDisplayClear; } @@ -606,20 +593,20 @@ namespace INT_PT002.DataStore set { this.m_IsMenuIOTest = value; } } - public bool IsMenuEquipmentLog + public bool IsMenuHistoryLog { - get { return this.m_IsMenuEquipmentLog; } - set { this.m_IsMenuEquipmentLog = value; } + get { return this.m_IsMenuHistoryLog; } + set { this.m_IsMenuHistoryLog = value; } } - public bool IsMenuCheckLog + public bool IsMenuInspectionLog { - get { return this.m_IsMenuCheckLog; } - set { this.m_IsMenuCheckLog = value; } + get { return this.m_IsMenuInspectionLog; } + set { this.m_IsMenuInspectionLog = value; } } - public bool IsMenuAlarmList + public bool IsMenuAlarmLog { - get { return this.m_IsMenuAlarmList; } - set { this.m_IsMenuAlarmList = value; } + get { return this.m_IsMenuAlarmLog; } + set { this.m_IsMenuAlarmLog = value; } } public bool IsMenuInformation { @@ -638,8 +625,8 @@ namespace INT_PT002.DataStore { bool ret = false; - if (this.IsMainDisplayProductChange == true || this.IsMainDisplayWeightSetting == true - || this.IsMainDisplayClear == true || this.IsMainDisplaySubMenu == true) + if (this.IsMainDisplayProductChange == true || this.IsMainDisplayClear == true + || this.IsMainDisplaySubMenu == true) ret = true; return ret; @@ -687,7 +674,7 @@ namespace INT_PT002.DataStore { bool ret = false; - if (this.IsMenuEquipmentLog == true || this.IsMenuCheckLog == true || this.IsMenuAlarmList == true) + if (this.IsMenuHistoryLog == true || this.IsMenuInspectionLog == true || this.IsMenuAlarmLog == true) ret = true; return ret; @@ -711,7 +698,6 @@ namespace INT_PT002.DataStore private void Initialize() { this.IsMainDisplayProductChange = false; - this.IsMainDisplayWeightSetting = false; this.IsMainDisplayClear = false; this.IsMainDisplaySubMenu = false; @@ -719,9 +705,9 @@ namespace INT_PT002.DataStore this.IsMenuUserSetting = false; this.IsMenuUserGroupEditor = false; this.IsMenuIOTest = false; - this.IsMenuEquipmentLog = false; - this.IsMenuCheckLog = false; - this.IsMenuAlarmList = false; + this.IsMenuHistoryLog = false; + this.IsMenuInspectionLog = false; + this.IsMenuAlarmLog = false; this.IsMenuInformation = false; this.IsMenuStatus = false; } @@ -733,7 +719,6 @@ namespace INT_PT002.DataStore public struct StructUserGroupItem { public bool IsMainDisplayProductChange; - public bool IsMainDisplayWeightSetting; public bool IsMainDisplayClear; public bool IsMainDispalySubMenu; @@ -764,6 +749,7 @@ namespace INT_PT002.DataStore public bool Dummy15; public bool Dummy16; public bool Dummy17; + public bool Dummy18; } #endregion diff --git a/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs b/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs index 5a114b2..840210c 100644 --- a/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs +++ b/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs @@ -30,13 +30,13 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogFormLogOn)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.textBoxPassword = new System.Windows.Forms.TextBox(); + this.textBoxID = new System.Windows.Forms.TextBox(); this.smartLabel3 = new SmartX.SmartLabel(); this.smartLabel2 = new SmartX.SmartLabel(); this.buttonCancel = new SmartX.SmartButton(); this.buttonLogOn = new SmartX.SmartButton(); this.smartKeyboard = new SmartX.SmartKeyboard(); - this.textBoxID = new System.Windows.Forms.TextBox(); - this.textBoxPassword = new System.Windows.Forms.TextBox(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -65,6 +65,24 @@ this.smartGroupBox1.Text = "Login"; this.smartGroupBox1.TextColor = System.Drawing.Color.White; // + // textBoxPassword + // + this.textBoxPassword.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); + this.textBoxPassword.Location = new System.Drawing.Point(141, 94); + this.textBoxPassword.Name = "textBoxPassword"; + this.textBoxPassword.Size = new System.Drawing.Size(261, 37); + this.textBoxPassword.TabIndex = 98; + this.textBoxPassword.GotFocus += new System.EventHandler(this.textBoxPassword_GotFocus); + // + // textBoxID + // + this.textBoxID.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); + this.textBoxID.Location = new System.Drawing.Point(141, 51); + this.textBoxID.Name = "textBoxID"; + this.textBoxID.Size = new System.Drawing.Size(261, 37); + this.textBoxID.TabIndex = 97; + this.textBoxID.GotFocus += new System.EventHandler(this.textBoxID_GotFocus); + // // smartLabel3 // this.smartLabel3.BackGround = null; @@ -121,7 +139,7 @@ this.buttonCancel.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonCancel.ButtonText = "취소"; this.buttonCancel.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonCancel.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.buttonCancel.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.buttonCancel.GroupID = 0; this.buttonCancel.ImageDisable = null; this.buttonCancel.ImageDown = null; @@ -145,6 +163,7 @@ this.buttonCancel.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); this.buttonCancel.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonCancel.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); // // buttonLogOn // @@ -156,7 +175,7 @@ this.buttonLogOn.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonLogOn.ButtonText = "로그인"; this.buttonLogOn.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonLogOn.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.buttonLogOn.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.buttonLogOn.GroupID = 0; this.buttonLogOn.ImageDisable = null; this.buttonLogOn.ImageDown = null; @@ -180,12 +199,13 @@ this.buttonLogOn.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); this.buttonLogOn.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonLogOn.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLogOn.Click += new System.EventHandler(this.buttonLogOn_Click); // // smartKeyboard // this.smartKeyboard.BackGround = this.smartGroupBox1; this.smartKeyboard.BackGroundColor = System.Drawing.Color.LightCoral; - this.smartKeyboard.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.smartKeyboard.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); this.smartKeyboard.BorderStyle = SmartX.SmartKeyboard.BorderStyles.RoundRectFill; this.smartKeyboard.ControlKeyDisable = false; this.smartKeyboard.DesignMinimize = false; @@ -213,7 +233,7 @@ this.smartKeyboard.OverlapOptimize = true; this.smartKeyboard.Radius = 5; this.smartKeyboard.RoundedCorners = true; - this.smartKeyboard.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.smartKeyboard.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); this.smartKeyboard.Size = new System.Drawing.Size(585, 232); this.smartKeyboard.SizeRunTime = new System.Drawing.Size(585, 232); this.smartKeyboard.TabIndex = 90; @@ -226,22 +246,6 @@ this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick); this.smartKeyboard.Click += new System.EventHandler(this.smartKeyboard_Click); // - // textBoxID - // - this.textBoxID.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); - this.textBoxID.Location = new System.Drawing.Point(141, 51); - this.textBoxID.Name = "textBoxID"; - this.textBoxID.Size = new System.Drawing.Size(261, 37); - this.textBoxID.TabIndex = 97; - // - // textBoxPassword - // - this.textBoxPassword.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); - this.textBoxPassword.Location = new System.Drawing.Point(141, 94); - this.textBoxPassword.Name = "textBoxPassword"; - this.textBoxPassword.Size = new System.Drawing.Size(261, 37); - this.textBoxPassword.TabIndex = 98; - // // DialogFormLogOn // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT_PT002/DialogForms/DialogFormLogOn.cs b/INT_PT002/DialogForms/DialogFormLogOn.cs index c227556..0dcaf22 100644 --- a/INT_PT002/DialogForms/DialogFormLogOn.cs +++ b/INT_PT002/DialogForms/DialogFormLogOn.cs @@ -193,44 +193,44 @@ namespace INT_PT002.Forms #region 로그인 성공 if (userInfo.user_id == "Intech") - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.Developer; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.Developer; else if (userInfo.user_id == "Admin00") - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.Admin; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.Admin; - this.ParentForm.SystemConfig.CURRENT_USER.ID = userInfo.user_id; - this.ParentForm.SystemConfig.CURRENT_USER.Password = userInfo.user_pw; + this.ParentForm.CurrentSystemStatus.CurrentUser.ID = userInfo.user_id; + this.ParentForm.CurrentSystemStatus.CurrentUser.Password = userInfo.user_pw; - this.ParentForm.SystemConfig.CURRENT_USER.ExpireAccount = userInfo.expire_period_account; - this.ParentForm.SystemConfig.CURRENT_USER.ExpirePassword = userInfo.expire_period_pw; + this.ParentForm.CurrentSystemStatus.CurrentUser.ExpireAccount = userInfo.expire_period_account; + this.ParentForm.CurrentSystemStatus.CurrentUser.ExpirePassword = userInfo.expire_period_pw; DateTime time = DateTime.ParseExact(userInfo.register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CURRENT_USER.DateRegister = time; + this.ParentForm.CurrentSystemStatus.CurrentUser.DateRegister = time; time = DateTime.ParseExact(userInfo.login_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CURRENT_USER.DateLogin = time; + this.ParentForm.CurrentSystemStatus.CurrentUser.DateLogin = time; time = DateTime.ParseExact(userInfo.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CURRENT_USER.DateExpireRegister = time; + this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister = time; time = DateTime.ParseExact(userInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CURRENT_USER.DateExpireLogin = time; + this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireLogin = time; - this.ParentForm.SystemConfig.CURRENT_USER.IsLockAccount = userInfo.flock_status_account == 0 ? false : true; - this.ParentForm.SystemConfig.CURRENT_USER.IsLockPassword = userInfo.flock_status_password == 0 ? false : true; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockAccount = userInfo.flock_status_account == 0 ? false : true; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockPassword = userInfo.flock_status_password == 0 ? false : true; - this.ParentForm.SystemConfig.CURRENT_USER.IsAdmin = userInfo.fadmin == 0 ? false : true; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; - this.ParentForm.SystemConfig.CURRENT_USER.IsMainProductChange = userInfo.menuID.fMenu[0]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMainWeightSetting = userInfo.menuID.fMenu[1]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMainClear = userInfo.menuID.fMenu[2]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMainSubMenu = userInfo.menuID.fMenu[3]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMainProductChange = userInfo.menuID.fMenu[0]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMainWeightSetting = userInfo.menuID.fMenu[1]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMainClear = userInfo.menuID.fMenu[2]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMainSubMenu = userInfo.menuID.fMenu[3]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuProduct = userInfo.menuID.fMenu[4]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuUserSetting = userInfo.menuID.fMenu[5]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuUserGroupEditor = userInfo.menuID.fMenu[6]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuIOTest = userInfo.menuID.fMenu[7]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuEquipmentLog = userInfo.menuID.fMenu[8]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuCheckLog = userInfo.menuID.fMenu[9]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuAlarmList = userInfo.menuID.fMenu[10]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuInformation = userInfo.menuID.fMenu[11]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuStatus = userInfo.menuID.fMenu[12]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuProduct = userInfo.menuID.fMenu[4]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuUserSetting = userInfo.menuID.fMenu[5]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuUserGroupEditor = userInfo.menuID.fMenu[6]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuIOTest = userInfo.menuID.fMenu[7]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuEquipmentLog = userInfo.menuID.fMenu[8]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuCheckLog = userInfo.menuID.fMenu[9]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuAlarmList = userInfo.menuID.fMenu[10]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuInformation = userInfo.menuID.fMenu[11]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuStatus = userInfo.menuID.fMenu[12]; #endregion this.DialogResult = DialogResult.OK; diff --git a/INT_PT002/Forms/FormMain.Designer.cs b/INT_PT002/Forms/FormMain.Designer.cs index fb88e9a..be7e322 100644 --- a/INT_PT002/Forms/FormMain.Designer.cs +++ b/INT_PT002/Forms/FormMain.Designer.cs @@ -35,6 +35,7 @@ this.smartFileCommunicationLog = new SmartX.SmartFile(); this.timer = new System.Windows.Forms.Timer(); this.smartFileIO = new SmartX.SmartFile(); + this.timer1 = new System.Windows.Forms.Timer(); this.SuspendLayout(); // // smartForm1 @@ -89,6 +90,11 @@ // this.smartFileIO.FilePathName = ""; // + // timer1 + // + this.timer1.Interval = 1000; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -110,6 +116,7 @@ private SmartX.SmartFile smartFileCommunicationLog; private System.Windows.Forms.Timer timer; private SmartX.SmartFile smartFileIO; + private System.Windows.Forms.Timer timer1; } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMain.cs b/INT_PT002/Forms/FormMain.cs index 3ed36e7..eb68365 100644 --- a/INT_PT002/Forms/FormMain.cs +++ b/INT_PT002/Forms/FormMain.cs @@ -123,11 +123,6 @@ namespace INT_PT002.Forms get { return this.m_PathDataAlarmFolder; } private set { this.m_PathDataAlarmFolder = value; } } - public static string PathBinFolder - { - get { return m_PathBinFolder; } - private set { m_PathBinFolder = value; } - } public Define.E_EquipmentStatus EquipmentStatus { @@ -181,7 +176,6 @@ namespace INT_PT002.Forms this.PathDataHistoryFolder = this.PathDataFolder + "History\\"; this.PathDataInspectionFolder = this.PathDataFolder + "Inspection\\"; this.PathDataAlarmFolder = this.PathDataFolder + "Alarm\\"; - PathBinFolder = this.PathLaunchFolder + "Bin\\"; this.CurrentAlarmList = new AlarmList(); this.CurrentAlarmList.EventAlarmStateChange += new Define.EventHandlerAlarmStateChange(this.CurrentAlarmList_Change); @@ -454,7 +448,7 @@ namespace INT_PT002.Forms { UserManager.UserMgr_login_timeout_t loginTimeout = (UserManager.UserMgr_login_timeout_t)data; - if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) this.ChildFormMainDisplay.CallBackUserListLoginTimeoutDataEvent(loginTimeout); } catch (Exception e) @@ -1781,7 +1775,7 @@ namespace INT_PT002.Forms data.Type = "Operation"; data.Time = DateTime.Now; - data.LoginID = this.SystemConfig.CURRENT_USER.ID; + data.LoginID = this.CurrentSystemStatus.CurrentUser.ID; data.Event = type.ToString(); data.Detail = detail; data.BeforeData = ""; @@ -1795,7 +1789,7 @@ namespace INT_PT002.Forms data.Type = "Parameter"; data.Time = DateTime.Now; - data.LoginID = this.SystemConfig.CURRENT_USER.ID; + data.LoginID = this.CurrentSystemStatus.CurrentUser.ID; data.Event = type.ToString(); data.Detail = detail; data.BeforeData = before; @@ -1914,7 +1908,7 @@ namespace INT_PT002.Forms data.Type = "Alarm"; data.Time = DateTime.Now; - data.LoginID = this.SystemConfig.CURRENT_USER.ID; + data.LoginID = this.CurrentSystemStatus.CurrentUser.ID; data.Event = type.ToString(); data.Detail = detail; data.BeforeData = ""; @@ -2025,7 +2019,6 @@ namespace INT_PT002.Forms { #region StructItem structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2033,9 +2026,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2056,6 +2049,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; #endregion this.smartFileIO.StructType.Write(structItem, i, SmartFile.WriteMode.Overwrite); @@ -2064,7 +2058,6 @@ namespace INT_PT002.Forms { #region StructItem structItem.IsMainDisplayProductChange = true; - structItem.IsMainDisplayWeightSetting = true; structItem.IsMainDisplayClear = true; structItem.IsMainDispalySubMenu = true; @@ -2095,6 +2088,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; #endregion this.smartFileIO.StructType.Write(structItem, i, SmartFile.WriteMode.Overwrite); @@ -2120,7 +2114,6 @@ namespace INT_PT002.Forms #region Level1 structItem.IsMainDisplayProductChange = item.Level1.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.Level1.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.Level1.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.Level1.IsMainDisplaySubMenu; @@ -2128,9 +2121,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.Level1.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.Level1.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.Level1.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.Level1.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.Level1.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.Level1.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.Level1.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.Level1.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.Level1.IsMenuAlarmLog; structItem.IsMenuInformation = item.Level1.IsMenuInformation; structItem.IsMenuStatus = item.Level1.IsMenuStatus; @@ -2151,13 +2144,13 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f0_Level1, SmartFile.WriteMode.Overwrite); #endregion #region Level2 structItem.IsMainDisplayProductChange = item.Level2.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.Level2.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.Level2.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.Level2.IsMainDisplaySubMenu; @@ -2165,9 +2158,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.Level2.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.Level2.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.Level2.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.Level2.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.Level2.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.Level2.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.Level2.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.Level2.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.Level2.IsMenuAlarmLog; structItem.IsMenuInformation = item.Level2.IsMenuInformation; structItem.IsMenuStatus = item.Level2.IsMenuStatus; @@ -2188,13 +2181,13 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f1_Level2, SmartFile.WriteMode.Overwrite); #endregion #region Level3 structItem.IsMainDisplayProductChange = item.Level3.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.Level3.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.Level3.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.Level3.IsMainDisplaySubMenu; @@ -2202,9 +2195,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.Level3.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.Level3.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.Level3.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.Level3.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.Level3.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.Level3.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.Level3.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.Level3.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.Level3.IsMenuAlarmLog; structItem.IsMenuInformation = item.Level3.IsMenuInformation; structItem.IsMenuStatus = item.Level3.IsMenuStatus; @@ -2225,13 +2218,13 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f2_Level3, SmartFile.WriteMode.Overwrite); #endregion #region Default structItem.IsMainDisplayProductChange = item.Default.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.Default.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.Default.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.Default.IsMainDisplaySubMenu; @@ -2239,9 +2232,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.Default.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.Default.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.Default.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.Default.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.Default.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.Default.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.Default.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.Default.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.Default.IsMenuAlarmLog; structItem.IsMenuInformation = item.Default.IsMenuInformation; structItem.IsMenuStatus = item.Default.IsMenuStatus; @@ -2262,6 +2255,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f3_Default, SmartFile.WriteMode.Overwrite); #endregion @@ -2288,7 +2282,6 @@ namespace INT_PT002.Forms #region Level1 structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2296,9 +2289,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2319,6 +2312,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f0_Level1, SmartFile.WriteMode.Overwrite); #endregion @@ -2345,7 +2339,6 @@ namespace INT_PT002.Forms #region Level2 structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2353,9 +2346,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2376,6 +2369,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f1_Level2, SmartFile.WriteMode.Overwrite); #endregion @@ -2402,7 +2396,6 @@ namespace INT_PT002.Forms #region Level3 structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2410,9 +2403,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2433,6 +2426,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f2_Level3, SmartFile.WriteMode.Overwrite); #endregion @@ -2459,7 +2453,6 @@ namespace INT_PT002.Forms #region Default structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2467,9 +2460,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2490,6 +2483,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f3_Default, SmartFile.WriteMode.Overwrite); #endregion @@ -2522,7 +2516,6 @@ namespace INT_PT002.Forms structItem = (StructUserGroupItem)this.smartFileIO.StructType.ReadBuffer((int)Define.E_UserGroup.f0_Level1); item.Level1.IsMainDisplayProductChange = structItem.IsMainDisplayProductChange; - item.Level1.IsMainDisplayWeightSetting = structItem.IsMainDisplayWeightSetting; item.Level1.IsMainDisplayClear = structItem.IsMainDisplayClear; item.Level1.IsMainDisplaySubMenu = structItem.IsMainDispalySubMenu; @@ -2530,9 +2523,9 @@ namespace INT_PT002.Forms item.Level1.IsMenuUserSetting = structItem.IsMenuUserSetting; item.Level1.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor; item.Level1.IsMenuIOTest = structItem.IsMenuIOTest; - item.Level1.IsMenuEquipmentLog = structItem.IsMenuEquipmentLog; - item.Level1.IsMenuCheckLog = structItem.IsMenuCheckLog; - item.Level1.IsMenuAlarmList = structItem.IsMenuAlarmList; + item.Level1.IsMenuHistoryLog = structItem.IsMenuEquipmentLog; + item.Level1.IsMenuInspectionLog = structItem.IsMenuCheckLog; + item.Level1.IsMenuAlarmLog = structItem.IsMenuAlarmList; item.Level1.IsMenuInformation = structItem.IsMenuInformation; item.Level1.IsMenuStatus = structItem.IsMenuStatus; #endregion @@ -2541,7 +2534,6 @@ namespace INT_PT002.Forms structItem = (StructUserGroupItem)this.smartFileIO.StructType.ReadBuffer((int)Define.E_UserGroup.f1_Level2); item.Level2.IsMainDisplayProductChange = structItem.IsMainDisplayProductChange; - item.Level2.IsMainDisplayWeightSetting = structItem.IsMainDisplayWeightSetting; item.Level2.IsMainDisplayClear = structItem.IsMainDisplayClear; item.Level2.IsMainDisplaySubMenu = structItem.IsMainDispalySubMenu; @@ -2549,9 +2541,9 @@ namespace INT_PT002.Forms item.Level2.IsMenuUserSetting = structItem.IsMenuUserSetting; item.Level2.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor; item.Level2.IsMenuIOTest = structItem.IsMenuIOTest; - item.Level2.IsMenuEquipmentLog = structItem.IsMenuEquipmentLog; - item.Level2.IsMenuCheckLog = structItem.IsMenuCheckLog; - item.Level2.IsMenuAlarmList = structItem.IsMenuAlarmList; + item.Level2.IsMenuHistoryLog = structItem.IsMenuEquipmentLog; + item.Level2.IsMenuInspectionLog = structItem.IsMenuCheckLog; + item.Level2.IsMenuAlarmLog = structItem.IsMenuAlarmList; item.Level2.IsMenuInformation = structItem.IsMenuInformation; item.Level2.IsMenuStatus = structItem.IsMenuStatus; #endregion @@ -2560,7 +2552,6 @@ namespace INT_PT002.Forms structItem = (StructUserGroupItem)this.smartFileIO.StructType.ReadBuffer((int)Define.E_UserGroup.f2_Level3); item.Level3.IsMainDisplayProductChange = structItem.IsMainDisplayProductChange; - item.Level3.IsMainDisplayWeightSetting = structItem.IsMainDisplayWeightSetting; item.Level3.IsMainDisplayClear = structItem.IsMainDisplayClear; item.Level3.IsMainDisplaySubMenu = structItem.IsMainDispalySubMenu; @@ -2568,9 +2559,9 @@ namespace INT_PT002.Forms item.Level3.IsMenuUserSetting = structItem.IsMenuUserSetting; item.Level3.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor; item.Level3.IsMenuIOTest = structItem.IsMenuIOTest; - item.Level3.IsMenuEquipmentLog = structItem.IsMenuEquipmentLog; - item.Level3.IsMenuCheckLog = structItem.IsMenuCheckLog; - item.Level3.IsMenuAlarmList = structItem.IsMenuAlarmList; + item.Level3.IsMenuHistoryLog = structItem.IsMenuEquipmentLog; + item.Level3.IsMenuInspectionLog = structItem.IsMenuCheckLog; + item.Level3.IsMenuAlarmLog = structItem.IsMenuAlarmList; item.Level3.IsMenuInformation = structItem.IsMenuInformation; item.Level3.IsMenuStatus = structItem.IsMenuStatus; #endregion @@ -2579,7 +2570,6 @@ namespace INT_PT002.Forms structItem = (StructUserGroupItem)this.smartFileIO.StructType.ReadBuffer((int)Define.E_UserGroup.f3_Default); item.Default.IsMainDisplayProductChange = structItem.IsMainDisplayProductChange; - item.Default.IsMainDisplayWeightSetting = structItem.IsMainDisplayWeightSetting; item.Default.IsMainDisplayClear = structItem.IsMainDisplayClear; item.Default.IsMainDisplaySubMenu = structItem.IsMainDispalySubMenu; @@ -2587,9 +2577,9 @@ namespace INT_PT002.Forms item.Default.IsMenuUserSetting = structItem.IsMenuUserSetting; item.Default.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor; item.Default.IsMenuIOTest = structItem.IsMenuIOTest; - item.Default.IsMenuEquipmentLog = structItem.IsMenuEquipmentLog; - item.Default.IsMenuCheckLog = structItem.IsMenuCheckLog; - item.Default.IsMenuAlarmList = structItem.IsMenuAlarmList; + item.Default.IsMenuHistoryLog = structItem.IsMenuEquipmentLog; + item.Default.IsMenuInspectionLog = structItem.IsMenuCheckLog; + item.Default.IsMenuAlarmLog = structItem.IsMenuAlarmList; item.Default.IsMenuInformation = structItem.IsMenuInformation; item.Default.IsMenuStatus = structItem.IsMenuStatus; #endregion @@ -2633,6 +2623,12 @@ namespace INT_PT002.Forms //DialogFormLogOn loginForm = new DialogFormLogOn( + // UserManager 초기화 + this.InitializeUserManager(); + this.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.LogOff; + //UserManager.UserManager_GetUserListName(); + this.timer1.Enabled = true; + // 화면 시계 표시 타이머 this.timer.Enabled = true; } @@ -2679,5 +2675,11 @@ namespace INT_PT002.Forms this.ChildFormMainDisplay.UpdateDisplayTime(); } #endregion + + private void timer1_Tick(object sender, EventArgs e) + { + this.timer1.Enabled = false; + UserManager.UserManager_GetUserListName(); + } } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMain.resx b/INT_PT002/Forms/FormMain.resx index ff1e1e2..e28b802 100644 --- a/INT_PT002/Forms/FormMain.resx +++ b/INT_PT002/Forms/FormMain.resx @@ -221,6 +221,9 @@ 175, 17 + + 582, 17 + WEBPAD diff --git a/INT_PT002/Forms/FormMainDisplay.cs b/INT_PT002/Forms/FormMainDisplay.cs index 94050c4..608e39e 100644 --- a/INT_PT002/Forms/FormMainDisplay.cs +++ b/INT_PT002/Forms/FormMainDisplay.cs @@ -83,7 +83,7 @@ namespace INT_PT002.Forms } public void Logout() { - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.LogOff; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.LogOff; this.buttonUser.ButtonUp(); this.DisplayRefresh(); diff --git a/INT_PT002/Forms/FormMainDisplay1.cs b/INT_PT002/Forms/FormMainDisplay1.cs index 81c934f..35bdd62 100644 --- a/INT_PT002/Forms/FormMainDisplay1.cs +++ b/INT_PT002/Forms/FormMainDisplay1.cs @@ -282,7 +282,7 @@ namespace INT_PT002.Forms } public void Logout() { - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.LogOff; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.LogOff; this.buttonUser.ButtonUp(); this.DisplayRefresh(); diff --git a/INT_PT002/Forms/FormMainDisplay2.Designer.cs b/INT_PT002/Forms/FormMainDisplay2.Designer.cs index 01a6ff8..b834ff9 100644 --- a/INT_PT002/Forms/FormMainDisplay2.Designer.cs +++ b/INT_PT002/Forms/FormMainDisplay2.Designer.cs @@ -2196,7 +2196,7 @@ this.buttonUser.ImageDown = null; this.buttonUser.ImageUp = null; this.buttonUser.Location = new System.Drawing.Point(917, 276); - this.buttonUser.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonUser.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonUser.Name = "buttonUser"; this.buttonUser.NestedClickEventPrevent = false; this.buttonUser.OutlinePixel = 2; @@ -2214,7 +2214,6 @@ this.buttonUser.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); this.buttonUser.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonUser.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonUser.Visible = false; this.buttonUser.Click += new System.EventHandler(this.buttonUser_Click); // // labelCommunicationStatus diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs index b9171b4..e8f121a 100644 --- a/INT_PT002/Forms/FormMainDisplay2.cs +++ b/INT_PT002/Forms/FormMainDisplay2.cs @@ -170,6 +170,55 @@ namespace INT_PT002.Forms } + private void UpdateDisplayUser(UserItem user) + { + string id = "", group = ""; + + if (user.Status == Define.E_UserStatus.NotLogin) + { + id = ""; + + this.buttonRecipeNo.Enabled = true; + this.buttonClear.Enabled = true; + } + else if (user.Status == Define.E_UserStatus.LogOff) + { + id = "LogOff"; + + //if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOff) + // this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOff; + + //this.buttonUser.ButtonUp(); + //this.buttonProductNo.Enabled = false; + //this.buttonClear.Enabled = false; + //this.buttonSubMenu.Enabled = false; + //this.buttonUnder.Enabled = false; + //this.buttonPass.Enabled = false; + //this.buttonOver.Enabled = false; + //this.buttonTare.Enabled = false; + } + else + { + id = user.ID; + + //if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOn) + // this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOn; + + //this.buttonUser.ButtonDown(); + //this.buttonProductNo.Enabled = user.IsMainProductNo; + //this.buttonClear.Enabled = user.IsMainClear; + //this.buttonSubMenu.Enabled = user.IsMainSubMenu; + //this.buttonUnder.Enabled = user.IsMainWeightSetting; + //this.buttonPass.Enabled = user.IsMainWeightSetting; + //this.buttonOver.Enabled = user.IsMainWeightSetting; + //this.buttonTare.Enabled = user.IsMainWeightSetting; + } + + //if (this.labelUserLevel.Text != group) + // this.labelUserLevel.Text = group; + //if (this.labelUserID.Text != id) + // this.labelUserID.Text = id; + } private void Login() { DialogFormLogOn logOn = new DialogFormLogOn(this.ParentForm); @@ -177,6 +226,7 @@ namespace INT_PT002.Forms { this.DisplayRefresh(); this.buttonUser.ButtonDown(); + this.buttonUser.ButtonText = "Logout"; //this.ParentForm.TimerAutomaticLogout(true, this.ParentForm.SystemConfig.AutomaticLogout); // Part 11 @@ -189,7 +239,7 @@ namespace INT_PT002.Forms } public void Logout() { - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.LogOff; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.LogOff; this.buttonUser.ButtonUp(); this.DisplayRefresh(); @@ -638,6 +688,7 @@ namespace INT_PT002.Forms this.labelTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); } + public void DisplayRefresh() { this.ParentForm.CurrentSystemStatus.CurrentForm = Define.E_FormStore.FormMainDisplay; @@ -693,7 +744,18 @@ namespace INT_PT002.Forms } private void buttonUser_Click(object sender, EventArgs e) { - + if (this.ParentForm.CurrentSystemStatus.CurrentUser.Status == Define.E_UserStatus.LogOff) + { + this.Login(); + } + else + { + DialogFormYesNo msg = new DialogFormYesNo(this.ParentForm.SystemConfig.LANGUAGE, 12); + if (msg.ShowDialog() == DialogResult.Yes) + { + this.Logout(); + } + } } private void buttonMenu_Click(object sender, EventArgs e) { diff --git a/INT_PT002/INT_PT002.csproj b/INT_PT002/INT_PT002.csproj deleted file mode 100644 index 218108d..0000000 --- a/INT_PT002/INT_PT002.csproj +++ /dev/null @@ -1,365 +0,0 @@ - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {37DB9023-1C6E-4094-9777-C626E6885290} - WinExe - Properties - INT_PT002 - INT_PT002 - {4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - WindowsCE - E2BECB1F-8C8C-41ba-B736-9BE7D946A398 - 5.0 - INT_PT002 - v3.5 - Windows CE - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(PlatformFamilyName) - true - true - prompt - 512 - 4 - Off - - - pdbonly - true - bin\Release\ - TRACE;$(PlatformFamilyName) - true - true - prompt - 512 - 4 - Off - - - - - - False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNCommon.dll - - - False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNFDCommon.dll - - - False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXN_IEC1000.dll - - - - - - - - - - - - - UserControl - - - ControlBottomManual.cs - - - UserControl - - - ControlBottomSetting.cs - - - UserControl - - - ControlMenuLogTemporary.cs - - - UserControl - - - ControlMenuSystemInformation.cs - - - UserControl - - - ControlMenuLogAlarm.cs - - - UserControl - - - ControlMenuLogHistory.cs - - - UserControl - - - ControlMenuLogInspection.cs - - - UserControl - - - ControlMenuManualIoTest.cs - - - UserControl - - - ControlMenuRecipeSetting.cs - - - UserControl - - - ControlMainDisplay.cs - - - UserControl - - - ControlMainDisplayDotGraph.cs - - - UserControl - - - ControlMenuSystemStatus.cs - - - UserControl - - - ControlMenuUserGroupEditor.cs - - - UserControl - - - ControlMenuUserUserEditor.cs - - - - - - - - - - - - Form - - - DialogFormNumKeyPad.cs - - - Form - - - DialogFormProgressBar.cs - - - Form - - - DialogFormYesNo.cs - - - Form - - - DialogFormMessage.cs - - - Form - - - DialogFormPasswordKeyPad.cs - - - Form - - - DialogFormLogOn.cs - - - Form - - - FormConfiguration.cs - - - Form - - - FormMainDisplay.cs - - - Form - - - FormMain.cs - - - Form - - - FormMainDisplay1.cs - - - Form - - - FormMainDisplay2.cs - - - Form - - - FormMenu.cs - - - - - - - - - ControlMainDisplay.cs - Designer - - - ControlMainDisplayDotGraph.cs - Designer - - - ControlMenuLogTemporary.cs - Designer - - - ControlMenuSystemInformation.cs - Designer - - - ControlMenuLogAlarm.cs - Designer - - - ControlMenuLogHistory.cs - Designer - - - ControlMenuLogInspection.cs - Designer - - - ControlMenuManualIoTest.cs - Designer - - - ControlMenuRecipeSetting.cs - Designer - - - ControlMenuSystemStatus.cs - Designer - - - ControlMenuUserGroupEditor.cs - Designer - - - ControlMenuUserUserEditor.cs - Designer - - - DialogFormLogOn.cs - Designer - - - DialogFormNumKeyPad.cs - Designer - - - DialogFormProgressBar.cs - Designer - - - DialogFormYesNo.cs - Designer - - - DialogFormMessage.cs - Designer - - - DialogFormPasswordKeyPad.cs - Designer - - - FormConfiguration.cs - Designer - - - FormMainDisplay.cs - Designer - - - FormMain.cs - Designer - - - FormMainDisplay1.cs - Designer - - - FormMainDisplay2.cs - Designer - - - FormMenu.cs - Designer - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - - - - - - - - \ No newline at end of file