diff --git a/INT_PT002/Controls/System/ControlMenuSystemStatus.cs b/INT_PT002/Controls/System/ControlMenuSystemStatus.cs index 94a33b7..c97707b 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemStatus.cs +++ b/INT_PT002/Controls/System/ControlMenuSystemStatus.cs @@ -71,7 +71,7 @@ namespace INT_PT002.Controls this.ColorProgressOn = Color.Lime; this.ColorResultPass = Color.Green; this.ColorResultNG = Color.Red; - this.ColorResultNone = Color.Black; + this.ColorResultNone = Color.White; this.CollectionLabelProgress = new Collection(); this.CollectionLabelProgress.Clear(); diff --git a/INT_PT002/Forms/FormMainDisplay2.Designer.cs b/INT_PT002/Forms/FormMainDisplay2.Designer.cs index e44c003..ff12e83 100644 --- a/INT_PT002/Forms/FormMainDisplay2.Designer.cs +++ b/INT_PT002/Forms/FormMainDisplay2.Designer.cs @@ -304,7 +304,7 @@ this.labelUserID.BackGroundColor = System.Drawing.Color.SkyBlue; 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(787, 93); this.labelUserID.Name = "labelUserID"; @@ -327,7 +327,7 @@ this.labelUserLevel.BackGroundColor = System.Drawing.Color.SkyBlue; 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(787, 119); this.labelUserLevel.Name = "labelUserLevel"; @@ -1593,7 +1593,7 @@ this.labelTime.BackGroundColor = System.Drawing.Color.SkyBlue; this.labelTime.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTime.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelTime.LineSpacing = 0F; this.labelTime.Location = new System.Drawing.Point(141, 119); this.labelTime.Name = "labelTime"; diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs index c7b6579..ed9b6fc 100644 --- a/INT_PT002/Forms/FormMainDisplay2.cs +++ b/INT_PT002/Forms/FormMainDisplay2.cs @@ -215,8 +215,8 @@ namespace INT_PT002.Forms for (int i = 0; i < this.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) { this.CollectionLabelResult[i].Visible = false; - //this.CollectionLabelPressure[i].Text = "0"; - //this.CollectionLabelLeakRatePerSec[i].Text = "0"; + this.CollectionLabelPressure[i].Text = "0.0"; + this.CollectionLabelLeakRatePerSec[i].Text = "0.0"; this.CollectionLabelSbAlarm[i].Visible = false; } } @@ -722,6 +722,8 @@ namespace INT_PT002.Forms #region Stop this.labelStart.Visible = false; this.labelStop.Visible = true; + + this.InitializeData(); #endregion } } @@ -787,7 +789,7 @@ namespace INT_PT002.Forms public void UpdateDisplayPresData(Collection datas) { for (int i = 0; i < this.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) - this.CollectionLabelPressure[i].Text = datas[i].WorkingChamber.Trim() + " kPa"; + this.CollectionLabelPressure[i].Text = datas[i].WorkingChamber.Trim(); } public void UpdateDisplayJudgmentData(LeakData datas) { diff --git a/INT_PT002/Forms/FormMenu.Designer.cs b/INT_PT002/Forms/FormMenu.Designer.cs index a38e0a8..37814d5 100644 --- a/INT_PT002/Forms/FormMenu.Designer.cs +++ b/INT_PT002/Forms/FormMenu.Designer.cs @@ -30,6 +30,13 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMenu)); this.smartForm1 = new SmartX.SmartForm(); + this.smartButton4 = new SmartX.SmartButton(); + this.smartButton3 = new SmartX.SmartButton(); + this.smartButton2 = new SmartX.SmartButton(); + this.smartButton1 = new SmartX.SmartButton(); + this.smartGroupBox3 = new SmartX.SmartGroupBox(); + this.labelAlarm = new SmartX.SmartLabel(); + this.smartGroupBox2 = new SmartX.SmartGroupBox(); this.labelStop = new SmartX.SmartLabel(); this.labelStart = new SmartX.SmartLabel(); this.buttonUser = new SmartX.SmartButton(); @@ -47,14 +54,7 @@ this.buttonRecipe = new SmartX.SmartButton(); this.buttonHome = new SmartX.SmartButton(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); - this.labelAlarm = new SmartX.SmartLabel(); this.smartTimerAlarm = new SmartX.SmartTimer(); - this.smartGroupBox2 = new SmartX.SmartGroupBox(); - this.smartGroupBox3 = new SmartX.SmartGroupBox(); - this.smartButton1 = new SmartX.SmartButton(); - this.smartButton2 = new SmartX.SmartButton(); - this.smartButton3 = new SmartX.SmartButton(); - this.smartButton4 = new SmartX.SmartButton(); this.smartForm1.SuspendLayout(); this.smartGroupBox3.SuspendLayout(); this.SuspendLayout(); @@ -101,6 +101,209 @@ this.smartForm1.SpecialFunctionClickPointSize = 100; this.smartForm1.UseMainMenu = false; // + // smartButton4 + // + this.smartButton4.BackGround = this.smartForm1; + this.smartButton4.BackGroundColor = System.Drawing.Color.Black; + this.smartButton4.ButtonColor = System.Drawing.Color.Teal; + this.smartButton4.ButtonDownColor = System.Drawing.Color.DarkSlateGray; + this.smartButton4.ButtonImageAutoSize = true; + this.smartButton4.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.smartButton4.ButtonText = "4"; + this.smartButton4.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.smartButton4.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartButton4.GroupID = 0; + this.smartButton4.ImageDisable = null; + this.smartButton4.ImageDown = null; + this.smartButton4.ImageUp = null; + this.smartButton4.Location = new System.Drawing.Point(917, 622); + this.smartButton4.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.smartButton4.Name = "smartButton4"; + this.smartButton4.NestedClickEventPrevent = false; + this.smartButton4.OutlinePixel = 2; + this.smartButton4.OverlapOptimize = true; + this.smartButton4.RepeatInterval = 200; + this.smartButton4.RepeatIntervalAccelerate = null; + this.smartButton4.RoundSize = 10; + this.smartButton4.SafeInterval = 200; + this.smartButton4.Size = new System.Drawing.Size(100, 60); + this.smartButton4.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.smartButton4.TabIndex = 95; + this.smartButton4.Text = null; + this.smartButton4.TextColor = System.Drawing.Color.White; + this.smartButton4.TextColorDisable = System.Drawing.Color.Gainsboro; + this.smartButton4.TextDownColor = System.Drawing.Color.Chartreuse; + this.smartButton4.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.smartButton4.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.smartButton4.Click += new System.EventHandler(this.smartButton4_Click); + // + // smartButton3 + // + this.smartButton3.BackGround = this.smartForm1; + this.smartButton3.BackGroundColor = System.Drawing.Color.Black; + this.smartButton3.ButtonColor = System.Drawing.Color.Teal; + this.smartButton3.ButtonDownColor = System.Drawing.Color.DarkSlateGray; + this.smartButton3.ButtonImageAutoSize = true; + this.smartButton3.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.smartButton3.ButtonText = "3"; + this.smartButton3.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.smartButton3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartButton3.GroupID = 0; + this.smartButton3.ImageDisable = null; + this.smartButton3.ImageDown = null; + this.smartButton3.ImageUp = null; + this.smartButton3.Location = new System.Drawing.Point(917, 556); + this.smartButton3.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.smartButton3.Name = "smartButton3"; + this.smartButton3.NestedClickEventPrevent = false; + this.smartButton3.OutlinePixel = 2; + this.smartButton3.OverlapOptimize = true; + this.smartButton3.RepeatInterval = 200; + this.smartButton3.RepeatIntervalAccelerate = null; + this.smartButton3.RoundSize = 10; + this.smartButton3.SafeInterval = 200; + this.smartButton3.Size = new System.Drawing.Size(100, 60); + this.smartButton3.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.smartButton3.TabIndex = 94; + this.smartButton3.Text = null; + this.smartButton3.TextColor = System.Drawing.Color.White; + this.smartButton3.TextColorDisable = System.Drawing.Color.Gainsboro; + this.smartButton3.TextDownColor = System.Drawing.Color.Chartreuse; + this.smartButton3.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.smartButton3.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.smartButton3.Click += new System.EventHandler(this.smartButton3_Click); + // + // smartButton2 + // + this.smartButton2.BackGround = this.smartForm1; + this.smartButton2.BackGroundColor = System.Drawing.Color.Black; + this.smartButton2.ButtonColor = System.Drawing.Color.Teal; + this.smartButton2.ButtonDownColor = System.Drawing.Color.DarkSlateGray; + this.smartButton2.ButtonImageAutoSize = true; + this.smartButton2.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.smartButton2.ButtonText = "1"; + this.smartButton2.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.smartButton2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartButton2.GroupID = 0; + this.smartButton2.ImageDisable = null; + this.smartButton2.ImageDown = null; + this.smartButton2.ImageUp = null; + this.smartButton2.Location = new System.Drawing.Point(917, 424); + this.smartButton2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.smartButton2.Name = "smartButton2"; + this.smartButton2.NestedClickEventPrevent = false; + this.smartButton2.OutlinePixel = 2; + this.smartButton2.OverlapOptimize = true; + this.smartButton2.RepeatInterval = 200; + this.smartButton2.RepeatIntervalAccelerate = null; + this.smartButton2.RoundSize = 10; + this.smartButton2.SafeInterval = 200; + this.smartButton2.Size = new System.Drawing.Size(100, 60); + this.smartButton2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.smartButton2.TabIndex = 93; + this.smartButton2.Text = null; + this.smartButton2.TextColor = System.Drawing.Color.White; + this.smartButton2.TextColorDisable = System.Drawing.Color.Gainsboro; + this.smartButton2.TextDownColor = System.Drawing.Color.Chartreuse; + this.smartButton2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.smartButton2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.smartButton2.Click += new System.EventHandler(this.smartButton1_Click); + // + // smartButton1 + // + this.smartButton1.BackGround = this.smartForm1; + this.smartButton1.BackGroundColor = System.Drawing.Color.Black; + this.smartButton1.ButtonColor = System.Drawing.Color.Teal; + this.smartButton1.ButtonDownColor = System.Drawing.Color.DarkSlateGray; + this.smartButton1.ButtonImageAutoSize = true; + this.smartButton1.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.smartButton1.ButtonText = "2"; + this.smartButton1.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.smartButton1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartButton1.GroupID = 0; + this.smartButton1.ImageDisable = null; + this.smartButton1.ImageDown = null; + this.smartButton1.ImageUp = null; + this.smartButton1.Location = new System.Drawing.Point(917, 490); + this.smartButton1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.smartButton1.Name = "smartButton1"; + this.smartButton1.NestedClickEventPrevent = false; + this.smartButton1.OutlinePixel = 2; + this.smartButton1.OverlapOptimize = true; + this.smartButton1.RepeatInterval = 200; + this.smartButton1.RepeatIntervalAccelerate = null; + this.smartButton1.RoundSize = 10; + this.smartButton1.SafeInterval = 200; + this.smartButton1.Size = new System.Drawing.Size(100, 60); + this.smartButton1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.smartButton1.TabIndex = 92; + this.smartButton1.Text = null; + this.smartButton1.TextColor = System.Drawing.Color.White; + this.smartButton1.TextColorDisable = System.Drawing.Color.Gainsboro; + this.smartButton1.TextDownColor = System.Drawing.Color.Chartreuse; + this.smartButton1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.smartButton1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.smartButton1.Click += new System.EventHandler(this.smartButton2_Click); + // + // smartGroupBox3 + // + this.smartGroupBox3.BackGround = null; + this.smartGroupBox3.BackGroundColor = System.Drawing.Color.Black; + this.smartGroupBox3.BackImage = null; + this.smartGroupBox3.Controls.Add(this.labelAlarm); + this.smartGroupBox3.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.smartGroupBox3.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.smartGroupBox3.FrameLineThickness = 2; + this.smartGroupBox3.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.None; + this.smartGroupBox3.HeaderHeightOffset = 12; + this.smartGroupBox3.Location = new System.Drawing.Point(231, 3); + this.smartGroupBox3.Name = "smartGroupBox3"; + this.smartGroupBox3.RoundRadius = 5; + this.smartGroupBox3.Size = new System.Drawing.Size(465, 30); + this.smartGroupBox3.TabIndex = 91; + this.smartGroupBox3.Text = "smartGroupBox3"; + this.smartGroupBox3.TextColor = System.Drawing.Color.White; + // + // labelAlarm + // + this.labelAlarm.BackGround = this.smartForm1; + this.labelAlarm.BackGroundColor = System.Drawing.Color.Black; + this.labelAlarm.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelAlarm.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelAlarm.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelAlarm.LineSpacing = 0F; + this.labelAlarm.Location = new System.Drawing.Point(0, 0); + this.labelAlarm.Name = "labelAlarm"; + this.labelAlarm.OverlapOptimize = true; + this.labelAlarm.PasswordChar = '\0'; + this.labelAlarm.Radius = 3; + this.labelAlarm.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelAlarm.Size = new System.Drawing.Size(465, 30); + this.labelAlarm.TabIndex = 90; + this.labelAlarm.TextColor = System.Drawing.Color.White; + this.labelAlarm.TextColorDisable = System.Drawing.Color.Gray; + this.labelAlarm.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelAlarm.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelAlarm.Wordwrap = false; + // + // smartGroupBox2 + // + this.smartGroupBox2.BackGround = null; + this.smartGroupBox2.BackGroundColor = System.Drawing.Color.Black; + this.smartGroupBox2.BackImage = null; + this.smartGroupBox2.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.smartGroupBox2.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.smartGroupBox2.FrameLineThickness = 2; + this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.None; + this.smartGroupBox2.HeaderHeightOffset = 12; + this.smartGroupBox2.Location = new System.Drawing.Point(234, 3); + this.smartGroupBox2.Name = "smartGroupBox2"; + this.smartGroupBox2.RoundRadius = 5; + this.smartGroupBox2.Size = new System.Drawing.Size(465, 30); + this.smartGroupBox2.TabIndex = 90; + this.smartGroupBox2.Text = "smartGroupBox2"; + this.smartGroupBox2.TextColor = System.Drawing.Color.White; + // // labelStop // this.labelStop.BackGround = null; @@ -191,7 +394,7 @@ 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(705, 13); this.labelUserID.Name = "labelUserID"; @@ -214,7 +417,7 @@ 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(811, 13); this.labelUserLevel.Name = "labelUserLevel"; @@ -244,7 +447,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"; @@ -603,28 +806,6 @@ this.smartGroupBox1.Text = "기본 > "; this.smartGroupBox1.TextColor = System.Drawing.Color.White; // - // labelAlarm - // - this.labelAlarm.BackGround = this.smartForm1; - this.labelAlarm.BackGroundColor = System.Drawing.Color.Black; - this.labelAlarm.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelAlarm.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelAlarm.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.labelAlarm.LineSpacing = 0F; - this.labelAlarm.Location = new System.Drawing.Point(0, 0); - this.labelAlarm.Name = "labelAlarm"; - this.labelAlarm.OverlapOptimize = true; - this.labelAlarm.PasswordChar = '\0'; - this.labelAlarm.Radius = 3; - this.labelAlarm.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelAlarm.Size = new System.Drawing.Size(465, 30); - this.labelAlarm.TabIndex = 90; - this.labelAlarm.TextColor = System.Drawing.Color.White; - this.labelAlarm.TextColorDisable = System.Drawing.Color.Gray; - this.labelAlarm.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelAlarm.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelAlarm.Wordwrap = false; - // // smartTimerAlarm // this.smartTimerAlarm.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter; @@ -634,187 +815,6 @@ this.smartTimerAlarm.TimeFormStringSeparator = ":"; this.smartTimerAlarm.Tick += new System.EventHandler(this.smartTimerAlarm_Tick); // - // smartGroupBox2 - // - this.smartGroupBox2.BackGround = null; - this.smartGroupBox2.BackGroundColor = System.Drawing.Color.Black; - this.smartGroupBox2.BackImage = null; - this.smartGroupBox2.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); - this.smartGroupBox2.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); - this.smartGroupBox2.FrameLineThickness = 2; - this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.None; - this.smartGroupBox2.HeaderHeightOffset = 12; - this.smartGroupBox2.Location = new System.Drawing.Point(234, 3); - this.smartGroupBox2.Name = "smartGroupBox2"; - this.smartGroupBox2.RoundRadius = 5; - this.smartGroupBox2.Size = new System.Drawing.Size(465, 30); - this.smartGroupBox2.TabIndex = 90; - this.smartGroupBox2.Text = "smartGroupBox2"; - this.smartGroupBox2.TextColor = System.Drawing.Color.White; - // - // smartGroupBox3 - // - this.smartGroupBox3.BackGround = null; - this.smartGroupBox3.BackGroundColor = System.Drawing.Color.Black; - this.smartGroupBox3.BackImage = null; - this.smartGroupBox3.Controls.Add(this.labelAlarm); - this.smartGroupBox3.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); - this.smartGroupBox3.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); - this.smartGroupBox3.FrameLineThickness = 2; - this.smartGroupBox3.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.None; - this.smartGroupBox3.HeaderHeightOffset = 12; - this.smartGroupBox3.Location = new System.Drawing.Point(231, 3); - this.smartGroupBox3.Name = "smartGroupBox3"; - this.smartGroupBox3.RoundRadius = 5; - this.smartGroupBox3.Size = new System.Drawing.Size(465, 30); - this.smartGroupBox3.TabIndex = 91; - this.smartGroupBox3.Text = "smartGroupBox3"; - this.smartGroupBox3.TextColor = System.Drawing.Color.White; - // - // smartButton1 - // - this.smartButton1.BackGround = this.smartForm1; - this.smartButton1.BackGroundColor = System.Drawing.Color.Black; - this.smartButton1.ButtonColor = System.Drawing.Color.Teal; - this.smartButton1.ButtonDownColor = System.Drawing.Color.DarkSlateGray; - this.smartButton1.ButtonImageAutoSize = true; - this.smartButton1.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; - this.smartButton1.ButtonText = "2"; - this.smartButton1.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.smartButton1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.smartButton1.GroupID = 0; - this.smartButton1.ImageDisable = null; - this.smartButton1.ImageDown = null; - this.smartButton1.ImageUp = null; - this.smartButton1.Location = new System.Drawing.Point(917, 490); - this.smartButton1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.smartButton1.Name = "smartButton1"; - this.smartButton1.NestedClickEventPrevent = false; - this.smartButton1.OutlinePixel = 2; - this.smartButton1.OverlapOptimize = true; - this.smartButton1.RepeatInterval = 200; - this.smartButton1.RepeatIntervalAccelerate = null; - this.smartButton1.RoundSize = 10; - this.smartButton1.SafeInterval = 200; - this.smartButton1.Size = new System.Drawing.Size(100, 60); - this.smartButton1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.smartButton1.TabIndex = 92; - this.smartButton1.Text = null; - this.smartButton1.TextColor = System.Drawing.Color.White; - this.smartButton1.TextColorDisable = System.Drawing.Color.Gainsboro; - this.smartButton1.TextDownColor = System.Drawing.Color.Chartreuse; - this.smartButton1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.smartButton1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.smartButton1.Click += new System.EventHandler(this.smartButton2_Click); - // - // smartButton2 - // - this.smartButton2.BackGround = this.smartForm1; - this.smartButton2.BackGroundColor = System.Drawing.Color.Black; - this.smartButton2.ButtonColor = System.Drawing.Color.Teal; - this.smartButton2.ButtonDownColor = System.Drawing.Color.DarkSlateGray; - this.smartButton2.ButtonImageAutoSize = true; - this.smartButton2.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; - this.smartButton2.ButtonText = "1"; - this.smartButton2.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.smartButton2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.smartButton2.GroupID = 0; - this.smartButton2.ImageDisable = null; - this.smartButton2.ImageDown = null; - this.smartButton2.ImageUp = null; - this.smartButton2.Location = new System.Drawing.Point(917, 424); - this.smartButton2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.smartButton2.Name = "smartButton2"; - this.smartButton2.NestedClickEventPrevent = false; - this.smartButton2.OutlinePixel = 2; - this.smartButton2.OverlapOptimize = true; - this.smartButton2.RepeatInterval = 200; - this.smartButton2.RepeatIntervalAccelerate = null; - this.smartButton2.RoundSize = 10; - this.smartButton2.SafeInterval = 200; - this.smartButton2.Size = new System.Drawing.Size(100, 60); - this.smartButton2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.smartButton2.TabIndex = 93; - this.smartButton2.Text = null; - this.smartButton2.TextColor = System.Drawing.Color.White; - this.smartButton2.TextColorDisable = System.Drawing.Color.Gainsboro; - this.smartButton2.TextDownColor = System.Drawing.Color.Chartreuse; - this.smartButton2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.smartButton2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.smartButton2.Click += new System.EventHandler(this.smartButton1_Click); - // - // smartButton3 - // - this.smartButton3.BackGround = this.smartForm1; - this.smartButton3.BackGroundColor = System.Drawing.Color.Black; - this.smartButton3.ButtonColor = System.Drawing.Color.Teal; - this.smartButton3.ButtonDownColor = System.Drawing.Color.DarkSlateGray; - this.smartButton3.ButtonImageAutoSize = true; - this.smartButton3.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; - this.smartButton3.ButtonText = "3"; - this.smartButton3.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.smartButton3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.smartButton3.GroupID = 0; - this.smartButton3.ImageDisable = null; - this.smartButton3.ImageDown = null; - this.smartButton3.ImageUp = null; - this.smartButton3.Location = new System.Drawing.Point(917, 556); - this.smartButton3.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.smartButton3.Name = "smartButton3"; - this.smartButton3.NestedClickEventPrevent = false; - this.smartButton3.OutlinePixel = 2; - this.smartButton3.OverlapOptimize = true; - this.smartButton3.RepeatInterval = 200; - this.smartButton3.RepeatIntervalAccelerate = null; - this.smartButton3.RoundSize = 10; - this.smartButton3.SafeInterval = 200; - this.smartButton3.Size = new System.Drawing.Size(100, 60); - this.smartButton3.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.smartButton3.TabIndex = 94; - this.smartButton3.Text = null; - this.smartButton3.TextColor = System.Drawing.Color.White; - this.smartButton3.TextColorDisable = System.Drawing.Color.Gainsboro; - this.smartButton3.TextDownColor = System.Drawing.Color.Chartreuse; - this.smartButton3.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.smartButton3.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.smartButton3.Click += new System.EventHandler(this.smartButton3_Click); - // - // smartButton4 - // - this.smartButton4.BackGround = this.smartForm1; - this.smartButton4.BackGroundColor = System.Drawing.Color.Black; - this.smartButton4.ButtonColor = System.Drawing.Color.Teal; - this.smartButton4.ButtonDownColor = System.Drawing.Color.DarkSlateGray; - this.smartButton4.ButtonImageAutoSize = true; - this.smartButton4.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; - this.smartButton4.ButtonText = "4"; - this.smartButton4.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.smartButton4.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.smartButton4.GroupID = 0; - this.smartButton4.ImageDisable = null; - this.smartButton4.ImageDown = null; - this.smartButton4.ImageUp = null; - this.smartButton4.Location = new System.Drawing.Point(917, 622); - this.smartButton4.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.smartButton4.Name = "smartButton4"; - this.smartButton4.NestedClickEventPrevent = false; - this.smartButton4.OutlinePixel = 2; - this.smartButton4.OverlapOptimize = true; - this.smartButton4.RepeatInterval = 200; - this.smartButton4.RepeatIntervalAccelerate = null; - this.smartButton4.RoundSize = 10; - this.smartButton4.SafeInterval = 200; - this.smartButton4.Size = new System.Drawing.Size(100, 60); - this.smartButton4.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.smartButton4.TabIndex = 95; - this.smartButton4.Text = null; - this.smartButton4.TextColor = System.Drawing.Color.White; - this.smartButton4.TextColorDisable = System.Drawing.Color.Gainsboro; - this.smartButton4.TextDownColor = System.Drawing.Color.Chartreuse; - this.smartButton4.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.smartButton4.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.smartButton4.Click += new System.EventHandler(this.smartButton4_Click); - // // FormMenu // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT_PT002/Forms/FormMenu.cs b/INT_PT002/Forms/FormMenu.cs index 82d981f..aad164a 100644 --- a/INT_PT002/Forms/FormMenu.cs +++ b/INT_PT002/Forms/FormMenu.cs @@ -966,7 +966,7 @@ namespace INT_PT002.Forms { this.labelAlarm.Left = this.labelAlarm.Left - 5; if (this.labelAlarm.Left < 0 - this.labelAlarm.Width - 20) - this.labelAlarm.Left = this.smartGroupBox1.Width - 10; + this.labelAlarm.Left = this.smartGroupBox3.Width - 10; } #endregion