From d88b1aac3ab2ed3eef1ac2f12e1d7d6f19f8488c Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Fri, 8 Sep 2023 11:21:51 +0900 Subject: [PATCH] =?UTF-8?q?Part11=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controls/ControlUserSetting.Designer.cs | 22 +- .../DialogFormDataStatistics.Designer.cs | 1 + .../DialogForms/DialogFormDataStatistics.cs | 3 +- .../DialogForms/DialogFormDataViewerFilter.cs | 1 - .../DialogForms/DialogFormHistoryData.cs | 17 +- .../DialogFormHistoryData.designer.cs | 83 ++++- .../DialogForms/DialogFormLogOn.Designer.cs | 5 + INT69DB_2A/DialogForms/DialogFormLogOn.cs | 30 +- .../DialogFormUserEditorKeyboard.Designer.cs | 89 +++-- .../DialogFormUserEditorKeyboard.cs | 13 +- .../DialogFormUserEditorKeyboard.resx | 144 ++++----- .../Forms/FormDataStatistics.Designer.cs | 1 + INT69DB_2A/Forms/FormDataStatistics.cs | 5 +- INT69DB_2A/Forms/FormDataViewer.Designer.cs | 204 ++++++------ .../Forms/FormEquipmentSetting.Designer.cs | 198 ++++++------ INT69DB_2A/Forms/FormMain.cs | 305 ++++++++++++------ INT69DB_2A/Forms/FormMenu.Designer.cs | 11 +- INT69DB_2A/Forms/FormMenu.cs | 98 +++--- INT69DB_2A/Forms/FormUserEditor.Designer.cs | 27 +- INT69DB_2A/Forms/FormUserEditor.cs | 42 ++- .../Forms/FormUserGroupEditor.Designer.cs | 50 ++- INT69DB_2A/Forms/FormUserGroupEditor.cs | 35 +- INT69DB_2A/Version.txt | 3 + INT69DB_2A/bin/Release/DllAes128.dll | Bin 74752 -> 74752 bytes INT69DB_2A/bin/Release/DllUserMgr.dll | Bin 51200 -> 51712 bytes ...rms.DialogFormUserEditorKeyboard.resources | Bin 14689 -> 14683 bytes 26 files changed, 822 insertions(+), 565 deletions(-) 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 9099ed221b2be2172fcbff6f35d262659b514403..cf8898edb3e238b52d417fc6f28235dc1a7b35c3 100644 GIT binary patch delta 58 zcmZoT!P0PoWx@w$r{~``esa`98w;l^Ok#XBb)I4mdJy!{Io;|FGt L{PyR3jFO@NhHD(^ delta 58 zcmZoT!P0PoWx@yMV#)U#KRfOP(VNZpt@RNIJg?NI8`tbP$+|ewrf6%@_AgwFADBV% L+n@6>N{Rvi5AYc0 diff --git a/INT69DB_2A/bin/Release/DllUserMgr.dll b/INT69DB_2A/bin/Release/DllUserMgr.dll index dd5398fc382ce62976d7c772c1043be3adb2f074..e976c80f0a3088f8e55ef18bfdde2c8cf43a5f6f 100644 GIT binary patch delta 17027 zcmaKT4_uU0_V<0p0f#^83=D#RF#Hh^5QZ5B1{mN`QAtrTNzGNm#J`!Lq0z1dnt!lY zi#q1oF0Nx)S!=tPROG6mSy?~(Ew#3<+ebJ4?h;x{@6X+(vUtDed7g=Jw)dUS=W?EN z?z!ijd+xdSo_n8%`okzuQASpnIr$LZaqWdX8BT6$xO0ha2 zQGt|{eL)EF7ozsO5alYL`nN*}i@}R9AjH*?LRg!Hh^7;|bbY%JgHOdpQHNy6DfNhE zb$YK>c(e#nnX##AdChVm{uBuUB#3B~0~Di+&4L)ALwOCw>n97*mQk&?QtaqJWgtom zZO}!IuHwf5lwg#zClBZzmFlu%MSt^IVYJGVzK~>hrzm%KMpzH`3hU0^NwMO(B+T7@ z!fnck6;Xhl*7`Gj%pYty+^ZLddnKd0d%0fpM_d!eCC%`Z#ofvDQJ^pKSLq&_0B!#5 zv^qt=oZE@LIxybhLmL5Fi4RQ=TCoq!543zAnm=d`AKFOJtp0VkTWA0=&4)1nv?L!| zAZT$uv>?!;eQ3d;g?ni5N`UsP@0iqU1U|_TDz3A;^c{zKmKa69`x9Yo{a6@13?od# z^;1JdKi9cGq4)eU!Y;>%>j=MYo#+@bu=|X`AEWa}3h>W0y~Q<+?#^b5yPJLfD$Vl` z4Lc61zt!DYX*t|$0kuTz>3WGC_D_g=5j81n9mbAbKLtjyX-H7_Yk!V}1;N{&_mcwBqt!@)Ehn9#PA*<+- zkqL1tHO+cx=E0P_H0#lNwwLD5M&?Mf$z%xCmBvt#AvNE@qU+tA7qo6p1P&FQ+_@d- zq+T?1rGUnruKBUk4P6N_^tfSq>RTbhy);0VA6Vhb?tzyM^$FotAiEo#{??F`7r@#y zcURY+F|c`hjWz;9z_fZa`}cV8Rk}OtHLI@Ek-$(#Kd5@x;nM7o#jdVi(Ae$%7AS|! zd%O(d!Tgkt1el{03)J~3= z$*|f>71y6cy&iq%+0A`tINW#XO^OQ$o$wkfQo>@mw=XcQa#;DZN^cLcIG^4UXrA8k z+{^VcfqVNH_f`us_*>eo=-mDjIyd|1T&w6@^AkE(c<#d@r5ngOb7)YT9^8 zd7OMFeIFF-?=bP)BW5c838s97DOP2Q502NRjHl_r@k!y#3-^?3!4L$z0%PL|Q|@@+ zczPl@-t;nNy6RmK$mD<0x#0ir=zmXN2Zz=TM57r-U)D7A0QVjJZqV5EJo>zH?efulszy_kLbazVC>LyZxF!}(3 zOEklHsW?L?M#V~R(Z{1=O?P`4!E@;al17^oy`vqyngSs&LC6#@A-|@)(XkVM397KV zyVGHt-s0}${YJK4=*{yHyOXw!_71B(bZ&I${X4j|PbfdcG<3i-aqk1}hal$Vqzq%m zgR%}Z-@sl8nkTSFgEzp-0&a5`O&;U1VDXq#X%Sl>&8KI_WR45QlF!cL<=*4vF_3YM zI>(sJJ{3k({OPAEOsM#PE0&{0HE-l_9s3*0T6dJzEp`;IG$CNNid}tg89gpgug* zO>w4#NmoIYgy@&7*s3sm>_{F?Gpu~XN6iPUCIV_|k!N^&EDX#Wxc_w?8+;bZ_Z8jc z-I6x1w~ujmpJE#NwLMeaB!36oGjS%zy1UuNS3&bk937MxMi2Xp>klb%hbInML;NOS z2WJC~>^Irn*#aH|5-N6-urJO|GoQ!v7wn>49PKV0++{HMSUQS;LZWq>J>WDP6xZ+b!)D^Ae%u<6n~`XDS;`aOLS7G*Lh-BR}d$Y>GO zTSQ@F(`h6wcpVd`;>`)(DUvYwS0jx_-etl{*wajp@MNI`EA0d_Q%L4UJI+4l659P`%7_ z=WDcVTqLE3r$nmgFk3U&n0EX%+7O;Ip;WV@OtZrUoR?#RRh{O+u%m!J2v4x3GAA5q zL1zbEKGgT!&``fBXju4?#9r>&7@ z(>_gXspi9NbR;r#d_7aE5guM$jL^Eckv@)8Lu9~9yqr8NzUp<-Mdc`+s(O96Q~SZf zox1os-5FJ+RA2O}zM)m8zd^5Pt<&EaZtY4@TQ|O;xFkB-XiD;NNu)9~vy*F}a?Q9`P2OgOCr(1+83gjoTwHoa9CBd$?@LS&H>ZF!UStlF{` z5WMonq0Wq%>z(9U6n-^%MbbVcai;VJ?MqBkR=uWHI-8h3?tjKYCUyrL-UB`I*aN*} znsATevL+bdS<)_?+%_RXVvk&DrQam|Mp{LM$yUZA-l9#(FX}SKQe;Xd6YAfhIVm|h z^H|!IVv8IK6W1G*r5fw8^|7u7Ec^pl_+i#3DeRW1P)Go*l;a%U@KD$e*#4aQD zb*&{+>d*Wm8ildu9BoSNkH4WcUevy?Yv9Q(GQGEJ6 zWsqKqiUH0gWSp>|HCVAuv$-5vfLF)y+PR~Pt<{U2T|;JZeF+)I}dD{VX8n31BSrx2hv$L z>C9%@VolQN%=8;;k@OW^v(Az}r-@k!VV~h}+lC&<*4>K7N^u7Kl$K}xOnQ&bWG#_! z!(_YDbbyb*@UJI69;Zia1(<$s+2-oP%@k-~fK%{t`%592VDvEY=9&;nk=ZuLnw`B+ zx~&O5<~hP~*B0lvIW6CI>PMfEv4??^TM91H_6i4z_Un@#k+BYb=jBxBNb zKlb^)E-Smwi(@5a<%Etqh<5vt)ZnhHzrm|^G1p4_Xe0jarJXqmbLzlp0f(^e>tZcD z*&YSWpgYtX!d*pZdGrJ$4%xF6e?ZuxG@`Via8{v(^1pI2Oy8opDDUXL1m#mkySuB% zk(*$e52|+tHJ8@r#@2;`+83{O(1;EO0l(~p^NEo2El@mw z4WSLr7@dCzJ>e{p{ttcRjFlSbOXsX{{~ITX2>9tit>rYWth5n~p+AS3ZZ1yCS4dDXTD+dR#{71T8NNo!E}t zz44qd@>Sv1b~PIg#`?r-FHbK7tP%>R&@NLtz->mqep?&bUYH+nk4Z%F8EOx`TUaM; zr)fpAqzrnhNX>0aPt$uvufSy+i*uDl9)#Z&#|Oqh5bu6KKP%2Kl$HtOZ(n)k6)G=x z<{jkInH8y}wjXm!&PN@A>A{0H4T&Bvrn*WTWo0aLJQYPv_a7-sj*|A!Y&lJuL=Vfq zkj~RTdL#55c}ApyZJONDlhbYNJmODCqItbV6nfq2~ZCxj2+#3 z@a#G5;i^9nC%(=Krj;X`(oTUM`W!Od5iXU|#5<;%R)dE%jfN)HLiETTX#w1lHLRi& zcO;u$#f~c}*B>I%3~DfaaYwZDG5OEjC56(ynNiYadU|J#kGnIIuFaepFf|a% zHn3=#I4eQdJ%Z-UiZo5rv$}mPM@}Y|<0-EGpik*UNH81&tKfYcchBkP%U3$)je0a-T*irAf16B^%Ag z-!!^^wq1&+BeO%tKWk9?T86%wt-n-G#&>AG3Zai@|5lnokIYFJ)sOxLDYEwWK2NXC zNzV8OC_nr#)bB!$^&Ot!$$p+KjIZ`*sqStgr%Kz-^i?b*-Q0}0ZxwQRH?F;)41YjL*iS%Veb=*qO6dQQ&Xp(V&Ii${ zlE|m$1y8`?OmSux?;u+EMNo;#CA zg>&B!ejHZybmq?3m0K{=j0hl3<0hk)Lu@{vCx~S{`v!3k(|#g|{kR?I!9Kw~M3d)F zHN~LTJFI82{;{%`ewNGn#|P1e^KBt1KxK=%2Ff_sCkD~zis`zLAX-rIsA)FF9OK>D zigyH@8GTE=6?O3wHENqi{WBsySc?KqKx)s?uDeoA0&E`9oL;?2=kAJ{-U4PGB&ICY ztSu9VaET!zrvm2%q#VMGhzO<^DLlip{b!UcJbporbcF6+kT!l31d2v%LwHfMf|={_ zY}wPraau=579>db(z^>{$8BK67R(zc=go2paGs|n^!D zVroY>&la9;PtwFC#mH;cE{W2O4xn92GVcDtz&BtEyPLgUBFSQB$ROx=m(a=E!V0Vf z5|Vd6xSKu1v{$f(c%J_Y&rKLtKkygA5PrrHc4@d|rU^?k;~!JZKt>73$*;#8o**q4 z8XVoWEX^2a<31pX;X~;F-osQHaqxhuHFRcal(d}wveX{ZteA^~8b(?>a>Oi4oe<#F z)aX8BFdO%Ev2!=VvS{sjCf&a*wr(%4YqI;tOZ|G_DM+IItm?^-Th)QauMl}a(5LRt zl&n+D*myhR^UlEJNnaR{b?NGHJ%@#->mM+_QhkYpy-Wvp8}7wjXtk#AUNy@d+g$~M z=NKyEK*tJKP~1JC(lT<~GefGNNA8Km26^b7*nkq|Mg1yz_nu;@fcz@c>cT<8K=5*o zHB$8R`rtA4Al>uSj!>zJ)XBXRVfquMo>>8wxDi=!qG+}ux4s+A+_cL0Fzn{=f{QZz# zSe{(83;}@Dy6{Lnb-l>J1$($3uuVCVBS-@8jSnkhlMv{b z`hkN85T1=QX!5;w-49>UmU|bEdXo2&a&>OKN!RX8kRnK0ksW|o(*mYwMN-&#B_xM0 zKv?@9=;0Mm(L-4!#Wi8QJzQyNc&RpH}zX|m9>NS)jP zZ{XcMJjm0*NE@r7bcT`iL{+RG!Up#*uT`Z=|D9pYNoVM-l_i=y-Kyzf0h-Z+LqmbAmYsN>maa;W zav>ripi*o84!yc6S=vIMuCmr~5OX$OJ)Dj6gdezt{=>nXPO(>bvKu(-LvTw%EatVA zXCIr|gr)8x#*F>Ns#$FVvKE%Z&u>F5FB1Hmu9?7z4=*^=@xJ!Q*VfoYaA_~1>ajtw z>yBDDE1Zw_7VZ%`;H-=dIcnYEcY%%3j6hKMubw&Xk8E=_;#uyPin%e9_46XsNNZO| zNs+X3b%N;ks3|3ks&8HdSU;yuCax!h20fy$9+SF^#pyX^Go zn%HrZ*rgZ(1XSQxBUBf1t&2vjjg6lS**xJ{7xZ@r4i5W6O}1&y+8AjR-M=;pDe|7R zvnG9c9rH|OSKJr?lcdUBT>)Z2XV=isDaD=WIlDN4q;;XX-WxP_-5kdUJ`H=7;6MOq zZesg|nAgoKDh>^iO;`xd)3fWM5TUQHOOsxq&UH~?J#aVo2YK^MgadlIqw7U7-IqD~ zX~_4CC8oxl`)txXwC%oRME=Y772|yO#eLn<+>;-z-zr6TFS?b8*?PDQt_z~&8^Up7 ze|STb?z?_Eu%SqIy`TQPVX^LVKiM8w3`_Psuv^#p9gVGyiQLSlXk+bJC3!h#<<&)D z)X(;GbYtT8DdP$MK0!ySEz&hQUp*a{2LT)TIdx;k*e39DF#U>0NT|C5#BA6&RvJk= zH^xd5y|D33-SuxzF56_2aF%)MK`ZZg%I*QbN$3RojlHpn{_8Bn z9EIFr{N~ltCfd0#eHhLa7$ib`&pvqHP6sgLa+m{dljL%&(PAdA zTg*J;WM}Q~C5+lrKTjDC{cCVAKHZL1)B1{*y!es370)dw&Fv@u{PU0z@n8LY==ul* zDtvm1+xG+Kz(vr$1N{8=f2Y7lbL!40WbEx25q5*V4YRSWsW*Bkv$F%@yzw3%JlF>} z`ru|CJi-T$ZWnd8DX{o3B>LbfK6tthZuP;leQ>7_?rN{Qy@#?7Lx~Sw>Vud0;N?De zg%7^S2VYX>L#Xt@t9D%Y>wRa;*RWm+T^ophZ?ex3t58Uk|t;q*>``|}?@MAvsao}4C zTe-bNcGB$FQbt+EF~uhxLLFe$fZNJG-zxUZ_}xUv}916^KLg=?_*{y@RO!Jn**s$7gu+~;xg1lqt5dw3-A2VUiAx5??OHA{G$i>Y7=j(__iumsd`S5k62}MJqrahhGx(Al@8M7eQSdQs;#kkOySRZ7&!DV-8|4L>xj(<| zV5~64`_VWggQC8fS8esj_;C&A=PK}V%@BUrOn+?C;?t(XtIZ|wdD^ta4Y%nVZWAh4 zxcP+2$j{AjwBbNfc`H7W;I^J0SEYlEZRKu6JDgiTXtNDVe_hWoZ7Omxw-1L@>Tu zV53TuuNPFKnl$xpKsKtGMI_O{FU@)D!RB%85|0 zZNLW#O!fS@b%&S4c1_|CWliE0O=2HQoOARiBvzo6$Ho#ovz9f0+)cNa zM5or)1;{p*C2==#2tV;`X#PbnA+4H_tC|qA@=1eg)>TbNhbCk|72;+g6J22RSdxxs zwxnEx4PHX(Y2L4rr9reYr+77K)L2_Ic*Cp76>d^gijNr}^T!`6(BoqVkJ6i3%LvdE z<;sT;s^uvu%BbG>l{tTnSCd5=>sCPaSc_MaT20+nK=#<)6e>EHOv`^Ant#eE`DjAbYQ%RHY_1uQMI=sCobHAYb1C>dmdki%i>mopnGnv8l4&k`BJ zijqfXe*ONOD_Q^Pn;LwJ;L%WpXV%aF$Qs&|?-W!kU0PcikgY7uI{8Uc&WO6xc=IKL z*Yo4{xO-Gq7G7N#=Q4?8 z!>^Vh2V_G9b}VkpmA9}Bu~2TfUlYPCjJJ6Sy#YR^a~t!#;Wih2+T8SNbE{l!Q?+vA z=9R9BB1;YV9~qsx->bRtjLO2IS*1(E`FY1YDmwDsvWlIVo4&wiE8 zk`kX8_Q6$6qerU&JHO{yJVSxcN2a!Tv0Joi4@;RBd*d@S=lOW!7fVaNK9+Br{Cw*N zsek_AyDzBz`KLI4jetemjDI|WDZsN)$~F2e@USoV$5t|wQMes{r^z_~yzAC$ZJEw( zw|dEAn&($n1px=WnAw11z+1c;FwajJ;N6Y|mVmFvOBRRaP2hUC*;^j-u^#;DZnN6E zG1ndhV>TM|Gyhm%3GfOZfy}1~yiFdr9e`V|pxi{^PF!dd#>%G<6DUaPRO9qmFST|Dn0 z32}oNKy2}1Ouqnn`%`gapKk6nf!?mwg@8Wz4xM`G@yVY2F!((+)>0vb%Nnp4-xZ=2 zrNM--!ar8kqbx!>27C~(Vm!pt&SO*S%rW>UF1+-+WyTnd!=izL4_L(wz*~T)@oK_~ z7FR+L17op};EqWj4qlXtkajvuh(yq$V1*53KFSu9XHi~5`4FWCMZ7OWI7$Y}T$J@F zPrr|WIEjZ(Q2vP$eo=@5lw~N}QI4X#i_(jt{{WX;C>bcTP}ZS5igEzuHIxrg{)X~B ziupq!CZWtkS%I=0hu#a zT)FB*Y?xNT$IV~QMYf}~KKZK?^QF27A;ZZ=DMQE@45Jh;WDJZ^3KTL1#V92T83SaL zEJDTr86~TbF-S&fypS8y`4yptk}_6NFr50rVGg6+@$tj|1w*h_*gJ-AEzp<3NuRaxI`f zM6~fig6Tbg{&wu{@t7-qqU|!^2#aW2!g;b@wACc=wra#~$%GN2tsQU#3{aAAFw`fi z4Gf%s0=EFNfMXio#yHw5$t~JPBNOC$B{c>AX~yG4TNyrn<@Qy8BSwifH{;-MNygGN z0zDbj2*Jp%m_bSIz_5gI2<+kP3j%I24uvJ0_MmKM##br=n(Q{ zhPim(kd68{A!j=vXqJ#Gb3n(KUuHN}v~}d7K19eVPT*Gb3{YAtzV!1Up3 z2aK^?%lJegb6z7b3$g*FEKDzkDY&IYeup)(jq^c{dft*a1~?buj_hCv&t3r3n?)Pv zfD-tWON%-*rZQ5hgBYG+u0pt?uJmYao;A|ludjR!VsBSO}g$t_z^U#5ffE5_BO@N4r z>IVTaMAJaTIkE`%9AbYZDA7C~-@dO}Z ziT^8x*NuoLfy1*6fI7s;RmNdx9e)afe-oFF0_vTjjWafmPW-R95`5OD0WmEH8G>#m zKp0x8!P9^`2pVJ@QJ;vsNe9UJ6XTru^H8+|>cd1EXaC&35)k<0HqP&vz{wLw`z1GA zgK5XNW84G2A!Eq*b=b`1Xh6nYjDrvNdYuwUr{~wzJG1kgd8hN*^7`^>@@w;N<`3q# z6totkyDD5;T}NFvUFC&6g?)v_qWwh&i&~3BvA$SXkknv9KWaT@tg<6;8d=;FO&u&T?mkbCL6^v%`7AIpDnM9CW(!2UwI;%bFGWsxRyJfp%Z?_-IKAvrLl;>3BEXui*)1GrF zw>|fA?v>oDxgE|P=hpoC{2loX`K7KhS2?`2$W`g8En_}a4tqgyW5@TUo)jXj{7Ns;$G;W9zfsunpL5qJ!1;8hfq1 z!F~`Xx7u&oD=gV%N=%;4Zp*%qeKGq|w#y+qN*tvQ?n{MZ5&Cn<(eAkHxZ=3#=zwQ9 zJQH)WbA%fwDHw1Wp15f>W|^~`StVH@G@ty{+mA_78^xS^3@=fhJC~sE5V%YK;GCb% P-{3SlBb=CjiTeKwH=uoa delta 16691 zcmaKU4O~=p*8lGg0|Elh$ngF)fC9?fFbwY_Ton}+6_d;@G&C$TDl{x~*}z1l7F+62 zYdx5wS)oy3*t6DZ&s6T_K7T81t+m!#URzS@pf*ATc+#Qupt*fyA)Fa?s+8gf{1N_WFVkJR$e;>- z>_ZDcJJ$QS?tZE1^H_1A=S5+#$myR;vZG&AIQqjadxwQ(`|v=lxF`wJpto=s2V+GP zV85mL_z3d{nD-9r#ol4b;24~*7Z<|c5r!%UB4u{;Gd&P=*+-?jXacmNYiUi2g4}C~ z!#Xf#dCcJ| zz>1Zv$m3R$Xy%0AX;YahZWu(>`%i#ux`I~>)|mH(Ot3hNupC?}S|&%)uO=kMM{1V! zu*}K)`{Z%UdPwWsEPp&9SJIKuH(2+53?=zaFT4-~=4MC#32m640*8ry9$X6ssTZvS zpMb`LuK#h+tpn#`=po;^)AzdB@`bI}z=~K7jy|_%1oKUS9BvHyTi>LD*V&pD?z-mV zzUfwi7^FtOp2A%|s!|r2t^mEnT?dA|C z^C8;jXNp!lQ0J$Rd-^efy)XwA^N-RQzu;Bd*W%IA|^pc-ntqRL96g&mQ=?dGO}M zq>up38hhYMzy$h!Vw}&Xn72pYpa%jHbpMK`X9E(FhN4w3Dzq9n2fPv~aaAYl|4TG| z8IWLn&cp1R6d(BiP5OV+(!k)R<7@#*mo*EAfqN#s2Q(fbC!H6p?QW(x=??UB!T&Vr z>iQE7SuEXyys+J?$)fy%Q6L#!`q4c@Tp^>_H+0pGeyL8~J4#VKk3(^(<`}OK50Nn_ zPTE0PL2cJeE8C3a z#BiR6+Uux4$gO^)@<8*fA1i3C z`UwK>1UC;@CV}=%a(VFDr0LRB_CPYzHzd`#qg8nk;U-oVM4Y&pmA~EBdb=oQP?~MfW;wH72GX z1XU8^f@HxCh4gVCIh`hW`AZKokF%L@m}zia8<-F<*YfzATt0ZLj~$Bbia|-6vJXsh z4DMta#`Qp^x;Oq3xNG9fjB^aKk6S=Bi zJNmbR#~0@)4wSI83>y&Fo)_u0$#Z?G+k~OjK|aB`#u9M3Jb7SJ%Rmt=3eNLOXW2E| zhrQ{m*(TZ-ye(3S5>Y~2KltyfS0fFUj$t8|VRv>Izl)?|Q$ol;BEscY<(q~rVKA+wQ4~{5fYITberAd7_1B^bVJQvc;u;5r##kl%WsOK0nJ%2yF z9uY}xVJVR+I?h&+sIqkLr+340r-o>j%Qee>zEDzUrCROY zKd$Zy)VZvhpT>Z!#tRYZU`jQWpVI1x;02#B)om~V+F;&eI-(YhsEs0O-(9_WfqgbV zJ#M6P%D9n^rztkVYJ5{O;)>XRDn?%MFk;Y*JokSX>2Nb*pE_>D_WgP%>waG#IyOez*pEANwKQOB*7?tn2;{tBr0d^OMG{jvhct66k!S$#|otwoHrR zVv?eQV-_*B4h7*B$8c?k#XqKJ)J=V#oBEn(XiZeEGN_to#s_6fRtI(R8G1RYSm{3L z*4?Icr#(yl(W-RXv*Xg|weI$3m5?+>8=C$Zer^8$4!jH{<=Wr%D5=kw$88iT+9=L3 z{b#D7-OXe}%6Q21&j~}I6N|`-^v?r&b`1!zl-`T*BU6l8`P}cCf9D{_*=u-CnH+U7 zDMl3?XR*=2m^A4*`Y>j{)X=**c8TN{9xkGInF{Sa6PGGU_t5v|GH<-jIiI5i@sZL> zS{r|Zw2+R+M@gmhQGBLkBfo@s(sWvy5G5tjo%kC~4<^I~Mu!P3^Ob{8W(=WM60&ty zLg_+6Qs6&A#l`SSb((uoOk$p{Ka`dy&ei=rl%7hQt~(z}{|#^^l)g?}=!XHNbqPcG zJG5X*WU+S`$7_5Mm$iD~h4@S8H6iZqN8K+#~G%>u9R{w{qSftP8+)SH!%b;1ExRBL+sr-n-$k#k-2L()@HHtk8aFdlx8-cNp3 zcO`_jq+~Lo`5?WRlB??vq0dsRk*7k$#a3mt#*%E=HqeTFU{rO>IxWHY2D)`=>T)RR z9R07*+G&X)J)oYznE0)Q&md)D=fLx{XW9+Y9{Sg`CFz^d&*K|?dd~>Ibe}({)=I;2 z+hjfj7)~!5kg8EHV%I<}ZJ2(O&!vZjq5d$vKm9_&tD5kN)4K*ne{+1qb_mN5ngMML zirU_wPgD2nzBSPUX*ZWcdl@=L`Dh{IJquPpGO>4>&lQgTcYxQ$^J3aEz~1V`_JLEN zRe@Hf(Mmyko6^%0rS-HlJxr>h+tZiCcZ2JwP*11)Zok=2%`>0BIkz43QF`Lk--4^z zWe+j>HSl$aj?3Nza6Uxw8NtTw=&?iJ1he`!btBEmNR7M;R3%#4v4$6N9<<>QJ(Tg3 zR8G?}6D91rnX_X*R#;JJbq@Hj977S2T~O$2*go)Q6TO(ZSei)RXJ$%$lx~TRz&6L> z?}9Q_A<}>p_&!f-EE{$G!StaeN%vkb{a`7Ueor&97E0apU{+$tb9lLSVg#~frxLL; zyb127H?nS$h+?c&l7qHbuQT4lui%KUt3Ga^Ppn0lei7MAbVI?kK6|+oNpEC7H~9)) zoLo%2zm86(EjBB3yk8wTQwSRSPZb4aO*y2F%^JKZ=B45M&~ z&p%u?CA2a(EM_8Hz{zQF+uwE#@MJpb#$lyLa)Tq*Laqa69Nd^)Xm#sN=3ePWI)lHz zpyAxa#pU2MgF{$$4X_oSYzsm2)$JMn8z861WhVf2$dRpl9%YNxj&=l%4;ES}FVD*` zzRhA4eS@c9d{z+di|DbuM57s0_XAZl{V6Z5sSjuKkpy*s1`O~V@Uw3CS>Sy9a!L9^ z%Mt6|;cktG`zE+)X7{f`rVafDw;}xiT71xs0lpOL{q`z`RWXP)hHlFb(Oops{rS0( zpMXVz+i`GP7l3#>(Aph?gGPEcKUVi=BYl})Ed3Xy7sN@|)1rcf5eFa zl85MUL89~oeNb?l^lO??m@3uL?S*ytwm7@$q;a@rLKc;5@>E~>FY(G>G}=yto_yqK5YhIrQubSCkje$P%mLUpffWv zrGq3D2TwbRgM9m8Vc_e+MyGl-{)r4C`7&hUsH)f?J4;L5u;jJ->U#hm! znc^mC3oR{KC?(OJ67_&v)=lr19Fi{3ujD*snFrxDIl(^^ig^D6`k9S1)4z z^z#XuE1;MjoHb9nozBe4!`$|peH*wp%uZG}nr?b(cC3_3$7e@LPWoteX4C9R;-aDF z*8>7`=@>%7A>7cYv;Ytfcqb}@x-XWjUp0zWU9 zsnGAbtxcOWep{=_NB(%d%fdW{cFoXNw68R3DhKLx_qAt@QqHi(T_F|@+)w?bnNkcH z=a`I0>`8cb1tKgO{sIqJXPQK>&yK|0-!LaL=#wD#5z~uv;-nYp-8l)UkFVw=>Nd>~Ssg#RcE8@)A?}0xh^MNxFp!=0)jN1kuCSO_%1= z)_K9Y)}{3Lyyen%`eI%tR@#`dRA~~;FS||p7acB3mM+pqW!XBPAPSoQ01iKo%wHDK zt-T~BVK!j@9po2hQGH_gL;8MxX2|2{4G z{v2gg9BnU8)S2~ks65j6fL={ir=eBZO{UNX<+G*VQpBQEX(!ED6c@uv4nx1*^2o3k z)`wRxB2J!LWRpY|<^(@plFHy2rBp7aqHce$}Y;>P|y85idThD{I`8<+!1 zOmzL?aG|r|XUMoD3a_~7OP-gO z(ML-X1HVS7CMr5QhF>DTisX#%K>6W^s~4Dm0>+M1{3w49yyWsR@X2ZG@sY9XX;npr z&SwHWToEh1PA^nsORrFWMR35_^}=8m%>%#1T|WiPNYT9%NVzkty8VH)e#T;oo|zxs ztYihRy4w2zUl7z`S)kK%%+gadZE2$P2rXKgT=1S!w7UlOGqkAlA{_G~y?<28bs}ojO5Q(1z=x zq(!vry429(iCiKr!xDnwi(v54;K)jP_qqfrjlQ}rIq)+?&V+*II$c8FFN<4T@cq?` z1{5P7^9&H@a!pXws1solo?W*ZuJZpFT7GU?ob{)>7KCC&KDcbQ@e45V9_yMG5o|8h z%gr3CVRM)K$y#Zh{BNMLSzZ2QyrlippYE-ktLyit*DLQgM)MIAHFgwV9PmNuPqgUz zri3wHmFm=}&#+3Z3iv$IaG1Wle!B5Ju(?$8X=?{fTOJj&4a{7&Oi9Bq+1qll2bUZo zax$%69vm8|P#uF6P-#FcJ6=$Z;SVj(#eV+A^3<4_P$Al}MdAAzD>FCa+5F%DSN3A^ zyCG4^qVyZ$B4)5DGj8l)j`zwrz2L%m3-r4PX; znYSzY_%-AoezavpQt=TsD?9rC$gr8e)N}N|#n08srC>jsx(XLe)w_m2fm#>Nra$uQ z{dC2*k}((jjN1VDq;93pZ%mbLqL7=GNptD;o9@BH`Q)ZV`^1;Ntjdtyp_r9nfp7bYD13>~&%1<`X08k_*o^go zgX@Wa>%?w-ZdObyH;i1Odf|6zWZAoUJgr(H@;)_mkoFifoTiPT$Me!3GVUIF^cSJ?;bl= zO~=c`;Z>A+kM$iYV;(l=x*PHD4@oIkw@D%v!ZBbtcnR78{{QV&Z9pf6@ zqZ~HXmtNl7_%&yAX8Py8*uZtoj{Z)pM?s3?6OB-vqf+kyb z3|N4hp`B++I_C6YhgS)Ho;Yyv%59XYK~bBEUl zUMyWM@o7tOsakcZnLeowOaCh;OCG-(e2;O9ddAY@K*R&D&|Eo1@vDQSw<%}!4brQ$ zYjvD-m|no&gY*vm?xQd8_X!GIlU!Vli_n|Rb@fv`*xm@Wx#o`o7ft% z!@lww%t=OqH?BztiQ-rxwV15_V@N5_rcgS#CR-=|hdy0%W8f;@6e`rYv4iH^l8B?i z?YG$cph8RZv$rILoKVVX{04)qKScevq{biN9_)}PGB3=1B9iw}KW6X%WOq2ARg5TO*OQZz< z8xVg9iz~aZhz_qy3{1mz6m8%&ktzM_vLj=7OOw?K7~Q7kL527GxL$Z={X(M| zB07~_S*Qxhct=!dxcmA72c%{=QGp{K?YcWG z_9`odthbh#W77B=OU6Zd^X_6@>_yVm-Kd*zkyh2+D2>vqbvxrH!^_>4$A(3pV~``| zTGHF`Q^v(t|wuLV@%*Cxs&PIM- zzA+>HJ@9hcpY&2^yG5Jnu0>L+QwPBDFQmg8hO~YIFU?9Y{2d4cXZd~lep6V) zlibtJn{nT4gld7Gl9|?lm6U#O6s`c~-+P<%3?05VQ(8^^_s$FaEsD&n&6A^)bKkrf z8%NXZXg$te zUE^f0gm?_m3#E$yy~gq}z`2xB#%}?C(=tN2O}R~@e`m5o`5Kc)taqa1oSnnbS2O$j zpw1m1^1uT;aDxYK^1#DA@Mx!Ky2gOngJFsXp5lS0dEgcg+~$Gjd*F6w)3qa%Js3(o z@G=j)+yk%hz$-oQ6&`q1lLw*N1F!MG*LmQz9(bJxUhjbm58T@9L1^*7TRreLCq23K z|M4`fdWY6OkcngElMnpa8?QaM0^hi8319EFqt*1_r+IF*)ZwI$x83~<4{ep!$VcOqvug4jzD1xI&`fB&(z^%Xoby`T*8?B*z%M!JwVj2!u}A6aozrz! zIw+xay6)7Yw750N=h$LlIQt@PX`MCs^sliDD5$#n4B?`v^{xa%Iqtr&7!7H+O{HK- zSpx4~QrS{oVzx*ZoBd^0hR_VM0V1-oL-)`xkX74eq5AEgN9#>P6>7WKvjp{$IxnDLVKDP zJYLw8A14e6-V`B$-0Waw>WA@e4d-V)__*gPKCR|)nIj%DeQq+f;B(1T$B)a5jLQTI zR&Ls-GV*gpJl(ZBsbWRKxG$`OyVAhMzVa}l@ys+Cknu)06=&h&NW3a9Ll67>=x+1k zD?g*N6LKz{ZFpv#J%IT7MvMRgD7M=**$z$LfdqDwx_@gbFzg>!A@Iy9rU0^vDnOTt zltlG84Uk>3)1AAM7x_+6sm#S6mTqy=Sg&c^t!X^%rmsZ z0Z*$wmIAsg+cjAkkbSJ6e)w26^`}18Ldq4mDm=5_&6>ueZW_;P8v8VjI8*LUrp6~s zg?(-sPHP%2YZ}rHjQdotS#JPjpIWDK=lj1&6d{|KIL2cOH4G(58- z6&h@H(_v0lyx$EW(=<1kc8&Ll1~0kEG^jEoiXlC|xssUsNI^9$ROjDgV0I~yS4bKu8!h)7h$M?LwxFPGOL#*!_ zw@`y;w$KX57My?pN|er9)aO1xwlHGpegCOkucjV+(IYdH_F?(+pz&J6jd5;c&yU-7 z(E_?v+c>j|bLeM&GiW$}idsMbMfM6_r1)7tFWa^NGJ1L;4ukCIWe`}HI~~}MIAm<3 zLsNoBMUm4@X*>9s&N4@_W4UBbddOUMlW~BLWop)L*tFJOS!}K+pQnSS=U0r28(z?S z1sl6y*KmGLsi5Mg|F|lpWt;_6h3zufT!|jSGqd|*FXd3kfG)nH+tlY{fb97R4L_;j zL)&Q0frTr3aNICpWBau*wBUIJV|A9}J14hiGq(8(Qt7N|49~6@oYyS6toq^z;Cenw z0_Gf(^LZmyWN=CfiB=j z+yt2C=NxdCV}+&Q8*?p!=4(&1;4`TOkptBuEP_+E^CRMqwL4^(ou%d3jlW2Gp9Datb@bW)qvB#=3 zSNPrgD%#XOK3=liW$0nY^*Ah=(Oh~t3K;*m;uJhrR;WT8a-csNNNQZ!+j(z4Y3_hi3kGV*F3F)}}!Vw{>6%z?X47Xst#e%JA=r%xGh{o$dm@8_$=~ z+GzWs*-b}cFv4Jj+k~|x0?+ta1kx=s1R9bm1qrUPon)E z?XPIxq8VO=0<@WE)oAr-ZD?I+PPFrA|3veDO^8G^8SNKn4QOp>93&k|SuebWkC-5Q zg&+RS6utYry*HrypuTt3L)S|PcFa$L&7#P<1Dj17{qS<64j{5O$_N4zT@BQ^y|LVR zYj0eL)=|?V#D6TgdR3L~eX@6%)RZA)1lb@Z2pIu4Nd7`bunp1_AtUex$t+|9-XK|o zjNluj7$GA83LjFaK%`TFNUcFK2^lFhNMS-oS`AVX^u?(CNUmas=Z)kGeSl4pQOI3* z&`%Lgeznk{V+EizRmhhZ`UqKX1~dq{98f<=I9maA6NG$#=}|%sj|Y9SaPlhy(^~+2 zvV~K5CGZx``UK1ovv4ZMdA)F&5`i0pvnmnWCX(Q+V*(sdj@Do>Pf-PwgE4TYhAYQf z;MG%A1zmtFe~fV$C`|&6{whGP1mV1-;re9Yfx;;RGJhrG7|8BqUV1?2))+=KhAWIi zp>h_3!p;=n@OTK2`NuR|=Hm_UazJUKkQ*3B>U^iGk*Nnnoym=ihahzfk@D75z)3s9T5-&jK8T$8!PUfbTr?V`S9~XJWRLA+#{u4ag3K&sSj!pcF3TA%^Hr zTL6e+J_+cZFPwZ%)cFagayATX5>CEHKn~?-Kxvwg`FtW!_2(GR!t`4Nn1YaEE5Tal z0mv;N zkJNr0@LS;VGC&w!R|z^&V#jX`xZerLhWIxJsCLP z3?*az0MxyPBE1!IsPZ9(D9RPL0it-%0_so`4YvcIjv82xT0$xt)?@zjN_7?lT@7+t z3%DMN?*d#TWch9gV1a637>p`sSb!1K0al{8HUiE>1nvPW0bUP?B0Rw`5hLFO2t6(L z0%ilh4|@L#3)vRHt-u>G|Jl%_DaioCzF~XW=z@0*FegKfGogwD0 zej6Yn)(*%ksB)slG_&Dk&C}Y!Cv2pmi*eMHlOd+vWk4MwP~Nm1g2?r`9Uvgo>vpPe z3{Ve-idNvr;S~*bJqQH|VO<-b4H4P}h+^V@(ZTD)CB_las)vE2MtT6*QU1+>5TIkh>NdfFCyb5rpbKo#UtRmFNUYNLqbhxIA5&s^u$HoHxfy& zFKarRe=fhOpt_*7z*HDs*ipEvz;b=J$)F{?h?H#;EPkX@O*BD*GgU3P7@ zu<30Eo5>b#i?%sz2W&mIBetVWwqrIqr!=P`r!r?nPF0R0=Ri(R&XJs>IrdyRw>-BZ zw=#D{?ojSX?&aLE+$*^vFF((oSC&_vSCQAA*OBMQJCN6v*OxbxH=1`jZ!E7dzd64x zzdgSre|P@*{J#84`J?%l^YaVr1!V>G1w-}`dtb>=$w&#jx8R0?Pph)!sO6ZYE~_4+ z*lq2!)@Ijbm)Xi~r){G-mvhE)YIEyyYxC;z>hl`%8uOa-Tk@j|&4p76Qwm3lE)|U; zQe#EJ9$t*)TvS8vu`FlSS?f9Ld263_$U0)ZWF19B>T?@%8*`g60DWFnUO<7Nz*Nvs z(AZSaT;MD`QP@?~U39kST#>KcUMv?MEgmYKQc_(~Q*yH8RLSX*vnA));|d(p7+C5o z-B~?ZN3!y*`dm@8yXf4E^E3Kp)NpF5aZw1+oYj&QZ8ckK3+gcL@WSZAQ-!AstL)Ww zeX(z`tt7w1ULxx7wvrF#ZcC5lN|r#*#!ifJf}IgJg=;<%wBGH+EZrK z&Ty8TU`Lwq5)M#hskYQv>#YseMr%uUYj#_<**3*yv31&x<{ry+=AOzuoqIO7ys)aU zwy?3Vt+2DOyYLtsIbV3G@JeAoQFKvSQ<1%>yr`(L^Jm!MfLvT!+)=!{xVt#IBn@LIFR3c2EvYN1FX8_K0Dg%&4900WZRxX& zT7(j%qgkAi6Imy-WNWFl%vx@(LYX#N+pH(8<(IAI?6U0g?Dp)A?A_U&*^X>ijq+Gh zY-tz|S8JE8Tdi2zkZr^^X7kNyE9olfRuVK?a)qPf=-vOuHVNPNCB3x`--aA|D^Y(M Q?+d+W-tyLA!ddnI3xc)S+5i9m diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources index 3970265b2395a4710cbf9710b409d179627a67e6..9c87886cca6925d4e7748faee5c2011914e19053 100644 GIT binary patch delta 70 zcmaD@bh~JS45QqWwwJN$3=q)7$iSdfz>vw1%uvEm%233RIys+Fl!<|1vKFH*(;oH7 WZH)6bI|<3FPhKiGce5%}13v(~brVAX delta 92 zcmcaz^ss1y3?pCP4^C4CAkYWm4#vrWjJhBegGMn!E<++i5km=sJCMw0C}k*Ma01d5 l42BGP44z=wbcR$0S%Jw7jPp0&)@