diff --git a/INT69DC_7C/Controls/ControlUserSetting.Designer.cs b/INT69DC_7C/Controls/ControlUserSetting.Designer.cs index 47c5841..f8f87e6 100644 --- a/INT69DC_7C/Controls/ControlUserSetting.Designer.cs +++ b/INT69DC_7C/Controls/ControlUserSetting.Designer.cs @@ -48,7 +48,7 @@ this.labelStatusExpirePassword.BackPictureBox2 = null; this.labelStatusExpirePassword.BorderColor = System.Drawing.Color.Black; this.labelStatusExpirePassword.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStatusExpirePassword.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStatusExpirePassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStatusExpirePassword.ForeColor = System.Drawing.Color.DarkRed; this.labelStatusExpirePassword.InitVisible = true; this.labelStatusExpirePassword.LineSpacing = 0F; @@ -69,7 +69,7 @@ this.labelStatusExpireAccount.BackPictureBox2 = null; this.labelStatusExpireAccount.BorderColor = System.Drawing.Color.Black; this.labelStatusExpireAccount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStatusExpireAccount.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStatusExpireAccount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStatusExpireAccount.ForeColor = System.Drawing.Color.DarkRed; this.labelStatusExpireAccount.InitVisible = true; this.labelStatusExpireAccount.LineSpacing = 0F; @@ -84,7 +84,7 @@ // // labelExpirePasswordDate // - this.labelExpirePasswordDate.BackColor = System.Drawing.Color.WhiteSmoke; + this.labelExpirePasswordDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); this.labelExpirePasswordDate.BackPictureBox = null; this.labelExpirePasswordDate.BackPictureBox1 = null; this.labelExpirePasswordDate.BackPictureBox2 = null; @@ -103,7 +103,7 @@ // // labelExpireAccountDate // - this.labelExpireAccountDate.BackColor = System.Drawing.Color.WhiteSmoke; + this.labelExpireAccountDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); this.labelExpireAccountDate.BackPictureBox = null; this.labelExpireAccountDate.BackPictureBox1 = null; this.labelExpireAccountDate.BackPictureBox2 = null; diff --git a/INT69DC_7C/DialogForms/DialogFormDataStatistics.cs b/INT69DC_7C/DialogForms/DialogFormDataStatistics.cs index 9a23f4d..3e45656 100644 --- a/INT69DC_7C/DialogForms/DialogFormDataStatistics.cs +++ b/INT69DC_7C/DialogForms/DialogFormDataStatistics.cs @@ -30,7 +30,7 @@ namespace INT69DC_7C.DialogForms this.ParentForm = parent; this.InitializeDesign(); - this.InitializeContnrol(); + this.InitializeControl(); this.DefaultSetting(); } #endregion @@ -47,16 +47,15 @@ namespace INT69DC_7C.DialogForms private void InitializeDesign() { } - private void InitializeContnrol() + 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(450, 165); + this.Size = new Size(350, 470); } private void DefaultSetting() { diff --git a/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs b/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs index 1265c41..2ea622e 100644 --- a/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs +++ b/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs @@ -61,12 +61,11 @@ namespace INT69DC_7C.DialogForms 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(710, 470); } private void DefaultSetting() diff --git a/INT69DC_7C/DialogForms/DialogFormHistoryData.cs b/INT69DC_7C/DialogForms/DialogFormHistoryData.cs index 8882e8a..fdfc725 100644 --- a/INT69DC_7C/DialogForms/DialogFormHistoryData.cs +++ b/INT69DC_7C/DialogForms/DialogFormHistoryData.cs @@ -78,8 +78,7 @@ namespace INT69DC_7C.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/INT69DC_7C/DialogForms/DialogFormLogOn.cs b/INT69DC_7C/DialogForms/DialogFormLogOn.cs index 9cc9b9d..77d9063 100644 --- a/INT69DC_7C/DialogForms/DialogFormLogOn.cs +++ b/INT69DC_7C/DialogForms/DialogFormLogOn.cs @@ -95,7 +95,7 @@ namespace INT69DC_7C.DialogForms 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; @@ -104,17 +104,35 @@ namespace INT69DC_7C.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/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.cs b/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.cs index cf743f7..f94d425 100644 --- a/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.cs +++ b/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.cs @@ -24,6 +24,7 @@ namespace INT69DC_7C.DialogForms this.textBox.Text = value; this.RetStringValue = value; + this.InitializeControl(); this.DefaultSetting(); } #endregion @@ -37,10 +38,18 @@ namespace INT69DC_7C.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(); @@ -83,10 +92,5 @@ namespace INT69DC_7C.DialogForms this.KeyActionEsc(); } #endregion - - private void smartKeyboard_Click(object sender, EventArgs e) - { - - } } } \ No newline at end of file diff --git a/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.designer.cs b/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.designer.cs index 31bd3d2..32ad535 100644 --- a/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.designer.cs +++ b/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.designer.cs @@ -72,20 +72,22 @@ this.smartKeyboard.KeyUpImage2 = null; this.smartKeyboard.KeyUpImage3 = null; this.smartKeyboard.LeftMargin = 5; - this.smartKeyboard.Location = new System.Drawing.Point(12, 191); + this.smartKeyboard.Location = new System.Drawing.Point(11, 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(692, 276); + this.smartKeyboard.Size = new System.Drawing.Size(690, 270); this.smartKeyboard.TabIndex = 173; this.smartKeyboard.TABKeyDisable = false; this.smartKeyboard.TargetInputObject = null; this.smartKeyboard.Text = "smartKeyboard1"; this.smartKeyboard.ThemeStyle = SmartX.SmartKeyboard.KEYBOARDTHEMESTYLE.CUSTOMIZED_LITE; this.smartKeyboard.TopMargin = 5; + this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick); + this.smartKeyboard.KeyDown += new System.Windows.Forms.KeyEventHandler(this.smartKeyboard_KeyDown); // // labelTitle // diff --git a/INT69DC_7C/Forms/FormMenu.cs b/INT69DC_7C/Forms/FormMenu.cs index 9b2f6ab..511f69e 100644 --- a/INT69DC_7C/Forms/FormMenu.cs +++ b/INT69DC_7C/Forms/FormMenu.cs @@ -350,7 +350,7 @@ namespace INT69DC_7C.Forms this.buttonEquipmentSetting.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment; this.buttonTimeSetting.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuTime; - this.buttonUser.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuUser; + this.buttonUser.Enabled = true; this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics; this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuViewer; @@ -383,7 +383,7 @@ namespace INT69DC_7C.Forms this.buttonEquipmentSetting.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment; this.buttonTimeSetting.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuTime; - this.buttonUser.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuUser; + this.buttonUser.Enabled = true; this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics; this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuViewer; @@ -414,9 +414,9 @@ namespace INT69DC_7C.Forms this.buttonFactoryInitialize.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization; this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest; - this.buttonEquipmentSetting.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuEquipment; - this.buttonTimeSetting.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuTime; - this.buttonUser.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuUser; + this.buttonEquipmentSetting.Enabled = true; + this.buttonTimeSetting.Enabled = true; + this.buttonUser.Enabled = true; this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics; this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer; diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs index 4cb5cef..5f01421 100644 --- a/INT69DC_7C/Forms/FormUserEditor.cs +++ b/INT69DC_7C/Forms/FormUserEditor.cs @@ -374,6 +374,7 @@ namespace INT69DC_7C.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; @@ -394,6 +395,7 @@ namespace INT69DC_7C.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; @@ -412,31 +414,33 @@ namespace INT69DC_7C.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; case DataStore.UserGroup.Developer: case DataStore.UserGroup.Admin: - this.labelProductNo.ForeColor = Color.Black; - this.labelClear.ForeColor = Color.Black; - this.labelSubMenu.ForeColor = Color.Black; - this.labelWeightSetting.ForeColor = Color.Black; + this.labelProductNo.ForeColor = Color.DarkGreen; + this.labelClear.ForeColor = Color.DarkGreen; + this.labelSubMenu.ForeColor = Color.DarkGreen; + this.labelWeightSetting.ForeColor = Color.DarkGreen; - this.labelInformation.ForeColor = Color.Black; - this.labelConfiguration.ForeColor = Color.Black; - this.labelCommunication.ForeColor = Color.Black; - this.labelCalibration.ForeColor = Color.Black; - this.labelSystem.ForeColor = Color.Black; - this.labelMotor.ForeColor = Color.Black; - this.labelIOTest.ForeColor = Color.Black; - this.labelUpdate.ForeColor = Color.Black; - this.labelInitialization.ForeColor = Color.Black; - this.labelTime.ForeColor = Color.Black; - this.labelDataBackup.ForeColor = Color.Black; - this.labelStatistics.ForeColor = Color.Black; - this.labelViewer.ForeColor = Color.Black; + this.labelInformation.ForeColor = Color.DarkGreen; + this.labelConfiguration.ForeColor = Color.DarkGreen; + this.labelCommunication.ForeColor = Color.DarkGreen; + this.labelCalibration.ForeColor = Color.DarkGreen; + this.labelSystem.ForeColor = Color.DarkGreen; + this.labelMotor.ForeColor = Color.DarkGreen; + this.labelIOTest.ForeColor = Color.DarkGreen; + this.labelUpdate.ForeColor = Color.DarkGreen; + this.labelInitialization.ForeColor = Color.DarkGreen; + this.labelTime.ForeColor = Color.DarkGreen; + this.labelDataBackup.ForeColor = Color.DarkGreen; + this.labelEquipment.ForeColor = Color.DarkGreen; + this.labelStatistics.ForeColor = Color.DarkGreen; + this.labelViewer.ForeColor = Color.DarkGreen; break; default: break; @@ -714,6 +718,7 @@ namespace INT69DC_7C.Forms this.labelTime.ForeColor = this.ReturnColor(item.IsMenuTime); this.labelDataBackup.ForeColor = this.ReturnColor(item.IsMenuDataBackup); this.labelStatistics.ForeColor = this.ReturnColor(item.IsMenuStatistics); + this.labelEquipment.ForeColor = this.ReturnColor(item.IsMenuEquipment); this.labelViewer.ForeColor = this.ReturnColor(item.IsMenuViewer); } diff --git a/INT69DC_7C/Forms/FormUserEditor.designer.cs b/INT69DC_7C/Forms/FormUserEditor.designer.cs index d2af797..c9e76c8 100644 --- a/INT69DC_7C/Forms/FormUserEditor.designer.cs +++ b/INT69DC_7C/Forms/FormUserEditor.designer.cs @@ -82,6 +82,7 @@ this.labelID = new SmartX.SmartLabel(); this.labelTitleID = new SmartX.SmartLabel(); this.buttonGroupEditor = new SmartX.SmartButton(); + this.labelEquipment = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.smartGroupBox1.SuspendLayout(); this.smartGroupBox2.SuspendLayout(); @@ -109,7 +110,7 @@ this.labelTitle.BackPictureBox2 = null; this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold); + this.labelTitle.Font = new System.Drawing.Font("새굴림", 35F, System.Drawing.FontStyle.Bold); this.labelTitle.InitVisible = true; this.labelTitle.LineSpacing = 0F; this.labelTitle.Location = new System.Drawing.Point(199, 7); @@ -235,7 +236,7 @@ // // comboBoxAccessRight // - this.comboBoxAccessRight.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Regular); + this.comboBoxAccessRight.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Regular); this.comboBoxAccessRight.Location = new System.Drawing.Point(219, 156); this.comboBoxAccessRight.Name = "comboBoxAccessRight"; this.comboBoxAccessRight.Size = new System.Drawing.Size(291, 29); @@ -444,7 +445,7 @@ this.labelStatusExpiryPassword.BackPictureBox2 = null; this.labelStatusExpiryPassword.BorderColor = System.Drawing.Color.Black; this.labelStatusExpiryPassword.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStatusExpiryPassword.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStatusExpiryPassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStatusExpiryPassword.ForeColor = System.Drawing.Color.DarkRed; this.labelStatusExpiryPassword.InitVisible = true; this.labelStatusExpiryPassword.LineSpacing = 0F; @@ -465,7 +466,7 @@ this.labelStatusExpiryAccount.BackPictureBox2 = null; this.labelStatusExpiryAccount.BorderColor = System.Drawing.Color.Black; this.labelStatusExpiryAccount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStatusExpiryAccount.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStatusExpiryAccount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStatusExpiryAccount.ForeColor = System.Drawing.Color.DarkRed; this.labelStatusExpiryAccount.InitVisible = true; this.labelStatusExpiryAccount.LineSpacing = 0F; @@ -535,6 +536,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); @@ -619,7 +621,7 @@ this.labelViewer.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelViewer.InitVisible = true; this.labelViewer.LineSpacing = 0F; - this.labelViewer.Location = new System.Drawing.Point(427, 103); + this.labelViewer.Location = new System.Drawing.Point(427, 127); this.labelViewer.Name = "labelViewer"; this.labelViewer.Size = new System.Drawing.Size(130, 18); this.labelViewer.TabIndex = 261; @@ -637,7 +639,7 @@ this.labelStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelStatistics.InitVisible = true; this.labelStatistics.LineSpacing = 0F; - this.labelStatistics.Location = new System.Drawing.Point(427, 79); + this.labelStatistics.Location = new System.Drawing.Point(427, 103); this.labelStatistics.Name = "labelStatistics"; this.labelStatistics.Size = new System.Drawing.Size(130, 18); this.labelStatistics.TabIndex = 260; @@ -1216,6 +1218,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(427, 79); + this.labelEquipment.Name = "labelEquipment"; + this.labelEquipment.Size = new System.Drawing.Size(130, 18); + this.labelEquipment.TabIndex = 264; + 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); @@ -1292,5 +1312,6 @@ public SmartX.SmartLabel labelAutoLogoutWarning; private System.Windows.Forms.ComboBox comboBoxAccessRight; public SmartX.SmartLabel labelAccessRightAdmin; + private SmartX.SmartLabel labelEquipment; } } \ No newline at end of file diff --git a/INT69DC_7C/Forms/FormUserGroupEditor.Designer.cs b/INT69DC_7C/Forms/FormUserGroupEditor.Designer.cs index 7da0571..8ee60c8 100644 --- a/INT69DC_7C/Forms/FormUserGroupEditor.Designer.cs +++ b/INT69DC_7C/Forms/FormUserGroupEditor.Designer.cs @@ -369,7 +369,7 @@ this.checkBoxNotLoginMenuViewer.ImageCheckBox = null; this.checkBoxNotLoginMenuViewer.ImageUnCheckBox = null; this.checkBoxNotLoginMenuViewer.InitVisible = true; - this.checkBoxNotLoginMenuViewer.Location = new System.Drawing.Point(925, 531); + this.checkBoxNotLoginMenuViewer.Location = new System.Drawing.Point(925, 593); this.checkBoxNotLoginMenuViewer.Name = "checkBoxNotLoginMenuViewer"; this.checkBoxNotLoginMenuViewer.Size = new System.Drawing.Size(29, 30); this.checkBoxNotLoginMenuViewer.TabIndex = 854; @@ -391,7 +391,7 @@ this.checkBoxL3MenuViewer.ImageCheckBox = null; this.checkBoxL3MenuViewer.ImageUnCheckBox = null; this.checkBoxL3MenuViewer.InitVisible = true; - this.checkBoxL3MenuViewer.Location = new System.Drawing.Point(875, 531); + this.checkBoxL3MenuViewer.Location = new System.Drawing.Point(875, 593); this.checkBoxL3MenuViewer.Name = "checkBoxL3MenuViewer"; this.checkBoxL3MenuViewer.Size = new System.Drawing.Size(29, 30); this.checkBoxL3MenuViewer.TabIndex = 855; @@ -413,7 +413,7 @@ this.checkBoxL2MenuViewer.ImageCheckBox = null; this.checkBoxL2MenuViewer.ImageUnCheckBox = null; this.checkBoxL2MenuViewer.InitVisible = true; - this.checkBoxL2MenuViewer.Location = new System.Drawing.Point(825, 531); + this.checkBoxL2MenuViewer.Location = new System.Drawing.Point(825, 593); this.checkBoxL2MenuViewer.Name = "checkBoxL2MenuViewer"; this.checkBoxL2MenuViewer.Size = new System.Drawing.Size(29, 30); this.checkBoxL2MenuViewer.TabIndex = 856; @@ -435,7 +435,7 @@ this.checkBoxL1MenuViewer.ImageCheckBox = null; this.checkBoxL1MenuViewer.ImageUnCheckBox = null; this.checkBoxL1MenuViewer.InitVisible = true; - this.checkBoxL1MenuViewer.Location = new System.Drawing.Point(775, 531); + this.checkBoxL1MenuViewer.Location = new System.Drawing.Point(775, 593); this.checkBoxL1MenuViewer.Name = "checkBoxL1MenuViewer"; this.checkBoxL1MenuViewer.Size = new System.Drawing.Size(29, 30); this.checkBoxL1MenuViewer.TabIndex = 853; @@ -454,7 +454,7 @@ this.labelTitleViewer.ForeColor = System.Drawing.Color.Black; this.labelTitleViewer.InitVisible = true; this.labelTitleViewer.LineSpacing = 0F; - this.labelTitleViewer.Location = new System.Drawing.Point(535, 531); + this.labelTitleViewer.Location = new System.Drawing.Point(535, 593); this.labelTitleViewer.Name = "labelTitleViewer"; this.labelTitleViewer.Size = new System.Drawing.Size(200, 30); this.labelTitleViewer.TabIndex = 852; @@ -825,7 +825,7 @@ this.checkBoxNotLoginMenuStatistics.ImageCheckBox = null; this.checkBoxNotLoginMenuStatistics.ImageUnCheckBox = null; this.checkBoxNotLoginMenuStatistics.InitVisible = true; - this.checkBoxNotLoginMenuStatistics.Location = new System.Drawing.Point(925, 500); + this.checkBoxNotLoginMenuStatistics.Location = new System.Drawing.Point(925, 562); this.checkBoxNotLoginMenuStatistics.Name = "checkBoxNotLoginMenuStatistics"; this.checkBoxNotLoginMenuStatistics.Size = new System.Drawing.Size(29, 30); this.checkBoxNotLoginMenuStatistics.TabIndex = 630; @@ -847,7 +847,7 @@ this.checkBoxL3MenuStatistics.ImageCheckBox = null; this.checkBoxL3MenuStatistics.ImageUnCheckBox = null; this.checkBoxL3MenuStatistics.InitVisible = true; - this.checkBoxL3MenuStatistics.Location = new System.Drawing.Point(875, 500); + this.checkBoxL3MenuStatistics.Location = new System.Drawing.Point(875, 562); this.checkBoxL3MenuStatistics.Name = "checkBoxL3MenuStatistics"; this.checkBoxL3MenuStatistics.Size = new System.Drawing.Size(29, 30); this.checkBoxL3MenuStatistics.TabIndex = 631; @@ -869,7 +869,7 @@ this.checkBoxL2MenuStatistics.ImageCheckBox = null; this.checkBoxL2MenuStatistics.ImageUnCheckBox = null; this.checkBoxL2MenuStatistics.InitVisible = true; - this.checkBoxL2MenuStatistics.Location = new System.Drawing.Point(825, 500); + this.checkBoxL2MenuStatistics.Location = new System.Drawing.Point(825, 562); this.checkBoxL2MenuStatistics.Name = "checkBoxL2MenuStatistics"; this.checkBoxL2MenuStatistics.Size = new System.Drawing.Size(29, 30); this.checkBoxL2MenuStatistics.TabIndex = 632; @@ -891,7 +891,7 @@ this.checkBoxL1MenuStatistics.ImageCheckBox = null; this.checkBoxL1MenuStatistics.ImageUnCheckBox = null; this.checkBoxL1MenuStatistics.InitVisible = true; - this.checkBoxL1MenuStatistics.Location = new System.Drawing.Point(775, 500); + this.checkBoxL1MenuStatistics.Location = new System.Drawing.Point(775, 562); this.checkBoxL1MenuStatistics.Name = "checkBoxL1MenuStatistics"; this.checkBoxL1MenuStatistics.Size = new System.Drawing.Size(29, 30); this.checkBoxL1MenuStatistics.TabIndex = 629; @@ -910,7 +910,7 @@ this.labelTitleStatistics.ForeColor = System.Drawing.Color.Black; this.labelTitleStatistics.InitVisible = true; this.labelTitleStatistics.LineSpacing = 0F; - this.labelTitleStatistics.Location = new System.Drawing.Point(535, 500); + this.labelTitleStatistics.Location = new System.Drawing.Point(535, 562); this.labelTitleStatistics.Name = "labelTitleStatistics"; this.labelTitleStatistics.Size = new System.Drawing.Size(200, 30); this.labelTitleStatistics.TabIndex = 628; @@ -1102,12 +1102,11 @@ this.checkBoxNotLoginMenuEquipment.ImageCheckBox = null; this.checkBoxNotLoginMenuEquipment.ImageUnCheckBox = null; this.checkBoxNotLoginMenuEquipment.InitVisible = true; - this.checkBoxNotLoginMenuEquipment.Location = new System.Drawing.Point(425, 672); + this.checkBoxNotLoginMenuEquipment.Location = new System.Drawing.Point(925, 500); this.checkBoxNotLoginMenuEquipment.Name = "checkBoxNotLoginMenuEquipment"; this.checkBoxNotLoginMenuEquipment.Size = new System.Drawing.Size(29, 30); this.checkBoxNotLoginMenuEquipment.TabIndex = 601; this.checkBoxNotLoginMenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxNotLoginMenuEquipment.Visible = false; this.checkBoxNotLoginMenuEquipment.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL3MenuEquipment @@ -1115,21 +1114,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(375, 672); + this.checkBoxL3MenuEquipment.Location = new System.Drawing.Point(875, 500); this.checkBoxL3MenuEquipment.Name = "checkBoxL3MenuEquipment"; this.checkBoxL3MenuEquipment.Size = new System.Drawing.Size(29, 30); this.checkBoxL3MenuEquipment.TabIndex = 602; this.checkBoxL3MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL3MenuEquipment.Visible = false; this.checkBoxL3MenuEquipment.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxNotLoginMenuUpdate @@ -1272,12 +1271,11 @@ this.checkBoxL2MenuEquipment.ImageCheckBox = null; this.checkBoxL2MenuEquipment.ImageUnCheckBox = null; this.checkBoxL2MenuEquipment.InitVisible = true; - this.checkBoxL2MenuEquipment.Location = new System.Drawing.Point(325, 672); + this.checkBoxL2MenuEquipment.Location = new System.Drawing.Point(825, 500); this.checkBoxL2MenuEquipment.Name = "checkBoxL2MenuEquipment"; this.checkBoxL2MenuEquipment.Size = new System.Drawing.Size(29, 30); this.checkBoxL2MenuEquipment.TabIndex = 593; this.checkBoxL2MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL2MenuEquipment.Visible = false; this.checkBoxL2MenuEquipment.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL2MenuUpdate @@ -1357,12 +1355,11 @@ this.checkBoxL1MenuEquipment.ImageCheckBox = null; this.checkBoxL1MenuEquipment.ImageUnCheckBox = null; this.checkBoxL1MenuEquipment.InitVisible = true; - this.checkBoxL1MenuEquipment.Location = new System.Drawing.Point(275, 672); + this.checkBoxL1MenuEquipment.Location = new System.Drawing.Point(775, 500); this.checkBoxL1MenuEquipment.Name = "checkBoxL1MenuEquipment"; this.checkBoxL1MenuEquipment.Size = new System.Drawing.Size(29, 30); this.checkBoxL1MenuEquipment.TabIndex = 591; this.checkBoxL1MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL1MenuEquipment.Visible = false; this.checkBoxL1MenuEquipment.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL1MenuUpdate @@ -1946,7 +1943,7 @@ this.checkBoxNotLoginMenuTime.ImageCheckBox = null; this.checkBoxNotLoginMenuTime.ImageUnCheckBox = null; this.checkBoxNotLoginMenuTime.InitVisible = true; - this.checkBoxNotLoginMenuTime.Location = new System.Drawing.Point(925, 562); + this.checkBoxNotLoginMenuTime.Location = new System.Drawing.Point(925, 531); this.checkBoxNotLoginMenuTime.Name = "checkBoxNotLoginMenuTime"; this.checkBoxNotLoginMenuTime.Size = new System.Drawing.Size(29, 30); this.checkBoxNotLoginMenuTime.TabIndex = 581; @@ -1968,7 +1965,7 @@ this.checkBoxL3MenuTime.ImageCheckBox = null; this.checkBoxL3MenuTime.ImageUnCheckBox = null; this.checkBoxL3MenuTime.InitVisible = true; - this.checkBoxL3MenuTime.Location = new System.Drawing.Point(875, 562); + this.checkBoxL3MenuTime.Location = new System.Drawing.Point(875, 531); this.checkBoxL3MenuTime.Name = "checkBoxL3MenuTime"; this.checkBoxL3MenuTime.Size = new System.Drawing.Size(29, 30); this.checkBoxL3MenuTime.TabIndex = 580; @@ -2073,7 +2070,7 @@ this.checkBoxL2MenuTime.ImageCheckBox = null; this.checkBoxL2MenuTime.ImageUnCheckBox = null; this.checkBoxL2MenuTime.InitVisible = true; - this.checkBoxL2MenuTime.Location = new System.Drawing.Point(825, 562); + this.checkBoxL2MenuTime.Location = new System.Drawing.Point(825, 531); this.checkBoxL2MenuTime.Name = "checkBoxL2MenuTime"; this.checkBoxL2MenuTime.Size = new System.Drawing.Size(29, 30); this.checkBoxL2MenuTime.TabIndex = 575; @@ -2157,7 +2154,7 @@ this.checkBoxL1MenuTime.ImageCheckBox = null; this.checkBoxL1MenuTime.ImageUnCheckBox = null; this.checkBoxL1MenuTime.InitVisible = true; - this.checkBoxL1MenuTime.Location = new System.Drawing.Point(775, 562); + this.checkBoxL1MenuTime.Location = new System.Drawing.Point(775, 531); this.checkBoxL1MenuTime.Name = "checkBoxL1MenuTime"; this.checkBoxL1MenuTime.Size = new System.Drawing.Size(29, 30); this.checkBoxL1MenuTime.TabIndex = 577; @@ -2284,14 +2281,13 @@ this.smartLabel21.ForeColor = System.Drawing.Color.Black; this.smartLabel21.InitVisible = true; this.smartLabel21.LineSpacing = 0F; - this.smartLabel21.Location = new System.Drawing.Point(35, 672); + this.smartLabel21.Location = new System.Drawing.Point(535, 500); this.smartLabel21.Name = "smartLabel21"; this.smartLabel21.Size = new System.Drawing.Size(200, 30); this.smartLabel21.TabIndex = 555; - this.smartLabel21.Text = "Equipment Test"; + this.smartLabel21.Text = "Equipment"; this.smartLabel21.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel21.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel21.Visible = false; this.smartLabel21.Wordwrap = false; // // smartLabel18 @@ -2485,7 +2481,7 @@ this.smartLabel8.ForeColor = System.Drawing.Color.Black; this.smartLabel8.InitVisible = true; this.smartLabel8.LineSpacing = 0F; - this.smartLabel8.Location = new System.Drawing.Point(535, 562); + this.smartLabel8.Location = new System.Drawing.Point(535, 531); this.smartLabel8.Name = "smartLabel8"; this.smartLabel8.Size = new System.Drawing.Size(200, 30); this.smartLabel8.TabIndex = 543; diff --git a/INT69DC_7C/Forms/FormUserGroupEditor.cs b/INT69DC_7C/Forms/FormUserGroupEditor.cs index 4f4ecb2..c917bbe 100644 --- a/INT69DC_7C/Forms/FormUserGroupEditor.cs +++ b/INT69DC_7C/Forms/FormUserGroupEditor.cs @@ -283,10 +283,10 @@ namespace INT69DC_7C.Forms this.checkBoxL3MenuSystem.Checked = group.Level3.IsMenuSystem; this.checkBoxL3MenuMotor.Checked = group.Level3.IsMenuMotor; this.checkBoxL3MenuIOTest.Checked = group.Level3.IsMenuIOTest; - this.checkBoxL3MenuEquipment.Checked = group.Level3.IsMenuEquipment; + this.checkBoxL3MenuEquipment.Checked = true; this.checkBoxL3MenuUpdate.Checked = group.Level3.IsMenuUpdate; this.checkBoxL3MenuInitialization.Checked = group.Level3.IsMenuInitialization; - this.checkBoxL3MenuTime.Checked = group.Level3.IsMenuTime; + this.checkBoxL3MenuTime.Checked = true; this.checkBoxL3MenuDataBackup.Checked = group.Level3.IsMenuDataBackup; this.checkBoxL3MenuStatistics.Checked = group.Level3.IsMenuStatistics; this.checkBoxL3MenuViewer.Checked = group.Level3.IsMenuViewer; @@ -411,11 +411,11 @@ namespace INT69DC_7C.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 @@ -435,11 +435,10 @@ namespace INT69DC_7C.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 @@ -457,13 +456,12 @@ namespace INT69DC_7C.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 @@ -521,7 +519,7 @@ namespace INT69DC_7C.Forms this.checkBoxL1MenuDataBackup.Checked = true; this.checkBoxL1MenuStatistics.Checked = true; this.checkBoxL1MenuViewer.Checked = true; - //this.checkBoxL1MenuEquipment.Checked = true; + this.checkBoxL1MenuEquipment.Checked = true; this.buttonSave.Visible = true; } @@ -549,7 +547,7 @@ namespace INT69DC_7C.Forms this.checkBoxL2MenuDataBackup.Checked = true; this.checkBoxL2MenuStatistics.Checked = true; this.checkBoxL2MenuViewer.Checked = true; - //this.checkBoxL2MenuEquipment.Checked = true; + this.checkBoxL2MenuEquipment.Checked = true; this.buttonSave.Visible = true; } @@ -577,7 +575,7 @@ namespace INT69DC_7C.Forms this.checkBoxL3MenuDataBackup.Checked = true; this.checkBoxL3MenuStatistics.Checked = true; this.checkBoxL3MenuViewer.Checked = true; - //this.checkBoxL3MenuEquipment.Checked = true; + this.checkBoxL3MenuEquipment.Checked = true; this.buttonSave.Visible = true; } @@ -605,7 +603,7 @@ namespace INT69DC_7C.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; }