diff --git a/INT69DB_2A/Controls/ControlUserSetting.Designer.cs b/INT69DB_2A/Controls/ControlUserSetting.Designer.cs
index e3c1b40..2f07de6 100644
--- a/INT69DB_2A/Controls/ControlUserSetting.Designer.cs
+++ b/INT69DB_2A/Controls/ControlUserSetting.Designer.cs
@@ -52,7 +52,7 @@
this.labelStatusExpirePassword.ForeColor = System.Drawing.Color.DarkRed;
this.labelStatusExpirePassword.InitVisible = true;
this.labelStatusExpirePassword.LineSpacing = 0F;
- this.labelStatusExpirePassword.Location = new System.Drawing.Point(642, 252);
+ this.labelStatusExpirePassword.Location = new System.Drawing.Point(639, 247);
this.labelStatusExpirePassword.Name = "labelStatusExpirePassword";
this.labelStatusExpirePassword.Size = new System.Drawing.Size(100, 30);
this.labelStatusExpirePassword.TabIndex = 240;
@@ -73,7 +73,7 @@
this.labelStatusExpireAccount.ForeColor = System.Drawing.Color.DarkRed;
this.labelStatusExpireAccount.InitVisible = true;
this.labelStatusExpireAccount.LineSpacing = 0F;
- this.labelStatusExpireAccount.Location = new System.Drawing.Point(642, 216);
+ this.labelStatusExpireAccount.Location = new System.Drawing.Point(639, 211);
this.labelStatusExpireAccount.Name = "labelStatusExpireAccount";
this.labelStatusExpireAccount.Size = new System.Drawing.Size(100, 30);
this.labelStatusExpireAccount.TabIndex = 239;
@@ -92,7 +92,7 @@
this.labelExpirePasswordDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelExpirePasswordDate.InitVisible = true;
this.labelExpirePasswordDate.LineSpacing = 0F;
- this.labelExpirePasswordDate.Location = new System.Drawing.Point(345, 252);
+ this.labelExpirePasswordDate.Location = new System.Drawing.Point(342, 247);
this.labelExpirePasswordDate.Name = "labelExpirePasswordDate";
this.labelExpirePasswordDate.Size = new System.Drawing.Size(291, 30);
this.labelExpirePasswordDate.TabIndex = 242;
@@ -111,7 +111,7 @@
this.labelExpireAccountDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelExpireAccountDate.InitVisible = true;
this.labelExpireAccountDate.LineSpacing = 0F;
- this.labelExpireAccountDate.Location = new System.Drawing.Point(345, 216);
+ this.labelExpireAccountDate.Location = new System.Drawing.Point(342, 211);
this.labelExpireAccountDate.Name = "labelExpireAccountDate";
this.labelExpireAccountDate.Size = new System.Drawing.Size(291, 30);
this.labelExpireAccountDate.TabIndex = 241;
@@ -132,7 +132,7 @@
this.smartLabel2.ForeColor = System.Drawing.Color.White;
this.smartLabel2.InitVisible = true;
this.smartLabel2.LineSpacing = 0F;
- this.smartLabel2.Location = new System.Drawing.Point(152, 252);
+ this.smartLabel2.Location = new System.Drawing.Point(149, 247);
this.smartLabel2.Name = "smartLabel2";
this.smartLabel2.Size = new System.Drawing.Size(187, 30);
this.smartLabel2.TabIndex = 238;
@@ -153,7 +153,7 @@
this.labelTitleExpireAccount.ForeColor = System.Drawing.Color.White;
this.labelTitleExpireAccount.InitVisible = true;
this.labelTitleExpireAccount.LineSpacing = 0F;
- this.labelTitleExpireAccount.Location = new System.Drawing.Point(152, 216);
+ this.labelTitleExpireAccount.Location = new System.Drawing.Point(149, 211);
this.labelTitleExpireAccount.Name = "labelTitleExpireAccount";
this.labelTitleExpireAccount.Size = new System.Drawing.Size(187, 30);
this.labelTitleExpireAccount.TabIndex = 237;
@@ -172,7 +172,7 @@
this.labelPassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelPassword.InitVisible = true;
this.labelPassword.LineSpacing = 0F;
- this.labelPassword.Location = new System.Drawing.Point(345, 180);
+ this.labelPassword.Location = new System.Drawing.Point(342, 175);
this.labelPassword.Name = "labelPassword";
this.labelPassword.Size = new System.Drawing.Size(291, 30);
this.labelPassword.TabIndex = 236;
@@ -194,7 +194,7 @@
this.labelTitlePassword.ForeColor = System.Drawing.Color.White;
this.labelTitlePassword.InitVisible = true;
this.labelTitlePassword.LineSpacing = 0F;
- this.labelTitlePassword.Location = new System.Drawing.Point(152, 180);
+ this.labelTitlePassword.Location = new System.Drawing.Point(149, 175);
this.labelTitlePassword.Name = "labelTitlePassword";
this.labelTitlePassword.Size = new System.Drawing.Size(187, 30);
this.labelTitlePassword.TabIndex = 235;
@@ -213,7 +213,7 @@
this.labelID.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelID.InitVisible = true;
this.labelID.LineSpacing = 0F;
- this.labelID.Location = new System.Drawing.Point(345, 144);
+ this.labelID.Location = new System.Drawing.Point(342, 139);
this.labelID.Name = "labelID";
this.labelID.Size = new System.Drawing.Size(291, 30);
this.labelID.TabIndex = 234;
@@ -234,7 +234,7 @@
this.labelTitleID.ForeColor = System.Drawing.Color.White;
this.labelTitleID.InitVisible = true;
this.labelTitleID.LineSpacing = 0F;
- this.labelTitleID.Location = new System.Drawing.Point(152, 144);
+ this.labelTitleID.Location = new System.Drawing.Point(149, 139);
this.labelTitleID.Name = "labelTitleID";
this.labelTitleID.Size = new System.Drawing.Size(187, 30);
this.labelTitleID.TabIndex = 233;
@@ -259,7 +259,7 @@
this.Controls.Add(this.labelID);
this.Controls.Add(this.labelTitleID);
this.Name = "ControlUserSetting";
- this.Size = new System.Drawing.Size(800, 452);
+ this.Size = new System.Drawing.Size(800, 446);
this.ResumeLayout(false);
}
diff --git a/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs b/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs
index 78bea22..35cdf88 100644
--- a/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs
@@ -65,6 +65,7 @@
this.treeView1.Name = "treeView1";
this.treeView1.Size = new System.Drawing.Size(219, 445);
this.treeView1.TabIndex = 4;
+ this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
//
// buttonRead
//
diff --git a/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs b/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs
index 2fd41dc..ec3d16d 100644
--- a/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs
+++ b/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs
@@ -55,8 +55,7 @@ namespace INT69DB_2A.DialogForms
y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
this.Location = new Point(x, y);
-
- this.Size = new Size(450, 165);
+ this.Size = new Size(350, 470);
}
private void DefaultSetting()
{
diff --git a/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.cs b/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.cs
index 2d2a66e..8a7c3f3 100644
--- a/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.cs
+++ b/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.cs
@@ -66,7 +66,6 @@ namespace INT69DB_2A.DialogForms
y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
this.Location = new Point(x, y);
-
this.Size = new Size(710, 470);
}
private void DefaultSetting()
diff --git a/INT69DB_2A/DialogForms/DialogFormHistoryData.cs b/INT69DB_2A/DialogForms/DialogFormHistoryData.cs
index 15e6d90..c0d7fb4 100644
--- a/INT69DB_2A/DialogForms/DialogFormHistoryData.cs
+++ b/INT69DB_2A/DialogForms/DialogFormHistoryData.cs
@@ -78,8 +78,7 @@ namespace INT69DB_2A.DialogForms
y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
this.Location = new Point(x, y);
-
- this.Size = new Size(450, 165);
+ this.Size = new Size(350, 470);
}
private void DefaultSetting()
{
@@ -213,6 +212,10 @@ namespace INT69DB_2A.DialogForms
public void DisplayRefresh()
{
this.DisplayTreeViewUpdate();
+
+ this.checkBoxTypeAlarm.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm;
+ this.checkBoxTypeOperation.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation;
+ this.checkBoxTypeParameter.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter;
}
#endregion
@@ -228,6 +231,13 @@ namespace INT69DB_2A.DialogForms
this.treeView.Enabled = false;
this.buttonRead.Enabled = false;
this.buttonClose.Enabled = false;
+ this.checkBoxTypeAlarm.Enabled = false;
+ this.checkBoxTypeOperation.Enabled = false;
+ this.checkBoxTypeParameter.Enabled = false;
+
+ this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm = this.checkBoxTypeAlarm.Checked;
+ this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation = this.checkBoxTypeOperation.Checked;
+ this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter = this.checkBoxTypeParameter.Checked;
year = this.SeletedFilePath.Substring(1, 4);
iMonth = int.Parse(this.SeletedFilePath.Substring(5, 2));
@@ -246,6 +256,9 @@ namespace INT69DB_2A.DialogForms
this.treeView.Enabled = true;
this.buttonRead.Enabled = true;
this.buttonClose.Enabled = true;
+ this.checkBoxTypeAlarm.Enabled = true;
+ this.checkBoxTypeOperation.Enabled = true;
+ this.checkBoxTypeParameter.Enabled = true;
}
private void buttonClose_Click(object sender, EventArgs e)
{
diff --git a/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs b/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs
index b5e9f7e..96bed35 100644
--- a/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs
@@ -38,6 +38,9 @@
this.labelDate = new SmartX.SmartLabel();
this.labelNodeIndex = new SmartX.SmartLabel();
this.buttonClose = new SmartX.SmartButton();
+ this.checkBoxTypeAlarm = new SmartX.SmartCheckBox();
+ this.checkBoxTypeOperation = new SmartX.SmartCheckBox();
+ this.checkBoxTypeParameter = new SmartX.SmartCheckBox();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox1.SuspendLayout();
this.SuspendLayout();
@@ -109,9 +112,9 @@
this.labelFileName.ForeColor = System.Drawing.Color.White;
this.labelFileName.InitVisible = true;
this.labelFileName.LineSpacing = 0F;
- this.labelFileName.Location = new System.Drawing.Point(237, 313);
+ this.labelFileName.Location = new System.Drawing.Point(237, 320);
this.labelFileName.Name = "labelFileName";
- this.labelFileName.Size = new System.Drawing.Size(100, 32);
+ this.labelFileName.Size = new System.Drawing.Size(100, 25);
this.labelFileName.TabIndex = 7;
this.labelFileName.Text = "20200214_1";
this.labelFileName.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -123,6 +126,9 @@
//
this.smartGroupBox1.BackPictureBox = this.smartForm1;
this.smartGroupBox1.BackPictureBox1 = null;
+ this.smartGroupBox1.Controls.Add(this.checkBoxTypeParameter);
+ this.smartGroupBox1.Controls.Add(this.checkBoxTypeOperation);
+ this.smartGroupBox1.Controls.Add(this.checkBoxTypeAlarm);
this.smartGroupBox1.Controls.Add(this.labelTitleDate);
this.smartGroupBox1.Controls.Add(this.labelDate);
this.smartGroupBox1.Controls.Add(this.labelNodeIndex);
@@ -198,9 +204,9 @@
this.labelNodeIndex.ForeColor = System.Drawing.Color.White;
this.labelNodeIndex.InitVisible = true;
this.labelNodeIndex.LineSpacing = 0F;
- this.labelNodeIndex.Location = new System.Drawing.Point(237, 275);
+ this.labelNodeIndex.Location = new System.Drawing.Point(237, 289);
this.labelNodeIndex.Name = "labelNodeIndex";
- this.labelNodeIndex.Size = new System.Drawing.Size(100, 32);
+ this.labelNodeIndex.Size = new System.Drawing.Size(100, 25);
this.labelNodeIndex.TabIndex = 14;
this.labelNodeIndex.Text = "20200214_1";
this.labelNodeIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -240,6 +246,72 @@
this.buttonClose.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonClose.UpImage")));
this.buttonClose.Click += new System.EventHandler(this.buttonClose_Click);
//
+ // checkBoxTypeAlarm
+ //
+ this.checkBoxTypeAlarm.BackPictureBox = this.smartForm1;
+ this.checkBoxTypeAlarm.BackPictureBox1 = null;
+ this.checkBoxTypeAlarm.BackPictureBox2 = null;
+ this.checkBoxTypeAlarm.CheckBoxBackColor = System.Drawing.Color.White;
+ this.checkBoxTypeAlarm.CheckBoxCheckColor = System.Drawing.Color.Green;
+ this.checkBoxTypeAlarm.CheckBoxForeColor = System.Drawing.Color.Black;
+ this.checkBoxTypeAlarm.CheckBoxSymbolSize = 15;
+ this.checkBoxTypeAlarm.Checked = false;
+ this.checkBoxTypeAlarm.CheckLineWidth = 3;
+ this.checkBoxTypeAlarm.ForeColor = System.Drawing.Color.White;
+ this.checkBoxTypeAlarm.ImageCheckBox = null;
+ this.checkBoxTypeAlarm.ImageUnCheckBox = null;
+ this.checkBoxTypeAlarm.InitVisible = true;
+ this.checkBoxTypeAlarm.Location = new System.Drawing.Point(241, 148);
+ this.checkBoxTypeAlarm.Name = "checkBoxTypeAlarm";
+ this.checkBoxTypeAlarm.Size = new System.Drawing.Size(90, 25);
+ this.checkBoxTypeAlarm.TabIndex = 17;
+ this.checkBoxTypeAlarm.Text = "Alarm";
+ this.checkBoxTypeAlarm.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
+ //
+ // checkBoxTypeOperation
+ //
+ this.checkBoxTypeOperation.BackPictureBox = this.smartForm1;
+ this.checkBoxTypeOperation.BackPictureBox1 = null;
+ this.checkBoxTypeOperation.BackPictureBox2 = null;
+ this.checkBoxTypeOperation.CheckBoxBackColor = System.Drawing.Color.White;
+ this.checkBoxTypeOperation.CheckBoxCheckColor = System.Drawing.Color.Green;
+ this.checkBoxTypeOperation.CheckBoxForeColor = System.Drawing.Color.Black;
+ this.checkBoxTypeOperation.CheckBoxSymbolSize = 15;
+ this.checkBoxTypeOperation.Checked = false;
+ this.checkBoxTypeOperation.CheckLineWidth = 3;
+ this.checkBoxTypeOperation.ForeColor = System.Drawing.Color.White;
+ this.checkBoxTypeOperation.ImageCheckBox = null;
+ this.checkBoxTypeOperation.ImageUnCheckBox = null;
+ this.checkBoxTypeOperation.InitVisible = true;
+ this.checkBoxTypeOperation.Location = new System.Drawing.Point(241, 179);
+ this.checkBoxTypeOperation.Name = "checkBoxTypeOperation";
+ this.checkBoxTypeOperation.Size = new System.Drawing.Size(90, 25);
+ this.checkBoxTypeOperation.TabIndex = 18;
+ this.checkBoxTypeOperation.Text = "Operation";
+ this.checkBoxTypeOperation.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
+ //
+ // checkBoxTypeParameter
+ //
+ this.checkBoxTypeParameter.BackPictureBox = this.smartForm1;
+ this.checkBoxTypeParameter.BackPictureBox1 = null;
+ this.checkBoxTypeParameter.BackPictureBox2 = null;
+ this.checkBoxTypeParameter.CheckBoxBackColor = System.Drawing.Color.White;
+ this.checkBoxTypeParameter.CheckBoxCheckColor = System.Drawing.Color.Green;
+ this.checkBoxTypeParameter.CheckBoxForeColor = System.Drawing.Color.Black;
+ this.checkBoxTypeParameter.CheckBoxSymbolSize = 15;
+ this.checkBoxTypeParameter.Checked = false;
+ this.checkBoxTypeParameter.CheckLineWidth = 3;
+ this.checkBoxTypeParameter.ForeColor = System.Drawing.Color.White;
+ this.checkBoxTypeParameter.ImageCheckBox = null;
+ this.checkBoxTypeParameter.ImageUnCheckBox = null;
+ this.checkBoxTypeParameter.InitVisible = true;
+ this.checkBoxTypeParameter.Location = new System.Drawing.Point(241, 210);
+ this.checkBoxTypeParameter.Name = "checkBoxTypeParameter";
+ this.checkBoxTypeParameter.Size = new System.Drawing.Size(90, 25);
+ this.checkBoxTypeParameter.TabIndex = 19;
+ this.checkBoxTypeParameter.Text = "Parameter";
+ this.checkBoxTypeParameter.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
+ //
// DialogFormHistoryData
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -268,5 +340,8 @@
private SmartX.SmartLabel labelNodeIndex;
private SmartX.SmartLabel labelTitleDate;
private SmartX.SmartLabel labelDate;
+ private SmartX.SmartCheckBox checkBoxTypeParameter;
+ private SmartX.SmartCheckBox checkBoxTypeOperation;
+ private SmartX.SmartCheckBox checkBoxTypeAlarm;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/DialogForms/DialogFormLogOn.Designer.cs b/INT69DB_2A/DialogForms/DialogFormLogOn.Designer.cs
index bb57e4c..7f23a09 100644
--- a/INT69DB_2A/DialogForms/DialogFormLogOn.Designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormLogOn.Designer.cs
@@ -211,6 +211,7 @@
this.smartButton1.TextLocation = new System.Drawing.Point(0, 0);
this.smartButton1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton1.UpImage = null;
+ this.smartButton1.Visible = false;
this.smartButton1.Click += new System.EventHandler(this.smartButton1_Click);
//
// smartButtonAdmin
@@ -243,6 +244,7 @@
this.smartButtonAdmin.TextLocation = new System.Drawing.Point(0, 0);
this.smartButtonAdmin.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButtonAdmin.UpImage = null;
+ this.smartButtonAdmin.Visible = false;
this.smartButtonAdmin.Click += new System.EventHandler(this.smartButtonAdmin_Click);
//
// smartButtonIUser11
@@ -275,6 +277,7 @@
this.smartButtonIUser11.TextLocation = new System.Drawing.Point(0, 0);
this.smartButtonIUser11.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButtonIUser11.UpImage = null;
+ this.smartButtonIUser11.Visible = false;
this.smartButtonIUser11.Click += new System.EventHandler(this.smartButtonIUser11_Click);
//
// smartButtonUser22
@@ -307,6 +310,7 @@
this.smartButtonUser22.TextLocation = new System.Drawing.Point(0, 0);
this.smartButtonUser22.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButtonUser22.UpImage = null;
+ this.smartButtonUser22.Visible = false;
this.smartButtonUser22.Click += new System.EventHandler(this.smartButtonUser22_Click);
//
// smartButtonUser33
@@ -339,6 +343,7 @@
this.smartButtonUser33.TextLocation = new System.Drawing.Point(0, 0);
this.smartButtonUser33.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButtonUser33.UpImage = null;
+ this.smartButtonUser33.Visible = false;
this.smartButtonUser33.Click += new System.EventHandler(this.smartButtonUser33_Click);
//
// pictureBoxImage
diff --git a/INT69DB_2A/DialogForms/DialogFormLogOn.cs b/INT69DB_2A/DialogForms/DialogFormLogOn.cs
index 3f5ad92..58dde34 100644
--- a/INT69DB_2A/DialogForms/DialogFormLogOn.cs
+++ b/INT69DB_2A/DialogForms/DialogFormLogOn.cs
@@ -106,17 +106,35 @@ namespace INT69DB_2A.DialogForms
if (this.IsChangePassword == false)
{
- this.labelTitle1.Text = "User Loigin";
- this.labelTitle2.Text = "ID";
- this.labelTitle3.Text = "Password";
+ if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean)
+ {
+ this.labelTitle1.Text = "로그인";
+ this.labelTitle2.Text = "ID";
+ this.labelTitle3.Text = "비밀번호";
+ }
+ else
+ {
+ this.labelTitle1.Text = "User Login";
+ this.labelTitle2.Text = "ID";
+ this.labelTitle3.Text = "Password";
+ }
this.textBoxID.PasswordChar = default(char);
}
else
{
- this.labelTitle1.Text = "Change Password";
- this.labelTitle2.Text = "New PW";
- this.labelTitle3.Text = "Confirmation";
+ if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean)
+ {
+ this.labelTitle1.Text = "비밀번호 변경";
+ this.labelTitle2.Text = "변경할 비밀번호";
+ this.labelTitle3.Text = "비밀번호 확인";
+ }
+ else
+ {
+ this.labelTitle1.Text = "Change Password";
+ this.labelTitle2.Text = "New";
+ this.labelTitle3.Text = "Confirmation";
+ }
this.textBoxID.PasswordChar = '*';
}
diff --git a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs
index 67b3a40..f4cd255 100644
--- a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs
@@ -29,14 +29,31 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogFormUserEditorKeyboard));
- this.smartKeyboard = new SmartX.SmartKeyboard();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.textBox = new System.Windows.Forms.TextBox();
- this.smartGroupBox1 = new SmartX.SmartGroupBox();
- this.labelTitle = new SmartX.SmartLabel();
+ this.smartKeyboard = new SmartX.SmartKeyboard();
this.pictureBoxImage = new System.Windows.Forms.PictureBox();
- this.smartGroupBox1.SuspendLayout();
+ this.labelTitle = new SmartX.SmartLabel();
this.SuspendLayout();
//
+ // pictureBox1
+ //
+ this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(710, 470);
+ //
+ // textBox
+ //
+ this.textBox.Font = new System.Drawing.Font("Tahoma", 25F, System.Drawing.FontStyle.Regular);
+ this.textBox.Location = new System.Drawing.Point(143, 99);
+ this.textBox.MaxLength = 20;
+ this.textBox.Name = "textBox";
+ this.textBox.Size = new System.Drawing.Size(489, 47);
+ this.textBox.TabIndex = 181;
+ this.textBox.Text = "ABCDE";
+ this.textBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox_KeyPress);
+ //
// smartKeyboard
//
this.smartKeyboard.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(40)))), ((int)(((byte)(24)))));
@@ -55,15 +72,15 @@
this.smartKeyboard.KeyUpImage2 = null;
this.smartKeyboard.KeyUpImage3 = null;
this.smartKeyboard.LeftMargin = 5;
- this.smartKeyboard.Location = new System.Drawing.Point(7, 188);
+ this.smartKeyboard.Location = new System.Drawing.Point(13, 190);
this.smartKeyboard.Name = "smartKeyboard";
this.smartKeyboard.PressFontColor = System.Drawing.Color.Olive;
this.smartKeyboard.PressKeyFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.smartKeyboard.PressKeyOutLineColor = System.Drawing.Color.Green;
this.smartKeyboard.RoundedCorners = true;
this.smartKeyboard.SetBackimage = null;
- this.smartKeyboard.Size = new System.Drawing.Size(697, 270);
- this.smartKeyboard.TabIndex = 3;
+ this.smartKeyboard.Size = new System.Drawing.Size(685, 268);
+ this.smartKeyboard.TabIndex = 182;
this.smartKeyboard.TABKeyDisable = false;
this.smartKeyboard.TargetInputObject = null;
this.smartKeyboard.Text = "smartKeyboard1";
@@ -72,38 +89,12 @@
this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick);
this.smartKeyboard.KeyDown += new System.Windows.Forms.KeyEventHandler(this.smartKeyboard_KeyDown);
//
- // textBox
+ // pictureBoxImage
//
- this.textBox.Font = new System.Drawing.Font("Tahoma", 25F, System.Drawing.FontStyle.Regular);
- this.textBox.Location = new System.Drawing.Point(143, 99);
- this.textBox.MaxLength = 20;
- this.textBox.Name = "textBox";
- this.textBox.Size = new System.Drawing.Size(489, 47);
- this.textBox.TabIndex = 2;
- this.textBox.Text = "ABCDE";
- this.textBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox_KeyPress);
- //
- // smartGroupBox1
- //
- this.smartGroupBox1.BackPictureBox = null;
- this.smartGroupBox1.BackPictureBox1 = null;
- this.smartGroupBox1.Controls.Add(this.labelTitle);
- this.smartGroupBox1.Controls.Add(this.pictureBoxImage);
- this.smartGroupBox1.Controls.Add(this.smartKeyboard);
- this.smartGroupBox1.Controls.Add(this.textBox);
- this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black;
- this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black;
- this.smartGroupBox1.FrameLineThickness = 1;
- this.smartGroupBox1.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.None;
- this.smartGroupBox1.Image = ((System.Drawing.Image)(resources.GetObject("smartGroupBox1.Image")));
- this.smartGroupBox1.InitVisible = true;
- this.smartGroupBox1.Location = new System.Drawing.Point(0, 0);
- this.smartGroupBox1.Name = "smartGroupBox1";
- this.smartGroupBox1.RoundRadius = 5;
- this.smartGroupBox1.Size = new System.Drawing.Size(710, 470);
- this.smartGroupBox1.TabIndex = 4;
- this.smartGroupBox1.Text = "smartGroupBox1";
- this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
+ this.pictureBoxImage.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxImage.Image")));
+ this.pictureBoxImage.Location = new System.Drawing.Point(40, 67);
+ this.pictureBoxImage.Name = "pictureBoxImage";
+ this.pictureBoxImage.Size = new System.Drawing.Size(66, 72);
//
// labelTitle
//
@@ -120,19 +111,12 @@
this.labelTitle.Location = new System.Drawing.Point(143, 43);
this.labelTitle.Name = "labelTitle";
this.labelTitle.Size = new System.Drawing.Size(489, 50);
- this.labelTitle.TabIndex = 179;
+ this.labelTitle.TabIndex = 183;
this.labelTitle.Text = "입력";
this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle.Wordwrap = false;
//
- // pictureBoxImage
- //
- this.pictureBoxImage.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxImage.Image")));
- this.pictureBoxImage.Location = new System.Drawing.Point(40, 67);
- this.pictureBoxImage.Name = "pictureBoxImage";
- this.pictureBoxImage.Size = new System.Drawing.Size(66, 72);
- //
// DialogFormUserEditorKeyboard
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -141,21 +125,26 @@
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.ClientSize = new System.Drawing.Size(710, 470);
this.ControlBox = false;
- this.Controls.Add(this.smartGroupBox1);
+ this.Controls.Add(this.labelTitle);
+ this.Controls.Add(this.pictureBoxImage);
+ this.Controls.Add(this.smartKeyboard);
+ this.Controls.Add(this.textBox);
+ this.Controls.Add(this.pictureBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Name = "DialogFormUserEditorKeyboard";
this.Text = "DialogFormUserEditorKeyboard";
- this.smartGroupBox1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
- private SmartX.SmartKeyboard smartKeyboard;
+ private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.TextBox textBox;
- private SmartX.SmartGroupBox smartGroupBox1;
+ private SmartX.SmartKeyboard smartKeyboard;
private System.Windows.Forms.PictureBox pictureBoxImage;
private SmartX.SmartLabel labelTitle;
+
+
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs
index 4b8d5da..272446f 100644
--- a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs
+++ b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs
@@ -23,6 +23,7 @@ namespace INT69DB_2A.DialogForms
this.textBox.Text = value;
this.RetStringValue = value;
+ this.InitializeControl();
this.DefaultSetting();
}
#endregion
@@ -36,10 +37,18 @@ namespace INT69DB_2A.DialogForms
#endregion
#region Method
+ private void InitializeControl()
+ {
+ int x = 0, y = 0;
+
+ x = Screen.PrimaryScreen.Bounds.Width / 2 - this.Size.Width / 2;
+ y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
+
+ this.Location = new Point(x, y);
+ this.Size = new Size(713, 473);
+ }
private void DefaultSetting()
{
- this.Location = new Point(112, 210);
-
this.smartKeyboard.TargetInputObject = this.textBox;
this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL;
this.smartKeyboard.Show();
diff --git a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.resx b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.resx
index 98db8cf..9adad6e 100644
--- a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.resx
+++ b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.resx
@@ -118,78 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 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
- YII=
-
-
-
+
iVBORw0KGgoAAAANSUhEUgAAAsYAAAHWCAYAAAB0Vk+zAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -358,6 +287,77 @@
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
+ YII=
diff --git a/INT69DB_2A/Forms/FormDataStatistics.Designer.cs b/INT69DB_2A/Forms/FormDataStatistics.Designer.cs
index 24e98dc..6c26947 100644
--- a/INT69DB_2A/Forms/FormDataStatistics.Designer.cs
+++ b/INT69DB_2A/Forms/FormDataStatistics.Designer.cs
@@ -5373,6 +5373,7 @@
this.buttonDisplay.TextLocation = new System.Drawing.Point(0, 0);
this.buttonDisplay.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonDisplay.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonDisplay.UpImage")));
+ this.buttonDisplay.Click += new System.EventHandler(this.buttonDisplay_Click);
//
// FormDataStatistics
//
diff --git a/INT69DB_2A/Forms/FormDataStatistics.cs b/INT69DB_2A/Forms/FormDataStatistics.cs
index 4bd8cb5..4a77a27 100644
--- a/INT69DB_2A/Forms/FormDataStatistics.cs
+++ b/INT69DB_2A/Forms/FormDataStatistics.cs
@@ -1177,7 +1177,10 @@ namespace INT69DB_2A.Forms
this.SelectFilePath = "";
DialogFormDataStatistics form = new DialogFormDataStatistics(this);
- form.ShowDialog();
+ if (form.ShowDialog() == DialogResult.OK)
+ this.buttonSave.Enabled = true;
+ else
+ this.buttonSave.Enabled = false;
}
private void buttonSave_Click(object sender, EventArgs e)
{
diff --git a/INT69DB_2A/Forms/FormDataViewer.Designer.cs b/INT69DB_2A/Forms/FormDataViewer.Designer.cs
index 19ea37b..56462be 100644
--- a/INT69DB_2A/Forms/FormDataViewer.Designer.cs
+++ b/INT69DB_2A/Forms/FormDataViewer.Designer.cs
@@ -34,6 +34,9 @@
this.labelTitle = new SmartX.SmartLabel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.panel1 = new System.Windows.Forms.Panel();
+ this.labelCurrentIndex = new SmartX.SmartLabel();
+ this.smartSeparatorLine1 = new SmartX.SmartSeparatorLine();
+ this.labelTotalIndex = new SmartX.SmartLabel();
this.listBoxEvent = new SmartX.SmartListBox();
this.labelItemCount = new SmartX.SmartLabel();
this.listBoxType = new SmartX.SmartListBox();
@@ -61,9 +64,6 @@
this.smartTimer1 = new SmartX.SmartTimer(this.components);
this.labelDisplayUpdateElapsedTime = new SmartX.SmartLabel();
this.labelFileReadElapsedTime = new SmartX.SmartLabel();
- this.labelCurrentIndex = new SmartX.SmartLabel();
- this.smartSeparatorLine1 = new SmartX.SmartSeparatorLine();
- this.labelTotalIndex = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -137,6 +137,62 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(800, 451);
//
+ // labelCurrentIndex
+ //
+ this.labelCurrentIndex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
+ this.labelCurrentIndex.BackPictureBox = this.smartForm1;
+ this.labelCurrentIndex.BackPictureBox1 = null;
+ this.labelCurrentIndex.BackPictureBox2 = null;
+ this.labelCurrentIndex.BorderColor = System.Drawing.Color.Black;
+ this.labelCurrentIndex.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelCurrentIndex.InitVisible = true;
+ this.labelCurrentIndex.LineSpacing = 0F;
+ this.labelCurrentIndex.Location = new System.Drawing.Point(725, 225);
+ this.labelCurrentIndex.Name = "labelCurrentIndex";
+ this.labelCurrentIndex.Size = new System.Drawing.Size(70, 15);
+ this.labelCurrentIndex.TabIndex = 242;
+ this.labelCurrentIndex.Text = "0";
+ this.labelCurrentIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelCurrentIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelCurrentIndex.Visible = false;
+ this.labelCurrentIndex.Wordwrap = false;
+ //
+ // smartSeparatorLine1
+ //
+ this.smartSeparatorLine1.InitVisible = true;
+ this.smartSeparatorLine1.Line1Color = System.Drawing.Color.DimGray;
+ this.smartSeparatorLine1.Line1Width = 1F;
+ this.smartSeparatorLine1.Line2Color = System.Drawing.Color.LightGray;
+ this.smartSeparatorLine1.Line2Visible = true;
+ this.smartSeparatorLine1.Line2Width = 1F;
+ this.smartSeparatorLine1.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal;
+ this.smartSeparatorLine1.Location = new System.Drawing.Point(725, 246);
+ this.smartSeparatorLine1.Name = "smartSeparatorLine1";
+ this.smartSeparatorLine1.Size = new System.Drawing.Size(70, 2);
+ this.smartSeparatorLine1.TabIndex = 241;
+ this.smartSeparatorLine1.Text = "smartSeparatorLine1";
+ this.smartSeparatorLine1.Visible = false;
+ //
+ // labelTotalIndex
+ //
+ this.labelTotalIndex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
+ this.labelTotalIndex.BackPictureBox = this.smartForm1;
+ this.labelTotalIndex.BackPictureBox1 = null;
+ this.labelTotalIndex.BackPictureBox2 = null;
+ this.labelTotalIndex.BorderColor = System.Drawing.Color.Black;
+ this.labelTotalIndex.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTotalIndex.InitVisible = true;
+ this.labelTotalIndex.LineSpacing = 0F;
+ this.labelTotalIndex.Location = new System.Drawing.Point(726, 254);
+ this.labelTotalIndex.Name = "labelTotalIndex";
+ this.labelTotalIndex.Size = new System.Drawing.Size(70, 15);
+ this.labelTotalIndex.TabIndex = 240;
+ this.labelTotalIndex.Text = "0";
+ this.labelTotalIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelTotalIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTotalIndex.Visible = false;
+ this.labelTotalIndex.Wordwrap = false;
+ //
// listBoxEvent
//
this.listBoxEvent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
@@ -153,7 +209,7 @@
this.listBoxEvent.ItemOffsetGap = 5;
this.listBoxEvent.ItemOffsetX = 5;
this.listBoxEvent.ItemOffsetY = 0;
- this.listBoxEvent.Location = new System.Drawing.Point(165, 41);
+ this.listBoxEvent.Location = new System.Drawing.Point(160, 45);
this.listBoxEvent.MouseMoveEventSpace = 3;
this.listBoxEvent.MouseMoveSpace = 10;
this.listBoxEvent.Name = "listBoxEvent";
@@ -162,12 +218,12 @@
this.listBoxEvent.SelectFilled = true;
this.listBoxEvent.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxEvent.SelectItemIndex = -1;
- this.listBoxEvent.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxEvent.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxEvent.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxEvent.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxEvent.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxEvent.SeparationlineVisibleBottom = false;
this.listBoxEvent.SeparationlineVisibleTop = false;
- this.listBoxEvent.Size = new System.Drawing.Size(135, 405);
+ this.listBoxEvent.Size = new System.Drawing.Size(135, 398);
this.listBoxEvent.TabIndex = 28;
this.listBoxEvent.Text = "smartListBox1";
this.listBoxEvent.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -182,7 +238,7 @@
this.labelItemCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelItemCount.InitVisible = true;
this.labelItemCount.LineSpacing = 0F;
- this.labelItemCount.Location = new System.Drawing.Point(725, 5);
+ this.labelItemCount.Location = new System.Drawing.Point(725, 7);
this.labelItemCount.Name = "labelItemCount";
this.labelItemCount.Size = new System.Drawing.Size(70, 30);
this.labelItemCount.TabIndex = 38;
@@ -208,7 +264,7 @@
this.listBoxType.ItemOffsetGap = 5;
this.listBoxType.ItemOffsetX = 5;
this.listBoxType.ItemOffsetY = 0;
- this.listBoxType.Location = new System.Drawing.Point(645, 41);
+ this.listBoxType.Location = new System.Drawing.Point(645, 45);
this.listBoxType.MouseMoveEventSpace = 3;
this.listBoxType.MouseMoveSpace = 10;
this.listBoxType.Name = "listBoxType";
@@ -217,12 +273,12 @@
this.listBoxType.SelectFilled = true;
this.listBoxType.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxType.SelectItemIndex = -1;
- this.listBoxType.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxType.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxType.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxType.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxType.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxType.SeparationlineVisibleBottom = false;
this.listBoxType.SeparationlineVisibleTop = false;
- this.listBoxType.Size = new System.Drawing.Size(75, 405);
+ this.listBoxType.Size = new System.Drawing.Size(75, 398);
this.listBoxType.TabIndex = 28;
this.listBoxType.Text = "smartListBox1";
this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -243,7 +299,7 @@
this.listBoxAfter.ItemOffsetGap = 5;
this.listBoxAfter.ItemOffsetX = 5;
this.listBoxAfter.ItemOffsetY = 0;
- this.listBoxAfter.Location = new System.Drawing.Point(564, 41);
+ this.listBoxAfter.Location = new System.Drawing.Point(551, 45);
this.listBoxAfter.MouseMoveEventSpace = 3;
this.listBoxAfter.MouseMoveSpace = 10;
this.listBoxAfter.Name = "listBoxAfter";
@@ -252,12 +308,12 @@
this.listBoxAfter.SelectFilled = true;
this.listBoxAfter.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxAfter.SelectItemIndex = -1;
- this.listBoxAfter.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxAfter.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxAfter.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxAfter.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxAfter.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxAfter.SeparationlineVisibleBottom = false;
this.listBoxAfter.SeparationlineVisibleTop = false;
- this.listBoxAfter.Size = new System.Drawing.Size(75, 405);
+ this.listBoxAfter.Size = new System.Drawing.Size(88, 398);
this.listBoxAfter.TabIndex = 28;
this.listBoxAfter.Text = "smartListBox1";
this.listBoxAfter.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -278,7 +334,7 @@
this.listBoxBefore.ItemOffsetGap = 5;
this.listBoxBefore.ItemOffsetX = 5;
this.listBoxBefore.ItemOffsetY = 0;
- this.listBoxBefore.Location = new System.Drawing.Point(483, 41);
+ this.listBoxBefore.Location = new System.Drawing.Point(457, 45);
this.listBoxBefore.MouseMoveEventSpace = 3;
this.listBoxBefore.MouseMoveSpace = 10;
this.listBoxBefore.Name = "listBoxBefore";
@@ -287,12 +343,12 @@
this.listBoxBefore.SelectFilled = true;
this.listBoxBefore.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxBefore.SelectItemIndex = -1;
- this.listBoxBefore.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxBefore.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxBefore.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxBefore.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxBefore.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxBefore.SeparationlineVisibleBottom = false;
this.listBoxBefore.SeparationlineVisibleTop = false;
- this.listBoxBefore.Size = new System.Drawing.Size(75, 405);
+ this.listBoxBefore.Size = new System.Drawing.Size(88, 398);
this.listBoxBefore.TabIndex = 28;
this.listBoxBefore.Text = "smartListBox1";
this.listBoxBefore.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -313,7 +369,7 @@
this.listBoxDetail.ItemOffsetGap = 5;
this.listBoxDetail.ItemOffsetX = 5;
this.listBoxDetail.ItemOffsetY = 0;
- this.listBoxDetail.Location = new System.Drawing.Point(306, 41);
+ this.listBoxDetail.Location = new System.Drawing.Point(301, 45);
this.listBoxDetail.MouseMoveEventSpace = 3;
this.listBoxDetail.MouseMoveSpace = 10;
this.listBoxDetail.Name = "listBoxDetail";
@@ -322,12 +378,12 @@
this.listBoxDetail.SelectFilled = true;
this.listBoxDetail.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxDetail.SelectItemIndex = -1;
- this.listBoxDetail.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxDetail.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxDetail.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxDetail.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxDetail.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxDetail.SeparationlineVisibleBottom = false;
this.listBoxDetail.SeparationlineVisibleTop = false;
- this.listBoxDetail.Size = new System.Drawing.Size(171, 405);
+ this.listBoxDetail.Size = new System.Drawing.Size(150, 398);
this.listBoxDetail.TabIndex = 28;
this.listBoxDetail.Text = "smartListBox1";
this.listBoxDetail.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -348,7 +404,7 @@
this.listBoxLoginID.ItemOffsetGap = 5;
this.listBoxLoginID.ItemOffsetX = 5;
this.listBoxLoginID.ItemOffsetY = 0;
- this.listBoxLoginID.Location = new System.Drawing.Point(79, 41);
+ this.listBoxLoginID.Location = new System.Drawing.Point(74, 45);
this.listBoxLoginID.MouseMoveEventSpace = 3;
this.listBoxLoginID.MouseMoveSpace = 10;
this.listBoxLoginID.Name = "listBoxLoginID";
@@ -357,12 +413,12 @@
this.listBoxLoginID.SelectFilled = true;
this.listBoxLoginID.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxLoginID.SelectItemIndex = -1;
- this.listBoxLoginID.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxLoginID.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxLoginID.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxLoginID.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxLoginID.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxLoginID.SeparationlineVisibleBottom = false;
this.listBoxLoginID.SeparationlineVisibleTop = false;
- this.listBoxLoginID.Size = new System.Drawing.Size(80, 405);
+ this.listBoxLoginID.Size = new System.Drawing.Size(80, 398);
this.listBoxLoginID.TabIndex = 28;
this.listBoxLoginID.Text = "smartListBox1";
this.listBoxLoginID.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -383,7 +439,7 @@
this.listBoxTime.ItemOffsetGap = 5;
this.listBoxTime.ItemOffsetX = 5;
this.listBoxTime.ItemOffsetY = 0;
- this.listBoxTime.Location = new System.Drawing.Point(3, 41);
+ this.listBoxTime.Location = new System.Drawing.Point(3, 45);
this.listBoxTime.MouseMoveEventSpace = 3;
this.listBoxTime.MouseMoveSpace = 10;
this.listBoxTime.Name = "listBoxTime";
@@ -392,12 +448,12 @@
this.listBoxTime.SelectFilled = true;
this.listBoxTime.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxTime.SelectItemIndex = -1;
- this.listBoxTime.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxTime.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxTime.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxTime.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxTime.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxTime.SeparationlineVisibleBottom = false;
this.listBoxTime.SeparationlineVisibleTop = false;
- this.listBoxTime.Size = new System.Drawing.Size(70, 405);
+ this.listBoxTime.Size = new System.Drawing.Size(65, 398);
this.listBoxTime.TabIndex = 28;
this.listBoxTime.Text = "smartListBox1";
this.listBoxTime.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -415,7 +471,7 @@
this.buttonDown.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular);
this.buttonDown.GroupID = 0;
this.buttonDown.InitVisible = true;
- this.buttonDown.Location = new System.Drawing.Point(725, 286);
+ this.buttonDown.Location = new System.Drawing.Point(725, 273);
this.buttonDown.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonDown.Name = "buttonDown";
this.buttonDown.NestedClickEventPrevent = false;
@@ -423,7 +479,7 @@
this.buttonDown.RepeatInterval = 200;
this.buttonDown.RepeatIntervalAccelerate = null;
this.buttonDown.SafeInterval = 200;
- this.buttonDown.Size = new System.Drawing.Size(70, 160);
+ this.buttonDown.Size = new System.Drawing.Size(70, 170);
this.buttonDown.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonDown.TabIndex = 30;
this.buttonDown.Text = "▼";
@@ -448,7 +504,7 @@
this.buttonUp.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular);
this.buttonUp.GroupID = 0;
this.buttonUp.InitVisible = true;
- this.buttonUp.Location = new System.Drawing.Point(725, 41);
+ this.buttonUp.Location = new System.Drawing.Point(725, 43);
this.buttonUp.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonUp.Name = "buttonUp";
this.buttonUp.NestedClickEventPrevent = false;
@@ -456,7 +512,7 @@
this.buttonUp.RepeatInterval = 200;
this.buttonUp.RepeatIntervalAccelerate = null;
this.buttonUp.SafeInterval = 200;
- this.buttonUp.Size = new System.Drawing.Size(70, 160);
+ this.buttonUp.Size = new System.Drawing.Size(70, 170);
this.buttonUp.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonUp.TabIndex = 29;
this.buttonUp.Text = "▲";
@@ -479,7 +535,7 @@
this.smartLabel8.ForeColor = System.Drawing.Color.White;
this.smartLabel8.InitVisible = true;
this.smartLabel8.LineSpacing = 0F;
- this.smartLabel8.Location = new System.Drawing.Point(645, 5);
+ this.smartLabel8.Location = new System.Drawing.Point(645, 9);
this.smartLabel8.Name = "smartLabel8";
this.smartLabel8.Size = new System.Drawing.Size(75, 30);
this.smartLabel8.TabIndex = 28;
@@ -499,9 +555,9 @@
this.smartLabel7.ForeColor = System.Drawing.Color.White;
this.smartLabel7.InitVisible = true;
this.smartLabel7.LineSpacing = 0F;
- this.smartLabel7.Location = new System.Drawing.Point(564, 5);
+ this.smartLabel7.Location = new System.Drawing.Point(551, 9);
this.smartLabel7.Name = "smartLabel7";
- this.smartLabel7.Size = new System.Drawing.Size(75, 30);
+ this.smartLabel7.Size = new System.Drawing.Size(88, 30);
this.smartLabel7.TabIndex = 28;
this.smartLabel7.Text = "After";
this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -519,9 +575,9 @@
this.smartLabel6.ForeColor = System.Drawing.Color.White;
this.smartLabel6.InitVisible = true;
this.smartLabel6.LineSpacing = 0F;
- this.smartLabel6.Location = new System.Drawing.Point(483, 5);
+ this.smartLabel6.Location = new System.Drawing.Point(457, 9);
this.smartLabel6.Name = "smartLabel6";
- this.smartLabel6.Size = new System.Drawing.Size(75, 30);
+ this.smartLabel6.Size = new System.Drawing.Size(88, 30);
this.smartLabel6.TabIndex = 28;
this.smartLabel6.Text = "Before";
this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -539,9 +595,9 @@
this.smartLabel5.ForeColor = System.Drawing.Color.White;
this.smartLabel5.InitVisible = true;
this.smartLabel5.LineSpacing = 0F;
- this.smartLabel5.Location = new System.Drawing.Point(306, 5);
+ this.smartLabel5.Location = new System.Drawing.Point(301, 9);
this.smartLabel5.Name = "smartLabel5";
- this.smartLabel5.Size = new System.Drawing.Size(171, 30);
+ this.smartLabel5.Size = new System.Drawing.Size(150, 30);
this.smartLabel5.TabIndex = 28;
this.smartLabel5.Text = "Detail";
this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -559,7 +615,7 @@
this.smartLabel4.ForeColor = System.Drawing.Color.White;
this.smartLabel4.InitVisible = true;
this.smartLabel4.LineSpacing = 0F;
- this.smartLabel4.Location = new System.Drawing.Point(165, 5);
+ this.smartLabel4.Location = new System.Drawing.Point(160, 9);
this.smartLabel4.Name = "smartLabel4";
this.smartLabel4.Size = new System.Drawing.Size(135, 30);
this.smartLabel4.TabIndex = 28;
@@ -579,7 +635,7 @@
this.smartLabel3.ForeColor = System.Drawing.Color.White;
this.smartLabel3.InitVisible = true;
this.smartLabel3.LineSpacing = 0F;
- this.smartLabel3.Location = new System.Drawing.Point(79, 5);
+ this.smartLabel3.Location = new System.Drawing.Point(74, 9);
this.smartLabel3.Name = "smartLabel3";
this.smartLabel3.Size = new System.Drawing.Size(80, 30);
this.smartLabel3.TabIndex = 28;
@@ -599,9 +655,9 @@
this.smartLabel2.ForeColor = System.Drawing.Color.White;
this.smartLabel2.InitVisible = true;
this.smartLabel2.LineSpacing = 0F;
- this.smartLabel2.Location = new System.Drawing.Point(3, 5);
+ this.smartLabel2.Location = new System.Drawing.Point(3, 9);
this.smartLabel2.Name = "smartLabel2";
- this.smartLabel2.Size = new System.Drawing.Size(70, 30);
+ this.smartLabel2.Size = new System.Drawing.Size(65, 30);
this.smartLabel2.TabIndex = 28;
this.smartLabel2.Text = "Time";
this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -668,6 +724,7 @@
this.buttonFilter.TextLocation = new System.Drawing.Point(0, 0);
this.buttonFilter.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonFilter.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonFilter.UpImage")));
+ this.buttonFilter.Visible = false;
this.buttonFilter.Click += new System.EventHandler(this.buttonFilter_Click);
//
// buttonBack
@@ -828,59 +885,6 @@
this.labelFileReadElapsedTime.Visible = false;
this.labelFileReadElapsedTime.Wordwrap = false;
//
- // labelCurrentIndex
- //
- this.labelCurrentIndex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
- this.labelCurrentIndex.BackPictureBox = this.smartForm1;
- this.labelCurrentIndex.BackPictureBox1 = null;
- this.labelCurrentIndex.BackPictureBox2 = null;
- this.labelCurrentIndex.BorderColor = System.Drawing.Color.Black;
- this.labelCurrentIndex.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelCurrentIndex.InitVisible = true;
- this.labelCurrentIndex.LineSpacing = 0F;
- this.labelCurrentIndex.Location = new System.Drawing.Point(725, 218);
- this.labelCurrentIndex.Name = "labelCurrentIndex";
- this.labelCurrentIndex.Size = new System.Drawing.Size(70, 20);
- this.labelCurrentIndex.TabIndex = 242;
- this.labelCurrentIndex.Text = "0";
- this.labelCurrentIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelCurrentIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelCurrentIndex.Wordwrap = false;
- //
- // smartSeparatorLine1
- //
- this.smartSeparatorLine1.InitVisible = true;
- this.smartSeparatorLine1.Line1Color = System.Drawing.Color.DimGray;
- this.smartSeparatorLine1.Line1Width = 1F;
- this.smartSeparatorLine1.Line2Color = System.Drawing.Color.LightGray;
- this.smartSeparatorLine1.Line2Visible = true;
- this.smartSeparatorLine1.Line2Width = 1F;
- this.smartSeparatorLine1.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal;
- this.smartSeparatorLine1.Location = new System.Drawing.Point(725, 244);
- this.smartSeparatorLine1.Name = "smartSeparatorLine1";
- this.smartSeparatorLine1.Size = new System.Drawing.Size(70, 2);
- this.smartSeparatorLine1.TabIndex = 241;
- this.smartSeparatorLine1.Text = "smartSeparatorLine1";
- //
- // labelTotalIndex
- //
- this.labelTotalIndex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
- this.labelTotalIndex.BackPictureBox = this.smartForm1;
- this.labelTotalIndex.BackPictureBox1 = null;
- this.labelTotalIndex.BackPictureBox2 = null;
- this.labelTotalIndex.BorderColor = System.Drawing.Color.Black;
- this.labelTotalIndex.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelTotalIndex.InitVisible = true;
- this.labelTotalIndex.LineSpacing = 0F;
- this.labelTotalIndex.Location = new System.Drawing.Point(725, 252);
- this.labelTotalIndex.Name = "labelTotalIndex";
- this.labelTotalIndex.Size = new System.Drawing.Size(70, 20);
- this.labelTotalIndex.TabIndex = 240;
- this.labelTotalIndex.Text = "0";
- this.labelTotalIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelTotalIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTotalIndex.Wordwrap = false;
- //
// FormDataViewer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
diff --git a/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs b/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs
index cc56993..2879014 100644
--- a/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs
+++ b/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs
@@ -84,6 +84,9 @@
this.labelStaticPingTimer = new SmartX.SmartLabel();
this.buttonPingTimer = new SmartX.SmartButton();
this.groupBoxSpecialMenu = new SmartX.SmartGroupBox();
+ this.smartLabel6 = new SmartX.SmartLabel();
+ this.labelDataStoragePeriod = new SmartX.SmartLabel();
+ this.labelStaticDataStoragePeriod = new SmartX.SmartLabel();
this.smartLabel2 = new SmartX.SmartLabel();
this.buttonIntegratedTransmission = new SmartX.SmartButton();
this.labelStaticIntegratedTransmission = new SmartX.SmartLabel();
@@ -91,9 +94,6 @@
this.pictureBoxFormIcon = new System.Windows.Forms.PictureBox();
this.buttonSave = new SmartX.SmartButton();
this.buttonBack = new SmartX.SmartButton();
- this.labelDataStoragePeriod = new SmartX.SmartLabel();
- this.labelStaticDataStoragePeriod = new SmartX.SmartLabel();
- this.smartLabel6 = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.panel1.SuspendLayout();
this.panel3.SuspendLayout();
@@ -130,7 +130,7 @@
this.labelStaticEquipmentID.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticEquipmentID.InitVisible = true;
this.labelStaticEquipmentID.LineSpacing = 0F;
- this.labelStaticEquipmentID.Location = new System.Drawing.Point(318, 451);
+ this.labelStaticEquipmentID.Location = new System.Drawing.Point(318, 423);
this.labelStaticEquipmentID.Name = "labelStaticEquipmentID";
this.labelStaticEquipmentID.Size = new System.Drawing.Size(108, 25);
this.labelStaticEquipmentID.TabIndex = 119;
@@ -149,7 +149,7 @@
this.labelStaticEquipmentLine.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticEquipmentLine.InitVisible = true;
this.labelStaticEquipmentLine.LineSpacing = 0F;
- this.labelStaticEquipmentLine.Location = new System.Drawing.Point(16, 110);
+ this.labelStaticEquipmentLine.Location = new System.Drawing.Point(16, 112);
this.labelStaticEquipmentLine.Name = "labelStaticEquipmentLine";
this.labelStaticEquipmentLine.Size = new System.Drawing.Size(204, 25);
this.labelStaticEquipmentLine.TabIndex = 119;
@@ -168,7 +168,7 @@
this.labelStaticWeightCheck.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticWeightCheck.InitVisible = true;
this.labelStaticWeightCheck.LineSpacing = 0F;
- this.labelStaticWeightCheck.Location = new System.Drawing.Point(12, 141);
+ this.labelStaticWeightCheck.Location = new System.Drawing.Point(12, 485);
this.labelStaticWeightCheck.Name = "labelStaticWeightCheck";
this.labelStaticWeightCheck.Size = new System.Drawing.Size(208, 25);
this.labelStaticWeightCheck.TabIndex = 119;
@@ -188,7 +188,7 @@
this.labelStaticSelectSensor.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticSelectSensor.InitVisible = true;
this.labelStaticSelectSensor.LineSpacing = 0F;
- this.labelStaticSelectSensor.Location = new System.Drawing.Point(12, 234);
+ this.labelStaticSelectSensor.Location = new System.Drawing.Point(12, 206);
this.labelStaticSelectSensor.Name = "labelStaticSelectSensor";
this.labelStaticSelectSensor.Size = new System.Drawing.Size(208, 25);
this.labelStaticSelectSensor.TabIndex = 119;
@@ -208,7 +208,7 @@
this.labelEquipmentID.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold);
this.labelEquipmentID.InitVisible = true;
this.labelEquipmentID.LineSpacing = 0F;
- this.labelEquipmentID.Location = new System.Drawing.Point(432, 451);
+ this.labelEquipmentID.Location = new System.Drawing.Point(432, 423);
this.labelEquipmentID.Name = "labelEquipmentID";
this.labelEquipmentID.Size = new System.Drawing.Size(72, 25);
this.labelEquipmentID.TabIndex = 120;
@@ -228,7 +228,7 @@
this.labelStaticIndividualNG.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticIndividualNG.InitVisible = true;
this.labelStaticIndividualNG.LineSpacing = 0F;
- this.labelStaticIndividualNG.Location = new System.Drawing.Point(12, 203);
+ this.labelStaticIndividualNG.Location = new System.Drawing.Point(12, 175);
this.labelStaticIndividualNG.Name = "labelStaticIndividualNG";
this.labelStaticIndividualNG.Size = new System.Drawing.Size(208, 25);
this.labelStaticIndividualNG.TabIndex = 125;
@@ -249,7 +249,7 @@
this.buttonEachNG.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachNG.DownImage")));
this.buttonEachNG.GroupID = 0;
this.buttonEachNG.InitVisible = true;
- this.buttonEachNG.Location = new System.Drawing.Point(226, 203);
+ this.buttonEachNG.Location = new System.Drawing.Point(226, 175);
this.buttonEachNG.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonEachNG.Name = "buttonEachNG";
this.buttonEachNG.NestedClickEventPrevent = false;
@@ -278,7 +278,7 @@
this.labelStaticRejectConveyor.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticRejectConveyor.InitVisible = true;
this.labelStaticRejectConveyor.LineSpacing = 0F;
- this.labelStaticRejectConveyor.Location = new System.Drawing.Point(12, 265);
+ this.labelStaticRejectConveyor.Location = new System.Drawing.Point(12, 237);
this.labelStaticRejectConveyor.Name = "labelStaticRejectConveyor";
this.labelStaticRejectConveyor.Size = new System.Drawing.Size(208, 25);
this.labelStaticRejectConveyor.TabIndex = 125;
@@ -299,7 +299,7 @@
this.buttonDischargeConveyor.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDischargeConveyor.DownImage")));
this.buttonDischargeConveyor.GroupID = 0;
this.buttonDischargeConveyor.InitVisible = true;
- this.buttonDischargeConveyor.Location = new System.Drawing.Point(226, 265);
+ this.buttonDischargeConveyor.Location = new System.Drawing.Point(226, 237);
this.buttonDischargeConveyor.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDischargeConveyor.Name = "buttonDischargeConveyor";
this.buttonDischargeConveyor.NestedClickEventPrevent = false;
@@ -328,7 +328,7 @@
this.labelStaticFeedingConveyor.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticFeedingConveyor.InitVisible = true;
this.labelStaticFeedingConveyor.LineSpacing = 0F;
- this.labelStaticFeedingConveyor.Location = new System.Drawing.Point(12, 296);
+ this.labelStaticFeedingConveyor.Location = new System.Drawing.Point(12, 268);
this.labelStaticFeedingConveyor.Name = "labelStaticFeedingConveyor";
this.labelStaticFeedingConveyor.Size = new System.Drawing.Size(208, 25);
this.labelStaticFeedingConveyor.TabIndex = 125;
@@ -349,7 +349,7 @@
this.buttonFeedingConveyor.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonFeedingConveyor.DownImage")));
this.buttonFeedingConveyor.GroupID = 0;
this.buttonFeedingConveyor.InitVisible = true;
- this.buttonFeedingConveyor.Location = new System.Drawing.Point(226, 296);
+ this.buttonFeedingConveyor.Location = new System.Drawing.Point(226, 268);
this.buttonFeedingConveyor.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonFeedingConveyor.Name = "buttonFeedingConveyor";
this.buttonFeedingConveyor.NestedClickEventPrevent = false;
@@ -371,7 +371,7 @@
// comboBoxEquipmentColumn
//
this.comboBoxEquipmentColumn.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
- this.comboBoxEquipmentColumn.Location = new System.Drawing.Point(226, 107);
+ this.comboBoxEquipmentColumn.Location = new System.Drawing.Point(226, 109);
this.comboBoxEquipmentColumn.Name = "comboBoxEquipmentColumn";
this.comboBoxEquipmentColumn.Size = new System.Drawing.Size(104, 29);
this.comboBoxEquipmentColumn.TabIndex = 127;
@@ -380,7 +380,7 @@
// comboBoxInputSensorSelect
//
this.comboBoxInputSensorSelect.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
- this.comboBoxInputSensorSelect.Location = new System.Drawing.Point(226, 230);
+ this.comboBoxInputSensorSelect.Location = new System.Drawing.Point(226, 202);
this.comboBoxInputSensorSelect.Name = "comboBoxInputSensorSelect";
this.comboBoxInputSensorSelect.Size = new System.Drawing.Size(165, 29);
this.comboBoxInputSensorSelect.TabIndex = 127;
@@ -392,7 +392,7 @@
this.panel1.Controls.Add(this.radioButtonEquipmentModeStick3);
this.panel1.Controls.Add(this.radioButtonEquipmentModeStick2);
this.panel1.Controls.Add(this.radioButtonEquipmentModeStick1);
- this.panel1.Location = new System.Drawing.Point(226, 79);
+ this.panel1.Location = new System.Drawing.Point(226, 81);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(298, 25);
//
@@ -436,7 +436,7 @@
this.labelStaticEquipmentType.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticEquipmentType.InitVisible = true;
this.labelStaticEquipmentType.LineSpacing = 0F;
- this.labelStaticEquipmentType.Location = new System.Drawing.Point(12, 79);
+ this.labelStaticEquipmentType.Location = new System.Drawing.Point(12, 81);
this.labelStaticEquipmentType.Name = "labelStaticEquipmentType";
this.labelStaticEquipmentType.Size = new System.Drawing.Size(208, 25);
this.labelStaticEquipmentType.TabIndex = 129;
@@ -451,7 +451,7 @@
this.panel3.Controls.Add(this.radioButtonDischargeConveyorDirectionCWCCW);
this.panel3.Controls.Add(this.radioButtonDischargeConveyorDirectionCCW);
this.panel3.Controls.Add(this.radioButtonDischargeConveyorDirectionCW);
- this.panel3.Location = new System.Drawing.Point(316, 265);
+ this.panel3.Location = new System.Drawing.Point(316, 237);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(410, 25);
//
@@ -491,7 +491,7 @@
this.panel6.BackColor = System.Drawing.SystemColors.ControlLight;
this.panel6.Controls.Add(this.radioButtonImpellerMotorDirectionCCW);
this.panel6.Controls.Add(this.radioButtonImpellerMotorDirectionCW);
- this.panel6.Location = new System.Drawing.Point(226, 389);
+ this.panel6.Location = new System.Drawing.Point(226, 361);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(500, 25);
//
@@ -521,7 +521,7 @@
this.panel7.BackColor = System.Drawing.SystemColors.ControlLight;
this.panel7.Controls.Add(this.radioButtonFeedingConveyorRunNg);
this.panel7.Controls.Add(this.radioButtonFeedingConveyorRunPass);
- this.panel7.Location = new System.Drawing.Point(316, 296);
+ this.panel7.Location = new System.Drawing.Point(316, 268);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(410, 25);
//
@@ -556,7 +556,7 @@
this.labelStaticImpellerRotationDirection.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticImpellerRotationDirection.InitVisible = true;
this.labelStaticImpellerRotationDirection.LineSpacing = 0F;
- this.labelStaticImpellerRotationDirection.Location = new System.Drawing.Point(12, 389);
+ this.labelStaticImpellerRotationDirection.Location = new System.Drawing.Point(12, 361);
this.labelStaticImpellerRotationDirection.Name = "labelStaticImpellerRotationDirection";
this.labelStaticImpellerRotationDirection.Size = new System.Drawing.Size(208, 25);
this.labelStaticImpellerRotationDirection.TabIndex = 129;
@@ -575,7 +575,7 @@
this.labelStaticImpellerBaudrate.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticImpellerBaudrate.InitVisible = true;
this.labelStaticImpellerBaudrate.LineSpacing = 0F;
- this.labelStaticImpellerBaudrate.Location = new System.Drawing.Point(12, 358);
+ this.labelStaticImpellerBaudrate.Location = new System.Drawing.Point(12, 330);
this.labelStaticImpellerBaudrate.Name = "labelStaticImpellerBaudrate";
this.labelStaticImpellerBaudrate.Size = new System.Drawing.Size(208, 25);
this.labelStaticImpellerBaudrate.TabIndex = 135;
@@ -591,7 +591,7 @@
this.panel5.Controls.Add(this.radioButtonImpellerMotorBaudrate38400);
this.panel5.Controls.Add(this.radioButtonImpellerMotorBaudrate19200);
this.panel5.Controls.Add(this.radioButtonImpellerMotorBaudrate9600);
- this.panel5.Location = new System.Drawing.Point(226, 358);
+ this.panel5.Location = new System.Drawing.Point(226, 330);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(500, 25);
//
@@ -648,7 +648,7 @@
this.panel2.BackColor = System.Drawing.SystemColors.ControlLight;
this.panel2.Controls.Add(this.radioButtonWeightViewReverse);
this.panel2.Controls.Add(this.radioButtonWeightViewForward);
- this.panel2.Location = new System.Drawing.Point(226, 141);
+ this.panel2.Location = new System.Drawing.Point(226, 485);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(500, 25);
this.panel2.Visible = false;
@@ -686,7 +686,7 @@
this.smartLabel12.ForeColor = System.Drawing.Color.Red;
this.smartLabel12.InitVisible = true;
this.smartLabel12.LineSpacing = 0F;
- this.smartLabel12.Location = new System.Drawing.Point(428, 204);
+ this.smartLabel12.Location = new System.Drawing.Point(428, 176);
this.smartLabel12.Name = "smartLabel12";
this.smartLabel12.Size = new System.Drawing.Size(267, 23);
this.smartLabel12.TabIndex = 145;
@@ -707,7 +707,7 @@
this.smartLabel14.ForeColor = System.Drawing.Color.Red;
this.smartLabel14.InitVisible = true;
this.smartLabel14.LineSpacing = 0F;
- this.smartLabel14.Location = new System.Drawing.Point(428, 235);
+ this.smartLabel14.Location = new System.Drawing.Point(428, 207);
this.smartLabel14.Name = "smartLabel14";
this.smartLabel14.Size = new System.Drawing.Size(267, 23);
this.smartLabel14.TabIndex = 145;
@@ -722,7 +722,7 @@
this.panel8.Controls.Add(this.radioButtonChinese);
this.panel8.Controls.Add(this.radioButtonEnglish);
this.panel8.Controls.Add(this.radioButtonKorean);
- this.panel8.Location = new System.Drawing.Point(226, 420);
+ this.panel8.Location = new System.Drawing.Point(226, 392);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(500, 25);
//
@@ -766,7 +766,7 @@
this.labelBuadrateWarning.BorderColor = System.Drawing.Color.Black;
this.labelBuadrateWarning.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelBuadrateWarning.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
- this.labelBuadrateWarning.ForeColor = System.Drawing.Color.Red;
+ this.labelBuadrateWarning.ForeColor = System.Drawing.Color.Gold;
this.labelBuadrateWarning.InitVisible = true;
this.labelBuadrateWarning.LineSpacing = 0F;
this.labelBuadrateWarning.Location = new System.Drawing.Point(41, 539);
@@ -788,7 +788,7 @@
this.labelStaticLanguage.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticLanguage.InitVisible = true;
this.labelStaticLanguage.LineSpacing = 0F;
- this.labelStaticLanguage.Location = new System.Drawing.Point(12, 420);
+ this.labelStaticLanguage.Location = new System.Drawing.Point(12, 392);
this.labelStaticLanguage.Name = "labelStaticLanguage";
this.labelStaticLanguage.Size = new System.Drawing.Size(208, 25);
this.labelStaticLanguage.TabIndex = 156;
@@ -806,7 +806,7 @@
this.labelBuadrateWarning2.BorderColor = System.Drawing.Color.Black;
this.labelBuadrateWarning2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelBuadrateWarning2.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
- this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.Red;
+ this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.Gold;
this.labelBuadrateWarning2.InitVisible = true;
this.labelBuadrateWarning2.LineSpacing = 0F;
this.labelBuadrateWarning2.Location = new System.Drawing.Point(41, 565);
@@ -828,7 +828,7 @@
this.labelStaticLogin.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticLogin.InitVisible = true;
this.labelStaticLogin.LineSpacing = 0F;
- this.labelStaticLogin.Location = new System.Drawing.Point(12, 451);
+ this.labelStaticLogin.Location = new System.Drawing.Point(12, 423);
this.labelStaticLogin.Name = "labelStaticLogin";
this.labelStaticLogin.Size = new System.Drawing.Size(208, 25);
this.labelStaticLogin.TabIndex = 181;
@@ -849,7 +849,7 @@
this.buttonLogin.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLogin.DownImage")));
this.buttonLogin.GroupID = 0;
this.buttonLogin.InitVisible = true;
- this.buttonLogin.Location = new System.Drawing.Point(226, 451);
+ this.buttonLogin.Location = new System.Drawing.Point(226, 423);
this.buttonLogin.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonLogin.Name = "buttonLogin";
this.buttonLogin.NestedClickEventPrevent = false;
@@ -878,7 +878,7 @@
this.labelTitleStepMotorType.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelTitleStepMotorType.InitVisible = true;
this.labelTitleStepMotorType.LineSpacing = 0F;
- this.labelTitleStepMotorType.Location = new System.Drawing.Point(12, 482);
+ this.labelTitleStepMotorType.Location = new System.Drawing.Point(12, 454);
this.labelTitleStepMotorType.Name = "labelTitleStepMotorType";
this.labelTitleStepMotorType.Size = new System.Drawing.Size(208, 25);
this.labelTitleStepMotorType.TabIndex = 190;
@@ -890,7 +890,7 @@
// comboBoxStepMotorType
//
this.comboBoxStepMotorType.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.comboBoxStepMotorType.Location = new System.Drawing.Point(226, 482);
+ this.comboBoxStepMotorType.Location = new System.Drawing.Point(226, 454);
this.comboBoxStepMotorType.Name = "comboBoxStepMotorType";
this.comboBoxStepMotorType.Size = new System.Drawing.Size(165, 25);
this.comboBoxStepMotorType.TabIndex = 191;
@@ -906,7 +906,7 @@
this.labelStaticPingTimer.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticPingTimer.InitVisible = true;
this.labelStaticPingTimer.LineSpacing = 0F;
- this.labelStaticPingTimer.Location = new System.Drawing.Point(532, 451);
+ this.labelStaticPingTimer.Location = new System.Drawing.Point(532, 423);
this.labelStaticPingTimer.Name = "labelStaticPingTimer";
this.labelStaticPingTimer.Size = new System.Drawing.Size(104, 25);
this.labelStaticPingTimer.TabIndex = 199;
@@ -927,7 +927,7 @@
this.buttonPingTimer.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPingTimer.DownImage")));
this.buttonPingTimer.GroupID = 0;
this.buttonPingTimer.InitVisible = true;
- this.buttonPingTimer.Location = new System.Drawing.Point(642, 451);
+ this.buttonPingTimer.Location = new System.Drawing.Point(642, 423);
this.buttonPingTimer.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonPingTimer.Name = "buttonPingTimer";
this.buttonPingTimer.NestedClickEventPrevent = false;
@@ -1008,6 +1008,65 @@
this.groupBoxSpecialMenu.TabIndex = 144;
this.groupBoxSpecialMenu.TextColor = System.Drawing.Color.Black;
//
+ // smartLabel6
+ //
+ this.smartLabel6.BackPictureBox = this.smartForm1;
+ this.smartLabel6.BackPictureBox1 = null;
+ this.smartLabel6.BackPictureBox2 = null;
+ this.smartLabel6.BorderColor = System.Drawing.Color.Black;
+ this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.smartLabel6.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular);
+ this.smartLabel6.InitVisible = true;
+ this.smartLabel6.LineSpacing = 0F;
+ this.smartLabel6.Location = new System.Drawing.Point(316, 299);
+ this.smartLabel6.Name = "smartLabel6";
+ this.smartLabel6.Size = new System.Drawing.Size(174, 25);
+ this.smartLabel6.TabIndex = 259;
+ this.smartLabel6.Text = "months";
+ this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+ this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.smartLabel6.Wordwrap = false;
+ //
+ // labelDataStoragePeriod
+ //
+ this.labelDataStoragePeriod.BackColor = System.Drawing.SystemColors.Window;
+ this.labelDataStoragePeriod.BackPictureBox = null;
+ this.labelDataStoragePeriod.BackPictureBox1 = null;
+ this.labelDataStoragePeriod.BackPictureBox2 = null;
+ this.labelDataStoragePeriod.BorderColor = System.Drawing.Color.Black;
+ this.labelDataStoragePeriod.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labelDataStoragePeriod.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold);
+ this.labelDataStoragePeriod.InitVisible = true;
+ this.labelDataStoragePeriod.LineSpacing = 0F;
+ this.labelDataStoragePeriod.Location = new System.Drawing.Point(226, 299);
+ this.labelDataStoragePeriod.Name = "labelDataStoragePeriod";
+ this.labelDataStoragePeriod.Size = new System.Drawing.Size(84, 25);
+ this.labelDataStoragePeriod.TabIndex = 258;
+ this.labelDataStoragePeriod.Text = "100";
+ this.labelDataStoragePeriod.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
+ this.labelDataStoragePeriod.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelDataStoragePeriod.Wordwrap = false;
+ this.labelDataStoragePeriod.Click += new System.EventHandler(this.labelDataStoragePeriod_Click);
+ //
+ // labelStaticDataStoragePeriod
+ //
+ this.labelStaticDataStoragePeriod.BackPictureBox = this.smartForm1;
+ this.labelStaticDataStoragePeriod.BackPictureBox1 = null;
+ this.labelStaticDataStoragePeriod.BackPictureBox2 = null;
+ this.labelStaticDataStoragePeriod.BorderColor = System.Drawing.Color.Black;
+ this.labelStaticDataStoragePeriod.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelStaticDataStoragePeriod.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
+ this.labelStaticDataStoragePeriod.InitVisible = true;
+ this.labelStaticDataStoragePeriod.LineSpacing = 0F;
+ this.labelStaticDataStoragePeriod.Location = new System.Drawing.Point(12, 299);
+ this.labelStaticDataStoragePeriod.Name = "labelStaticDataStoragePeriod";
+ this.labelStaticDataStoragePeriod.Size = new System.Drawing.Size(208, 25);
+ this.labelStaticDataStoragePeriod.TabIndex = 257;
+ this.labelStaticDataStoragePeriod.Text = "데이터 저장 기한";
+ this.labelStaticDataStoragePeriod.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
+ this.labelStaticDataStoragePeriod.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelStaticDataStoragePeriod.Wordwrap = false;
+ //
// smartLabel2
//
this.smartLabel2.BackColor = System.Drawing.Color.Silver;
@@ -1020,7 +1079,7 @@
this.smartLabel2.ForeColor = System.Drawing.Color.Red;
this.smartLabel2.InitVisible = true;
this.smartLabel2.LineSpacing = 0F;
- this.smartLabel2.Location = new System.Drawing.Point(428, 172);
+ this.smartLabel2.Location = new System.Drawing.Point(428, 144);
this.smartLabel2.Name = "smartLabel2";
this.smartLabel2.Size = new System.Drawing.Size(267, 25);
this.smartLabel2.TabIndex = 248;
@@ -1041,7 +1100,7 @@
this.buttonIntegratedTransmission.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonIntegratedTransmission.DownImage")));
this.buttonIntegratedTransmission.GroupID = 0;
this.buttonIntegratedTransmission.InitVisible = true;
- this.buttonIntegratedTransmission.Location = new System.Drawing.Point(226, 172);
+ this.buttonIntegratedTransmission.Location = new System.Drawing.Point(226, 144);
this.buttonIntegratedTransmission.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonIntegratedTransmission.Name = "buttonIntegratedTransmission";
this.buttonIntegratedTransmission.NestedClickEventPrevent = false;
@@ -1070,7 +1129,7 @@
this.labelStaticIntegratedTransmission.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticIntegratedTransmission.InitVisible = true;
this.labelStaticIntegratedTransmission.LineSpacing = 0F;
- this.labelStaticIntegratedTransmission.Location = new System.Drawing.Point(12, 172);
+ this.labelStaticIntegratedTransmission.Location = new System.Drawing.Point(12, 144);
this.labelStaticIntegratedTransmission.Name = "labelStaticIntegratedTransmission";
this.labelStaticIntegratedTransmission.Size = new System.Drawing.Size(208, 25);
this.labelStaticIntegratedTransmission.TabIndex = 246;
@@ -1169,65 +1228,6 @@
this.buttonBack.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonBack.UpImage")));
this.buttonBack.Click += new System.EventHandler(this.buttonBack_Click);
//
- // labelDataStoragePeriod
- //
- this.labelDataStoragePeriod.BackColor = System.Drawing.SystemColors.Window;
- this.labelDataStoragePeriod.BackPictureBox = null;
- this.labelDataStoragePeriod.BackPictureBox1 = null;
- this.labelDataStoragePeriod.BackPictureBox2 = null;
- this.labelDataStoragePeriod.BorderColor = System.Drawing.Color.Black;
- this.labelDataStoragePeriod.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.labelDataStoragePeriod.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold);
- this.labelDataStoragePeriod.InitVisible = true;
- this.labelDataStoragePeriod.LineSpacing = 0F;
- this.labelDataStoragePeriod.Location = new System.Drawing.Point(226, 327);
- this.labelDataStoragePeriod.Name = "labelDataStoragePeriod";
- this.labelDataStoragePeriod.Size = new System.Drawing.Size(84, 25);
- this.labelDataStoragePeriod.TabIndex = 258;
- this.labelDataStoragePeriod.Text = "100";
- this.labelDataStoragePeriod.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
- this.labelDataStoragePeriod.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelDataStoragePeriod.Wordwrap = false;
- this.labelDataStoragePeriod.Click += new System.EventHandler(this.labelDataStoragePeriod_Click);
- //
- // labelStaticDataStoragePeriod
- //
- this.labelStaticDataStoragePeriod.BackPictureBox = this.smartForm1;
- this.labelStaticDataStoragePeriod.BackPictureBox1 = null;
- this.labelStaticDataStoragePeriod.BackPictureBox2 = null;
- this.labelStaticDataStoragePeriod.BorderColor = System.Drawing.Color.Black;
- this.labelStaticDataStoragePeriod.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelStaticDataStoragePeriod.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
- this.labelStaticDataStoragePeriod.InitVisible = true;
- this.labelStaticDataStoragePeriod.LineSpacing = 0F;
- this.labelStaticDataStoragePeriod.Location = new System.Drawing.Point(12, 327);
- this.labelStaticDataStoragePeriod.Name = "labelStaticDataStoragePeriod";
- this.labelStaticDataStoragePeriod.Size = new System.Drawing.Size(208, 25);
- this.labelStaticDataStoragePeriod.TabIndex = 257;
- this.labelStaticDataStoragePeriod.Text = "데이터 저장 기한";
- this.labelStaticDataStoragePeriod.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
- this.labelStaticDataStoragePeriod.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelStaticDataStoragePeriod.Wordwrap = false;
- //
- // smartLabel6
- //
- this.smartLabel6.BackPictureBox = this.smartForm1;
- this.smartLabel6.BackPictureBox1 = null;
- this.smartLabel6.BackPictureBox2 = null;
- this.smartLabel6.BorderColor = System.Drawing.Color.Black;
- this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.smartLabel6.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular);
- this.smartLabel6.InitVisible = true;
- this.smartLabel6.LineSpacing = 0F;
- this.smartLabel6.Location = new System.Drawing.Point(316, 327);
- this.smartLabel6.Name = "smartLabel6";
- this.smartLabel6.Size = new System.Drawing.Size(174, 25);
- this.smartLabel6.TabIndex = 259;
- this.smartLabel6.Text = "months";
- this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
- this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel6.Wordwrap = false;
- //
// FormEquipmentSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs
index 33b9c9b..847b160 100644
--- a/INT69DB_2A/Forms/FormMain.cs
+++ b/INT69DB_2A/Forms/FormMain.cs
@@ -6900,104 +6900,202 @@ namespace INT69DB_2A.Forms
StructUserGroupItem structItem;
UserGroupItem item = new UserGroupItem();
- for (int i = 0; i < 2; i++)
- {
- #region StructItem
- structItem.IsMainDisplayProductNo = item.IsMainDisplayProductNo;
- structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting;
- structItem.IsMainDisplayClear = item.IsMainDisplayClear;
- structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu;
+ #region Level1
+ #region StructItem
+ structItem.IsMainDisplayProductNo = true;
+ structItem.IsMainDisplayWeightSetting = false;
+ structItem.IsMainDisplayClear = true;
+ structItem.IsMainDispalySubMenu = false;
- structItem.IsMenuTime = item.IsMenuTime;
- structItem.IsMenuInformation = item.IsMenuInformation;
- structItem.IsMenuDataBackup = item.IsMenuDataBackup;
- structItem.IsMenuCalibration = item.IsMenuCalibration;
- structItem.IsMenuCommunication = item.IsMenuCommunication;
- structItem.IsMenuConfiguration = item.IsMenuConfiguration;
- structItem.IsMenuSystem = item.IsMenuSystem;
- structItem.IsMenuMotor = item.IsMenuMotor;
- structItem.IsMenuUpdate = item.IsMenuUpdate;
- structItem.IsMenuInitialization = item.IsMenuInitialization;
- structItem.IsMenuEquipment = item.IsMenuEquipment;
- structItem.IsMenuIOTest = item.IsMenuIOTest;
- structItem.IsMenuStatistics = item.IsMenuStatistics;
- structItem.IsMenuUser = item.IsMenuUser;
- structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor;
- structItem.IsMenuViewer = item.IsMenuViewer;
+ structItem.IsMenuTime = false;
+ structItem.IsMenuInformation = true;
+ structItem.IsMenuDataBackup = true;
+ structItem.IsMenuCalibration = false;
+ structItem.IsMenuCommunication = false;
+ structItem.IsMenuConfiguration = false;
+ structItem.IsMenuSystem = false;
+ structItem.IsMenuMotor = false;
+ structItem.IsMenuUpdate = false;
+ structItem.IsMenuInitialization = false;
+ structItem.IsMenuEquipment = false;
+ structItem.IsMenuIOTest = false;
+ structItem.IsMenuStatistics = true;
+ structItem.IsMenuUser = true;
+ structItem.IsMenuUserGroupEditor = false;
+ structItem.IsMenuViewer = false;
- structItem.Dummy1 = false;
- structItem.Dummy2 = false;
- structItem.Dummy3 = false;
- structItem.Dummy4 = false;
- structItem.Dummy5 = false;
- structItem.Dummy6 = false;
- structItem.Dummy7 = false;
- structItem.Dummy8 = false;
- structItem.Dummy9 = false;
- structItem.Dummy10 = false;
- structItem.Dummy11 = false;
- structItem.Dummy12 = false;
- structItem.Dummy13 = false;
- structItem.Dummy14 = false;
- structItem.Dummy15 = false;
- structItem.Dummy16 = false;
- structItem.Dummy17 = false;
- structItem.Dummy18 = false;
- structItem.Dummy19 = false;
- structItem.Dummy20 = false;
- #endregion
+ structItem.Dummy1 = false;
+ structItem.Dummy2 = false;
+ structItem.Dummy3 = false;
+ structItem.Dummy4 = false;
+ structItem.Dummy5 = false;
+ structItem.Dummy6 = false;
+ structItem.Dummy7 = false;
+ structItem.Dummy8 = false;
+ structItem.Dummy9 = false;
+ structItem.Dummy10 = false;
+ structItem.Dummy11 = false;
+ structItem.Dummy12 = false;
+ structItem.Dummy13 = false;
+ structItem.Dummy14 = false;
+ structItem.Dummy15 = false;
+ structItem.Dummy16 = false;
+ structItem.Dummy17 = false;
+ structItem.Dummy18 = false;
+ structItem.Dummy19 = false;
+ structItem.Dummy20 = false;
+ #endregion
- this.smartFileIO.WriteStructure_Begin(structItem, i);
- }
- for (int i = 2; i < 4; i++)
- {
- #region StructItem
- structItem.IsMainDisplayProductNo = true;
- structItem.IsMainDisplayWeightSetting = true;
- structItem.IsMainDisplayClear = true;
- structItem.IsMainDispalySubMenu = true;
+ this.smartFileIO.WriteStructure_Begin(structItem, 0);
+ #endregion
- structItem.IsMenuTime = true;
- structItem.IsMenuInformation = true;
- structItem.IsMenuDataBackup = true;
- structItem.IsMenuCalibration = true;
- structItem.IsMenuCommunication = true;
- structItem.IsMenuConfiguration = true;
- structItem.IsMenuSystem = true;
- structItem.IsMenuMotor = true;
- structItem.IsMenuUpdate = true;
- structItem.IsMenuInitialization = true;
- structItem.IsMenuEquipment = true;
- structItem.IsMenuIOTest = true;
- structItem.IsMenuStatistics = true;
- structItem.IsMenuUser = true;
- structItem.IsMenuUserGroupEditor = true;
- structItem.IsMenuViewer = true;
+ #region Level2
+ #region StructItem
+ structItem.IsMainDisplayProductNo = true;
+ structItem.IsMainDisplayWeightSetting = true;
+ structItem.IsMainDisplayClear = true;
+ structItem.IsMainDispalySubMenu = true;
- structItem.Dummy1 = false;
- structItem.Dummy2 = false;
- structItem.Dummy3 = false;
- structItem.Dummy4 = false;
- structItem.Dummy5 = false;
- structItem.Dummy6 = false;
- structItem.Dummy7 = false;
- structItem.Dummy8 = false;
- structItem.Dummy9 = false;
- structItem.Dummy10 = false;
- structItem.Dummy11 = false;
- structItem.Dummy12 = false;
- structItem.Dummy13 = false;
- structItem.Dummy14 = false;
- structItem.Dummy15 = false;
- structItem.Dummy16 = false;
- structItem.Dummy17 = false;
- structItem.Dummy18 = false;
- structItem.Dummy19 = false;
- structItem.Dummy20 = false;
- #endregion
+ structItem.IsMenuTime = false;
+ structItem.IsMenuInformation = true;
+ structItem.IsMenuDataBackup = true;
+ structItem.IsMenuCalibration = true;
+ structItem.IsMenuCommunication = false;
+ structItem.IsMenuConfiguration = false;
+ structItem.IsMenuSystem = true;
+ structItem.IsMenuMotor = false;
+ structItem.IsMenuUpdate = false;
+ structItem.IsMenuInitialization = false;
+ structItem.IsMenuEquipment = false;
+ structItem.IsMenuIOTest = false;
+ structItem.IsMenuStatistics = true;
+ structItem.IsMenuUser = true;
+ structItem.IsMenuUserGroupEditor = false;
+ structItem.IsMenuViewer = true;
+
+ structItem.Dummy1 = false;
+ structItem.Dummy2 = false;
+ structItem.Dummy3 = false;
+ structItem.Dummy4 = false;
+ structItem.Dummy5 = false;
+ structItem.Dummy6 = false;
+ structItem.Dummy7 = false;
+ structItem.Dummy8 = false;
+ structItem.Dummy9 = false;
+ structItem.Dummy10 = false;
+ structItem.Dummy11 = false;
+ structItem.Dummy12 = false;
+ structItem.Dummy13 = false;
+ structItem.Dummy14 = false;
+ structItem.Dummy15 = false;
+ structItem.Dummy16 = false;
+ structItem.Dummy17 = false;
+ structItem.Dummy18 = false;
+ structItem.Dummy19 = false;
+ structItem.Dummy20 = false;
+ #endregion
+
+ this.smartFileIO.WriteStructure_Begin(structItem, 1);
+ #endregion
+
+ #region Level3
+ #region StructItem
+ structItem.IsMainDisplayProductNo = true;
+ structItem.IsMainDisplayWeightSetting = true;
+ structItem.IsMainDisplayClear = true;
+ structItem.IsMainDispalySubMenu = true;
+
+ structItem.IsMenuTime = true;
+ structItem.IsMenuInformation = true;
+ structItem.IsMenuDataBackup = true;
+ structItem.IsMenuCalibration = true;
+ structItem.IsMenuCommunication = true;
+ structItem.IsMenuConfiguration = true;
+ structItem.IsMenuSystem = true;
+ structItem.IsMenuMotor = true;
+ structItem.IsMenuUpdate = true;
+ structItem.IsMenuInitialization = true;
+ structItem.IsMenuEquipment = true;
+ structItem.IsMenuIOTest = true;
+ structItem.IsMenuStatistics = true;
+ structItem.IsMenuUser = true;
+ structItem.IsMenuUserGroupEditor = true;
+ structItem.IsMenuViewer = true;
+
+ structItem.Dummy1 = false;
+ structItem.Dummy2 = false;
+ structItem.Dummy3 = false;
+ structItem.Dummy4 = false;
+ structItem.Dummy5 = false;
+ structItem.Dummy6 = false;
+ structItem.Dummy7 = false;
+ structItem.Dummy8 = false;
+ structItem.Dummy9 = false;
+ structItem.Dummy10 = false;
+ structItem.Dummy11 = false;
+ structItem.Dummy12 = false;
+ structItem.Dummy13 = false;
+ structItem.Dummy14 = false;
+ structItem.Dummy15 = false;
+ structItem.Dummy16 = false;
+ structItem.Dummy17 = false;
+ structItem.Dummy18 = false;
+ structItem.Dummy19 = false;
+ structItem.Dummy20 = false;
+ #endregion
+
+ this.smartFileIO.WriteStructure_Begin(structItem, 2);
+ #endregion
+
+ #region Not Login
+ #region StructItem
+ structItem.IsMainDisplayProductNo = true;
+ structItem.IsMainDisplayWeightSetting = true;
+ structItem.IsMainDisplayClear = true;
+ structItem.IsMainDispalySubMenu = true;
+
+ structItem.IsMenuTime = true;
+ structItem.IsMenuInformation = true;
+ structItem.IsMenuDataBackup = true;
+ structItem.IsMenuCalibration = true;
+ structItem.IsMenuCommunication = true;
+ structItem.IsMenuConfiguration = true;
+ structItem.IsMenuSystem = true;
+ structItem.IsMenuMotor = true;
+ structItem.IsMenuUpdate = true;
+ structItem.IsMenuInitialization = true;
+ structItem.IsMenuEquipment = true;
+ structItem.IsMenuIOTest = true;
+ structItem.IsMenuStatistics = false;
+ structItem.IsMenuUser = false;
+ structItem.IsMenuUserGroupEditor = false;
+ structItem.IsMenuViewer = false;
+
+ structItem.Dummy1 = false;
+ structItem.Dummy2 = false;
+ structItem.Dummy3 = false;
+ structItem.Dummy4 = false;
+ structItem.Dummy5 = false;
+ structItem.Dummy6 = false;
+ structItem.Dummy7 = false;
+ structItem.Dummy8 = false;
+ structItem.Dummy9 = false;
+ structItem.Dummy10 = false;
+ structItem.Dummy11 = false;
+ structItem.Dummy12 = false;
+ structItem.Dummy13 = false;
+ structItem.Dummy14 = false;
+ structItem.Dummy15 = false;
+ structItem.Dummy16 = false;
+ structItem.Dummy17 = false;
+ structItem.Dummy18 = false;
+ structItem.Dummy19 = false;
+ structItem.Dummy20 = false;
+ #endregion
+
+ this.smartFileIO.WriteStructure_Begin(structItem, 3);
+ #endregion
- this.smartFileIO.WriteStructure_Begin(structItem, i);
- }
this.smartFileIO.WriteStructure_End();
}
public void SaveUserGroupFile(UserGroup item)
@@ -7258,7 +7356,7 @@ namespace INT69DB_2A.Forms
item.Level1.IsMenuEquipment = structItem.IsMenuEquipment;
item.Level1.IsMenuIOTest = structItem.IsMenuIOTest;
item.Level1.IsMenuStatistics = structItem.IsMenuStatistics;
- item.Level1.IsMenuUser = structItem.IsMenuUser;
+ item.Level1.IsMenuUser = true;
item.Level1.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor;
item.Level1.IsMenuViewer = structItem.IsMenuViewer;
#endregion
@@ -7284,7 +7382,7 @@ namespace INT69DB_2A.Forms
item.Level2.IsMenuEquipment = structItem.IsMenuEquipment;
item.Level2.IsMenuIOTest = structItem.IsMenuIOTest;
item.Level2.IsMenuStatistics = structItem.IsMenuStatistics;
- item.Level2.IsMenuUser = structItem.IsMenuUser;
+ item.Level2.IsMenuUser = true;
item.Level2.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor;
item.Level2.IsMenuViewer = structItem.IsMenuViewer;
#endregion
@@ -7307,10 +7405,10 @@ namespace INT69DB_2A.Forms
item.Level3.IsMenuMotor = structItem.IsMenuMotor;
item.Level3.IsMenuUpdate = structItem.IsMenuUpdate;
item.Level3.IsMenuInitialization = structItem.IsMenuInitialization;
- item.Level3.IsMenuEquipment = structItem.IsMenuEquipment;
+ item.Level3.IsMenuEquipment = true;
item.Level3.IsMenuIOTest = structItem.IsMenuIOTest;
item.Level3.IsMenuStatistics = structItem.IsMenuStatistics;
- item.Level3.IsMenuUser = structItem.IsMenuUser;
+ item.Level3.IsMenuUser = true;
item.Level3.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor;
item.Level3.IsMenuViewer = structItem.IsMenuViewer;
#endregion
@@ -7336,7 +7434,7 @@ namespace INT69DB_2A.Forms
item.NotLogin.IsMenuEquipment = structItem.IsMenuEquipment;
item.NotLogin.IsMenuIOTest = structItem.IsMenuIOTest;
item.NotLogin.IsMenuStatistics = structItem.IsMenuStatistics;
- item.NotLogin.IsMenuUser = structItem.IsMenuUser;
+ item.NotLogin.IsMenuUser = false;
item.NotLogin.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor;
item.NotLogin.IsMenuViewer = structItem.IsMenuViewer;
#endregion
@@ -7433,12 +7531,12 @@ namespace INT69DB_2A.Forms
if (this.SystemConfig.IsPart11 == false)
{
folder = this.PathDataBackupFolder;
- fileName = string.Format("{0:yyyyMMdd}-{1}", time, this.SystemConfig.ProductNumber);
+ fileName = string.Format("{0:yyyyMMdd}_{1}", time, this.SystemConfig.ProductNumber);
}
else
{
folder = string.Format("{0}{1}\\{2}\\", this.PathDataInspectionFolder, time.Year, time.Month);
- fileName = string.Format("I{0:yyyyMMdd}-{1}.csv", time, this.SystemConfig.ProductNumber);
+ fileName = string.Format("I{0:yyyyMMdd}_{1}.csv", time, this.SystemConfig.ProductNumber);
}
}
private void GetTrackingInspectionFolderPath(ref string folder, ref string fileName, int lane)
@@ -7448,14 +7546,14 @@ namespace INT69DB_2A.Forms
if (this.SystemConfig.IsPart11 == false)
{
- ret = string.Format("{0}{1:yyyyMMdd}-{2}_{3}Lane.csv", this.PathDataBackupFolder, DateTime.Now, this.SystemConfig.ProductNumber, lane);
+ ret = string.Format("{0}{1:yyyyMMdd}_{2}_{3}Lane.csv", this.PathDataBackupFolder, DateTime.Now, this.SystemConfig.ProductNumber, lane);
folder = this.PathDataBackupFolder;
- fileName = string.Format("{0:yyyyMMdd}-{1}_{2}Lane.csv", time, this.SystemConfig.ProductNumber, lane);
+ fileName = string.Format("{0:yyyyMMdd}_{1}_{2}Lane.csv", time, this.SystemConfig.ProductNumber, lane);
}
else
{
folder = string.Format("{0}{1}\\{2}\\", this.PathDataInspectionFolder, time.Year, time.Month);
- fileName = string.Format("I{0:yyyyMMdd}-{1}_{2}Lane.csv", time, this.SystemConfig.ProductNumber, lane);
+ fileName = string.Format("I{0:yyyyMMdd}_{1}_{2}Lane.csv", time, this.SystemConfig.ProductNumber, lane);
}
}
///
@@ -7727,6 +7825,9 @@ namespace INT69DB_2A.Forms
}
public void SetTrackingHistoryData(DataStore.TrackingParameter eventType, string detail, string before, string after)
{
+ if (before == after)
+ return;
+
HistoryData data = new HistoryData();
data.Type = "Parameter";
diff --git a/INT69DB_2A/Forms/FormMenu.Designer.cs b/INT69DB_2A/Forms/FormMenu.Designer.cs
index 772d060..9417122 100644
--- a/INT69DB_2A/Forms/FormMenu.Designer.cs
+++ b/INT69DB_2A/Forms/FormMenu.Designer.cs
@@ -115,7 +115,7 @@
this.buttonTime.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonTime.DownImage")));
this.buttonTime.GroupID = 0;
this.buttonTime.InitVisible = true;
- this.buttonTime.Location = new System.Drawing.Point(87, 349);
+ this.buttonTime.Location = new System.Drawing.Point(213, 349);
this.buttonTime.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonTime.Name = "buttonTime";
this.buttonTime.NestedClickEventPrevent = false;
@@ -422,7 +422,7 @@
this.buttonEquipment.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEquipment.DownImage")));
this.buttonEquipment.GroupID = 0;
this.buttonEquipment.InitVisible = true;
- this.buttonEquipment.Location = new System.Drawing.Point(87, 475);
+ this.buttonEquipment.Location = new System.Drawing.Point(87, 349);
this.buttonEquipment.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonEquipment.Name = "buttonEquipment";
this.buttonEquipment.NestedClickEventPrevent = false;
@@ -439,7 +439,6 @@
this.buttonEquipment.TextLocation = new System.Drawing.Point(0, 0);
this.buttonEquipment.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonEquipment.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonEquipment.UpImage")));
- this.buttonEquipment.Visible = false;
this.buttonEquipment.Click += new System.EventHandler(this.buttonMenu_Click);
//
// buttonIOTest
@@ -485,7 +484,7 @@
this.buttonTest.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonTest.DownImage")));
this.buttonTest.GroupID = 0;
this.buttonTest.InitVisible = true;
- this.buttonTest.Location = new System.Drawing.Point(213, 475);
+ this.buttonTest.Location = new System.Drawing.Point(87, 475);
this.buttonTest.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonTest.Name = "buttonTest";
this.buttonTest.NestedClickEventPrevent = false;
@@ -559,7 +558,7 @@
this.buttonUser.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonUser.DownImage")));
this.buttonUser.GroupID = 0;
this.buttonUser.InitVisible = true;
- this.buttonUser.Location = new System.Drawing.Point(213, 349);
+ this.buttonUser.Location = new System.Drawing.Point(591, 349);
this.buttonUser.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonUser.Name = "buttonUser";
this.buttonUser.NestedClickEventPrevent = false;
@@ -738,7 +737,7 @@
this.buttonOption.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonOption.DownImage")));
this.buttonOption.GroupID = 0;
this.buttonOption.InitVisible = true;
- this.buttonOption.Location = new System.Drawing.Point(339, 475);
+ this.buttonOption.Location = new System.Drawing.Point(213, 475);
this.buttonOption.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonOption.Name = "buttonOption";
this.buttonOption.NestedClickEventPrevent = false;
diff --git a/INT69DB_2A/Forms/FormMenu.cs b/INT69DB_2A/Forms/FormMenu.cs
index fb7a6ea..b08f120 100644
--- a/INT69DB_2A/Forms/FormMenu.cs
+++ b/INT69DB_2A/Forms/FormMenu.cs
@@ -177,7 +177,6 @@ namespace INT69DB_2A.Forms
this.labelUserLevel.Visible = false;
this.labelExpireOfPassword.Visible = false;
- this.buttonEquipment.Visible = false;
this.buttonUser.Visible = false;
this.buttonTest.Visible = false;
this.buttonOption.Visible = false;
@@ -195,7 +194,31 @@ namespace INT69DB_2A.Forms
public void UpdateDisplayUser(UserItem user)
{
- string id = "", group = "", expireDate = "";
+ string id = "", group = "", expirePW = "";
+ int expireDate = 0;
+ Color colorExpirePW = this.ParentForm.ColorLogOff;
+
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
+ {
+ this.buttonDataStatistics.Visible = true;
+ this.buttonDataViewer.Visible = true;
+ this.buttonUser.Visible = true;
+ }
+ else
+ {
+ this.buttonDataStatistics.Visible = false;
+ this.buttonDataViewer.Visible = false;
+
+ if (this.ParentForm.SystemConfig.IsLogin == true)
+ {
+ this.buttonUser.Location = new Point(this.buttonDataStatistics.Location.X, this.buttonDataStatistics.Location.Y);
+ this.buttonUser.Visible = true;
+ }
+ else
+ {
+ this.buttonUser.Visible = false;
+ }
+ }
switch (user.Group)
{
@@ -227,12 +250,12 @@ namespace INT69DB_2A.Forms
this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuInitialization;
this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuIOTest;
+ this.buttonEquipment.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment;
this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuTime;
this.buttonUser.Enabled = true;
this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics;
this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuViewer;
- this.buttonEquipment.Visible = false;
this.buttonTest.Visible = false;
this.buttonOption.Visible = false;
break;
@@ -262,12 +285,12 @@ namespace INT69DB_2A.Forms
this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuInitialization;
this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuIOTest;
+ this.buttonEquipment.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment;
this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuTime;
this.buttonUser.Enabled = true;
this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics;
this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuViewer;
- this.buttonEquipment.Visible = false;
this.buttonTest.Visible = false;
this.buttonOption.Visible = false;
break;
@@ -297,12 +320,12 @@ namespace INT69DB_2A.Forms
this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization;
this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest;
+ this.buttonEquipment.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuEquipment;
this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuTime;
this.buttonUser.Enabled = true;
this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics;
this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer;
- this.buttonEquipment.Visible = false;
this.buttonTest.Visible = false;
this.buttonOption.Visible = false;
break;
@@ -345,7 +368,6 @@ namespace INT69DB_2A.Forms
this.buttonDataStatistics.Enabled = true;
this.buttonDataViewer.Enabled = true;
- this.buttonEquipment.Visible = false;
this.buttonTest.Visible = false;
this.buttonOption.Visible = false;
break;
@@ -380,17 +402,10 @@ namespace INT69DB_2A.Forms
this.buttonEquipment.Enabled = true;
this.buttonTime.Enabled = true;
+ this.buttonDataStatistics.Enabled = true;
+ this.buttonDataViewer.Enabled = true;
this.buttonUser.Enabled = true;
- if (this.ParentForm.SystemConfig.IsLogin == true)
- {
- this.buttonDataStatistics.Visible = true;
- this.buttonDataViewer.Visible = true;
- this.buttonDataStatistics.Enabled = true;
- this.buttonDataViewer.Enabled = true;
- }
-
- this.buttonEquipment.Visible = true;
this.buttonTest.Visible = true;
this.buttonOption.Visible = true;
break;
@@ -407,12 +422,12 @@ namespace INT69DB_2A.Forms
this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInitialization;
this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuIOTest;
+ this.buttonEquipment.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment;
this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuTime;
this.buttonDataViewer.Visible = false;
this.buttonDataStatistics.Visible = false;
- this.buttonEquipment.Visible = false;
this.buttonTest.Visible = false;
this.buttonUser.Visible = false;
this.buttonOption.Visible = false;
@@ -433,49 +448,30 @@ namespace INT69DB_2A.Forms
break;
}
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
{
- if (this.ParentForm.SystemConfig.IsPart11 == true)
+ if (user.ExpirePassword != 0)
{
- expireDate = this.ParentForm.ChildFormMainDisplay.DisplayExpireOfPassword(user.Group);
- if (expireDate != "-")
+ expireDate = user.GetPasswordExpiryDday();
+ colorExpirePW = this.ParentForm.ColorLogOn;
+ expirePW = "-";
+
+ if (expireDate < 9999)
{
- int intExpireDate = int.Parse(expireDate);
-
- if (intExpireDate == 0)
+ if (expireDate >= -10)
{
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff;
- this.labelExpireOfPassword.Text = "D-0";
- }
- else if (intExpireDate < 0)
- {
- if (intExpireDate * -1 > this.ParentForm.SystemConfig.CurrentUser.ExpirePassword)
- expireDate = "-" + (this.ParentForm.SystemConfig.CurrentUser.ExpirePassword - 1).ToString();
-
- this.labelExpireOfPassword.Text = "D" + expireDate;
- if (intExpireDate >= -10)
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff;
+ colorExpirePW = this.ParentForm.ColorLogOff;
+ if (expireDate > 0)
+ expirePW = string.Format("D+{0}", expireDate);
else
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn;
+ expirePW = string.Format("D{0}", expireDate);
}
else
{
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn;
- this.labelExpireOfPassword.Text = "D+" + expireDate;
+ colorExpirePW = this.ParentForm.ColorLogOn;
+ expirePW = string.Format("D{0}", expireDate);
}
}
- else
- {
- // Administrator or Developer
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn;
- this.labelExpireOfPassword.Text = "-";
- }
- }
- else
- {
- // Part11 미사용
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn;
- this.labelExpireOfPassword.Text = "-";
}
}
@@ -483,6 +479,10 @@ namespace INT69DB_2A.Forms
this.labelUserID.Text = id;
if (this.labelUserLevel.Text != group)
this.labelUserLevel.Text = group;
+ if (this.labelExpireOfPassword.ForeColor != colorExpirePW)
+ this.labelExpireOfPassword.ForeColor = colorExpirePW;
+ if (this.labelExpireOfPassword.Text != expirePW)
+ this.labelExpireOfPassword.Text = expirePW;
}
public void DisplayRefresh()
diff --git a/INT69DB_2A/Forms/FormUserEditor.Designer.cs b/INT69DB_2A/Forms/FormUserEditor.Designer.cs
index bacba20..ba77cd8 100644
--- a/INT69DB_2A/Forms/FormUserEditor.Designer.cs
+++ b/INT69DB_2A/Forms/FormUserEditor.Designer.cs
@@ -82,6 +82,7 @@
this.buttonNew = new SmartX.SmartButton();
this.buttonBack = new SmartX.SmartButton();
this.buttonGroupEditor = new SmartX.SmartButton();
+ this.labelEquipment = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox1.SuspendLayout();
this.smartGroupBox2.SuspendLayout();
@@ -396,7 +397,7 @@
this.labelStatusExpiryPassword.Name = "labelStatusExpiryPassword";
this.labelStatusExpiryPassword.Size = new System.Drawing.Size(60, 26);
this.labelStatusExpiryPassword.TabIndex = 230;
- this.labelStatusExpiryPassword.Text = "Expiry";
+ this.labelStatusExpiryPassword.Text = "만료";
this.labelStatusExpiryPassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelStatusExpiryPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelStatusExpiryPassword.Wordwrap = false;
@@ -570,6 +571,7 @@
//
this.smartGroupBox2.BackPictureBox = this.smartForm1;
this.smartGroupBox2.BackPictureBox1 = null;
+ this.smartGroupBox2.Controls.Add(this.labelEquipment);
this.smartGroupBox2.Controls.Add(this.labelMenu);
this.smartGroupBox2.Controls.Add(this.labelMain);
this.smartGroupBox2.Controls.Add(this.labelViewer);
@@ -654,7 +656,7 @@
this.labelViewer.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelViewer.InitVisible = true;
this.labelViewer.LineSpacing = 0F;
- this.labelViewer.Location = new System.Drawing.Point(410, 94);
+ this.labelViewer.Location = new System.Drawing.Point(410, 118);
this.labelViewer.Name = "labelViewer";
this.labelViewer.Size = new System.Drawing.Size(125, 18);
this.labelViewer.TabIndex = 240;
@@ -672,7 +674,7 @@
this.labelStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelStatistics.InitVisible = true;
this.labelStatistics.LineSpacing = 0F;
- this.labelStatistics.Location = new System.Drawing.Point(410, 70);
+ this.labelStatistics.Location = new System.Drawing.Point(410, 94);
this.labelStatistics.Name = "labelStatistics";
this.labelStatistics.Size = new System.Drawing.Size(125, 18);
this.labelStatistics.TabIndex = 239;
@@ -1215,6 +1217,24 @@
this.buttonGroupEditor.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonGroupEditor.UpImage")));
this.buttonGroupEditor.Click += new System.EventHandler(this.buttonGroupEditor_Click);
//
+ // labelEquipment
+ //
+ this.labelEquipment.BackPictureBox = this.smartForm1;
+ this.labelEquipment.BackPictureBox1 = null;
+ this.labelEquipment.BackPictureBox2 = null;
+ this.labelEquipment.BorderColor = System.Drawing.Color.Black;
+ this.labelEquipment.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelEquipment.InitVisible = true;
+ this.labelEquipment.LineSpacing = 0F;
+ this.labelEquipment.Location = new System.Drawing.Point(410, 70);
+ this.labelEquipment.Name = "labelEquipment";
+ this.labelEquipment.Size = new System.Drawing.Size(125, 18);
+ this.labelEquipment.TabIndex = 243;
+ this.labelEquipment.Text = "Equipment";
+ this.labelEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+ this.labelEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelEquipment.Wordwrap = false;
+ //
// FormUserEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1295,5 +1315,6 @@
private SmartX.SmartSeparatorLine smartSeparatorLine1;
public SmartX.SmartLabel labelAccessRightAdmin;
public SmartX.SmartLabel labelAutoLogoutWarning;
+ private SmartX.SmartLabel labelEquipment;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormUserEditor.cs b/INT69DB_2A/Forms/FormUserEditor.cs
index 38ef241..5b164f9 100644
--- a/INT69DB_2A/Forms/FormUserEditor.cs
+++ b/INT69DB_2A/Forms/FormUserEditor.cs
@@ -62,18 +62,30 @@ namespace INT69DB_2A.Forms
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English)
{
this.labelTitle.Text = "User settings";
+
+ this.labelStatusExpiryAccount.Text = "Expiry";
+ this.labelStatusExpiryPassword.Text = "Expiry";
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
{
this.labelTitle.Text = "用户设置";
+
+ this.labelStatusExpiryAccount.Text = "过期";
+ this.labelStatusExpiryPassword.Text = "过期";
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech)
{
this.labelTitle.Text = "uživatelské nastavení";
+
+ this.labelStatusExpiryAccount.Text = "Uplynutí";
+ this.labelStatusExpiryPassword.Text = "Uplynutí";
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German)
{
this.labelTitle.Text = "Benutzereinstellungen";
+
+ this.labelStatusExpiryAccount.Text = "Ablauf";
+ this.labelStatusExpiryPassword.Text = "Ablauf";
}
else
{
@@ -330,9 +342,9 @@ namespace INT69DB_2A.Forms
private Color ReturnColor(bool bValue)
{
if (bValue == true)
- return Color.DarkGreen;
+ return Color.Black;
else
- return Color.Silver;
+ return Color.DarkGray;
}
private void CheckBoxCheckedAsLevel(DataStore.UserGroup level)
{
@@ -355,6 +367,7 @@ namespace INT69DB_2A.Forms
this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuInitialization);
this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuTime);
this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuDataBackup);
+ this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment);
this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics);
this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuViewer);
break;
@@ -375,6 +388,7 @@ namespace INT69DB_2A.Forms
this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuInitialization);
this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuTime);
this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuDataBackup);
+ this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment);
this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics);
this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuViewer);
break;
@@ -393,8 +407,9 @@ namespace INT69DB_2A.Forms
this.labelIOTest.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest);
this.labelUpdate.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuUpdate);
this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization);
- this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuTime);
+ this.labelTime.ForeColor = this.ReturnColor(true);
this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuDataBackup);
+ this.labelEquipment.ForeColor = this.ReturnColor(true);
this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics);
this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer);
break;
@@ -416,6 +431,7 @@ namespace INT69DB_2A.Forms
this.labelInitialization.ForeColor = Color.Black;
this.labelTime.ForeColor = Color.Black;
this.labelDataBackup.ForeColor = Color.Black;
+ this.labelEquipment.ForeColor = Color.Black;
this.labelStatistics.ForeColor = Color.Black;
this.labelViewer.ForeColor = Color.Black;
break;
@@ -693,6 +709,7 @@ namespace INT69DB_2A.Forms
this.labelInitialization.ForeColor = this.ReturnColor(item.IsMenuInitialization);
this.labelTime.ForeColor = this.ReturnColor(item.IsMenuTime);
this.labelDataBackup.ForeColor = this.ReturnColor(item.IsMenuDataBackup);
+ this.labelEquipment.ForeColor = this.ReturnColor(item.IsMenuEquipment);
this.labelStatistics.ForeColor = this.ReturnColor(item.IsMenuStatistics);
this.labelViewer.ForeColor = this.ReturnColor(item.IsMenuViewer);
}
@@ -922,6 +939,7 @@ namespace INT69DB_2A.Forms
|| this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Admin
|| this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer)
{
+ this.buttonNew.Visible = true;
this.buttonGroupEditor.Visible = true;
this.ChildControlUserSet.Visible = false;
@@ -930,7 +948,11 @@ namespace INT69DB_2A.Forms
}
else
{
+ this.buttonNew.Visible = false;
+ this.buttonDelete.Visible = false;
+ this.buttonSave.Visible = false;
this.buttonGroupEditor.Visible = false;
+
this.ChildControlUserSet.Visible = true;
this.ChildControlUserSet.BringToFront();
this.ChildControlUserSet.DisplayRefresh();
@@ -988,8 +1010,11 @@ namespace INT69DB_2A.Forms
this.labelID.Text = value;
- if (this.buttonSave.Visible == false)
- this.buttonSave.Visible = true;
+ if (this.labelID.Text != "")
+ {
+ if (this.buttonSave.Visible == false)
+ this.buttonSave.Visible = true;
+ }
}
}
private void labelPassword_Click(object sender, EventArgs e)
@@ -1003,8 +1028,11 @@ namespace INT69DB_2A.Forms
this.labelPassword.Text = value;
- if (this.buttonSave.Visible == false)
- this.buttonSave.Visible = true;
+ if (this.labelPassword.Text != "")
+ {
+ if (this.buttonSave.Visible == false)
+ this.buttonSave.Visible = true;
+ }
}
}
private void labelExpireAccount_Click(object sender, EventArgs e)
diff --git a/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs b/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs
index 5081a9b..905c3f3 100644
--- a/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs
+++ b/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs
@@ -387,7 +387,7 @@
this.checkBoxNotLoginMenuViewer.ImageCheckBox = null;
this.checkBoxNotLoginMenuViewer.ImageUnCheckBox = null;
this.checkBoxNotLoginMenuViewer.InitVisible = true;
- this.checkBoxNotLoginMenuViewer.Location = new System.Drawing.Point(746, 323);
+ this.checkBoxNotLoginMenuViewer.Location = new System.Drawing.Point(746, 346);
this.checkBoxNotLoginMenuViewer.Name = "checkBoxNotLoginMenuViewer";
this.checkBoxNotLoginMenuViewer.Size = new System.Drawing.Size(20, 20);
this.checkBoxNotLoginMenuViewer.TabIndex = 852;
@@ -409,7 +409,7 @@
this.checkBoxL3MenuViewer.ImageCheckBox = null;
this.checkBoxL3MenuViewer.ImageUnCheckBox = null;
this.checkBoxL3MenuViewer.InitVisible = true;
- this.checkBoxL3MenuViewer.Location = new System.Drawing.Point(709, 323);
+ this.checkBoxL3MenuViewer.Location = new System.Drawing.Point(709, 346);
this.checkBoxL3MenuViewer.Name = "checkBoxL3MenuViewer";
this.checkBoxL3MenuViewer.Size = new System.Drawing.Size(20, 20);
this.checkBoxL3MenuViewer.TabIndex = 853;
@@ -431,7 +431,7 @@
this.checkBoxL2MenuViewer.ImageCheckBox = null;
this.checkBoxL2MenuViewer.ImageUnCheckBox = null;
this.checkBoxL2MenuViewer.InitVisible = true;
- this.checkBoxL2MenuViewer.Location = new System.Drawing.Point(673, 323);
+ this.checkBoxL2MenuViewer.Location = new System.Drawing.Point(673, 346);
this.checkBoxL2MenuViewer.Name = "checkBoxL2MenuViewer";
this.checkBoxL2MenuViewer.Size = new System.Drawing.Size(20, 20);
this.checkBoxL2MenuViewer.TabIndex = 854;
@@ -453,7 +453,7 @@
this.checkBoxL1MenuViewer.ImageCheckBox = null;
this.checkBoxL1MenuViewer.ImageUnCheckBox = null;
this.checkBoxL1MenuViewer.InitVisible = true;
- this.checkBoxL1MenuViewer.Location = new System.Drawing.Point(637, 323);
+ this.checkBoxL1MenuViewer.Location = new System.Drawing.Point(637, 346);
this.checkBoxL1MenuViewer.Name = "checkBoxL1MenuViewer";
this.checkBoxL1MenuViewer.Size = new System.Drawing.Size(20, 20);
this.checkBoxL1MenuViewer.TabIndex = 851;
@@ -472,7 +472,7 @@
this.labelTitleViewer.ForeColor = System.Drawing.Color.Black;
this.labelTitleViewer.InitVisible = true;
this.labelTitleViewer.LineSpacing = 0F;
- this.labelTitleViewer.Location = new System.Drawing.Point(427, 323);
+ this.labelTitleViewer.Location = new System.Drawing.Point(427, 346);
this.labelTitleViewer.Name = "labelTitleViewer";
this.labelTitleViewer.Size = new System.Drawing.Size(200, 20);
this.labelTitleViewer.TabIndex = 850;
@@ -703,7 +703,7 @@
this.checkBoxNotLoginMenuStatistics.ImageCheckBox = null;
this.checkBoxNotLoginMenuStatistics.ImageUnCheckBox = null;
this.checkBoxNotLoginMenuStatistics.InitVisible = true;
- this.checkBoxNotLoginMenuStatistics.Location = new System.Drawing.Point(746, 300);
+ this.checkBoxNotLoginMenuStatistics.Location = new System.Drawing.Point(746, 323);
this.checkBoxNotLoginMenuStatistics.Name = "checkBoxNotLoginMenuStatistics";
this.checkBoxNotLoginMenuStatistics.Size = new System.Drawing.Size(20, 20);
this.checkBoxNotLoginMenuStatistics.TabIndex = 828;
@@ -725,7 +725,7 @@
this.checkBoxL3MenuStatistics.ImageCheckBox = null;
this.checkBoxL3MenuStatistics.ImageUnCheckBox = null;
this.checkBoxL3MenuStatistics.InitVisible = true;
- this.checkBoxL3MenuStatistics.Location = new System.Drawing.Point(709, 300);
+ this.checkBoxL3MenuStatistics.Location = new System.Drawing.Point(709, 323);
this.checkBoxL3MenuStatistics.Name = "checkBoxL3MenuStatistics";
this.checkBoxL3MenuStatistics.Size = new System.Drawing.Size(20, 20);
this.checkBoxL3MenuStatistics.TabIndex = 829;
@@ -747,7 +747,7 @@
this.checkBoxL2MenuStatistics.ImageCheckBox = null;
this.checkBoxL2MenuStatistics.ImageUnCheckBox = null;
this.checkBoxL2MenuStatistics.InitVisible = true;
- this.checkBoxL2MenuStatistics.Location = new System.Drawing.Point(673, 300);
+ this.checkBoxL2MenuStatistics.Location = new System.Drawing.Point(673, 323);
this.checkBoxL2MenuStatistics.Name = "checkBoxL2MenuStatistics";
this.checkBoxL2MenuStatistics.Size = new System.Drawing.Size(20, 20);
this.checkBoxL2MenuStatistics.TabIndex = 830;
@@ -769,7 +769,7 @@
this.checkBoxL1MenuStatistics.ImageCheckBox = null;
this.checkBoxL1MenuStatistics.ImageUnCheckBox = null;
this.checkBoxL1MenuStatistics.InitVisible = true;
- this.checkBoxL1MenuStatistics.Location = new System.Drawing.Point(637, 300);
+ this.checkBoxL1MenuStatistics.Location = new System.Drawing.Point(637, 323);
this.checkBoxL1MenuStatistics.Name = "checkBoxL1MenuStatistics";
this.checkBoxL1MenuStatistics.Size = new System.Drawing.Size(20, 20);
this.checkBoxL1MenuStatistics.TabIndex = 827;
@@ -788,7 +788,7 @@
this.labelTitleStatistics.ForeColor = System.Drawing.Color.Black;
this.labelTitleStatistics.InitVisible = true;
this.labelTitleStatistics.LineSpacing = 0F;
- this.labelTitleStatistics.Location = new System.Drawing.Point(427, 300);
+ this.labelTitleStatistics.Location = new System.Drawing.Point(427, 323);
this.labelTitleStatistics.Name = "labelTitleStatistics";
this.labelTitleStatistics.Size = new System.Drawing.Size(200, 20);
this.labelTitleStatistics.TabIndex = 826;
@@ -980,12 +980,11 @@
this.checkBoxNotLoginMenuEquipment.ImageCheckBox = null;
this.checkBoxNotLoginMenuEquipment.ImageUnCheckBox = null;
this.checkBoxNotLoginMenuEquipment.InitVisible = true;
- this.checkBoxNotLoginMenuEquipment.Location = new System.Drawing.Point(344, 369);
+ this.checkBoxNotLoginMenuEquipment.Location = new System.Drawing.Point(746, 300);
this.checkBoxNotLoginMenuEquipment.Name = "checkBoxNotLoginMenuEquipment";
this.checkBoxNotLoginMenuEquipment.Size = new System.Drawing.Size(20, 20);
this.checkBoxNotLoginMenuEquipment.TabIndex = 799;
this.checkBoxNotLoginMenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
- this.checkBoxNotLoginMenuEquipment.Visible = false;
this.checkBoxNotLoginMenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
//
// checkBoxL3MenuEquipment
@@ -993,21 +992,21 @@
this.checkBoxL3MenuEquipment.BackPictureBox = this.smartForm1;
this.checkBoxL3MenuEquipment.BackPictureBox1 = null;
this.checkBoxL3MenuEquipment.BackPictureBox2 = null;
- this.checkBoxL3MenuEquipment.CheckBoxBackColor = System.Drawing.Color.White;
+ this.checkBoxL3MenuEquipment.CheckBoxBackColor = System.Drawing.Color.Silver;
this.checkBoxL3MenuEquipment.CheckBoxCheckColor = System.Drawing.Color.Green;
this.checkBoxL3MenuEquipment.CheckBoxForeColor = System.Drawing.Color.Black;
this.checkBoxL3MenuEquipment.CheckBoxSymbolSize = 25;
- this.checkBoxL3MenuEquipment.Checked = false;
+ this.checkBoxL3MenuEquipment.Checked = true;
this.checkBoxL3MenuEquipment.CheckLineWidth = 3;
+ this.checkBoxL3MenuEquipment.Enabled = false;
this.checkBoxL3MenuEquipment.ImageCheckBox = null;
this.checkBoxL3MenuEquipment.ImageUnCheckBox = null;
this.checkBoxL3MenuEquipment.InitVisible = true;
- this.checkBoxL3MenuEquipment.Location = new System.Drawing.Point(307, 369);
+ this.checkBoxL3MenuEquipment.Location = new System.Drawing.Point(709, 300);
this.checkBoxL3MenuEquipment.Name = "checkBoxL3MenuEquipment";
this.checkBoxL3MenuEquipment.Size = new System.Drawing.Size(20, 20);
this.checkBoxL3MenuEquipment.TabIndex = 800;
this.checkBoxL3MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
- this.checkBoxL3MenuEquipment.Visible = false;
this.checkBoxL3MenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
//
// checkBoxNotLoginMenuUpdate
@@ -1150,12 +1149,11 @@
this.checkBoxL2MenuEquipment.ImageCheckBox = null;
this.checkBoxL2MenuEquipment.ImageUnCheckBox = null;
this.checkBoxL2MenuEquipment.InitVisible = true;
- this.checkBoxL2MenuEquipment.Location = new System.Drawing.Point(271, 369);
+ this.checkBoxL2MenuEquipment.Location = new System.Drawing.Point(673, 300);
this.checkBoxL2MenuEquipment.Name = "checkBoxL2MenuEquipment";
this.checkBoxL2MenuEquipment.Size = new System.Drawing.Size(20, 20);
this.checkBoxL2MenuEquipment.TabIndex = 791;
this.checkBoxL2MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
- this.checkBoxL2MenuEquipment.Visible = false;
this.checkBoxL2MenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
//
// checkBoxL2MenuUpdate
@@ -1235,12 +1233,11 @@
this.checkBoxL1MenuEquipment.ImageCheckBox = null;
this.checkBoxL1MenuEquipment.ImageUnCheckBox = null;
this.checkBoxL1MenuEquipment.InitVisible = true;
- this.checkBoxL1MenuEquipment.Location = new System.Drawing.Point(235, 369);
+ this.checkBoxL1MenuEquipment.Location = new System.Drawing.Point(637, 300);
this.checkBoxL1MenuEquipment.Name = "checkBoxL1MenuEquipment";
this.checkBoxL1MenuEquipment.Size = new System.Drawing.Size(20, 20);
this.checkBoxL1MenuEquipment.TabIndex = 789;
this.checkBoxL1MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
- this.checkBoxL1MenuEquipment.Visible = false;
this.checkBoxL1MenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
//
// checkBoxL1MenuUpdate
@@ -1489,7 +1486,7 @@
this.checkBoxNotLoginMenuUser.ImageCheckBox = null;
this.checkBoxNotLoginMenuUser.ImageUnCheckBox = null;
this.checkBoxNotLoginMenuUser.InitVisible = true;
- this.checkBoxNotLoginMenuUser.Location = new System.Drawing.Point(746, 346);
+ this.checkBoxNotLoginMenuUser.Location = new System.Drawing.Point(746, 369);
this.checkBoxNotLoginMenuUser.Name = "checkBoxNotLoginMenuUser";
this.checkBoxNotLoginMenuUser.Size = new System.Drawing.Size(20, 20);
this.checkBoxNotLoginMenuUser.TabIndex = 805;
@@ -1512,7 +1509,7 @@
this.checkBoxL3MenuUser.ImageCheckBox = null;
this.checkBoxL3MenuUser.ImageUnCheckBox = null;
this.checkBoxL3MenuUser.InitVisible = true;
- this.checkBoxL3MenuUser.Location = new System.Drawing.Point(709, 346);
+ this.checkBoxL3MenuUser.Location = new System.Drawing.Point(709, 369);
this.checkBoxL3MenuUser.Name = "checkBoxL3MenuUser";
this.checkBoxL3MenuUser.Size = new System.Drawing.Size(20, 20);
this.checkBoxL3MenuUser.TabIndex = 806;
@@ -1660,7 +1657,7 @@
this.checkBoxL2MenuUser.ImageCheckBox = null;
this.checkBoxL2MenuUser.ImageUnCheckBox = null;
this.checkBoxL2MenuUser.InitVisible = true;
- this.checkBoxL2MenuUser.Location = new System.Drawing.Point(673, 346);
+ this.checkBoxL2MenuUser.Location = new System.Drawing.Point(673, 369);
this.checkBoxL2MenuUser.Name = "checkBoxL2MenuUser";
this.checkBoxL2MenuUser.Size = new System.Drawing.Size(20, 20);
this.checkBoxL2MenuUser.TabIndex = 765;
@@ -1745,7 +1742,7 @@
this.checkBoxL1MenuUser.ImageCheckBox = null;
this.checkBoxL1MenuUser.ImageUnCheckBox = null;
this.checkBoxL1MenuUser.InitVisible = true;
- this.checkBoxL1MenuUser.Location = new System.Drawing.Point(637, 346);
+ this.checkBoxL1MenuUser.Location = new System.Drawing.Point(637, 369);
this.checkBoxL1MenuUser.Name = "checkBoxL1MenuUser";
this.checkBoxL1MenuUser.Size = new System.Drawing.Size(20, 20);
this.checkBoxL1MenuUser.TabIndex = 767;
@@ -2252,14 +2249,13 @@
this.labelTitleEquipment.ForeColor = System.Drawing.Color.Black;
this.labelTitleEquipment.InitVisible = true;
this.labelTitleEquipment.LineSpacing = 0F;
- this.labelTitleEquipment.Location = new System.Drawing.Point(25, 369);
+ this.labelTitleEquipment.Location = new System.Drawing.Point(427, 300);
this.labelTitleEquipment.Name = "labelTitleEquipment";
this.labelTitleEquipment.Size = new System.Drawing.Size(200, 20);
this.labelTitleEquipment.TabIndex = 753;
this.labelTitleEquipment.Text = "Equipment";
this.labelTitleEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTitleEquipment.Visible = false;
this.labelTitleEquipment.Wordwrap = false;
//
// labelTitleUser
@@ -2273,7 +2269,7 @@
this.labelTitleUser.ForeColor = System.Drawing.Color.Black;
this.labelTitleUser.InitVisible = true;
this.labelTitleUser.LineSpacing = 0F;
- this.labelTitleUser.Location = new System.Drawing.Point(427, 346);
+ this.labelTitleUser.Location = new System.Drawing.Point(427, 369);
this.labelTitleUser.Name = "labelTitleUser";
this.labelTitleUser.Size = new System.Drawing.Size(200, 20);
this.labelTitleUser.TabIndex = 751;
diff --git a/INT69DB_2A/Forms/FormUserGroupEditor.cs b/INT69DB_2A/Forms/FormUserGroupEditor.cs
index f77263c..6e651b8 100644
--- a/INT69DB_2A/Forms/FormUserGroupEditor.cs
+++ b/INT69DB_2A/Forms/FormUserGroupEditor.cs
@@ -153,7 +153,6 @@ namespace INT69DB_2A.Forms
this.CollectionLevel1Control.Add(this.checkBoxL1MenuIOTest);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuUpdate);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuInitialization);
- this.CollectionLevel1Control.Add(this.checkBoxL1MenuUser);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuEquipment);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuStatistics);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuViewer);
@@ -175,7 +174,6 @@ namespace INT69DB_2A.Forms
this.CollectionLevel2Control.Add(this.checkBoxL2MenuIOTest);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuUpdate);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuInitialization);
- this.CollectionLevel2Control.Add(this.checkBoxL2MenuUser);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuEquipment);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuStatistics);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuViewer);
@@ -197,7 +195,6 @@ namespace INT69DB_2A.Forms
this.CollectionLevel3Control.Add(this.checkBoxL3MenuIOTest);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuUpdate);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuInitialization);
- this.CollectionLevel3Control.Add(this.checkBoxL3MenuUser);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuEquipment);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuStatistics);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuViewer);
@@ -219,7 +216,6 @@ namespace INT69DB_2A.Forms
this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuIOTest);
this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuUpdate);
this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuInitialization);
- this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuUser);
this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuEquipment);
this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuStatistics);
this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuViewer);
@@ -368,9 +364,8 @@ namespace INT69DB_2A.Forms
this.labelTitleNotLogin1.Visible = false;
this.labelTitleNotLogin2.Visible = false;
- for (int i = 0; i < this.CollectionLevel1Control.Count; i++)
+ for (int i = 0; i < this.CollectionLevel4Control.Count; i++)
{
-
//this.CollectionLevel1Control[i].Location = new Point(this.CollectionLevel2Location[i].X, this.CollectionLevel2Location[i].Y);
//this.CollectionLevel2Control[i].Location = new Point(this.CollectionLevel3Location[i].X, this.CollectionLevel3Location[i].Y);
@@ -383,7 +378,7 @@ namespace INT69DB_2A.Forms
this.labelTitleNotLogin1.Visible = true;
this.labelTitleNotLogin2.Visible = true;
- for (int i = 0; i < this.CollectionLevel1Control.Count; i++)
+ for (int i = 0; i < this.CollectionLevel4Control.Count; i++)
{
//this.CollectionLevel1Control[i].Location = new Point(this.CollectionLevel1Location[i].X, this.CollectionLevel1Location[i].Y);
//this.CollectionLevel2Control[i].Location = new Point(this.CollectionLevel2Location[i].X, this.CollectionLevel2Location[i].Y);
@@ -422,11 +417,10 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentUserGroup.Level1.IsMenuInitialization = this.checkBoxL1MenuInitialization.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuTime = this.checkBoxL1MenuTime.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuDataBackup = this.checkBoxL1MenuDataBackup.Checked;
+ this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment = this.checkBoxL1MenuEquipment.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics = this.checkBoxL1MenuStatistics.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuViewer = this.checkBoxL1MenuViewer.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuUser = true;
-
- this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment = false;
#endregion
#region Level2
@@ -446,11 +440,10 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentUserGroup.Level2.IsMenuInitialization = this.checkBoxL2MenuInitialization.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuTime = this.checkBoxL2MenuTime.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuDataBackup = this.checkBoxL2MenuDataBackup.Checked;
+ this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment = this.checkBoxL2MenuEquipment.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics = this.checkBoxL2MenuStatistics.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuViewer = this.checkBoxL2MenuViewer.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuUser = true;
-
- this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment = false;
#endregion
#region Level3
@@ -468,13 +461,12 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest = this.checkBoxL3MenuIOTest.Checked;
this.ParentForm.CurrentUserGroup.Level3.IsMenuUpdate = this.checkBoxL3MenuUpdate.Checked;
this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization = this.checkBoxL3MenuInitialization.Checked;
- this.ParentForm.CurrentUserGroup.Level3.IsMenuTime = this.checkBoxL3MenuTime.Checked;
+ this.ParentForm.CurrentUserGroup.Level3.IsMenuTime = true;
this.ParentForm.CurrentUserGroup.Level3.IsMenuDataBackup = this.checkBoxL3MenuDataBackup.Checked;
+ this.ParentForm.CurrentUserGroup.Level3.IsMenuEquipment = true;
this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics = this.checkBoxL3MenuStatistics.Checked;
this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer = this.checkBoxL3MenuViewer.Checked;
this.ParentForm.CurrentUserGroup.Level3.IsMenuUser = true;
-
- this.ParentForm.CurrentUserGroup.Level3.IsMenuEquipment = false;
#endregion
#region NotLogin
@@ -495,6 +487,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInitialization = this.checkBoxNotLoginMenuInitialization.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuTime = this.checkBoxNotLoginMenuTime.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuDataBackup = this.checkBoxNotLoginMenuDataBackup.Checked;
+ this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment = this.checkBoxNotLoginMenuEquipment.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuStatistics = this.checkBoxNotLoginMenuStatistics.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuViewer = this.checkBoxNotLoginMenuViewer.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuUser = false;
@@ -531,8 +524,8 @@ namespace INT69DB_2A.Forms
this.checkBoxL1MenuDataBackup.Checked = true;
this.checkBoxL1MenuStatistics.Checked = true;
this.checkBoxL1MenuViewer.Checked = true;
- this.checkBoxL1MenuUser.Checked = true;
- //this.checkBoxL1MenuEquipment.Checked = true;
+ this.checkBoxL1MenuEquipment.Checked = true;
+ //this.checkBoxL1MenuUser.Checked = true;
this.buttonSave.Visible = true;
}
@@ -559,8 +552,8 @@ namespace INT69DB_2A.Forms
this.checkBoxL2MenuDataBackup.Checked = true;
this.checkBoxL2MenuStatistics.Checked = true;
this.checkBoxL2MenuViewer.Checked = true;
- this.checkBoxL2MenuUser.Checked = true;
- //this.checkBoxL2MenuEquipment.Checked = true;
+ //this.checkBoxL2MenuUser.Checked = true;
+ this.checkBoxL2MenuEquipment.Checked = true;
this.buttonSave.Visible = true;
}
@@ -587,8 +580,8 @@ namespace INT69DB_2A.Forms
this.checkBoxL3MenuDataBackup.Checked = true;
this.checkBoxL3MenuStatistics.Checked = true;
this.checkBoxL3MenuViewer.Checked = true;
- this.checkBoxL3MenuUser.Checked = true;
- //this.checkBoxL3MenuEquipment.Checked = true;
+ //this.checkBoxL3MenuUser.Checked = true;
+ this.checkBoxL3MenuEquipment.Checked = true;
this.buttonSave.Visible = true;
}
@@ -615,7 +608,7 @@ namespace INT69DB_2A.Forms
this.checkBoxNotLoginMenuStatistics.Checked = true;
this.checkBoxNotLoginMenuViewer.Checked = true;
this.checkBoxNotLoginMenuDataBackup.Checked = true;
- //this.checkBoxNotLoginMenuEquipment.Checked = true;
+ this.checkBoxNotLoginMenuEquipment.Checked = true;
this.buttonSave.Visible = true;
}
diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt
index d53232a..c5ca042 100644
--- a/INT69DB_2A/Version.txt
+++ b/INT69DB_2A/Version.txt
@@ -23,6 +23,9 @@
'ȸ' ϴ
- Part 11
INT69DC_7C V11.0.0
+
+ - Level1, 2 default bool
+ - ͺ - â ߰
@ Ver 4.5.0 by CJY
- 2022.12.22
diff --git a/INT69DB_2A/bin/Release/DllAes128.dll b/INT69DB_2A/bin/Release/DllAes128.dll
index 9099ed2..cf8898e 100644
Binary files a/INT69DB_2A/bin/Release/DllAes128.dll and b/INT69DB_2A/bin/Release/DllAes128.dll differ
diff --git a/INT69DB_2A/bin/Release/DllUserMgr.dll b/INT69DB_2A/bin/Release/DllUserMgr.dll
index dd5398f..e976c80 100644
Binary files a/INT69DB_2A/bin/Release/DllUserMgr.dll and b/INT69DB_2A/bin/Release/DllUserMgr.dll differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources
index 3970265..9c87886 100644
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources differ