diff --git a/INT_PT002/Controls/Log/ControlMenuLogHistory.Designer.cs b/INT_PT002/Controls/Log/ControlMenuLogHistory.Designer.cs
index cf76d08..5ad2a4b 100644
--- a/INT_PT002/Controls/Log/ControlMenuLogHistory.Designer.cs
+++ b/INT_PT002/Controls/Log/ControlMenuLogHistory.Designer.cs
@@ -30,6 +30,12 @@
{
this.smartFile1 = new SmartX.SmartFile();
this.smartGroupBox1 = new SmartX.SmartGroupBox();
+ this.smartLabel7 = new SmartX.SmartLabel();
+ this.smartLabel6 = new SmartX.SmartLabel();
+ this.smartLabel5 = new SmartX.SmartLabel();
+ this.smartLabel1 = new SmartX.SmartLabel();
+ this.smartLabel2 = new SmartX.SmartLabel();
+ this.smartLabel8 = new SmartX.SmartLabel();
this.smartSeparatorLine1 = new SmartX.SmartSeparatorLine();
this.labelTotalIndex = new SmartX.SmartLabel();
this.labelRemainIndex = new SmartX.SmartLabel();
@@ -43,12 +49,6 @@
this.listBoxDetail = new SmartX.SmartListBox();
this.listBoxEvent = new SmartX.SmartListBox();
this.listBoxLoginID = new SmartX.SmartListBox();
- this.smartLabel7 = new SmartX.SmartLabel();
- this.smartLabel6 = new SmartX.SmartLabel();
- this.smartLabel5 = new SmartX.SmartLabel();
- this.smartLabel1 = new SmartX.SmartLabel();
- this.smartLabel2 = new SmartX.SmartLabel();
- this.smartLabel8 = new SmartX.SmartLabel();
this.smartLabel9 = new SmartX.SmartLabel();
this.buttonDown = new SmartX.SmartButton();
this.buttonUp = new SmartX.SmartButton();
@@ -105,6 +105,144 @@
this.smartGroupBox1.Text = "smartGroupBox1";
this.smartGroupBox1.TextColor = System.Drawing.Color.White;
//
+ // smartLabel7
+ //
+ this.smartLabel7.BackGround = this.smartGroupBox1;
+ this.smartLabel7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
+ this.smartLabel7.BorderColor = System.Drawing.Color.Black;
+ this.smartLabel7.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
+ this.smartLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
+ this.smartLabel7.LineSpacing = 1F;
+ this.smartLabel7.Location = new System.Drawing.Point(763, 108);
+ this.smartLabel7.Name = "smartLabel7";
+ this.smartLabel7.OverlapOptimize = true;
+ this.smartLabel7.PasswordChar = '\0';
+ this.smartLabel7.Radius = 3;
+ this.smartLabel7.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.smartLabel7.Size = new System.Drawing.Size(78, 29);
+ this.smartLabel7.TabIndex = 115;
+ this.smartLabel7.Text = "Type";
+ this.smartLabel7.TextColor = System.Drawing.Color.White;
+ this.smartLabel7.TextColorDisable = System.Drawing.Color.Gray;
+ this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.smartLabel7.Wordwrap = false;
+ //
+ // smartLabel6
+ //
+ this.smartLabel6.BackGround = this.smartGroupBox1;
+ this.smartLabel6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
+ this.smartLabel6.BorderColor = System.Drawing.Color.Black;
+ this.smartLabel6.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
+ this.smartLabel6.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
+ this.smartLabel6.LineSpacing = 1F;
+ this.smartLabel6.Location = new System.Drawing.Point(709, 108);
+ this.smartLabel6.Name = "smartLabel6";
+ this.smartLabel6.OverlapOptimize = true;
+ this.smartLabel6.PasswordChar = '\0';
+ this.smartLabel6.Radius = 3;
+ this.smartLabel6.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.smartLabel6.Size = new System.Drawing.Size(55, 29);
+ this.smartLabel6.TabIndex = 114;
+ this.smartLabel6.Text = "After";
+ this.smartLabel6.TextColor = System.Drawing.Color.White;
+ this.smartLabel6.TextColorDisable = System.Drawing.Color.Gray;
+ this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.smartLabel6.Wordwrap = false;
+ //
+ // smartLabel5
+ //
+ this.smartLabel5.BackGround = this.smartGroupBox1;
+ this.smartLabel5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
+ this.smartLabel5.BorderColor = System.Drawing.Color.Black;
+ this.smartLabel5.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
+ this.smartLabel5.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
+ this.smartLabel5.LineSpacing = 1F;
+ this.smartLabel5.Location = new System.Drawing.Point(655, 108);
+ this.smartLabel5.Name = "smartLabel5";
+ this.smartLabel5.OverlapOptimize = true;
+ this.smartLabel5.PasswordChar = '\0';
+ this.smartLabel5.Radius = 3;
+ this.smartLabel5.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.smartLabel5.Size = new System.Drawing.Size(55, 29);
+ this.smartLabel5.TabIndex = 113;
+ this.smartLabel5.Text = "Before";
+ this.smartLabel5.TextColor = System.Drawing.Color.White;
+ this.smartLabel5.TextColorDisable = System.Drawing.Color.Gray;
+ this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.smartLabel5.Wordwrap = false;
+ //
+ // smartLabel1
+ //
+ this.smartLabel1.BackGround = this.smartGroupBox1;
+ this.smartLabel1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
+ this.smartLabel1.BorderColor = System.Drawing.Color.Black;
+ this.smartLabel1.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
+ this.smartLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
+ this.smartLabel1.LineSpacing = 1F;
+ this.smartLabel1.Location = new System.Drawing.Point(536, 108);
+ this.smartLabel1.Name = "smartLabel1";
+ this.smartLabel1.OverlapOptimize = true;
+ this.smartLabel1.PasswordChar = '\0';
+ this.smartLabel1.Radius = 3;
+ this.smartLabel1.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.smartLabel1.Size = new System.Drawing.Size(120, 29);
+ this.smartLabel1.TabIndex = 112;
+ this.smartLabel1.Text = "Detail";
+ this.smartLabel1.TextColor = System.Drawing.Color.White;
+ this.smartLabel1.TextColorDisable = System.Drawing.Color.Gray;
+ this.smartLabel1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.smartLabel1.Wordwrap = false;
+ //
+ // smartLabel2
+ //
+ this.smartLabel2.BackGround = this.smartGroupBox1;
+ this.smartLabel2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
+ this.smartLabel2.BorderColor = System.Drawing.Color.Black;
+ this.smartLabel2.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
+ this.smartLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
+ this.smartLabel2.LineSpacing = 1F;
+ this.smartLabel2.Location = new System.Drawing.Point(427, 108);
+ this.smartLabel2.Name = "smartLabel2";
+ this.smartLabel2.OverlapOptimize = true;
+ this.smartLabel2.PasswordChar = '\0';
+ this.smartLabel2.Radius = 3;
+ this.smartLabel2.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.smartLabel2.Size = new System.Drawing.Size(110, 29);
+ this.smartLabel2.TabIndex = 111;
+ this.smartLabel2.Text = "Event";
+ this.smartLabel2.TextColor = System.Drawing.Color.White;
+ this.smartLabel2.TextColorDisable = System.Drawing.Color.Gray;
+ this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.smartLabel2.Wordwrap = false;
+ //
+ // smartLabel8
+ //
+ this.smartLabel8.BackGround = this.smartGroupBox1;
+ this.smartLabel8.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
+ this.smartLabel8.BorderColor = System.Drawing.Color.Black;
+ this.smartLabel8.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
+ this.smartLabel8.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
+ this.smartLabel8.LineSpacing = 1F;
+ this.smartLabel8.Location = new System.Drawing.Point(338, 108);
+ this.smartLabel8.Name = "smartLabel8";
+ this.smartLabel8.OverlapOptimize = true;
+ this.smartLabel8.PasswordChar = '\0';
+ this.smartLabel8.Radius = 3;
+ this.smartLabel8.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.smartLabel8.Size = new System.Drawing.Size(90, 29);
+ this.smartLabel8.TabIndex = 110;
+ this.smartLabel8.Text = "Login ID";
+ this.smartLabel8.TextColor = System.Drawing.Color.White;
+ this.smartLabel8.TextColorDisable = System.Drawing.Color.Gray;
+ this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.smartLabel8.Wordwrap = false;
+ //
// smartSeparatorLine1
//
this.smartSeparatorLine1.Line1Color = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226)))));
@@ -264,7 +402,7 @@
this.listBoxAfter.ItemOffsetX = 1;
this.listBoxAfter.ItemOffsetY = 0;
this.listBoxAfter.ItemTextOffsetY = 1;
- this.listBoxAfter.Location = new System.Drawing.Point(713, 136);
+ this.listBoxAfter.Location = new System.Drawing.Point(709, 136);
this.listBoxAfter.MouseMoveEventSpace = 3;
this.listBoxAfter.MouseMoveSpace = 10;
this.listBoxAfter.Name = "listBoxAfter";
@@ -357,7 +495,7 @@
this.listBoxAfter.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxAfter.SeparationlineVisibleBottom = true;
this.listBoxAfter.SeparationlineVisibleTop = true;
- this.listBoxAfter.Size = new System.Drawing.Size(50, 502);
+ this.listBoxAfter.Size = new System.Drawing.Size(55, 502);
this.listBoxAfter.TabIndex = 121;
this.listBoxAfter.Text = "smartListBox1";
this.listBoxAfter.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
@@ -376,7 +514,7 @@
this.listBoxBefore.ItemOffsetX = 1;
this.listBoxBefore.ItemOffsetY = 0;
this.listBoxBefore.ItemTextOffsetY = 1;
- this.listBoxBefore.Location = new System.Drawing.Point(664, 136);
+ this.listBoxBefore.Location = new System.Drawing.Point(655, 136);
this.listBoxBefore.MouseMoveEventSpace = 3;
this.listBoxBefore.MouseMoveSpace = 10;
this.listBoxBefore.Name = "listBoxBefore";
@@ -469,7 +607,7 @@
this.listBoxBefore.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxBefore.SeparationlineVisibleBottom = true;
this.listBoxBefore.SeparationlineVisibleTop = true;
- this.listBoxBefore.Size = new System.Drawing.Size(50, 502);
+ this.listBoxBefore.Size = new System.Drawing.Size(55, 502);
this.listBoxBefore.TabIndex = 120;
this.listBoxBefore.Text = "smartListBox1";
this.listBoxBefore.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
@@ -488,7 +626,7 @@
this.listBoxType.ItemOffsetX = 1;
this.listBoxType.ItemOffsetY = 0;
this.listBoxType.ItemTextOffsetY = 1;
- this.listBoxType.Location = new System.Drawing.Point(762, 136);
+ this.listBoxType.Location = new System.Drawing.Point(763, 136);
this.listBoxType.MouseMoveEventSpace = 3;
this.listBoxType.MouseMoveSpace = 10;
this.listBoxType.Name = "listBoxType";
@@ -581,7 +719,7 @@
this.listBoxType.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxType.SeparationlineVisibleBottom = true;
this.listBoxType.SeparationlineVisibleTop = true;
- this.listBoxType.Size = new System.Drawing.Size(80, 502);
+ this.listBoxType.Size = new System.Drawing.Size(78, 502);
this.listBoxType.TabIndex = 119;
this.listBoxType.Text = "smartListBox1";
this.listBoxType.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
@@ -600,7 +738,7 @@
this.listBoxDetail.ItemOffsetX = 1;
this.listBoxDetail.ItemOffsetY = 0;
this.listBoxDetail.ItemTextOffsetY = 1;
- this.listBoxDetail.Location = new System.Drawing.Point(540, 136);
+ this.listBoxDetail.Location = new System.Drawing.Point(536, 136);
this.listBoxDetail.MouseMoveEventSpace = 3;
this.listBoxDetail.MouseMoveSpace = 10;
this.listBoxDetail.Name = "listBoxDetail";
@@ -693,7 +831,7 @@
this.listBoxDetail.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxDetail.SeparationlineVisibleBottom = true;
this.listBoxDetail.SeparationlineVisibleTop = true;
- this.listBoxDetail.Size = new System.Drawing.Size(125, 502);
+ this.listBoxDetail.Size = new System.Drawing.Size(120, 502);
this.listBoxDetail.TabIndex = 118;
this.listBoxDetail.Text = "smartListBox1";
this.listBoxDetail.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
@@ -712,7 +850,7 @@
this.listBoxEvent.ItemOffsetX = 1;
this.listBoxEvent.ItemOffsetY = 0;
this.listBoxEvent.ItemTextOffsetY = 1;
- this.listBoxEvent.Location = new System.Drawing.Point(429, 136);
+ this.listBoxEvent.Location = new System.Drawing.Point(427, 136);
this.listBoxEvent.MouseMoveEventSpace = 3;
this.listBoxEvent.MouseMoveSpace = 10;
this.listBoxEvent.Name = "listBoxEvent";
@@ -805,7 +943,7 @@
this.listBoxEvent.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxEvent.SeparationlineVisibleBottom = true;
this.listBoxEvent.SeparationlineVisibleTop = true;
- this.listBoxEvent.Size = new System.Drawing.Size(112, 502);
+ this.listBoxEvent.Size = new System.Drawing.Size(110, 502);
this.listBoxEvent.TabIndex = 117;
this.listBoxEvent.Text = "smartListBox1";
this.listBoxEvent.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
@@ -824,7 +962,7 @@
this.listBoxLoginID.ItemOffsetX = 1;
this.listBoxLoginID.ItemOffsetY = 0;
this.listBoxLoginID.ItemTextOffsetY = 1;
- this.listBoxLoginID.Location = new System.Drawing.Point(340, 136);
+ this.listBoxLoginID.Location = new System.Drawing.Point(338, 136);
this.listBoxLoginID.MouseMoveEventSpace = 3;
this.listBoxLoginID.MouseMoveSpace = 10;
this.listBoxLoginID.Name = "listBoxLoginID";
@@ -923,144 +1061,6 @@
this.listBoxLoginID.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.listBoxLoginID.TextColorDisable = System.Drawing.Color.Gray;
//
- // smartLabel7
- //
- this.smartLabel7.BackGround = this.smartGroupBox1;
- this.smartLabel7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
- this.smartLabel7.BorderColor = System.Drawing.Color.Black;
- this.smartLabel7.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
- this.smartLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
- this.smartLabel7.LineSpacing = 1F;
- this.smartLabel7.Location = new System.Drawing.Point(762, 108);
- this.smartLabel7.Name = "smartLabel7";
- this.smartLabel7.OverlapOptimize = true;
- this.smartLabel7.PasswordChar = '\0';
- this.smartLabel7.Radius = 3;
- this.smartLabel7.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.smartLabel7.Size = new System.Drawing.Size(80, 29);
- this.smartLabel7.TabIndex = 115;
- this.smartLabel7.Text = "Type";
- this.smartLabel7.TextColor = System.Drawing.Color.White;
- this.smartLabel7.TextColorDisable = System.Drawing.Color.Gray;
- this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel7.Wordwrap = false;
- //
- // smartLabel6
- //
- this.smartLabel6.BackGround = this.smartGroupBox1;
- this.smartLabel6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
- this.smartLabel6.BorderColor = System.Drawing.Color.Black;
- this.smartLabel6.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
- this.smartLabel6.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
- this.smartLabel6.LineSpacing = 1F;
- this.smartLabel6.Location = new System.Drawing.Point(713, 108);
- this.smartLabel6.Name = "smartLabel6";
- this.smartLabel6.OverlapOptimize = true;
- this.smartLabel6.PasswordChar = '\0';
- this.smartLabel6.Radius = 3;
- this.smartLabel6.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.smartLabel6.Size = new System.Drawing.Size(50, 29);
- this.smartLabel6.TabIndex = 114;
- this.smartLabel6.Text = "After";
- this.smartLabel6.TextColor = System.Drawing.Color.White;
- this.smartLabel6.TextColorDisable = System.Drawing.Color.Gray;
- this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel6.Wordwrap = false;
- //
- // smartLabel5
- //
- this.smartLabel5.BackGround = this.smartGroupBox1;
- this.smartLabel5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
- this.smartLabel5.BorderColor = System.Drawing.Color.Black;
- this.smartLabel5.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
- this.smartLabel5.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
- this.smartLabel5.LineSpacing = 1F;
- this.smartLabel5.Location = new System.Drawing.Point(664, 108);
- this.smartLabel5.Name = "smartLabel5";
- this.smartLabel5.OverlapOptimize = true;
- this.smartLabel5.PasswordChar = '\0';
- this.smartLabel5.Radius = 3;
- this.smartLabel5.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.smartLabel5.Size = new System.Drawing.Size(50, 29);
- this.smartLabel5.TabIndex = 113;
- this.smartLabel5.Text = "Before";
- this.smartLabel5.TextColor = System.Drawing.Color.White;
- this.smartLabel5.TextColorDisable = System.Drawing.Color.Gray;
- this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel5.Wordwrap = false;
- //
- // smartLabel1
- //
- this.smartLabel1.BackGround = this.smartGroupBox1;
- this.smartLabel1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
- this.smartLabel1.BorderColor = System.Drawing.Color.Black;
- this.smartLabel1.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
- this.smartLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
- this.smartLabel1.LineSpacing = 1F;
- this.smartLabel1.Location = new System.Drawing.Point(540, 108);
- this.smartLabel1.Name = "smartLabel1";
- this.smartLabel1.OverlapOptimize = true;
- this.smartLabel1.PasswordChar = '\0';
- this.smartLabel1.Radius = 3;
- this.smartLabel1.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.smartLabel1.Size = new System.Drawing.Size(125, 29);
- this.smartLabel1.TabIndex = 112;
- this.smartLabel1.Text = "Detail";
- this.smartLabel1.TextColor = System.Drawing.Color.White;
- this.smartLabel1.TextColorDisable = System.Drawing.Color.Gray;
- this.smartLabel1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel1.Wordwrap = false;
- //
- // smartLabel2
- //
- this.smartLabel2.BackGround = this.smartGroupBox1;
- this.smartLabel2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
- this.smartLabel2.BorderColor = System.Drawing.Color.Black;
- this.smartLabel2.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
- this.smartLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
- this.smartLabel2.LineSpacing = 1F;
- this.smartLabel2.Location = new System.Drawing.Point(429, 108);
- this.smartLabel2.Name = "smartLabel2";
- this.smartLabel2.OverlapOptimize = true;
- this.smartLabel2.PasswordChar = '\0';
- this.smartLabel2.Radius = 3;
- this.smartLabel2.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.smartLabel2.Size = new System.Drawing.Size(112, 29);
- this.smartLabel2.TabIndex = 111;
- this.smartLabel2.Text = "Event";
- this.smartLabel2.TextColor = System.Drawing.Color.White;
- this.smartLabel2.TextColorDisable = System.Drawing.Color.Gray;
- this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel2.Wordwrap = false;
- //
- // smartLabel8
- //
- this.smartLabel8.BackGround = this.smartGroupBox1;
- this.smartLabel8.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
- this.smartLabel8.BorderColor = System.Drawing.Color.Black;
- this.smartLabel8.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle;
- this.smartLabel8.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
- this.smartLabel8.LineSpacing = 1F;
- this.smartLabel8.Location = new System.Drawing.Point(340, 108);
- this.smartLabel8.Name = "smartLabel8";
- this.smartLabel8.OverlapOptimize = true;
- this.smartLabel8.PasswordChar = '\0';
- this.smartLabel8.Radius = 3;
- this.smartLabel8.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.smartLabel8.Size = new System.Drawing.Size(90, 29);
- this.smartLabel8.TabIndex = 110;
- this.smartLabel8.Text = "Login ID";
- this.smartLabel8.TextColor = System.Drawing.Color.White;
- this.smartLabel8.TextColorDisable = System.Drawing.Color.Gray;
- this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel8.Wordwrap = false;
- //
// smartLabel9
//
this.smartLabel9.BackGround = this.smartGroupBox1;
@@ -1075,7 +1075,7 @@
this.smartLabel9.PasswordChar = '\0';
this.smartLabel9.Radius = 3;
this.smartLabel9.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.smartLabel9.Size = new System.Drawing.Size(70, 29);
+ this.smartLabel9.Size = new System.Drawing.Size(68, 29);
this.smartLabel9.TabIndex = 109;
this.smartLabel9.Text = "Time";
this.smartLabel9.TextColor = System.Drawing.Color.White;
@@ -1297,7 +1297,7 @@
this.listBoxTime.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxTime.SeparationlineVisibleBottom = true;
this.listBoxTime.SeparationlineVisibleTop = true;
- this.listBoxTime.Size = new System.Drawing.Size(70, 502);
+ this.listBoxTime.Size = new System.Drawing.Size(68, 502);
this.listBoxTime.TabIndex = 82;
this.listBoxTime.Text = "smartListBox1";
this.listBoxTime.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
diff --git a/INT_PT002/Controls/Log/ControlMenuLogInspection.Designer.cs b/INT_PT002/Controls/Log/ControlMenuLogInspection.Designer.cs
index fffb38c..2cc9dc3 100644
--- a/INT_PT002/Controls/Log/ControlMenuLogInspection.Designer.cs
+++ b/INT_PT002/Controls/Log/ControlMenuLogInspection.Designer.cs
@@ -345,7 +345,7 @@
this.labelPassCount10.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount10.Size = new System.Drawing.Size(50, 20);
this.labelPassCount10.TabIndex = 127;
- this.labelPassCount10.Text = "00";
+ this.labelPassCount10.Text = "0";
this.labelPassCount10.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount10.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -368,7 +368,7 @@
this.labelLeakCount10.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount10.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount10.TabIndex = 126;
- this.labelLeakCount10.Text = "00";
+ this.labelLeakCount10.Text = "0";
this.labelLeakCount10.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount10.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -391,7 +391,7 @@
this.labelPassCount9.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount9.Size = new System.Drawing.Size(50, 20);
this.labelPassCount9.TabIndex = 125;
- this.labelPassCount9.Text = "00";
+ this.labelPassCount9.Text = "0";
this.labelPassCount9.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount9.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -414,7 +414,7 @@
this.labelLeakCount9.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount9.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount9.TabIndex = 124;
- this.labelLeakCount9.Text = "00";
+ this.labelLeakCount9.Text = "0";
this.labelLeakCount9.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount9.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -437,7 +437,7 @@
this.labelPassCount8.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount8.Size = new System.Drawing.Size(50, 20);
this.labelPassCount8.TabIndex = 123;
- this.labelPassCount8.Text = "00";
+ this.labelPassCount8.Text = "0";
this.labelPassCount8.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount8.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -460,7 +460,7 @@
this.labelLeakCount8.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount8.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount8.TabIndex = 122;
- this.labelLeakCount8.Text = "00";
+ this.labelLeakCount8.Text = "0";
this.labelLeakCount8.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount8.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -483,7 +483,7 @@
this.labelPassCount7.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount7.Size = new System.Drawing.Size(50, 20);
this.labelPassCount7.TabIndex = 121;
- this.labelPassCount7.Text = "00";
+ this.labelPassCount7.Text = "0";
this.labelPassCount7.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount7.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -506,7 +506,7 @@
this.labelLeakCount7.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount7.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount7.TabIndex = 120;
- this.labelLeakCount7.Text = "00";
+ this.labelLeakCount7.Text = "0";
this.labelLeakCount7.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount7.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -529,7 +529,7 @@
this.labelPassCount6.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount6.Size = new System.Drawing.Size(50, 20);
this.labelPassCount6.TabIndex = 119;
- this.labelPassCount6.Text = "00";
+ this.labelPassCount6.Text = "0";
this.labelPassCount6.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount6.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -552,7 +552,7 @@
this.labelLeakCount6.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount6.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount6.TabIndex = 118;
- this.labelLeakCount6.Text = "00";
+ this.labelLeakCount6.Text = "0";
this.labelLeakCount6.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount6.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -575,7 +575,7 @@
this.labelPassCount5.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount5.Size = new System.Drawing.Size(50, 20);
this.labelPassCount5.TabIndex = 117;
- this.labelPassCount5.Text = "00";
+ this.labelPassCount5.Text = "0";
this.labelPassCount5.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount5.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -598,7 +598,7 @@
this.labelLeakCount5.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount5.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount5.TabIndex = 116;
- this.labelLeakCount5.Text = "00";
+ this.labelLeakCount5.Text = "0";
this.labelLeakCount5.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount5.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -621,7 +621,7 @@
this.labelPassCount4.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount4.Size = new System.Drawing.Size(50, 20);
this.labelPassCount4.TabIndex = 115;
- this.labelPassCount4.Text = "00";
+ this.labelPassCount4.Text = "0";
this.labelPassCount4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount4.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -644,7 +644,7 @@
this.labelLeakCount4.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount4.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount4.TabIndex = 114;
- this.labelLeakCount4.Text = "00";
+ this.labelLeakCount4.Text = "0";
this.labelLeakCount4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount4.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -667,7 +667,7 @@
this.labelPassCount3.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount3.Size = new System.Drawing.Size(50, 20);
this.labelPassCount3.TabIndex = 113;
- this.labelPassCount3.Text = "00";
+ this.labelPassCount3.Text = "0";
this.labelPassCount3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount3.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -690,7 +690,7 @@
this.labelLeakCount3.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount3.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount3.TabIndex = 112;
- this.labelLeakCount3.Text = "00";
+ this.labelLeakCount3.Text = "0";
this.labelLeakCount3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount3.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -713,7 +713,7 @@
this.labelPassCount2.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount2.Size = new System.Drawing.Size(50, 20);
this.labelPassCount2.TabIndex = 111;
- this.labelPassCount2.Text = "00";
+ this.labelPassCount2.Text = "0";
this.labelPassCount2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount2.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -736,7 +736,7 @@
this.labelLeakCount2.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount2.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount2.TabIndex = 110;
- this.labelLeakCount2.Text = "00";
+ this.labelLeakCount2.Text = "0";
this.labelLeakCount2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount2.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -759,7 +759,7 @@
this.labelPassCount1.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelPassCount1.Size = new System.Drawing.Size(50, 20);
this.labelPassCount1.TabIndex = 109;
- this.labelPassCount1.Text = "00";
+ this.labelPassCount1.Text = "0";
this.labelPassCount1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelPassCount1.TextColorDisable = System.Drawing.Color.Gray;
this.labelPassCount1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -782,7 +782,7 @@
this.labelLeakCount1.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelLeakCount1.Size = new System.Drawing.Size(50, 20);
this.labelLeakCount1.TabIndex = 108;
- this.labelLeakCount1.Text = "00";
+ this.labelLeakCount1.Text = "0";
this.labelLeakCount1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelLeakCount1.TextColorDisable = System.Drawing.Color.Gray;
this.labelLeakCount1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
diff --git a/INT_PT002/Controls/Log/ControlMenuLogInspection.cs b/INT_PT002/Controls/Log/ControlMenuLogInspection.cs
index 1ffffed..81b9b84 100644
--- a/INT_PT002/Controls/Log/ControlMenuLogInspection.cs
+++ b/INT_PT002/Controls/Log/ControlMenuLogInspection.cs
@@ -309,6 +309,12 @@ namespace INT_PT002.Controls
this.labelRemainIndex.Text = "0";
this.labelTotalIndex.Text = "0";
+ this.ListBoxCount = 0;
+ for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++)
+ {
+ this.ListPassCount[i] = 0;
+ this.ListLeakCount[i] = 0;
+ }
if (int.Parse(this.labelCount.Text) == 0)
{
diff --git a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.resx b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.resx
index 204f000..1ab93f1 100644
--- a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.resx
+++ b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.resx
@@ -120,6 +120,9 @@
17, 17
+
+ 50
+
WEBPAD
diff --git a/INT_PT002/Controls/System/ControlMenuSystemInformation.Designer.cs b/INT_PT002/Controls/System/ControlMenuSystemInformation.Designer.cs
index 92fe71c..4520324 100644
--- a/INT_PT002/Controls/System/ControlMenuSystemInformation.Designer.cs
+++ b/INT_PT002/Controls/System/ControlMenuSystemInformation.Designer.cs
@@ -1246,6 +1246,7 @@
this.smartButton1.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255)))));
this.smartButton1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.smartButton1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.smartButton1.Visible = false;
this.smartButton1.Click += new System.EventHandler(this.smartButton1_Click);
//
// smartLabel3
diff --git a/INT_PT002/Controls/System/ControlMenuSystemStatus.Designer.cs b/INT_PT002/Controls/System/ControlMenuSystemStatus.Designer.cs
index 3adebf1..04d117a 100644
--- a/INT_PT002/Controls/System/ControlMenuSystemStatus.Designer.cs
+++ b/INT_PT002/Controls/System/ControlMenuSystemStatus.Designer.cs
@@ -3795,15 +3795,15 @@
this.labelProgress8.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress8.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.labelProgress8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress8.LineSpacing = 0F;
- this.labelProgress8.Location = new System.Drawing.Point(676, 37);
+ this.labelProgress8.Location = new System.Drawing.Point(711, 37);
this.labelProgress8.Name = "labelProgress8";
this.labelProgress8.OverlapOptimize = true;
this.labelProgress8.PasswordChar = '\0';
this.labelProgress8.Radius = 3;
this.labelProgress8.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.labelProgress8.Size = new System.Drawing.Size(90, 40);
+ this.labelProgress8.Size = new System.Drawing.Size(95, 40);
this.labelProgress8.TabIndex = 89;
this.labelProgress8.Text = "Release";
this.labelProgress8.TextColor = System.Drawing.Color.Black;
@@ -3818,15 +3818,15 @@
this.labelProgress7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress7.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.labelProgress7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress7.LineSpacing = 0F;
- this.labelProgress7.Location = new System.Drawing.Point(580, 37);
+ this.labelProgress7.Location = new System.Drawing.Point(610, 37);
this.labelProgress7.Name = "labelProgress7";
this.labelProgress7.OverlapOptimize = true;
this.labelProgress7.PasswordChar = '\0';
this.labelProgress7.Radius = 3;
this.labelProgress7.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.labelProgress7.Size = new System.Drawing.Size(90, 40);
+ this.labelProgress7.Size = new System.Drawing.Size(95, 40);
this.labelProgress7.TabIndex = 88;
this.labelProgress7.Text = "Separation";
this.labelProgress7.TextColor = System.Drawing.Color.Black;
@@ -3841,15 +3841,15 @@
this.labelProgress6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress6.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.labelProgress6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress6.LineSpacing = 0F;
- this.labelProgress6.Location = new System.Drawing.Point(484, 37);
+ this.labelProgress6.Location = new System.Drawing.Point(509, 37);
this.labelProgress6.Name = "labelProgress6";
this.labelProgress6.OverlapOptimize = true;
this.labelProgress6.PasswordChar = '\0';
this.labelProgress6.Radius = 3;
this.labelProgress6.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.labelProgress6.Size = new System.Drawing.Size(90, 40);
+ this.labelProgress6.Size = new System.Drawing.Size(95, 40);
this.labelProgress6.TabIndex = 87;
this.labelProgress6.Text = "V. Break";
this.labelProgress6.TextColor = System.Drawing.Color.Black;
@@ -3864,17 +3864,17 @@
this.labelProgress4.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress4.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.labelProgress4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress4.LineSpacing = 0F;
- this.labelProgress4.Location = new System.Drawing.Point(388, 37);
+ this.labelProgress4.Location = new System.Drawing.Point(408, 37);
this.labelProgress4.Name = "labelProgress4";
this.labelProgress4.OverlapOptimize = true;
this.labelProgress4.PasswordChar = '\0';
this.labelProgress4.Radius = 3;
this.labelProgress4.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.labelProgress4.Size = new System.Drawing.Size(90, 40);
+ this.labelProgress4.Size = new System.Drawing.Size(95, 40);
this.labelProgress4.TabIndex = 86;
- this.labelProgress4.Text = "Measuerment";
+ this.labelProgress4.Text = "Measurement";
this.labelProgress4.TextColor = System.Drawing.Color.Black;
this.labelProgress4.TextColorDisable = System.Drawing.Color.Gray;
this.labelProgress4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -3887,15 +3887,15 @@
this.labelProgress3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.labelProgress3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress3.LineSpacing = 0F;
- this.labelProgress3.Location = new System.Drawing.Point(292, 37);
+ this.labelProgress3.Location = new System.Drawing.Point(307, 37);
this.labelProgress3.Name = "labelProgress3";
this.labelProgress3.OverlapOptimize = true;
this.labelProgress3.PasswordChar = '\0';
this.labelProgress3.Radius = 3;
this.labelProgress3.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.labelProgress3.Size = new System.Drawing.Size(90, 40);
+ this.labelProgress3.Size = new System.Drawing.Size(95, 40);
this.labelProgress3.TabIndex = 85;
this.labelProgress3.Text = "V. Start";
this.labelProgress3.TextColor = System.Drawing.Color.Black;
@@ -3910,15 +3910,15 @@
this.labelProgress2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.labelProgress2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress2.LineSpacing = 0F;
- this.labelProgress2.Location = new System.Drawing.Point(196, 37);
+ this.labelProgress2.Location = new System.Drawing.Point(206, 37);
this.labelProgress2.Name = "labelProgress2";
this.labelProgress2.OverlapOptimize = true;
this.labelProgress2.PasswordChar = '\0';
this.labelProgress2.Radius = 3;
this.labelProgress2.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.labelProgress2.Size = new System.Drawing.Size(90, 40);
+ this.labelProgress2.Size = new System.Drawing.Size(95, 40);
this.labelProgress2.TabIndex = 84;
this.labelProgress2.Text = "Linkage";
this.labelProgress2.TextColor = System.Drawing.Color.Black;
@@ -3933,15 +3933,15 @@
this.labelProgress1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.labelProgress1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress1.LineSpacing = 0F;
- this.labelProgress1.Location = new System.Drawing.Point(100, 37);
+ this.labelProgress1.Location = new System.Drawing.Point(105, 37);
this.labelProgress1.Name = "labelProgress1";
this.labelProgress1.OverlapOptimize = true;
this.labelProgress1.PasswordChar = '\0';
this.labelProgress1.Radius = 3;
this.labelProgress1.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.labelProgress1.Size = new System.Drawing.Size(90, 40);
+ this.labelProgress1.Size = new System.Drawing.Size(95, 40);
this.labelProgress1.TabIndex = 83;
this.labelProgress1.Text = "Entry";
this.labelProgress1.TextColor = System.Drawing.Color.Black;
@@ -3956,7 +3956,7 @@
this.labelProgress0.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress0.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress0.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress0.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.labelProgress0.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress0.LineSpacing = 0F;
this.labelProgress0.Location = new System.Drawing.Point(4, 37);
this.labelProgress0.Name = "labelProgress0";
@@ -3964,7 +3964,7 @@
this.labelProgress0.PasswordChar = '\0';
this.labelProgress0.Radius = 3;
this.labelProgress0.RoundRectFillColor = System.Drawing.Color.LightBlue;
- this.labelProgress0.Size = new System.Drawing.Size(90, 40);
+ this.labelProgress0.Size = new System.Drawing.Size(95, 40);
this.labelProgress0.TabIndex = 82;
this.labelProgress0.Text = "Ready";
this.labelProgress0.TextColor = System.Drawing.Color.Black;
diff --git a/INT_PT002/DataStore/SystemConfiguration.cs b/INT_PT002/DataStore/SystemConfiguration.cs
index fa62043..7065414 100644
--- a/INT_PT002/DataStore/SystemConfiguration.cs
+++ b/INT_PT002/DataStore/SystemConfiguration.cs
@@ -161,7 +161,7 @@ namespace INT_PT002.DataStore
this.MAINBOARD_VERSION = "000";
this.RECIPE_NUMBER = 1;
- this.LANGUAGE = Define.E_LanguageID.Korean;
+ this.LANGUAGE = Define.E_LanguageID.English;
this.CHART1_DRAW_STEP = 4;
this.CHART2_DRAW_STEP = 2;
diff --git a/INT_PT002/Forms/FormMainDisplay2.Designer.cs b/INT_PT002/Forms/FormMainDisplay2.Designer.cs
index 9578bcf..389f97a 100644
--- a/INT_PT002/Forms/FormMainDisplay2.Designer.cs
+++ b/INT_PT002/Forms/FormMainDisplay2.Designer.cs
@@ -31,6 +31,8 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMainDisplay2));
this.smartForm1 = new SmartX.SmartForm();
this.labelResult9 = new SmartX.SmartLabel();
+ this.labelUserID = new SmartX.SmartLabel();
+ this.labelUserLevel = new SmartX.SmartLabel();
this.labelResult4 = new SmartX.SmartLabel();
this.labelResult10 = new SmartX.SmartLabel();
this.labelResult8 = new SmartX.SmartLabel();
@@ -57,8 +59,6 @@
this.buttonRecipeNo = new SmartX.SmartButton();
this.pictureBoxProgress0Selected = new System.Windows.Forms.PictureBox();
this.labelCommunicationStatus = new SmartX.SmartLabel();
- this.labelUserLevel = new SmartX.SmartLabel();
- this.labelUserID = new SmartX.SmartLabel();
this.smartLabel32 = new SmartX.SmartLabel();
this.smartLabel33 = new SmartX.SmartLabel();
this.smartLabel34 = new SmartX.SmartLabel();
@@ -298,6 +298,52 @@
this.labelResult9.Visible = false;
this.labelResult9.Wordwrap = false;
//
+ // labelUserID
+ //
+ this.labelUserID.BackGround = this.smartForm1;
+ 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.LineSpacing = 0F;
+ this.labelUserID.Location = new System.Drawing.Point(787, 93);
+ 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(100, 20);
+ this.labelUserID.TabIndex = 267;
+ this.labelUserID.Text = "ABCDEFG";
+ this.labelUserID.TextColor = System.Drawing.Color.White;
+ this.labelUserID.TextColorDisable = System.Drawing.Color.Gray;
+ this.labelUserID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelUserID.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelUserID.Wordwrap = false;
+ //
+ // labelUserLevel
+ //
+ this.labelUserLevel.BackGround = this.smartForm1;
+ 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.LineSpacing = 0F;
+ this.labelUserLevel.Location = new System.Drawing.Point(787, 119);
+ 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(100, 20);
+ this.labelUserLevel.TabIndex = 268;
+ this.labelUserLevel.Text = "ABCDEFG";
+ this.labelUserLevel.TextColor = System.Drawing.Color.White;
+ this.labelUserLevel.TextColorDisable = System.Drawing.Color.Gray;
+ this.labelUserLevel.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelUserLevel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelUserLevel.Wordwrap = false;
+ //
// labelResult4
//
this.labelResult4.BackGround = null;
@@ -735,6 +781,7 @@
this.smartButton5.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255)))));
this.smartButton5.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.smartButton5.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.smartButton5.Visible = false;
this.smartButton5.Click += new System.EventHandler(this.smartButton5_Click);
//
// pictureBoxProgress8Selected
@@ -857,52 +904,6 @@
this.labelCommunicationStatus.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
this.labelCommunicationStatus.Wordwrap = false;
//
- // labelUserLevel
- //
- this.labelUserLevel.BackGround = this.smartForm1;
- 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.LineSpacing = 0F;
- this.labelUserLevel.Location = new System.Drawing.Point(787, 119);
- 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(100, 20);
- this.labelUserLevel.TabIndex = 268;
- this.labelUserLevel.Text = "ABCDEFG";
- this.labelUserLevel.TextColor = System.Drawing.Color.White;
- this.labelUserLevel.TextColorDisable = System.Drawing.Color.Gray;
- this.labelUserLevel.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelUserLevel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelUserLevel.Wordwrap = false;
- //
- // labelUserID
- //
- this.labelUserID.BackGround = this.smartForm1;
- 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.LineSpacing = 0F;
- this.labelUserID.Location = new System.Drawing.Point(787, 93);
- 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(100, 20);
- this.labelUserID.TabIndex = 267;
- this.labelUserID.Text = "ABCDEFG";
- this.labelUserID.TextColor = System.Drawing.Color.White;
- this.labelUserID.TextColorDisable = System.Drawing.Color.Gray;
- this.labelUserID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelUserID.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelUserID.Wordwrap = false;
- //
// smartLabel32
//
this.smartLabel32.BackGround = this.smartForm1;
@@ -2013,6 +2014,7 @@
this.smartButton1.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255)))));
this.smartButton1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.smartButton1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.smartButton1.Visible = false;
this.smartButton1.Click += new System.EventHandler(this.smartButton4_Click);
//
// smartGroupBox1
@@ -2368,6 +2370,7 @@
this.buttonExit.TextDownColor = System.Drawing.Color.Chartreuse;
this.buttonExit.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonExit.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonExit.Visible = false;
this.buttonExit.Click += new System.EventHandler(this.buttonExit_Click);
//
// buttonInspection
diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs
index 121b811..3be7b7d 100644
--- a/INT_PT002/Forms/FormMainDisplay2.cs
+++ b/INT_PT002/Forms/FormMainDisplay2.cs
@@ -386,8 +386,8 @@ namespace INT_PT002.Forms
this.buttonMenu.Enabled = true;
break;
case Define.E_UserStatus.LogOff:
- id = "LogOff";
- group = "LogOff";
+ id = "Log Off";
+ group = "-";
if (this.labelUserLevel.TextColor != this.ParentForm.ColorLogOff)
this.labelUserLevel.TextColor = this.labelUserID.TextColor = this.ParentForm.ColorLogOff;