diff --git a/INT_PT002/Forms/FormMainDisplay2.Designer.cs b/INT_PT002/Forms/FormMainDisplay2.Designer.cs index 5573b45..0c30ef7 100644 --- a/INT_PT002/Forms/FormMainDisplay2.Designer.cs +++ b/INT_PT002/Forms/FormMainDisplay2.Designer.cs @@ -554,8 +554,8 @@ // this.buttonRecipeNo.BackGround = this.smartForm1; this.buttonRecipeNo.BackGroundColor = System.Drawing.Color.Gray; - this.buttonRecipeNo.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(95)))), ((int)(((byte)(196)))), ((int)(((byte)(188))))); - this.buttonRecipeNo.ButtonDownColor = System.Drawing.Color.DarkGray; + this.buttonRecipeNo.ButtonColor = System.Drawing.Color.Teal; + this.buttonRecipeNo.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonRecipeNo.ButtonImageAutoSize = true; this.buttonRecipeNo.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonRecipeNo.ButtonText = "1"; @@ -580,8 +580,8 @@ this.buttonRecipeNo.TabIndex = 295; this.buttonRecipeNo.Text = null; this.buttonRecipeNo.TextColor = System.Drawing.Color.White; - this.buttonRecipeNo.TextColorDisable = System.Drawing.Color.Gray; - this.buttonRecipeNo.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonRecipeNo.TextColorDisable = System.Drawing.Color.Gainsboro; + this.buttonRecipeNo.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonRecipeNo.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonRecipeNo.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonRecipeNo.Click += new System.EventHandler(this.buttonProductNo_Click); @@ -2254,7 +2254,7 @@ this.buttonUser.BackGround = this.smartForm1; this.buttonUser.BackGroundColor = System.Drawing.Color.Gray; this.buttonUser.ButtonColor = System.Drawing.Color.Teal; - this.buttonUser.ButtonDownColor = System.Drawing.Color.DarkGray; + this.buttonUser.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonUser.ButtonImageAutoSize = true; this.buttonUser.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonUser.ButtonText = "Login"; @@ -2279,8 +2279,8 @@ this.buttonUser.TabIndex = 78; this.buttonUser.Text = null; this.buttonUser.TextColor = System.Drawing.Color.White; - this.buttonUser.TextColorDisable = System.Drawing.Color.Gray; - this.buttonUser.TextDownColor = System.Drawing.Color.Gainsboro; + this.buttonUser.TextColorDisable = System.Drawing.Color.Gainsboro; + this.buttonUser.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonUser.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonUser.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonUser.Click += new System.EventHandler(this.buttonUser_Click); @@ -2374,7 +2374,7 @@ this.buttonInspection.BackGround = this.smartForm1; this.buttonInspection.BackGroundColor = System.Drawing.Color.Gray; this.buttonInspection.ButtonColor = System.Drawing.Color.Teal; - this.buttonInspection.ButtonDownColor = System.Drawing.Color.DarkGray; + this.buttonInspection.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonInspection.ButtonImageAutoSize = true; this.buttonInspection.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonInspection.ButtonText = "Inspection"; @@ -2399,8 +2399,8 @@ this.buttonInspection.TabIndex = 70; this.buttonInspection.Text = null; this.buttonInspection.TextColor = System.Drawing.Color.White; - this.buttonInspection.TextColorDisable = System.Drawing.Color.Gray; - this.buttonInspection.TextDownColor = System.Drawing.Color.Gainsboro; + this.buttonInspection.TextColorDisable = System.Drawing.Color.Gainsboro; + this.buttonInspection.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonInspection.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonInspection.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonInspection.Click += new System.EventHandler(this.buttonInspection_Click); @@ -2410,7 +2410,7 @@ this.buttonClear.BackGround = this.smartForm1; this.buttonClear.BackGroundColor = System.Drawing.Color.Gray; this.buttonClear.ButtonColor = System.Drawing.Color.Teal; - this.buttonClear.ButtonDownColor = System.Drawing.Color.DarkGray; + this.buttonClear.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonClear.ButtonImageAutoSize = true; this.buttonClear.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonClear.ButtonText = "Clear"; @@ -2435,8 +2435,8 @@ this.buttonClear.TabIndex = 64; this.buttonClear.Text = null; this.buttonClear.TextColor = System.Drawing.Color.White; - this.buttonClear.TextColorDisable = System.Drawing.Color.Gray; - this.buttonClear.TextDownColor = System.Drawing.Color.Gainsboro; + this.buttonClear.TextColorDisable = System.Drawing.Color.Gainsboro; + this.buttonClear.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonClear.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonClear.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonClear.Click += new System.EventHandler(this.buttonClear_Click); @@ -2446,7 +2446,7 @@ this.buttonMenu.BackGround = this.smartForm1; this.buttonMenu.BackGroundColor = System.Drawing.Color.Gray; this.buttonMenu.ButtonColor = System.Drawing.Color.Teal; - this.buttonMenu.ButtonDownColor = System.Drawing.Color.DarkGray; + this.buttonMenu.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonMenu.ButtonImageAutoSize = true; this.buttonMenu.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMenu.ButtonText = "Menu"; @@ -2471,8 +2471,8 @@ this.buttonMenu.TabIndex = 60; this.buttonMenu.Text = null; this.buttonMenu.TextColor = System.Drawing.Color.White; - this.buttonMenu.TextColorDisable = System.Drawing.Color.Gray; - this.buttonMenu.TextDownColor = System.Drawing.Color.Gainsboro; + this.buttonMenu.TextColorDisable = System.Drawing.Color.Gainsboro; + this.buttonMenu.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonMenu.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonMenu.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonMenu.Click += new System.EventHandler(this.buttonMenu_Click); @@ -2482,7 +2482,7 @@ this.buttonDisplay.BackGround = this.smartForm1; this.buttonDisplay.BackGroundColor = System.Drawing.Color.Gray; this.buttonDisplay.ButtonColor = System.Drawing.Color.Teal; - this.buttonDisplay.ButtonDownColor = System.Drawing.Color.DarkGray; + this.buttonDisplay.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonDisplay.ButtonImageAutoSize = true; this.buttonDisplay.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonDisplay.ButtonText = "Display"; @@ -2507,8 +2507,8 @@ this.buttonDisplay.TabIndex = 55; this.buttonDisplay.Text = null; this.buttonDisplay.TextColor = System.Drawing.Color.White; - this.buttonDisplay.TextColorDisable = System.Drawing.Color.Gray; - this.buttonDisplay.TextDownColor = System.Drawing.Color.Gainsboro; + this.buttonDisplay.TextColorDisable = System.Drawing.Color.Gainsboro; + this.buttonDisplay.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonDisplay.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonDisplay.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonDisplay.Visible = false; diff --git a/INT_PT002/Forms/FormMenu.Designer.cs b/INT_PT002/Forms/FormMenu.Designer.cs index ad5c7e0..12f6dcc 100644 --- a/INT_PT002/Forms/FormMenu.Designer.cs +++ b/INT_PT002/Forms/FormMenu.Designer.cs @@ -139,7 +139,7 @@ this.buttonUser.BackGround = this.smartForm1; this.buttonUser.BackGroundColor = System.Drawing.Color.Black; this.buttonUser.ButtonColor = System.Drawing.Color.Teal; - this.buttonUser.ButtonDownColor = System.Drawing.Color.SlateGray; + this.buttonUser.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonUser.ButtonImageAutoSize = true; this.buttonUser.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonUser.ButtonText = "User"; @@ -165,7 +165,7 @@ this.buttonUser.Text = null; this.buttonUser.TextColor = System.Drawing.Color.White; this.buttonUser.TextColorDisable = System.Drawing.Color.Gainsboro; - this.buttonUser.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonUser.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonUser.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonUser.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonUser.Click += new System.EventHandler(this.buttonUser_Click); @@ -176,15 +176,15 @@ this.labelUserID.BackGroundColor = System.Drawing.Color.Black; this.labelUserID.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelUserID.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelUserID.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelUserID.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelUserID.LineSpacing = 0F; - this.labelUserID.Location = new System.Drawing.Point(719, 3); + this.labelUserID.Location = new System.Drawing.Point(703, 13); this.labelUserID.Name = "labelUserID"; this.labelUserID.OverlapOptimize = true; this.labelUserID.PasswordChar = '\0'; this.labelUserID.Radius = 3; this.labelUserID.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelUserID.Size = new System.Drawing.Size(124, 30); + this.labelUserID.Size = new System.Drawing.Size(100, 20); this.labelUserID.TabIndex = 84; this.labelUserID.Text = "Intech00"; this.labelUserID.TextColor = System.Drawing.Color.White; @@ -199,15 +199,15 @@ this.labelUserLevel.BackGroundColor = System.Drawing.Color.Black; this.labelUserLevel.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelUserLevel.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelUserLevel.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelUserLevel.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelUserLevel.LineSpacing = 0F; - this.labelUserLevel.Location = new System.Drawing.Point(849, 3); + this.labelUserLevel.Location = new System.Drawing.Point(809, 13); this.labelUserLevel.Name = "labelUserLevel"; this.labelUserLevel.OverlapOptimize = true; this.labelUserLevel.PasswordChar = '\0'; this.labelUserLevel.Radius = 3; this.labelUserLevel.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelUserLevel.Size = new System.Drawing.Size(60, 30); + this.labelUserLevel.Size = new System.Drawing.Size(100, 20); this.labelUserLevel.TabIndex = 83; this.labelUserLevel.Text = "L3"; this.labelUserLevel.TextColor = System.Drawing.Color.White; @@ -229,7 +229,7 @@ this.smartLabel1.BackGroundColor = System.Drawing.Color.Black; this.smartLabel1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel1.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.smartLabel1.LineSpacing = 0F; this.smartLabel1.Location = new System.Drawing.Point(62, 3); this.smartLabel1.Name = "smartLabel1"; @@ -395,7 +395,7 @@ this.buttonSystem.BackGround = this.smartForm1; this.buttonSystem.BackGroundColor = System.Drawing.Color.Black; this.buttonSystem.ButtonColor = System.Drawing.Color.Teal; - this.buttonSystem.ButtonDownColor = System.Drawing.Color.SlateGray; + this.buttonSystem.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonSystem.ButtonImageAutoSize = true; this.buttonSystem.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonSystem.ButtonText = "System"; @@ -421,7 +421,7 @@ this.buttonSystem.Text = null; this.buttonSystem.TextColor = System.Drawing.Color.White; this.buttonSystem.TextColorDisable = System.Drawing.Color.Gainsboro; - this.buttonSystem.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonSystem.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonSystem.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonSystem.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonSystem.Click += new System.EventHandler(this.buttonSystem_Click); @@ -431,7 +431,7 @@ this.buttonLog.BackGround = this.smartForm1; this.buttonLog.BackGroundColor = System.Drawing.Color.Black; this.buttonLog.ButtonColor = System.Drawing.Color.Teal; - this.buttonLog.ButtonDownColor = System.Drawing.Color.SlateGray; + this.buttonLog.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonLog.ButtonImageAutoSize = true; this.buttonLog.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonLog.ButtonText = "Log"; @@ -457,7 +457,7 @@ this.buttonLog.Text = null; this.buttonLog.TextColor = System.Drawing.Color.White; this.buttonLog.TextColorDisable = System.Drawing.Color.Gainsboro; - this.buttonLog.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonLog.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonLog.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonLog.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonLog.Click += new System.EventHandler(this.buttonLog_Click); @@ -467,7 +467,7 @@ this.buttonManual.BackGround = this.smartForm1; this.buttonManual.BackGroundColor = System.Drawing.Color.Black; this.buttonManual.ButtonColor = System.Drawing.Color.Teal; - this.buttonManual.ButtonDownColor = System.Drawing.Color.SlateGray; + this.buttonManual.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonManual.ButtonImageAutoSize = true; this.buttonManual.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonManual.ButtonText = "Manual"; @@ -493,7 +493,7 @@ this.buttonManual.Text = null; this.buttonManual.TextColor = System.Drawing.Color.White; this.buttonManual.TextColorDisable = System.Drawing.Color.Gainsboro; - this.buttonManual.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonManual.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonManual.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonManual.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonManual.Click += new System.EventHandler(this.buttonManual_Click); @@ -503,7 +503,7 @@ this.buttonRecipe.BackGround = this.smartForm1; this.buttonRecipe.BackGroundColor = System.Drawing.Color.Black; this.buttonRecipe.ButtonColor = System.Drawing.Color.Teal; - this.buttonRecipe.ButtonDownColor = System.Drawing.Color.SlateGray; + this.buttonRecipe.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonRecipe.ButtonImageAutoSize = true; this.buttonRecipe.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonRecipe.ButtonText = "Recipe"; @@ -529,7 +529,7 @@ this.buttonRecipe.Text = null; this.buttonRecipe.TextColor = System.Drawing.Color.White; this.buttonRecipe.TextColorDisable = System.Drawing.Color.Gainsboro; - this.buttonRecipe.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonRecipe.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonRecipe.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonRecipe.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonRecipe.Click += new System.EventHandler(this.buttonRecipe_Click); @@ -539,7 +539,7 @@ this.buttonHome.BackGround = this.smartForm1; this.buttonHome.BackGroundColor = System.Drawing.Color.Black; this.buttonHome.ButtonColor = System.Drawing.Color.Teal; - this.buttonHome.ButtonDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(76)))), ((int)(((byte)(129))))); + this.buttonHome.ButtonDownColor = System.Drawing.Color.DarkSlateGray; this.buttonHome.ButtonImageAutoSize = true; this.buttonHome.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonHome.ButtonText = "HOME"; @@ -565,7 +565,7 @@ this.buttonHome.Text = null; this.buttonHome.TextColor = System.Drawing.Color.White; this.buttonHome.TextColorDisable = System.Drawing.Color.Gray; - this.buttonHome.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonHome.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonHome.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonHome.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonHome.Click += new System.EventHandler(this.buttonHome_Click); diff --git a/INT_PT002/Forms/FormMenu.cs b/INT_PT002/Forms/FormMenu.cs index 9763805..cfcf6e3 100644 --- a/INT_PT002/Forms/FormMenu.cs +++ b/INT_PT002/Forms/FormMenu.cs @@ -117,7 +117,7 @@ namespace INT_PT002.Forms { case Define.E_UserStatus.Level1: id = user.ID; - group = "Level1"; + group = user.Status.ToString(); this.buttonRecipe.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsRecipeEnable; this.buttonUser.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsUserEnable; @@ -127,7 +127,7 @@ namespace INT_PT002.Forms break; case Define.E_UserStatus.Level2: id = user.ID; - group = "Level2"; + group = user.Status.ToString(); this.buttonRecipe.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsRecipeEnable; this.buttonUser.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsUserEnable; @@ -137,7 +137,7 @@ namespace INT_PT002.Forms break; case Define.E_UserStatus.Level3: id = user.ID; - group = "Level3"; + group = user.Status.ToString(); this.buttonRecipe.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsRecipeEnable; this.buttonUser.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsUserEnable; @@ -147,7 +147,7 @@ namespace INT_PT002.Forms break; case Define.E_UserStatus.Developer: id = user.ID; - group = "Level4"; + group = user.Status.ToString(); this.buttonRecipe.Enabled = true; this.buttonUser.Enabled = true;