diff --git a/INT_PT002/DataStore/SystemStatus.cs b/INT_PT002/DataStore/SystemStatus.cs index 38b1cf3..cf11174 100644 --- a/INT_PT002/DataStore/SystemStatus.cs +++ b/INT_PT002/DataStore/SystemStatus.cs @@ -66,9 +66,6 @@ namespace INT_PT002.DataStore this.EquipmentColumn = 10; this.CurrentUser = new UserItem(); - this.CurrentUser.ID = ""; - this.CurrentUser.Password = ""; - this.CurrentUser.UserGroup = Define.E_UserGroup.f0_Level1; this.CurrentEquipmentMode = Define.E_EquipmentMode.Normal; this.EquipmentStatus = Define.E_EquipmentStatus.Stop; diff --git a/INT_PT002/DialogForms/DialogFormYesNo.cs b/INT_PT002/DialogForms/DialogFormYesNo.cs index 10d631c..cccd6cc 100644 --- a/INT_PT002/DialogForms/DialogFormYesNo.cs +++ b/INT_PT002/DialogForms/DialogFormYesNo.cs @@ -27,6 +27,10 @@ namespace INT_PT002.DialogForms { InitializeComponent(); + this.smartGroupBox1.Text = ""; + this.labelMessage1.Text = ""; + this.labelMessage2.Text = ""; + if (language == Define.E_LanguageID.Korean) { this.buttonYes.ButtonText = "Yes"; diff --git a/INT_PT002/Forms/FormMenu.Designer.cs b/INT_PT002/Forms/FormMenu.Designer.cs index cb35180..62886c8 100644 --- a/INT_PT002/Forms/FormMenu.Designer.cs +++ b/INT_PT002/Forms/FormMenu.Designer.cs @@ -30,6 +30,8 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMenu)); this.smartForm1 = new SmartX.SmartForm(); + this.labelStop = new SmartX.SmartLabel(); + this.labelStart = new SmartX.SmartLabel(); this.buttonUser = new SmartX.SmartButton(); this.labelUserID = new SmartX.SmartLabel(); this.labelUserLevel = new SmartX.SmartLabel(); @@ -42,11 +44,9 @@ this.buttonSystem = new SmartX.SmartButton(); this.buttonLog = new SmartX.SmartButton(); this.buttonManual = new SmartX.SmartButton(); - this.labelStop = new SmartX.SmartLabel(); this.buttonRecipe = new SmartX.SmartButton(); this.buttonHome = new SmartX.SmartButton(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); - this.labelStart = new SmartX.SmartLabel(); this.smartForm1.SuspendLayout(); this.SuspendLayout(); // @@ -85,6 +85,54 @@ this.smartForm1.SpecialFunctionClickPointSize = 100; this.smartForm1.UseMainMenu = false; // + // labelStop + // + this.labelStop.BackGround = null; + this.labelStop.BackGroundColor = System.Drawing.Color.Red; + this.labelStop.BorderColor = System.Drawing.Color.Red; + this.labelStop.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelStop.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.labelStop.LineSpacing = 0F; + this.labelStop.Location = new System.Drawing.Point(911, 3); + this.labelStop.Name = "labelStop"; + this.labelStop.OverlapOptimize = true; + this.labelStop.PasswordChar = '\0'; + this.labelStop.Radius = 10; + this.labelStop.RoundRectFillColor = System.Drawing.Color.Red; + this.labelStop.Size = new System.Drawing.Size(110, 30); + this.labelStop.TabIndex = 73; + this.labelStop.Text = "STOP"; + this.labelStop.TextColor = System.Drawing.Color.White; + this.labelStop.TextColorDisable = System.Drawing.Color.Gray; + this.labelStop.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelStop.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelStop.Wordwrap = false; + this.labelStop.Click += new System.EventHandler(this.labelStop_Click); + // + // labelStart + // + this.labelStart.BackGround = null; + this.labelStart.BackGroundColor = System.Drawing.Color.DarkGreen; + this.labelStart.BorderColor = System.Drawing.Color.DarkGreen; + this.labelStart.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelStart.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.labelStart.LineSpacing = 0F; + this.labelStart.Location = new System.Drawing.Point(911, 3); + this.labelStart.Name = "labelStart"; + this.labelStart.OverlapOptimize = true; + this.labelStart.PasswordChar = '\0'; + this.labelStart.Radius = 10; + this.labelStart.RoundRectFillColor = System.Drawing.Color.DarkGreen; + this.labelStart.Size = new System.Drawing.Size(110, 30); + this.labelStart.TabIndex = 88; + this.labelStart.Text = "START"; + this.labelStart.TextColor = System.Drawing.Color.White; + this.labelStart.TextColorDisable = System.Drawing.Color.Gray; + this.labelStart.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelStart.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelStart.Wordwrap = false; + this.labelStart.Click += new System.EventHandler(this.labelStart_Click); + // // buttonUser // this.buttonUser.BackGround = this.smartForm1; @@ -114,7 +162,7 @@ this.buttonUser.TabIndex = 86; this.buttonUser.Text = null; this.buttonUser.TextColor = System.Drawing.Color.White; - this.buttonUser.TextColorDisable = System.Drawing.Color.Gray; + 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.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonUser.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; @@ -365,7 +413,7 @@ this.buttonSystem.TabIndex = 77; this.buttonSystem.Text = null; this.buttonSystem.TextColor = System.Drawing.Color.White; - this.buttonSystem.TextColorDisable = System.Drawing.Color.Gray; + 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.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonSystem.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; @@ -400,7 +448,7 @@ this.buttonLog.TabIndex = 76; this.buttonLog.Text = null; this.buttonLog.TextColor = System.Drawing.Color.White; - this.buttonLog.TextColorDisable = System.Drawing.Color.Gray; + 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.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonLog.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; @@ -435,36 +483,12 @@ this.buttonManual.TabIndex = 75; this.buttonManual.Text = null; this.buttonManual.TextColor = System.Drawing.Color.White; - this.buttonManual.TextColorDisable = System.Drawing.Color.Gray; + 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.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonManual.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonManual.Click += new System.EventHandler(this.buttonManual_Click); // - // labelStop - // - this.labelStop.BackGround = null; - this.labelStop.BackGroundColor = System.Drawing.Color.Red; - this.labelStop.BorderColor = System.Drawing.Color.Red; - this.labelStop.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelStop.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.labelStop.LineSpacing = 0F; - this.labelStop.Location = new System.Drawing.Point(911, 3); - this.labelStop.Name = "labelStop"; - this.labelStop.OverlapOptimize = true; - this.labelStop.PasswordChar = '\0'; - this.labelStop.Radius = 10; - this.labelStop.RoundRectFillColor = System.Drawing.Color.Red; - this.labelStop.Size = new System.Drawing.Size(110, 30); - this.labelStop.TabIndex = 73; - this.labelStop.Text = "STOP"; - this.labelStop.TextColor = System.Drawing.Color.White; - this.labelStop.TextColorDisable = System.Drawing.Color.Gray; - this.labelStop.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelStop.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStop.Wordwrap = false; - this.labelStop.Click += new System.EventHandler(this.labelStop_Click); - // // buttonRecipe // this.buttonRecipe.BackGround = this.smartForm1; @@ -494,7 +518,7 @@ this.buttonRecipe.TabIndex = 72; this.buttonRecipe.Text = null; this.buttonRecipe.TextColor = System.Drawing.Color.White; - this.buttonRecipe.TextColorDisable = System.Drawing.Color.Gray; + 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.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonRecipe.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; @@ -553,30 +577,6 @@ this.smartGroupBox1.Text = "기본 > "; this.smartGroupBox1.TextColor = System.Drawing.Color.White; // - // labelStart - // - this.labelStart.BackGround = null; - this.labelStart.BackGroundColor = System.Drawing.Color.DarkGreen; - this.labelStart.BorderColor = System.Drawing.Color.DarkGreen; - this.labelStart.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelStart.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.labelStart.LineSpacing = 0F; - this.labelStart.Location = new System.Drawing.Point(911, 3); - this.labelStart.Name = "labelStart"; - this.labelStart.OverlapOptimize = true; - this.labelStart.PasswordChar = '\0'; - this.labelStart.Radius = 10; - this.labelStart.RoundRectFillColor = System.Drawing.Color.DarkGreen; - this.labelStart.Size = new System.Drawing.Size(110, 30); - this.labelStart.TabIndex = 88; - this.labelStart.Text = "START"; - this.labelStart.TextColor = System.Drawing.Color.White; - this.labelStart.TextColorDisable = System.Drawing.Color.Gray; - this.labelStart.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelStart.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStart.Wordwrap = false; - this.labelStart.Click += new System.EventHandler(this.labelStart_Click); - // // FormMenu // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);