diff --git a/INT_LKD_2.suo b/INT_LKD_2.suo
index 247bdda..1c6ed8e 100644
Binary files a/INT_LKD_2.suo and b/INT_LKD_2.suo differ
diff --git a/INT_LKD_2/Controls/MainDisplay/ControlMainDisplay12.cs b/INT_LKD_2/Controls/MainDisplay/ControlMainDisplay12.cs
index f7a40d3..013f00c 100644
--- a/INT_LKD_2/Controls/MainDisplay/ControlMainDisplay12.cs
+++ b/INT_LKD_2/Controls/MainDisplay/ControlMainDisplay12.cs
@@ -172,7 +172,7 @@ namespace INT_LKD_2.Controls.MainDisplay
this.CollectionLabelTitleLRMax[i].Text = "LR.Max";
this.CollectionLabelTitleLevel[i].Text = "Level";
this.CollectionLabelTitleHeight[i].Text = "Height";
- this.CollectionLabelTitleMaxHeight[i].Text = "MaxHeight";
+ this.CollectionLabelTitleMaxHeight[i].Text = "Max.H";
this.CollectionLabelTitleDiff[i].Text = "Diff";
}
break;
diff --git a/INT_LKD_2/Controls/MainDisplay/ControlMainResult.cs b/INT_LKD_2/Controls/MainDisplay/ControlMainResult.cs
index cb62695..bd5f031 100644
--- a/INT_LKD_2/Controls/MainDisplay/ControlMainResult.cs
+++ b/INT_LKD_2/Controls/MainDisplay/ControlMainResult.cs
@@ -55,8 +55,12 @@ namespace INT_LKD_2.Controls.MainDisplay
switch (this.ParentForm.ParentForm.SystemConfig.LANGUAGE)
{
case Define.E_LanguageID.Chinese:
+ this.labelResultDiff.Text = "压差";
+ this.labelResultDisp.Text = "位移";
break;
default:
+ this.labelResultDiff.Text = "Diff";
+ this.labelResultDisp.Text = "Disp";
break;
}
}
diff --git a/INT_LKD_2/Controls/System/ControlMenuSystemSetting.cs b/INT_LKD_2/Controls/System/ControlMenuSystemSetting.cs
index 46ca0ce..a8b580c 100644
--- a/INT_LKD_2/Controls/System/ControlMenuSystemSetting.cs
+++ b/INT_LKD_2/Controls/System/ControlMenuSystemSetting.cs
@@ -447,6 +447,10 @@ namespace INT_LKD_2.Controls
if (this.ParentForm.ParentForm.ChildFormMainDisplay != null)
this.ParentForm.ParentForm.ChildFormMainDisplay.InitializeDesign();
+ if (this.ParentForm.ParentForm.ChildFormMainDisplay.ChildMainDisplay10 != null)
+ this.ParentForm.ParentForm.ChildFormMainDisplay.ChildMainDisplay10.InitializeDesign();
+ if (this.ParentForm.ParentForm.ChildFormMainDisplay.ChildModbus != null)
+ this.ParentForm.ParentForm.ChildFormMainDisplay.ChildModbus.InitializeDesign();
if (this.ParentForm != null)
this.ParentForm.InitializeDesign();
diff --git a/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.Designer.cs b/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.Designer.cs
index 8b712a5..b91963d 100644
--- a/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.Designer.cs
+++ b/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.Designer.cs
@@ -34,7 +34,7 @@
this.labelTitleContents = new SmartX.SmartLabel();
this.labelNumberOfLoginFailures = new SmartX.SmartLabel();
this.labelTitleNumberOfLoginFailures = new SmartX.SmartLabel();
- this.smartLabel6 = new SmartX.SmartLabel();
+ this.labelTitleAutoInfo = new SmartX.SmartLabel();
this.labelAutomaticLogoutTime = new SmartX.SmartLabel();
this.labelTitleAutomaticLogoutTime = new SmartX.SmartLabel();
this.smartKeyboard = new SmartX.SmartKeyboard();
@@ -68,8 +68,8 @@
this.checkBoxMainProductChange = new SmartX.SmartCheckBox();
this.labelExpiryDateOfPassword2 = new SmartX.SmartLabel();
this.labelExpiryDateOfAccount2 = new SmartX.SmartLabel();
- this.smartLabel8 = new SmartX.SmartLabel();
- this.smartLabel7 = new SmartX.SmartLabel();
+ this.labelTitlePassInfo = new SmartX.SmartLabel();
+ this.labelTitleAccountInfo = new SmartX.SmartLabel();
this.labelExpiryDateOfPassword = new SmartX.SmartLabel();
this.labelExpiryDateOfAccount = new SmartX.SmartLabel();
this.labelTitleExpiryDateOfPassword = new SmartX.SmartLabel();
@@ -92,7 +92,7 @@
this.smartGroupBox1.Controls.Add(this.labelTitleContents);
this.smartGroupBox1.Controls.Add(this.labelNumberOfLoginFailures);
this.smartGroupBox1.Controls.Add(this.labelTitleNumberOfLoginFailures);
- this.smartGroupBox1.Controls.Add(this.smartLabel6);
+ this.smartGroupBox1.Controls.Add(this.labelTitleAutoInfo);
this.smartGroupBox1.Controls.Add(this.labelAutomaticLogoutTime);
this.smartGroupBox1.Controls.Add(this.labelTitleAutomaticLogoutTime);
this.smartGroupBox1.Controls.Add(this.smartKeyboard);
@@ -111,8 +111,8 @@
this.smartGroupBox1.Controls.Add(this.groupBoxAccessRight);
this.smartGroupBox1.Controls.Add(this.labelExpiryDateOfPassword2);
this.smartGroupBox1.Controls.Add(this.labelExpiryDateOfAccount2);
- this.smartGroupBox1.Controls.Add(this.smartLabel8);
- this.smartGroupBox1.Controls.Add(this.smartLabel7);
+ this.smartGroupBox1.Controls.Add(this.labelTitlePassInfo);
+ this.smartGroupBox1.Controls.Add(this.labelTitleAccountInfo);
this.smartGroupBox1.Controls.Add(this.labelExpiryDateOfPassword);
this.smartGroupBox1.Controls.Add(this.labelExpiryDateOfAccount);
this.smartGroupBox1.Controls.Add(this.labelTitleExpiryDateOfPassword);
@@ -122,7 +122,7 @@
this.smartGroupBox1.Controls.Add(this.buttonDelete);
this.smartGroupBox1.Controls.Add(this.buttonSave);
this.smartGroupBox1.Controls.Add(this.buttonRegister);
- this.smartGroupBox1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.smartGroupBox1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.smartGroupBox1.FrameLineThickness = 2;
@@ -155,7 +155,7 @@
this.labelTitleContents.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.labelTitleContents.BorderColor = System.Drawing.Color.White;
this.labelTitleContents.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleContents.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Bold);
+ this.labelTitleContents.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Bold);
this.labelTitleContents.ForeColor = System.Drawing.Color.White;
this.labelTitleContents.LineSpacing = 0F;
this.labelTitleContents.Location = new System.Drawing.Point(317, 529);
@@ -203,7 +203,7 @@
this.labelTitleNumberOfLoginFailures.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.labelTitleNumberOfLoginFailures.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelTitleNumberOfLoginFailures.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleNumberOfLoginFailures.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.labelTitleNumberOfLoginFailures.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.labelTitleNumberOfLoginFailures.LineSpacing = 0F;
this.labelTitleNumberOfLoginFailures.Location = new System.Drawing.Point(318, 601);
this.labelTitleNumberOfLoginFailures.Name = "labelTitleNumberOfLoginFailures";
@@ -220,28 +220,28 @@
this.labelTitleNumberOfLoginFailures.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleNumberOfLoginFailures.Wordwrap = false;
//
- // smartLabel6
+ // labelTitleAutoInfo
//
- this.smartLabel6.BackGround = null;
- this.smartLabel6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
- this.smartLabel6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
- this.smartLabel6.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.smartLabel6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
- this.smartLabel6.LineSpacing = 0F;
- this.smartLabel6.Location = new System.Drawing.Point(556, 561);
- 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(90, 34);
- this.smartLabel6.TabIndex = 91;
- this.smartLabel6.Text = "min(Max:90)";
- this.smartLabel6.TextColor = System.Drawing.Color.White;
- this.smartLabel6.TextColorDisable = System.Drawing.Color.Gray;
- this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
- this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel6.Wordwrap = false;
+ this.labelTitleAutoInfo.BackGround = null;
+ this.labelTitleAutoInfo.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
+ this.labelTitleAutoInfo.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+ this.labelTitleAutoInfo.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+ this.labelTitleAutoInfo.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Bold);
+ this.labelTitleAutoInfo.LineSpacing = 0F;
+ this.labelTitleAutoInfo.Location = new System.Drawing.Point(556, 561);
+ this.labelTitleAutoInfo.Name = "labelTitleAutoInfo";
+ this.labelTitleAutoInfo.OverlapOptimize = true;
+ this.labelTitleAutoInfo.PasswordChar = '\0';
+ this.labelTitleAutoInfo.Radius = 3;
+ this.labelTitleAutoInfo.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.labelTitleAutoInfo.Size = new System.Drawing.Size(90, 34);
+ this.labelTitleAutoInfo.TabIndex = 91;
+ this.labelTitleAutoInfo.Text = "min(Max:90)";
+ this.labelTitleAutoInfo.TextColor = System.Drawing.Color.White;
+ this.labelTitleAutoInfo.TextColorDisable = System.Drawing.Color.Gray;
+ this.labelTitleAutoInfo.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+ this.labelTitleAutoInfo.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitleAutoInfo.Wordwrap = false;
//
// labelAutomaticLogoutTime
//
@@ -273,7 +273,7 @@
this.labelTitleAutomaticLogoutTime.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.labelTitleAutomaticLogoutTime.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelTitleAutomaticLogoutTime.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleAutomaticLogoutTime.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.labelTitleAutomaticLogoutTime.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.labelTitleAutomaticLogoutTime.LineSpacing = 0F;
this.labelTitleAutomaticLogoutTime.Location = new System.Drawing.Point(318, 561);
this.labelTitleAutomaticLogoutTime.Name = "labelTitleAutomaticLogoutTime";
@@ -344,7 +344,7 @@
this.buttonPasswordReset.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonPasswordReset.ButtonText = "Reset";
this.buttonPasswordReset.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonPasswordReset.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonPasswordReset.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.buttonPasswordReset.GroupID = 0;
this.buttonPasswordReset.ImageDisable = null;
this.buttonPasswordReset.ImageDown = null;
@@ -380,7 +380,7 @@
this.buttonIDEdit.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonIDEdit.ButtonText = "Edit";
this.buttonIDEdit.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonIDEdit.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonIDEdit.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.buttonIDEdit.GroupID = 0;
this.buttonIDEdit.ImageDisable = null;
this.buttonIDEdit.ImageDown = null;
@@ -488,6 +488,7 @@
this.listBoxUserList.ItemOffsetGap = 10;
this.listBoxUserList.ItemOffsetX = 1;
this.listBoxUserList.ItemOffsetY = 0;
+ this.listBoxUserList.ItemTextOffsetX = 0;
this.listBoxUserList.ItemTextOffsetY = 1;
this.listBoxUserList.Location = new System.Drawing.Point(11, 45);
this.listBoxUserList.MouseMoveEventSpace = 3;
@@ -597,7 +598,7 @@
this.buttonLevel3.ButtonStyle = SmartX.SmartButton.ButtonStyles.Flat;
this.buttonLevel3.ButtonText = "Level 3";
this.buttonLevel3.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonLevel3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonLevel3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.buttonLevel3.GroupID = 0;
this.buttonLevel3.ImageDisable = null;
this.buttonLevel3.ImageDown = null;
@@ -633,7 +634,7 @@
this.buttonLevel2.ButtonStyle = SmartX.SmartButton.ButtonStyles.Flat;
this.buttonLevel2.ButtonText = "Level 2";
this.buttonLevel2.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonLevel2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonLevel2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.buttonLevel2.GroupID = 0;
this.buttonLevel2.ImageDisable = null;
this.buttonLevel2.ImageDown = null;
@@ -669,7 +670,7 @@
this.buttonLevel1.ButtonStyle = SmartX.SmartButton.ButtonStyles.Flat;
this.buttonLevel1.ButtonText = "Level 1";
this.buttonLevel1.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonLevel1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonLevel1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.buttonLevel1.GroupID = 0;
this.buttonLevel1.ImageDisable = null;
this.buttonLevel1.ImageDown = null;
@@ -724,7 +725,7 @@
this.labelTitleAccessRight.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.labelTitleAccessRight.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelTitleAccessRight.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleAccessRight.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.labelTitleAccessRight.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.labelTitleAccessRight.LineSpacing = 0F;
this.labelTitleAccessRight.Location = new System.Drawing.Point(317, 206);
this.labelTitleAccessRight.Name = "labelTitleAccessRight";
@@ -784,7 +785,7 @@
this.checkBoxMenuEthernet.Checked = false;
this.checkBoxMenuEthernet.CheckLineWidth = 3;
this.checkBoxMenuEthernet.Enabled = false;
- this.checkBoxMenuEthernet.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuEthernet.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuEthernet.ImageCheckBox = null;
this.checkBoxMenuEthernet.ImageUnCheckBox = null;
this.checkBoxMenuEthernet.Location = new System.Drawing.Point(339, 80);
@@ -808,7 +809,7 @@
this.checkBoxMenuUserGroupEditor.Checked = false;
this.checkBoxMenuUserGroupEditor.CheckLineWidth = 3;
this.checkBoxMenuUserGroupEditor.Enabled = false;
- this.checkBoxMenuUserGroupEditor.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuUserGroupEditor.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuUserGroupEditor.ImageCheckBox = null;
this.checkBoxMenuUserGroupEditor.ImageUnCheckBox = null;
this.checkBoxMenuUserGroupEditor.Location = new System.Drawing.Point(339, 167);
@@ -833,7 +834,7 @@
this.checkBoxMenuInformation.Checked = false;
this.checkBoxMenuInformation.CheckLineWidth = 3;
this.checkBoxMenuInformation.Enabled = false;
- this.checkBoxMenuInformation.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuInformation.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuInformation.ImageCheckBox = null;
this.checkBoxMenuInformation.ImageUnCheckBox = null;
this.checkBoxMenuInformation.Location = new System.Drawing.Point(339, 51);
@@ -857,7 +858,7 @@
this.checkBoxMenuAlarmLog.Checked = false;
this.checkBoxMenuAlarmLog.CheckLineWidth = 3;
this.checkBoxMenuAlarmLog.Enabled = false;
- this.checkBoxMenuAlarmLog.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuAlarmLog.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuAlarmLog.ImageCheckBox = null;
this.checkBoxMenuAlarmLog.ImageUnCheckBox = null;
this.checkBoxMenuAlarmLog.Location = new System.Drawing.Point(177, 196);
@@ -881,7 +882,7 @@
this.checkBoxMenuEquipment.Checked = false;
this.checkBoxMenuEquipment.CheckLineWidth = 3;
this.checkBoxMenuEquipment.Enabled = false;
- this.checkBoxMenuEquipment.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuEquipment.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuEquipment.ImageCheckBox = null;
this.checkBoxMenuEquipment.ImageUnCheckBox = null;
this.checkBoxMenuEquipment.Location = new System.Drawing.Point(339, 196);
@@ -906,7 +907,7 @@
this.checkBoxMenuInspectionLog.Checked = false;
this.checkBoxMenuInspectionLog.CheckLineWidth = 3;
this.checkBoxMenuInspectionLog.Enabled = false;
- this.checkBoxMenuInspectionLog.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuInspectionLog.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuInspectionLog.ImageCheckBox = null;
this.checkBoxMenuInspectionLog.ImageUnCheckBox = null;
this.checkBoxMenuInspectionLog.Location = new System.Drawing.Point(177, 167);
@@ -930,7 +931,7 @@
this.checkBoxMenuHistoryLog.Checked = false;
this.checkBoxMenuHistoryLog.CheckLineWidth = 3;
this.checkBoxMenuHistoryLog.Enabled = false;
- this.checkBoxMenuHistoryLog.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuHistoryLog.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuHistoryLog.ImageCheckBox = null;
this.checkBoxMenuHistoryLog.ImageUnCheckBox = null;
this.checkBoxMenuHistoryLog.Location = new System.Drawing.Point(177, 138);
@@ -954,7 +955,7 @@
this.checkBoxMenuIOTest.Checked = false;
this.checkBoxMenuIOTest.CheckLineWidth = 3;
this.checkBoxMenuIOTest.Enabled = false;
- this.checkBoxMenuIOTest.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuIOTest.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuIOTest.ImageCheckBox = null;
this.checkBoxMenuIOTest.ImageUnCheckBox = null;
this.checkBoxMenuIOTest.Location = new System.Drawing.Point(177, 109);
@@ -973,7 +974,7 @@
this.labelTitleMenu.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.labelTitleMenu.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelTitleMenu.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleMenu.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.labelTitleMenu.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.labelTitleMenu.LineSpacing = 0F;
this.labelTitleMenu.Location = new System.Drawing.Point(175, 22);
this.labelTitleMenu.Name = "labelTitleMenu";
@@ -996,7 +997,7 @@
this.labelTitleMain.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.labelTitleMain.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelTitleMain.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleMain.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.labelTitleMain.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.labelTitleMain.LineSpacing = 0F;
this.labelTitleMain.Location = new System.Drawing.Point(19, 22);
this.labelTitleMain.Name = "labelTitleMain";
@@ -1024,7 +1025,7 @@
this.checkBoxMenuUserSetting.Checked = false;
this.checkBoxMenuUserSetting.CheckLineWidth = 3;
this.checkBoxMenuUserSetting.Enabled = false;
- this.checkBoxMenuUserSetting.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuUserSetting.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuUserSetting.ImageCheckBox = null;
this.checkBoxMenuUserSetting.ImageUnCheckBox = null;
this.checkBoxMenuUserSetting.Location = new System.Drawing.Point(177, 80);
@@ -1048,7 +1049,7 @@
this.checkBoxMenuRecipe.Checked = false;
this.checkBoxMenuRecipe.CheckLineWidth = 3;
this.checkBoxMenuRecipe.Enabled = false;
- this.checkBoxMenuRecipe.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMenuRecipe.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMenuRecipe.ImageCheckBox = null;
this.checkBoxMenuRecipe.ImageUnCheckBox = null;
this.checkBoxMenuRecipe.Location = new System.Drawing.Point(177, 51);
@@ -1072,7 +1073,7 @@
this.checkBoxMainSubMenu.Checked = false;
this.checkBoxMainSubMenu.CheckLineWidth = 3;
this.checkBoxMainSubMenu.Enabled = false;
- this.checkBoxMainSubMenu.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMainSubMenu.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMainSubMenu.ImageCheckBox = null;
this.checkBoxMainSubMenu.ImageUnCheckBox = null;
this.checkBoxMainSubMenu.Location = new System.Drawing.Point(19, 109);
@@ -1097,7 +1098,7 @@
this.checkBoxMainClear.Checked = false;
this.checkBoxMainClear.CheckLineWidth = 3;
this.checkBoxMainClear.Enabled = false;
- this.checkBoxMainClear.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMainClear.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMainClear.ImageCheckBox = null;
this.checkBoxMainClear.ImageUnCheckBox = null;
this.checkBoxMainClear.Location = new System.Drawing.Point(19, 80);
@@ -1121,7 +1122,7 @@
this.checkBoxMainProductChange.Checked = false;
this.checkBoxMainProductChange.CheckLineWidth = 3;
this.checkBoxMainProductChange.Enabled = false;
- this.checkBoxMainProductChange.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.checkBoxMainProductChange.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.checkBoxMainProductChange.ImageCheckBox = null;
this.checkBoxMainProductChange.ImageUnCheckBox = null;
this.checkBoxMainProductChange.Location = new System.Drawing.Point(19, 51);
@@ -1182,51 +1183,51 @@
this.labelExpiryDateOfAccount2.Wordwrap = false;
this.labelExpiryDateOfAccount2.Click += new System.EventHandler(this.labelExpiryDateOfAccount2_Click);
//
- // smartLabel8
+ // labelTitlePassInfo
//
- this.smartLabel8.BackGround = null;
- this.smartLabel8.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
- this.smartLabel8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
- this.smartLabel8.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.smartLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
- this.smartLabel8.LineSpacing = 0F;
- this.smartLabel8.Location = new System.Drawing.Point(556, 166);
- 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, 34);
- this.smartLabel8.TabIndex = 93;
- this.smartLabel8.Text = "day(Max:90)";
- this.smartLabel8.TextColor = System.Drawing.Color.White;
- this.smartLabel8.TextColorDisable = System.Drawing.Color.Gray;
- this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
- this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel8.Wordwrap = false;
+ this.labelTitlePassInfo.BackGround = null;
+ this.labelTitlePassInfo.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
+ this.labelTitlePassInfo.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+ this.labelTitlePassInfo.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+ this.labelTitlePassInfo.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Bold);
+ this.labelTitlePassInfo.LineSpacing = 0F;
+ this.labelTitlePassInfo.Location = new System.Drawing.Point(556, 166);
+ this.labelTitlePassInfo.Name = "labelTitlePassInfo";
+ this.labelTitlePassInfo.OverlapOptimize = true;
+ this.labelTitlePassInfo.PasswordChar = '\0';
+ this.labelTitlePassInfo.Radius = 3;
+ this.labelTitlePassInfo.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.labelTitlePassInfo.Size = new System.Drawing.Size(90, 34);
+ this.labelTitlePassInfo.TabIndex = 93;
+ this.labelTitlePassInfo.Text = "day(Max:90)";
+ this.labelTitlePassInfo.TextColor = System.Drawing.Color.White;
+ this.labelTitlePassInfo.TextColorDisable = System.Drawing.Color.Gray;
+ this.labelTitlePassInfo.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+ this.labelTitlePassInfo.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitlePassInfo.Wordwrap = false;
//
- // smartLabel7
+ // labelTitleAccountInfo
//
- this.smartLabel7.BackGround = null;
- this.smartLabel7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
- this.smartLabel7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
- this.smartLabel7.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.smartLabel7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
- this.smartLabel7.LineSpacing = 0F;
- this.smartLabel7.Location = new System.Drawing.Point(556, 126);
- 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(90, 34);
- this.smartLabel7.TabIndex = 92;
- this.smartLabel7.Text = "day(Max:180)";
- this.smartLabel7.TextColor = System.Drawing.Color.White;
- this.smartLabel7.TextColorDisable = System.Drawing.Color.Gray;
- this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
- this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel7.Wordwrap = false;
+ this.labelTitleAccountInfo.BackGround = null;
+ this.labelTitleAccountInfo.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
+ this.labelTitleAccountInfo.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+ this.labelTitleAccountInfo.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+ this.labelTitleAccountInfo.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Bold);
+ this.labelTitleAccountInfo.LineSpacing = 0F;
+ this.labelTitleAccountInfo.Location = new System.Drawing.Point(556, 126);
+ this.labelTitleAccountInfo.Name = "labelTitleAccountInfo";
+ this.labelTitleAccountInfo.OverlapOptimize = true;
+ this.labelTitleAccountInfo.PasswordChar = '\0';
+ this.labelTitleAccountInfo.Radius = 3;
+ this.labelTitleAccountInfo.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.labelTitleAccountInfo.Size = new System.Drawing.Size(90, 34);
+ this.labelTitleAccountInfo.TabIndex = 92;
+ this.labelTitleAccountInfo.Text = "day(Max:180)";
+ this.labelTitleAccountInfo.TextColor = System.Drawing.Color.White;
+ this.labelTitleAccountInfo.TextColorDisable = System.Drawing.Color.Gray;
+ this.labelTitleAccountInfo.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+ this.labelTitleAccountInfo.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitleAccountInfo.Wordwrap = false;
//
// labelExpiryDateOfPassword
//
@@ -1282,7 +1283,7 @@
this.labelTitleExpiryDateOfPassword.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.labelTitleExpiryDateOfPassword.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelTitleExpiryDateOfPassword.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleExpiryDateOfPassword.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.labelTitleExpiryDateOfPassword.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.labelTitleExpiryDateOfPassword.LineSpacing = 0F;
this.labelTitleExpiryDateOfPassword.Location = new System.Drawing.Point(318, 166);
this.labelTitleExpiryDateOfPassword.Name = "labelTitleExpiryDateOfPassword";
@@ -1305,7 +1306,7 @@
this.labelTitleExpiryDateOfAccount.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.labelTitleExpiryDateOfAccount.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelTitleExpiryDateOfAccount.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleExpiryDateOfAccount.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular);
+ this.labelTitleExpiryDateOfAccount.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.labelTitleExpiryDateOfAccount.LineSpacing = 0F;
this.labelTitleExpiryDateOfAccount.Location = new System.Drawing.Point(318, 126);
this.labelTitleExpiryDateOfAccount.Name = "labelTitleExpiryDateOfAccount";
@@ -1328,7 +1329,7 @@
this.labelTitlePassword.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.labelTitlePassword.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelTitlePassword.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitlePassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.labelTitlePassword.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.labelTitlePassword.LineSpacing = 0F;
this.labelTitlePassword.Location = new System.Drawing.Point(318, 86);
this.labelTitlePassword.Name = "labelTitlePassword";
@@ -1351,7 +1352,7 @@
this.labelTitleID.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.labelTitleID.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelTitleID.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleID.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.labelTitleID.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.labelTitleID.LineSpacing = 0F;
this.labelTitleID.Location = new System.Drawing.Point(317, 45);
this.labelTitleID.Name = "labelTitleID";
@@ -1378,7 +1379,7 @@
this.buttonDelete.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonDelete.ButtonText = "Delete";
this.buttonDelete.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonDelete.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.buttonDelete.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Regular);
this.buttonDelete.GroupID = 0;
this.buttonDelete.ImageDisable = null;
this.buttonDelete.ImageDown = null;
@@ -1414,7 +1415,7 @@
this.buttonSave.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonSave.ButtonText = "Save";
this.buttonSave.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonSave.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.buttonSave.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Regular);
this.buttonSave.GroupID = 0;
this.buttonSave.ImageDisable = null;
this.buttonSave.ImageDown = null;
@@ -1451,7 +1452,7 @@
this.buttonRegister.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonRegister.ButtonText = "New";
this.buttonRegister.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonRegister.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.buttonRegister.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Regular);
this.buttonRegister.GroupID = 0;
this.buttonRegister.ImageDisable = null;
this.buttonRegister.ImageDown = null;
@@ -1502,9 +1503,9 @@
private SmartX.SmartLabel labelTitlePassword;
private SmartX.SmartLabel labelTitleID;
private SmartX.SmartLabel labelTitleAutomaticLogoutTime;
- private SmartX.SmartLabel smartLabel8;
- private SmartX.SmartLabel smartLabel7;
- private SmartX.SmartLabel smartLabel6;
+ private SmartX.SmartLabel labelTitlePassInfo;
+ private SmartX.SmartLabel labelTitleAccountInfo;
+ private SmartX.SmartLabel labelTitleAutoInfo;
private SmartX.SmartLabel labelAutomaticLogoutTime;
private SmartX.SmartLabel labelExpiryDateOfPassword;
private SmartX.SmartLabel labelExpiryDateOfAccount;
diff --git a/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.cs b/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.cs
index 816ce8b..d271d31 100644
--- a/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.cs
+++ b/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.cs
@@ -91,6 +91,14 @@ namespace INT_LKD_2.Controls
this.buttonDelete.ButtonText = "消除";
this.buttonSave.ButtonText = "节省";
+ this.buttonLevel1.ButtonText = "级别 1";
+ this.buttonLevel2.ButtonText = "级别 2";
+ this.buttonLevel3.ButtonText = "级别 3";
+
+ this.labelTitleAccountInfo.Text = "天(最大:180)";
+ this.labelTitlePassInfo.Text = "天(最大:90)";
+ this.labelTitleAutoInfo.Text = "分钟(最大:90)";
+
this.checkBoxMainProductChange.Text = "产品变化";
this.checkBoxMainClear.Text = "消除";
this.checkBoxMainSubMenu.Text = "子菜单";
@@ -128,6 +136,14 @@ namespace INT_LKD_2.Controls
this.buttonDelete.ButtonText = "Delete";
this.buttonSave.ButtonText = "Save";
+ this.buttonLevel1.ButtonText = "Level 1";
+ this.buttonLevel2.ButtonText = "Level 2";
+ this.buttonLevel3.ButtonText = "Level 3";
+
+ this.labelTitleAccountInfo.Text = "day(Max:180)";
+ this.labelTitlePassInfo.Text = "day(Max:90)";
+ this.labelTitleAutoInfo.Text = "min(Max:90)";
+
this.checkBoxMainProductChange.Text = "Product change";
this.checkBoxMainClear.Text = "Clear data";
this.checkBoxMainSubMenu.Text = "Submenu";
@@ -163,6 +179,14 @@ namespace INT_LKD_2.Controls
this.buttonDelete.ButtonText = "삭제";
this.buttonSave.ButtonText = "저장";
+ this.buttonLevel1.ButtonText = "Level 1";
+ this.buttonLevel2.ButtonText = "Level 2";
+ this.buttonLevel3.ButtonText = "Level 3";
+
+ this.labelTitleAccountInfo.Text = "day(Max:180)";
+ this.labelTitlePassInfo.Text = "day(Max:90)";
+ this.labelTitleAutoInfo.Text = "min(Max:90)";
+
this.checkBoxMainProductChange.Text = "Product change";
this.checkBoxMainClear.Text = "Clear data";
this.checkBoxMainSubMenu.Text = "Submenu";
@@ -195,6 +219,14 @@ namespace INT_LKD_2.Controls
this.buttonDelete.ButtonText = "Delete";
this.buttonSave.ButtonText = "Save";
+ this.buttonLevel1.ButtonText = "Level 1";
+ this.buttonLevel2.ButtonText = "Level 2";
+ this.buttonLevel3.ButtonText = "Level 3";
+
+ this.labelTitleAccountInfo.Text = "day(Max:180)";
+ this.labelTitlePassInfo.Text = "day(Max:90)";
+ this.labelTitleAutoInfo.Text = "min(Max:90)";
+
this.checkBoxMainProductChange.Text = "Product change";
this.checkBoxMainClear.Text = "Clear data";
this.checkBoxMainSubMenu.Text = "Submenu";
diff --git a/INT_LKD_2/Forms/FormMain.cs b/INT_LKD_2/Forms/FormMain.cs
index 5d5717f..9b932cc 100644
--- a/INT_LKD_2/Forms/FormMain.cs
+++ b/INT_LKD_2/Forms/FormMain.cs
@@ -2543,13 +2543,9 @@ namespace INT_LKD_2.Forms
this.CurrentAlarmList.SetAlarm(receiveData.Substring(0, 8));
#endregion
- if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
- {
- this.ChildFormMainDisplay.UpdateDisplayAlarmView(this.CurrentAlarmList);
- this.ChildFormMenu.UpdateDisplayIOTestAlarmView(this.CurrentAlarmList);
- this.ChildFormMenu.UpdateDisplayAlarmView(this.CurrentAlarmList);
- }
-
+ this.ChildFormMainDisplay.UpdateDisplayAlarmView(this.CurrentAlarmList);
+ this.ChildFormMenu.UpdateDisplayIOTestAlarmView(this.CurrentAlarmList);
+ this.ChildFormMenu.UpdateDisplayAlarmView(this.CurrentAlarmList);
break;
default:
break;
@@ -4049,13 +4045,9 @@ namespace INT_LKD_2.Forms
this.CurrentAlarmList.SetAlarm(receiveData.Substring(0, 8));
#endregion
- if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
- {
- this.ChildFormMainDisplay.UpdateDisplayAlarmView(this.CurrentAlarmList);
- this.ChildFormMenu.UpdateDisplayIOTestAlarmView(this.CurrentAlarmList);
- this.ChildFormMenu.UpdateDisplayAlarmView(this.CurrentAlarmList);
- }
-
+ this.ChildFormMainDisplay.UpdateDisplayAlarmView(this.CurrentAlarmList);
+ this.ChildFormMenu.UpdateDisplayIOTestAlarmView(this.CurrentAlarmList);
+ this.ChildFormMenu.UpdateDisplayAlarmView(this.CurrentAlarmList);
break;
default:
break;
diff --git a/INT_LKD_2/Forms/FormMainDisplay.Designer.cs b/INT_LKD_2/Forms/FormMainDisplay.Designer.cs
index 3833072..c4bf68a 100644
--- a/INT_LKD_2/Forms/FormMainDisplay.Designer.cs
+++ b/INT_LKD_2/Forms/FormMainDisplay.Designer.cs
@@ -162,6 +162,7 @@
this.smartTimerProgressBar = new SmartX.SmartTimer();
this.timerServer = new SmartX.SmartTimer();
this.smartTimerTest = new SmartX.SmartTimer();
+ this.labelTitleLeakDetetor = new SmartX.SmartLabel();
this.smartForm1.SuspendLayout();
this.smartGroupBox1.SuspendLayout();
this.SuspendLayout();
@@ -172,6 +173,7 @@
this.smartForm1.BackGroundFillStyle = SmartXUIBase.SmartUIControlFormBase.BackGroundFillStyles.UseBackImage;
this.smartForm1.BackImage = ((System.Drawing.Image)(resources.GetObject("smartForm1.BackImage")));
this.smartForm1.CenterLocation = false;
+ this.smartForm1.Controls.Add(this.labelTitleLeakDetetor);
this.smartForm1.Controls.Add(this.labelTitleTime);
this.smartForm1.Controls.Add(this.labelTitleProcess);
this.smartForm1.Controls.Add(this.labelTitleStatusResult);
@@ -305,7 +307,10 @@
this.smartForm1.Mode = SmartXUIBase.SmartUIControlFormBase.RUNMODE.RUNTIME;
this.smartForm1.MouseCursor = SmartX.SmartForm.OnOff.OFF;
this.smartForm1.Name = "smartForm1";
+ this.smartForm1.PasswordDialog.AdminPassword = "123";
+ this.smartForm1.PasswordDialog.Title = "관리자 비밀번호를 입력하세요";
this.smartForm1.Size = new System.Drawing.Size(1024, 768);
+ this.smartForm1.SpecialFunctionClickMode = SmartXUIBase.SmartUIControlFormBase.SpecialFunctionClickModeType.SpecialFunctionClickEvent;
this.smartForm1.SpecialFunctionClickPointSize = 100;
this.smartForm1.UseMainMenu = false;
//
@@ -315,7 +320,7 @@
this.labelTitleTime.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.labelTitleTime.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelTitleTime.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.labelTitleTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.labelTitleTime.LineSpacing = 0F;
this.labelTitleTime.Location = new System.Drawing.Point(147, 90);
this.labelTitleTime.Name = "labelTitleTime";
@@ -338,7 +343,7 @@
this.labelTitleProcess.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.labelTitleProcess.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelTitleProcess.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleProcess.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.labelTitleProcess.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.labelTitleProcess.LineSpacing = 0F;
this.labelTitleProcess.Location = new System.Drawing.Point(36, 160);
this.labelTitleProcess.Name = "labelTitleProcess";
@@ -361,7 +366,7 @@
this.labelTitleStatusResult.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.labelTitleStatusResult.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelTitleStatusResult.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleStatusResult.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.labelTitleStatusResult.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.labelTitleStatusResult.LineSpacing = 0F;
this.labelTitleStatusResult.Location = new System.Drawing.Point(610, 160);
this.labelTitleStatusResult.Name = "labelTitleStatusResult";
@@ -384,7 +389,7 @@
this.labelProgress1_1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress1_1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(101)))), ((int)(((byte)(103)))));
this.labelProgress1_1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress1_1.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold);
+ this.labelProgress1_1.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold);
this.labelProgress1_1.LineSpacing = 0F;
this.labelProgress1_1.Location = new System.Drawing.Point(332, 239);
this.labelProgress1_1.Name = "labelProgress1_1";
@@ -455,7 +460,7 @@
this.buttonDischarge.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonDischarge.ButtonText = "Discharge";
this.buttonDischarge.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonDischarge.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonDischarge.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonDischarge.GroupID = 0;
this.buttonDischarge.ImageDisable = null;
this.buttonDischarge.ImageDown = null;
@@ -759,7 +764,7 @@
this.buttonDisplay.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonDisplay.ButtonText = "Display";
this.buttonDisplay.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonDisplay.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonDisplay.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonDisplay.GroupID = 0;
this.buttonDisplay.ImageDisable = null;
this.buttonDisplay.ImageDown = null;
@@ -1506,7 +1511,7 @@
this.labelExpireOfPassword.BackGroundColor = System.Drawing.Color.SkyBlue;
this.labelExpireOfPassword.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelExpireOfPassword.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelExpireOfPassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.labelExpireOfPassword.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.labelExpireOfPassword.LineSpacing = 0F;
this.labelExpireOfPassword.Location = new System.Drawing.Point(787, 126);
this.labelExpireOfPassword.Name = "labelExpireOfPassword";
@@ -1533,7 +1538,7 @@
this.buttonModbus.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonModbus.ButtonText = "Modbus";
this.buttonModbus.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonModbus.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonModbus.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonModbus.GroupID = 0;
this.buttonModbus.ImageDisable = null;
this.buttonModbus.ImageDown = null;
@@ -1643,6 +1648,8 @@
this.progressBar1.TextAutoRotation = true;
this.progressBar1.TextColor = System.Drawing.Color.White;
this.progressBar1.TextColorDisable = System.Drawing.Color.Gray;
+ this.progressBar1.TextHAlign = SmartX.SmartProgressBar.TextHorAlign.Middle;
+ this.progressBar1.TextVAlign = SmartX.SmartProgressBar.TextVerAlign.Middle;
this.progressBar1.Units = "";
this.progressBar1.Value = new decimal(new int[] {
100,
@@ -1693,7 +1700,7 @@
this.labelProgress3_1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress3_1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(101)))), ((int)(((byte)(103)))));
this.labelProgress3_1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress3_1.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold);
+ this.labelProgress3_1.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold);
this.labelProgress3_1.LineSpacing = 0F;
this.labelProgress3_1.Location = new System.Drawing.Point(78, 507);
this.labelProgress3_1.Name = "labelProgress3_1";
@@ -1716,7 +1723,7 @@
this.labelProgress2_1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress2_1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(101)))), ((int)(((byte)(103)))));
this.labelProgress2_1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress2_1.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold);
+ this.labelProgress2_1.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold);
this.labelProgress2_1.LineSpacing = 0F;
this.labelProgress2_1.Location = new System.Drawing.Point(332, 507);
this.labelProgress2_1.Name = "labelProgress2_1";
@@ -1739,7 +1746,7 @@
this.labelProgress0_1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress0_1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(101)))), ((int)(((byte)(103)))));
this.labelProgress0_1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelProgress0_1.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold);
+ this.labelProgress0_1.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold);
this.labelProgress0_1.LineSpacing = 0F;
this.labelProgress0_1.Location = new System.Drawing.Point(78, 239);
this.labelProgress0_1.Name = "labelProgress0_1";
@@ -2080,7 +2087,7 @@
this.labelDisplacement2.BackGroundColor = System.Drawing.Color.Black;
this.labelDisplacement2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelDisplacement2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelDisplacement2.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.labelDisplacement2.Font = new System.Drawing.Font("Gulim", 12F, System.Drawing.FontStyle.Regular);
this.labelDisplacement2.LineSpacing = 0F;
this.labelDisplacement2.Location = new System.Drawing.Point(755, 253);
this.labelDisplacement2.Name = "labelDisplacement2";
@@ -2103,7 +2110,7 @@
this.labelDisplacement1.BackGroundColor = System.Drawing.Color.Black;
this.labelDisplacement1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelDisplacement1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelDisplacement1.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.labelDisplacement1.Font = new System.Drawing.Font("Gulim", 12F, System.Drawing.FontStyle.Regular);
this.labelDisplacement1.LineSpacing = 0F;
this.labelDisplacement1.Location = new System.Drawing.Point(610, 253);
this.labelDisplacement1.Name = "labelDisplacement1";
@@ -2126,7 +2133,7 @@
this.labelPressureWorking2.BackGroundColor = System.Drawing.Color.Black;
this.labelPressureWorking2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelPressureWorking2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelPressureWorking2.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.labelPressureWorking2.Font = new System.Drawing.Font("Gulim", 12F, System.Drawing.FontStyle.Regular);
this.labelPressureWorking2.LineSpacing = 0F;
this.labelPressureWorking2.Location = new System.Drawing.Point(755, 205);
this.labelPressureWorking2.Name = "labelPressureWorking2";
@@ -2149,7 +2156,7 @@
this.labelPressureWorking1.BackGroundColor = System.Drawing.Color.Black;
this.labelPressureWorking1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelPressureWorking1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelPressureWorking1.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.labelPressureWorking1.Font = new System.Drawing.Font("Gulim", 12F, System.Drawing.FontStyle.Regular);
this.labelPressureWorking1.LineSpacing = 0F;
this.labelPressureWorking1.Location = new System.Drawing.Point(610, 205);
this.labelPressureWorking1.Name = "labelPressureWorking1";
@@ -2195,7 +2202,7 @@
this.labelLrSec1.BackGroundColor = System.Drawing.Color.Black;
this.labelLrSec1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelLrSec1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelLrSec1.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.labelLrSec1.Font = new System.Drawing.Font("Gulim", 12F, System.Drawing.FontStyle.Regular);
this.labelLrSec1.LineSpacing = 0F;
this.labelLrSec1.Location = new System.Drawing.Point(610, 229);
this.labelLrSec1.Name = "labelLrSec1";
@@ -2241,7 +2248,7 @@
this.labelLrSec2.BackGroundColor = System.Drawing.Color.Black;
this.labelLrSec2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelLrSec2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelLrSec2.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.labelLrSec2.Font = new System.Drawing.Font("Gulim", 12F, System.Drawing.FontStyle.Regular);
this.labelLrSec2.LineSpacing = 0F;
this.labelLrSec2.Location = new System.Drawing.Point(755, 229);
this.labelLrSec2.Name = "labelLrSec2";
@@ -2287,7 +2294,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, 90);
this.labelUserID.Name = "labelUserID";
@@ -2379,7 +2386,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, 107);
this.labelUserLevel.Name = "labelUserLevel";
@@ -2679,7 +2686,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";
@@ -2804,7 +2811,7 @@
this.labelTitleAlarm.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.labelTitleAlarm.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.labelTitleAlarm.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
- this.labelTitleAlarm.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.labelTitleAlarm.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.labelTitleAlarm.LineSpacing = 0F;
this.labelTitleAlarm.Location = new System.Drawing.Point(3, 0);
this.labelTitleAlarm.Name = "labelTitleAlarm";
@@ -2840,7 +2847,7 @@
this.buttonUser.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonUser.ButtonText = "Login";
this.buttonUser.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonUser.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonUser.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonUser.GroupID = 0;
this.buttonUser.ImageDisable = null;
this.buttonUser.ImageDown = null;
@@ -2872,7 +2879,7 @@
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("새굴림", 20F, System.Drawing.FontStyle.Bold);
+ this.labelStop.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
this.labelStop.LineSpacing = 0F;
this.labelStop.Location = new System.Drawing.Point(917, 12);
this.labelStop.Name = "labelStop";
@@ -2896,7 +2903,7 @@
this.labelStart.BackGroundColor = System.Drawing.Color.Lime;
this.labelStart.BorderColor = System.Drawing.Color.DarkGreen;
this.labelStart.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect;
- this.labelStart.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold);
+ this.labelStart.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
this.labelStart.LineSpacing = 0F;
this.labelStart.Location = new System.Drawing.Point(917, 12);
this.labelStart.Name = "labelStart";
@@ -2924,7 +2931,7 @@
this.buttonExit.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonExit.ButtonText = "EXIT";
this.buttonExit.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonExit.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonExit.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonExit.GroupID = 0;
this.buttonExit.ImageDisable = null;
this.buttonExit.ImageDown = null;
@@ -2948,6 +2955,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
@@ -2960,7 +2968,7 @@
this.buttonInspection.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonInspection.ButtonText = "Inspection";
this.buttonInspection.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonInspection.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonInspection.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonInspection.GroupID = 0;
this.buttonInspection.ImageDisable = null;
this.buttonInspection.ImageDown = null;
@@ -2996,7 +3004,7 @@
this.buttonClear.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonClear.ButtonText = "Clear";
this.buttonClear.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonClear.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonClear.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonClear.GroupID = 0;
this.buttonClear.ImageDisable = null;
this.buttonClear.ImageDown = null;
@@ -3032,7 +3040,7 @@
this.buttonMenu.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonMenu.ButtonText = "Menu";
this.buttonMenu.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonMenu.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonMenu.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonMenu.GroupID = 0;
this.buttonMenu.ImageDisable = null;
this.buttonMenu.ImageDown = null;
@@ -3068,7 +3076,7 @@
this.buttonTest.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonTest.ButtonText = "Test";
this.buttonTest.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonTest.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonTest.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonTest.GroupID = 0;
this.buttonTest.ImageDisable = null;
this.buttonTest.ImageDown = null;
@@ -3149,6 +3157,29 @@
this.smartTimerTest.TimeFormStringSeparator = ":";
this.smartTimerTest.Tick += new System.EventHandler(this.smartTimerTest_Tick);
//
+ // labelTitleLeakDetetor
+ //
+ this.labelTitleLeakDetetor.BackGround = null;
+ this.labelTitleLeakDetetor.BackGroundColor = System.Drawing.Color.Black;
+ this.labelTitleLeakDetetor.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+ this.labelTitleLeakDetetor.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+ this.labelTitleLeakDetetor.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold);
+ this.labelTitleLeakDetetor.LineSpacing = 0F;
+ this.labelTitleLeakDetetor.Location = new System.Drawing.Point(245, 13);
+ this.labelTitleLeakDetetor.Name = "labelTitleLeakDetetor";
+ this.labelTitleLeakDetetor.OverlapOptimize = true;
+ this.labelTitleLeakDetetor.PasswordChar = '\0';
+ this.labelTitleLeakDetetor.Radius = 3;
+ this.labelTitleLeakDetetor.RoundRectFillColor = System.Drawing.Color.LightBlue;
+ this.labelTitleLeakDetetor.Size = new System.Drawing.Size(500, 60);
+ this.labelTitleLeakDetetor.TabIndex = 622;
+ this.labelTitleLeakDetetor.Text = "LEAK DETETOR";
+ this.labelTitleLeakDetetor.TextColor = System.Drawing.Color.White;
+ this.labelTitleLeakDetetor.TextColorDisable = System.Drawing.Color.Gray;
+ this.labelTitleLeakDetetor.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelTitleLeakDetetor.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitleLeakDetetor.Wordwrap = false;
+ //
// FormMainDisplay
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -3301,5 +3332,6 @@
private SmartX.SmartLabel labelTitleProcess;
private SmartX.SmartLabel labelTitleStatusResult;
private SmartX.SmartLabel labelTitleAlarm;
+ private SmartX.SmartLabel labelTitleLeakDetetor;
}
}
\ No newline at end of file
diff --git a/INT_LKD_2/Forms/FormMainDisplay.cs b/INT_LKD_2/Forms/FormMainDisplay.cs
index 50904fa..de5bfaa 100644
--- a/INT_LKD_2/Forms/FormMainDisplay.cs
+++ b/INT_LKD_2/Forms/FormMainDisplay.cs
@@ -50,7 +50,7 @@ namespace INT_LKD_2.Forms
//private ControlMainDisplay ChildControl;
public ControlMainModbus ChildModbus;
- private ControlMainDisplay12 ChildMainDisplay10;
+ public ControlMainDisplay12 ChildMainDisplay10;
#endregion
#region Constructor
@@ -248,6 +248,8 @@ namespace INT_LKD_2.Forms
switch (this.ParentForm.SystemConfig.LANGUAGE)
{
case Define.E_LanguageID.Chinese:
+ this.labelTitleLeakDetetor.Text = "泄漏检测仪";
+
this.labelStart.Text = "运行";
this.labelStop.Text = "停止";
@@ -271,6 +273,8 @@ namespace INT_LKD_2.Forms
this.buttonMenu.ButtonText = "菜单";
break;
default:
+ this.labelTitleLeakDetetor.Text = "LEAK DETECTOR";
+
this.labelStart.Text = "Run";
this.labelStop.Text = "Stop";
diff --git a/INT_LKD_2/Forms/FormMenu.Designer.cs b/INT_LKD_2/Forms/FormMenu.Designer.cs
index 0cb1431..b1278d2 100644
--- a/INT_LKD_2/Forms/FormMenu.Designer.cs
+++ b/INT_LKD_2/Forms/FormMenu.Designer.cs
@@ -97,7 +97,10 @@
this.smartForm1.Mode = SmartXUIBase.SmartUIControlFormBase.RUNMODE.RUNTIME;
this.smartForm1.MouseCursor = SmartX.SmartForm.OnOff.OFF;
this.smartForm1.Name = "smartForm1";
+ this.smartForm1.PasswordDialog.AdminPassword = "123";
+ this.smartForm1.PasswordDialog.Title = "관리자 비밀번호를 입력하세요";
this.smartForm1.Size = new System.Drawing.Size(1024, 768);
+ this.smartForm1.SpecialFunctionClickMode = SmartXUIBase.SmartUIControlFormBase.SpecialFunctionClickModeType.SpecialFunctionClickEvent;
this.smartForm1.SpecialFunctionClickPointSize = 100;
this.smartForm1.UseMainMenu = false;
//
@@ -271,7 +274,7 @@
// labelAlarm
//
this.labelAlarm.BackColor = System.Drawing.Color.Black;
- this.labelAlarm.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Regular);
+ this.labelAlarm.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Regular);
this.labelAlarm.ForeColor = System.Drawing.Color.White;
this.labelAlarm.Location = new System.Drawing.Point(0, 10);
this.labelAlarm.Name = "labelAlarm";
@@ -302,7 +305,7 @@
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("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.labelStop.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.labelStop.LineSpacing = 0F;
this.labelStop.Location = new System.Drawing.Point(917, 3);
this.labelStop.Name = "labelStop";
@@ -326,7 +329,7 @@
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.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.labelStart.LineSpacing = 0F;
this.labelStart.Location = new System.Drawing.Point(917, 3);
this.labelStart.Name = "labelStart";
@@ -354,7 +357,7 @@
this.buttonUser.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonUser.ButtonText = "User";
this.buttonUser.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonUser.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonUser.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonUser.GroupID = 0;
this.buttonUser.ImageDisable = null;
this.buttonUser.ImageDown = null;
@@ -386,7 +389,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";
@@ -409,7 +412,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";
@@ -439,7 +442,7 @@
this.labelTime.BackGroundColor = System.Drawing.Color.Black;
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(62, 3);
this.labelTime.Name = "labelTime";
@@ -466,7 +469,7 @@
this.buttonBottom4.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonBottom4.ButtonText = "측정시작";
this.buttonBottom4.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonBottom4.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonBottom4.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonBottom4.GroupID = 1;
this.buttonBottom4.ImageDisable = null;
this.buttonBottom4.ImageDown = null;
@@ -502,7 +505,7 @@
this.buttonBottom3.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonBottom3.ButtonText = "측정시작";
this.buttonBottom3.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonBottom3.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonBottom3.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonBottom3.GroupID = 1;
this.buttonBottom3.ImageDisable = null;
this.buttonBottom3.ImageDown = null;
@@ -538,7 +541,7 @@
this.buttonBottom2.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonBottom2.ButtonText = "측정시작";
this.buttonBottom2.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonBottom2.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonBottom2.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonBottom2.GroupID = 1;
this.buttonBottom2.ImageDisable = null;
this.buttonBottom2.ImageDown = null;
@@ -574,7 +577,7 @@
this.buttonBottom1.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonBottom1.ButtonText = "측정시작";
this.buttonBottom1.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonBottom1.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonBottom1.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonBottom1.GroupID = 1;
this.buttonBottom1.ImageDisable = null;
this.buttonBottom1.ImageDown = null;
@@ -610,7 +613,7 @@
this.buttonSystem.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonSystem.ButtonText = "System";
this.buttonSystem.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonSystem.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonSystem.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonSystem.GroupID = 0;
this.buttonSystem.ImageDisable = null;
this.buttonSystem.ImageDown = null;
@@ -646,7 +649,7 @@
this.buttonLog.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonLog.ButtonText = "Log";
this.buttonLog.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonLog.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonLog.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonLog.GroupID = 0;
this.buttonLog.ImageDisable = null;
this.buttonLog.ImageDown = null;
@@ -682,7 +685,7 @@
this.buttonManual.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonManual.ButtonText = "Manual";
this.buttonManual.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonManual.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonManual.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonManual.GroupID = 0;
this.buttonManual.ImageDisable = null;
this.buttonManual.ImageDown = null;
@@ -718,7 +721,7 @@
this.buttonRecipe.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonRecipe.ButtonText = "Recipe";
this.buttonRecipe.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonRecipe.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonRecipe.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonRecipe.GroupID = 0;
this.buttonRecipe.ImageDisable = null;
this.buttonRecipe.ImageDown = null;
@@ -754,7 +757,7 @@
this.buttonHome.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonHome.ButtonText = "HOME";
this.buttonHome.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonHome.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.buttonHome.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonHome.GroupID = 0;
this.buttonHome.ImageDisable = null;
this.buttonHome.ImageDown = null;
@@ -785,7 +788,7 @@
this.smartGroupBox1.BackGround = null;
this.smartGroupBox1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(51)))), ((int)(((byte)(53)))));
this.smartGroupBox1.BackImage = null;
- this.smartGroupBox1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.smartGroupBox1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(33)))), ((int)(((byte)(35)))));
this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(51)))), ((int)(((byte)(53)))));
this.smartGroupBox1.FrameLineThickness = 2;
diff --git a/INT_LKD_2/INT_LKD_2.csproj b/INT_LKD_2/INT_LKD_2.csproj
index d453fc3..77ad0a1 100644
--- a/INT_LKD_2/INT_LKD_2.csproj
+++ b/INT_LKD_2/INT_LKD_2.csproj
@@ -51,17 +51,17 @@
-
+
False
- C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNCommon.dll
+ C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.11_20240426\SmartX_New_5.0.0.11_IEC1000_DOTNETCF3.5수동설치파일\SmartXNCommon.dll
-
+
False
- C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNFDCommon.dll
+ C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.11_20240426\SmartX_New_5.0.0.11_IEC1000_DOTNETCF3.5수동설치파일\SmartXNFDCommon.dll
-
+
False
- C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXN_IEC1000.dll
+ C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.11_20240426\SmartX_New_5.0.0.11_IEC1000_DOTNETCF3.5수동설치파일\SmartXN_IEC1000.dll