diff --git a/INT69DC_7C/Forms/FormConfiguration.Designer.cs b/INT69DC_7C/Forms/FormConfiguration.Designer.cs index 2bf7ad4..a4e33d7 100644 --- a/INT69DC_7C/Forms/FormConfiguration.Designer.cs +++ b/INT69DC_7C/Forms/FormConfiguration.Designer.cs @@ -89,6 +89,7 @@ this.buttonAlarmTotalPassCount = new SmartX.SmartButton(); this.labelStaticATPC = new SmartX.SmartLabel(); this.labelAlarmTotalPassCount = new SmartX.SmartLabel(); + this.smartSeparatorLine1 = new SmartX.SmartSeparatorLine(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.groupBoxAutoZero.SuspendLayout(); this.groupBoxOption.SuspendLayout(); @@ -617,7 +618,7 @@ this.buttonBypassMode.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonBypassMode.DownImage"))); this.buttonBypassMode.GroupID = 0; this.buttonBypassMode.InitVisible = true; - this.buttonBypassMode.Location = new System.Drawing.Point(204, 273); + this.buttonBypassMode.Location = new System.Drawing.Point(271, 348); this.buttonBypassMode.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonBypassMode.Name = "buttonBypassMode"; this.buttonBypassMode.NestedClickEventPrevent = false; @@ -646,7 +647,7 @@ this.labelStaticBypass.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticBypass.InitVisible = true; this.labelStaticBypass.LineSpacing = 0F; - this.labelStaticBypass.Location = new System.Drawing.Point(48, 273); + this.labelStaticBypass.Location = new System.Drawing.Point(115, 348); this.labelStaticBypass.Name = "labelStaticBypass"; this.labelStaticBypass.Size = new System.Drawing.Size(150, 30); this.labelStaticBypass.TabIndex = 0; @@ -683,6 +684,7 @@ // this.groupBoxBypass.BackPictureBox = this.smartForm1; this.groupBoxBypass.BackPictureBox1 = null; + this.groupBoxBypass.Controls.Add(this.smartSeparatorLine1); this.groupBoxBypass.Controls.Add(this.buttonSaveBypass); this.groupBoxBypass.Controls.Add(this.buttonBypassLane12); this.groupBoxBypass.Controls.Add(this.buttonBypassLane10); @@ -729,7 +731,7 @@ // this.buttonSaveBypass.Enabled = false; this.buttonSaveBypass.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); - this.buttonSaveBypass.Location = new System.Drawing.Point(335, 273); + this.buttonSaveBypass.Location = new System.Drawing.Point(216, 270); this.buttonSaveBypass.Name = "buttonSaveBypass"; this.buttonSaveBypass.Size = new System.Drawing.Size(88, 30); this.buttonSaveBypass.TabIndex = 2; @@ -1463,6 +1465,21 @@ this.labelAlarmTotalPassCount.Wordwrap = false; this.labelAlarmTotalPassCount.Click += new System.EventHandler(this.labelAlarmTotalCount_Click); // + // 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(51, 323); + this.smartSeparatorLine1.Name = "smartSeparatorLine1"; + this.smartSeparatorLine1.Size = new System.Drawing.Size(400, 2); + this.smartSeparatorLine1.TabIndex = 3; + this.smartSeparatorLine1.Text = "smartSeparatorLine1"; + // // FormConfiguration // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -1550,5 +1567,6 @@ private SmartX.SmartButton buttonAlarmTotalPassCount; private SmartX.SmartLabel labelStaticATPC; private SmartX.SmartLabel labelAlarmTotalPassCount; + private SmartX.SmartSeparatorLine smartSeparatorLine1; } } \ No newline at end of file diff --git a/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs b/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs index f3fe6ea..6dd1ab1 100644 --- a/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs +++ b/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs @@ -99,6 +99,7 @@ this.labelStaticLine = new SmartX.SmartLabel(); this.labelStaticEquipmentID = new SmartX.SmartLabel(); this.labelTitle = new SmartX.SmartLabel(); + this.smartLabel5 = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.groupBoxSpecialMenu.SuspendLayout(); this.panel7.SuspendLayout(); @@ -129,6 +130,7 @@ // this.groupBoxSpecialMenu.BackPictureBox = this.smartForm1; this.groupBoxSpecialMenu.BackPictureBox1 = null; + this.groupBoxSpecialMenu.Controls.Add(this.smartLabel5); this.groupBoxSpecialMenu.Controls.Add(this.smartLabel6); this.groupBoxSpecialMenu.Controls.Add(this.labelDataStoragePeriod); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticDataStoragePeriod); @@ -196,12 +198,12 @@ 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.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.smartLabel6.InitVisible = true; this.smartLabel6.LineSpacing = 0F; this.smartLabel6.Location = new System.Drawing.Point(508, 344); this.smartLabel6.Name = "smartLabel6"; - this.smartLabel6.Size = new System.Drawing.Size(174, 25); + this.smartLabel6.Size = new System.Drawing.Size(100, 25); this.smartLabel6.TabIndex = 221; this.smartLabel6.Text = "months"; this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -236,7 +238,7 @@ 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("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticDataStoragePeriod.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticDataStoragePeriod.InitVisible = true; this.labelStaticDataStoragePeriod.LineSpacing = 0F; this.labelStaticDataStoragePeriod.Location = new System.Drawing.Point(12, 344); @@ -256,8 +258,8 @@ this.smartLabel4.BackPictureBox2 = null; this.smartLabel4.BorderColor = System.Drawing.Color.Black; this.smartLabel4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel4.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.smartLabel4.ForeColor = System.Drawing.Color.Red; + this.smartLabel4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel4.ForeColor = System.Drawing.Color.DarkRed; this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; this.smartLabel4.Location = new System.Drawing.Point(606, 127); @@ -307,7 +309,7 @@ this.labelStaticIntegratedTransmission.BackPictureBox2 = null; this.labelStaticIntegratedTransmission.BorderColor = System.Drawing.Color.Black; this.labelStaticIntegratedTransmission.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticIntegratedTransmission.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticIntegratedTransmission.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticIntegratedTransmission.InitVisible = true; this.labelStaticIntegratedTransmission.LineSpacing = 0F; this.labelStaticIntegratedTransmission.Location = new System.Drawing.Point(12, 127); @@ -321,7 +323,7 @@ // // comboBoxStepMotorType // - this.comboBoxStepMotorType.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.comboBoxStepMotorType.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); this.comboBoxStepMotorType.Location = new System.Drawing.Point(418, 524); this.comboBoxStepMotorType.Name = "comboBoxStepMotorType"; this.comboBoxStepMotorType.Size = new System.Drawing.Size(165, 29); @@ -335,7 +337,7 @@ this.labelTitleStepMotorType.BackPictureBox2 = null; this.labelTitleStepMotorType.BorderColor = System.Drawing.Color.Black; this.labelTitleStepMotorType.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleStepMotorType.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleStepMotorType.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); this.labelTitleStepMotorType.InitVisible = true; this.labelTitleStepMotorType.LineSpacing = 0F; this.labelTitleStepMotorType.Location = new System.Drawing.Point(204, 528); @@ -385,7 +387,7 @@ this.labelStaticLogin.BackPictureBox2 = null; this.labelStaticLogin.BorderColor = System.Drawing.Color.Black; this.labelStaticLogin.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticLogin.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticLogin.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticLogin.InitVisible = true; this.labelStaticLogin.LineSpacing = 0F; this.labelStaticLogin.Location = new System.Drawing.Point(12, 493); @@ -405,8 +407,8 @@ this.smartLabel2.BackPictureBox2 = null; this.smartLabel2.BorderColor = System.Drawing.Color.Black; this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.smartLabel2.ForeColor = System.Drawing.Color.Red; + this.smartLabel2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel2.ForeColor = System.Drawing.Color.DarkRed; this.smartLabel2.InitVisible = true; this.smartLabel2.LineSpacing = 0F; this.smartLabel2.Location = new System.Drawing.Point(606, 158); @@ -456,7 +458,7 @@ this.labelStaticIndividualTransmission.BackPictureBox2 = null; this.labelStaticIndividualTransmission.BorderColor = System.Drawing.Color.Black; this.labelStaticIndividualTransmission.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticIndividualTransmission.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticIndividualTransmission.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticIndividualTransmission.InitVisible = true; this.labelStaticIndividualTransmission.LineSpacing = 0F; this.labelStaticIndividualTransmission.Location = new System.Drawing.Point(12, 158); @@ -506,7 +508,7 @@ this.labelStaticEmergencyStopEntrySensorError.BackPictureBox2 = null; this.labelStaticEmergencyStopEntrySensorError.BorderColor = System.Drawing.Color.Black; this.labelStaticEmergencyStopEntrySensorError.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticEmergencyStopEntrySensorError.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticEmergencyStopEntrySensorError.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticEmergencyStopEntrySensorError.InitVisible = true; this.labelStaticEmergencyStopEntrySensorError.LineSpacing = 0F; this.labelStaticEmergencyStopEntrySensorError.Location = new System.Drawing.Point(12, 220); @@ -603,7 +605,7 @@ // // radioButtonLanguageGerman // - this.radioButtonLanguageGerman.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonLanguageGerman.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonLanguageGerman.Location = new System.Drawing.Point(272, 27); this.radioButtonLanguageGerman.Name = "radioButtonLanguageGerman"; this.radioButtonLanguageGerman.Size = new System.Drawing.Size(120, 20); @@ -614,7 +616,7 @@ // // radioButtonLanguageCzech // - this.radioButtonLanguageCzech.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonLanguageCzech.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonLanguageCzech.Location = new System.Drawing.Point(146, 29); this.radioButtonLanguageCzech.Name = "radioButtonLanguageCzech"; this.radioButtonLanguageCzech.Size = new System.Drawing.Size(120, 20); @@ -625,7 +627,7 @@ // // radioButtonLanguageChinese // - this.radioButtonLanguageChinese.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonLanguageChinese.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonLanguageChinese.Location = new System.Drawing.Point(20, 29); this.radioButtonLanguageChinese.Name = "radioButtonLanguageChinese"; this.radioButtonLanguageChinese.Size = new System.Drawing.Size(120, 20); @@ -636,7 +638,7 @@ // // radioButtonLanguageEnglish // - this.radioButtonLanguageEnglish.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonLanguageEnglish.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonLanguageEnglish.Location = new System.Drawing.Point(146, 3); this.radioButtonLanguageEnglish.Name = "radioButtonLanguageEnglish"; this.radioButtonLanguageEnglish.Size = new System.Drawing.Size(120, 20); @@ -648,7 +650,7 @@ // radioButtonLanguageKorean // this.radioButtonLanguageKorean.Checked = true; - this.radioButtonLanguageKorean.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonLanguageKorean.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonLanguageKorean.Location = new System.Drawing.Point(20, 3); this.radioButtonLanguageKorean.Name = "radioButtonLanguageKorean"; this.radioButtonLanguageKorean.Size = new System.Drawing.Size(120, 20); @@ -667,7 +669,7 @@ // // radioButtonWeightViewReverse // - this.radioButtonWeightViewReverse.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonWeightViewReverse.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonWeightViewReverse.Location = new System.Drawing.Point(188, 3); this.radioButtonWeightViewReverse.Name = "radioButtonWeightViewReverse"; this.radioButtonWeightViewReverse.Size = new System.Drawing.Size(162, 20); @@ -678,7 +680,7 @@ // radioButtonWeightViewForward // this.radioButtonWeightViewForward.Checked = true; - this.radioButtonWeightViewForward.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonWeightViewForward.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonWeightViewForward.Location = new System.Drawing.Point(20, 3); this.radioButtonWeightViewForward.Name = "radioButtonWeightViewForward"; this.radioButtonWeightViewForward.Size = new System.Drawing.Size(157, 20); @@ -693,7 +695,7 @@ this.labelStaticInputSensorSelect.BackPictureBox2 = null; this.labelStaticInputSensorSelect.BorderColor = System.Drawing.Color.Black; this.labelStaticInputSensorSelect.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticInputSensorSelect.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticInputSensorSelect.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticInputSensorSelect.InitVisible = true; this.labelStaticInputSensorSelect.LineSpacing = 0F; this.labelStaticInputSensorSelect.Location = new System.Drawing.Point(12, 189); @@ -713,8 +715,8 @@ this.labelBuadrateWarning2.BackPictureBox2 = null; this.labelBuadrateWarning2.BorderColor = System.Drawing.Color.Black; this.labelBuadrateWarning2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelBuadrateWarning2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.Red; + this.labelBuadrateWarning2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.DarkRed; this.labelBuadrateWarning2.InitVisible = true; this.labelBuadrateWarning2.LineSpacing = 0F; this.labelBuadrateWarning2.Location = new System.Drawing.Point(0, 647); @@ -723,7 +725,7 @@ this.labelBuadrateWarning2.TabIndex = 139; this.labelBuadrateWarning2.Text = "※ 엔지니어 이외에 절대 변경하지 마십시오."; this.labelBuadrateWarning2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelBuadrateWarning2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelBuadrateWarning2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelBuadrateWarning2.Wordwrap = false; // // smartLabel3 @@ -734,8 +736,8 @@ this.smartLabel3.BackPictureBox2 = null; this.smartLabel3.BorderColor = System.Drawing.Color.Black; this.smartLabel3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.smartLabel3.ForeColor = System.Drawing.Color.Red; + this.smartLabel3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel3.ForeColor = System.Drawing.Color.DarkRed; this.smartLabel3.InitVisible = true; this.smartLabel3.LineSpacing = 0F; this.smartLabel3.Location = new System.Drawing.Point(606, 189); @@ -755,8 +757,8 @@ this.smartLabel1.BackPictureBox2 = null; this.smartLabel1.BorderColor = System.Drawing.Color.Black; this.smartLabel1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.smartLabel1.ForeColor = System.Drawing.Color.Red; + this.smartLabel1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel1.ForeColor = System.Drawing.Color.DarkRed; this.smartLabel1.InitVisible = true; this.smartLabel1.LineSpacing = 0F; this.smartLabel1.Location = new System.Drawing.Point(606, 96); @@ -776,17 +778,17 @@ this.labelBuadrateWarning.BackPictureBox2 = null; this.labelBuadrateWarning.BorderColor = System.Drawing.Color.Black; this.labelBuadrateWarning.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelBuadrateWarning.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.labelBuadrateWarning.ForeColor = System.Drawing.Color.Red; + this.labelBuadrateWarning.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelBuadrateWarning.ForeColor = System.Drawing.Color.DarkRed; this.labelBuadrateWarning.InitVisible = true; this.labelBuadrateWarning.LineSpacing = 0F; - this.labelBuadrateWarning.Location = new System.Drawing.Point(0, 626); + this.labelBuadrateWarning.Location = new System.Drawing.Point(0, 618); this.labelBuadrateWarning.Name = "labelBuadrateWarning"; this.labelBuadrateWarning.Size = new System.Drawing.Size(811, 23); this.labelBuadrateWarning.TabIndex = 138; this.labelBuadrateWarning.Text = "※ 설정 변경 후, 전원을 껐다 켜야 합니다"; this.labelBuadrateWarning.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelBuadrateWarning.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelBuadrateWarning.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelBuadrateWarning.Wordwrap = false; // // panel5 @@ -855,7 +857,7 @@ this.labelStaticImpellerBaudrate.BackPictureBox2 = null; this.labelStaticImpellerBaudrate.BorderColor = System.Drawing.Color.Black; this.labelStaticImpellerBaudrate.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticImpellerBaudrate.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticImpellerBaudrate.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticImpellerBaudrate.InitVisible = true; this.labelStaticImpellerBaudrate.LineSpacing = 0F; this.labelStaticImpellerBaudrate.Location = new System.Drawing.Point(12, 375); @@ -874,7 +876,7 @@ this.labelStaticLanguage.BackPictureBox2 = null; this.labelStaticLanguage.BorderColor = System.Drawing.Color.Black; this.labelStaticLanguage.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticLanguage.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticLanguage.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticLanguage.InitVisible = true; this.labelStaticLanguage.LineSpacing = 0F; this.labelStaticLanguage.Location = new System.Drawing.Point(12, 437); @@ -893,7 +895,7 @@ this.labelStaticImpellerRotation.BackPictureBox2 = null; this.labelStaticImpellerRotation.BorderColor = System.Drawing.Color.Black; this.labelStaticImpellerRotation.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticImpellerRotation.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticImpellerRotation.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticImpellerRotation.InitVisible = true; this.labelStaticImpellerRotation.LineSpacing = 0F; this.labelStaticImpellerRotation.Location = new System.Drawing.Point(12, 406); @@ -916,7 +918,7 @@ // // radioButtonFeedingConveyorRunNg // - this.radioButtonFeedingConveyorRunNg.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonFeedingConveyorRunNg.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonFeedingConveyorRunNg.Location = new System.Drawing.Point(131, 3); this.radioButtonFeedingConveyorRunNg.Name = "radioButtonFeedingConveyorRunNg"; this.radioButtonFeedingConveyorRunNg.Size = new System.Drawing.Size(100, 20); @@ -927,7 +929,7 @@ // radioButtonFeedingConveyorRunPass // this.radioButtonFeedingConveyorRunPass.Checked = true; - this.radioButtonFeedingConveyorRunPass.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonFeedingConveyorRunPass.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonFeedingConveyorRunPass.Location = new System.Drawing.Point(25, 3); this.radioButtonFeedingConveyorRunPass.Name = "radioButtonFeedingConveyorRunPass"; this.radioButtonFeedingConveyorRunPass.Size = new System.Drawing.Size(100, 20); @@ -946,7 +948,7 @@ // // radioButtonImpellerMotorDirectionCCW // - this.radioButtonImpellerMotorDirectionCCW.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorDirectionCCW.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorDirectionCCW.Location = new System.Drawing.Point(183, 3); this.radioButtonImpellerMotorDirectionCCW.Name = "radioButtonImpellerMotorDirectionCCW"; this.radioButtonImpellerMotorDirectionCCW.Size = new System.Drawing.Size(120, 20); @@ -957,7 +959,7 @@ // radioButtonImpellerMotorDirectionCW // this.radioButtonImpellerMotorDirectionCW.Checked = true; - this.radioButtonImpellerMotorDirectionCW.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorDirectionCW.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorDirectionCW.Location = new System.Drawing.Point(20, 3); this.radioButtonImpellerMotorDirectionCW.Name = "radioButtonImpellerMotorDirectionCW"; this.radioButtonImpellerMotorDirectionCW.Size = new System.Drawing.Size(120, 20); @@ -977,7 +979,7 @@ // // radioButtonDischargeConveyorDirectionCWCCW // - this.radioButtonDischargeConveyorDirectionCWCCW.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonDischargeConveyorDirectionCWCCW.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonDischargeConveyorDirectionCWCCW.Location = new System.Drawing.Point(237, 3); this.radioButtonDischargeConveyorDirectionCWCCW.Name = "radioButtonDischargeConveyorDirectionCWCCW"; this.radioButtonDischargeConveyorDirectionCWCCW.Size = new System.Drawing.Size(103, 20); @@ -987,7 +989,7 @@ // // radioButtonDischargeConveyorDirectionCCW // - this.radioButtonDischargeConveyorDirectionCCW.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonDischargeConveyorDirectionCCW.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonDischargeConveyorDirectionCCW.Location = new System.Drawing.Point(131, 3); this.radioButtonDischargeConveyorDirectionCCW.Name = "radioButtonDischargeConveyorDirectionCCW"; this.radioButtonDischargeConveyorDirectionCCW.Size = new System.Drawing.Size(100, 20); @@ -998,7 +1000,7 @@ // radioButtonDischargeConveyorDirectionCW // this.radioButtonDischargeConveyorDirectionCW.Checked = true; - this.radioButtonDischargeConveyorDirectionCW.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonDischargeConveyorDirectionCW.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonDischargeConveyorDirectionCW.Location = new System.Drawing.Point(25, 3); this.radioButtonDischargeConveyorDirectionCW.Name = "radioButtonDischargeConveyorDirectionCW"; this.radioButtonDischargeConveyorDirectionCW.Size = new System.Drawing.Size(100, 20); @@ -1013,7 +1015,7 @@ this.labelStaticType.BackPictureBox2 = null; this.labelStaticType.BorderColor = System.Drawing.Color.Black; this.labelStaticType.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticType.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticType.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticType.InitVisible = true; this.labelStaticType.LineSpacing = 0F; this.labelStaticType.Location = new System.Drawing.Point(12, 3); @@ -1038,7 +1040,7 @@ // // radioButtonEquipmentModeStick3 // - this.radioButtonEquipmentModeStick3.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonEquipmentModeStick3.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonEquipmentModeStick3.Location = new System.Drawing.Point(338, 3); this.radioButtonEquipmentModeStick3.Name = "radioButtonEquipmentModeStick3"; this.radioButtonEquipmentModeStick3.Size = new System.Drawing.Size(100, 20); @@ -1048,7 +1050,7 @@ // // radioButtonEquipmentModeStick2 // - this.radioButtonEquipmentModeStick2.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonEquipmentModeStick2.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonEquipmentModeStick2.Location = new System.Drawing.Point(232, 3); this.radioButtonEquipmentModeStick2.Name = "radioButtonEquipmentModeStick2"; this.radioButtonEquipmentModeStick2.Size = new System.Drawing.Size(100, 20); @@ -1058,7 +1060,7 @@ // // radioButtonEquipmentModeStick1 // - this.radioButtonEquipmentModeStick1.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonEquipmentModeStick1.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonEquipmentModeStick1.Location = new System.Drawing.Point(126, 3); this.radioButtonEquipmentModeStick1.Name = "radioButtonEquipmentModeStick1"; this.radioButtonEquipmentModeStick1.Size = new System.Drawing.Size(100, 20); @@ -1069,7 +1071,7 @@ // radioButtonEquipmentModeConveyor // this.radioButtonEquipmentModeConveyor.Checked = true; - this.radioButtonEquipmentModeConveyor.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonEquipmentModeConveyor.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.radioButtonEquipmentModeConveyor.Location = new System.Drawing.Point(20, 3); this.radioButtonEquipmentModeConveyor.Name = "radioButtonEquipmentModeConveyor"; this.radioButtonEquipmentModeConveyor.Size = new System.Drawing.Size(100, 20); @@ -1124,7 +1126,7 @@ this.labelStaticFeedingCV.BackPictureBox2 = null; this.labelStaticFeedingCV.BorderColor = System.Drawing.Color.Black; this.labelStaticFeedingCV.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFeedingCV.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticFeedingCV.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticFeedingCV.InitVisible = true; this.labelStaticFeedingCV.LineSpacing = 0F; this.labelStaticFeedingCV.Location = new System.Drawing.Point(12, 282); @@ -1174,7 +1176,7 @@ this.labelStaticRejectCV.BackPictureBox2 = null; this.labelStaticRejectCV.BorderColor = System.Drawing.Color.Black; this.labelStaticRejectCV.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticRejectCV.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticRejectCV.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticRejectCV.InitVisible = true; this.labelStaticRejectCV.LineSpacing = 0F; this.labelStaticRejectCV.Location = new System.Drawing.Point(12, 251); @@ -1224,7 +1226,7 @@ this.labelStaticIndividualNG.BackPictureBox2 = null; this.labelStaticIndividualNG.BorderColor = System.Drawing.Color.Black; this.labelStaticIndividualNG.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticIndividualNG.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticIndividualNG.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticIndividualNG.InitVisible = true; this.labelStaticIndividualNG.LineSpacing = 0F; this.labelStaticIndividualNG.Location = new System.Drawing.Point(12, 96); @@ -1264,7 +1266,7 @@ this.labelStaticOrder.BackPictureBox2 = null; this.labelStaticOrder.BorderColor = System.Drawing.Color.Black; this.labelStaticOrder.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticOrder.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticOrder.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticOrder.InitVisible = true; this.labelStaticOrder.LineSpacing = 0F; this.labelStaticOrder.Location = new System.Drawing.Point(12, 65); @@ -1283,7 +1285,7 @@ this.labelStaticLine.BackPictureBox2 = null; this.labelStaticLine.BorderColor = System.Drawing.Color.Black; this.labelStaticLine.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticLine.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticLine.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticLine.InitVisible = true; this.labelStaticLine.LineSpacing = 0F; this.labelStaticLine.Location = new System.Drawing.Point(12, 34); @@ -1302,7 +1304,7 @@ this.labelStaticEquipmentID.BackPictureBox2 = null; this.labelStaticEquipmentID.BorderColor = System.Drawing.Color.Black; this.labelStaticEquipmentID.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticEquipmentID.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticEquipmentID.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticEquipmentID.InitVisible = true; this.labelStaticEquipmentID.LineSpacing = 0F; this.labelStaticEquipmentID.Location = new System.Drawing.Point(12, 313); @@ -1321,7 +1323,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("새굴림", 35F, System.Drawing.FontStyle.Bold); + this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold); this.labelTitle.InitVisible = true; this.labelTitle.LineSpacing = 0F; this.labelTitle.Location = new System.Drawing.Point(14, 7); @@ -1333,6 +1335,27 @@ this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitle.Wordwrap = false; // + // smartLabel5 + // + this.smartLabel5.BackColor = System.Drawing.Color.Silver; + this.smartLabel5.BackPictureBox = this.smartForm1; + this.smartLabel5.BackPictureBox1 = null; + this.smartLabel5.BackPictureBox2 = null; + this.smartLabel5.BorderColor = System.Drawing.Color.Black; + this.smartLabel5.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel5.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel5.ForeColor = System.Drawing.Color.DarkRed; + this.smartLabel5.InitVisible = true; + this.smartLabel5.LineSpacing = 0F; + this.smartLabel5.Location = new System.Drawing.Point(527, 493); + this.smartLabel5.Name = "smartLabel5"; + this.smartLabel5.Size = new System.Drawing.Size(341, 25); + this.smartLabel5.TabIndex = 229; + this.smartLabel5.Text = "OFF : delete user list"; + this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel5.Wordwrap = false; + // // FormEquipmentSetting // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -1429,5 +1452,6 @@ private SmartX.SmartLabel smartLabel6; public SmartX.SmartLabel labelDataStoragePeriod; private SmartX.SmartLabel labelStaticDataStoragePeriod; + private SmartX.SmartLabel smartLabel5; } } \ No newline at end of file diff --git a/INT69DC_7C/Forms/FormEquipmentSetting.cs b/INT69DC_7C/Forms/FormEquipmentSetting.cs index cc18094..64d8274 100644 --- a/INT69DC_7C/Forms/FormEquipmentSetting.cs +++ b/INT69DC_7C/Forms/FormEquipmentSetting.cs @@ -9,6 +9,7 @@ using System.Windows.Forms; using INT69DC_ImageDll; using INT69DC_7C.DialogForms; +using INT69DC_7C.Part11_UserManager; namespace INT69DC_7C.Forms { @@ -580,7 +581,12 @@ namespace INT69DC_7C.Forms if (this.buttonLogin.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) this.ParentForm.SystemConfig.IsLogin = true; else + { this.ParentForm.SystemConfig.IsLogin = false; + + // Delete user list + UserManager.UserManager_UserAllDel(); + } } // 스텝모터 종류 diff --git a/INT69DC_7C/Forms/FormFactoryInitialize.cs b/INT69DC_7C/Forms/FormFactoryInitialize.cs index bfadb40..51e210c 100644 --- a/INT69DC_7C/Forms/FormFactoryInitialize.cs +++ b/INT69DC_7C/Forms/FormFactoryInitialize.cs @@ -8,6 +8,7 @@ using System.IO; using System.Text; using System.Windows.Forms; using INT69DC_ImageDll; +using INT69DC_7C.Part11_UserManager; namespace INT69DC_7C.Forms { @@ -426,6 +427,10 @@ namespace INT69DC_7C.Forms this.ParentForm.smartFileIO.WriteStructure_End(); this.ParentForm.smartFileIO.Close(); } + private void ResetUserListFile() + { + UserManager.UserManager_UserAllDel(); + } public void DisplayRefresh() { @@ -437,6 +442,7 @@ namespace INT69DC_7C.Forms this.progressBarResetBar.Value = 0; //this.ParentForm.TransferData(CommunicationCommand.Initialization, CommunicationID.MainBoard); //this.ResetConfigurationFile(); + this.ResetUserListFile(); this.progressBarResetBar.Value += 20; this.ResetProductFile(); this.progressBarResetBar.Value += 20; diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index d347cee..bff250c 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -6784,104 +6784,195 @@ namespace INT69DC_7C.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 + structItem.IsMainDisplayProductNo = true; + structItem.IsMainDisplayWeightSetting = false; + structItem.IsMainDisplayClear = true; + structItem.IsMainDispalySubMenu = false; - structItem.IsMenuTimeSetting = item.IsMenuTime; - structItem.IsMenuInformation = item.IsMenuInformation; - structItem.IsMenuDataBackup = item.IsMenuDataBackup; - structItem.IsMenuCalibration = item.IsMenuCalibration; - structItem.IsMenuCommunication = item.IsMenuCommunication; - structItem.IsMenuConfiguration = item.IsMenuConfiguration; - structItem.IsMenuSystemSetting = item.IsMenuSystem; - structItem.IsMenuMotorSetting = item.IsMenuMotor; - structItem.IsMenuUpdate = item.IsMenuUpdate; - structItem.IsMenuFactoryReset = item.IsMenuInitialization; - structItem.IsMenuEquipmentSetting = item.IsMenuEquipment; - structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuDataStatistics = item.IsMenuStatistics; - structItem.IsMenuUserSetting = item.IsMenuUser; - structItem.IsMenuUserGroupSetting = item.IsMenuUserGroupEditor; - structItem.IsMenuDataViewer = item.IsMenuViewer; + structItem.IsMenuTimeSetting = false; + structItem.IsMenuInformation = true; + structItem.IsMenuDataBackup = true; + structItem.IsMenuCalibration = false; + structItem.IsMenuCommunication = false; + structItem.IsMenuConfiguration = false; + structItem.IsMenuSystemSetting = false; + structItem.IsMenuMotorSetting = false; + structItem.IsMenuUpdate = false; + structItem.IsMenuFactoryReset = false; + structItem.IsMenuEquipmentSetting = false; + structItem.IsMenuIOTest = false; + structItem.IsMenuDataStatistics = true; + structItem.IsMenuUserSetting = true; + structItem.IsMenuUserGroupSetting = false; + structItem.IsMenuDataViewer = 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; - 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.IsMenuTimeSetting = true; - structItem.IsMenuInformation = true; - structItem.IsMenuDataBackup = true; - structItem.IsMenuCalibration = true; - structItem.IsMenuCommunication = true; - structItem.IsMenuConfiguration = true; - structItem.IsMenuSystemSetting = true; - structItem.IsMenuMotorSetting = true; - structItem.IsMenuUpdate = true; - structItem.IsMenuFactoryReset = true; - structItem.IsMenuEquipmentSetting = true; - structItem.IsMenuIOTest = true; - structItem.IsMenuDataStatistics = false; - structItem.IsMenuUserSetting = false; - structItem.IsMenuUserGroupSetting = false; - structItem.IsMenuDataViewer = false; + #region Level2 + 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.IsMenuTimeSetting = false; + structItem.IsMenuInformation = true; + structItem.IsMenuDataBackup = true; + structItem.IsMenuCalibration = true; + structItem.IsMenuCommunication = false; + structItem.IsMenuConfiguration = false; + structItem.IsMenuSystemSetting = true; + structItem.IsMenuMotorSetting = false; + structItem.IsMenuUpdate = false; + structItem.IsMenuFactoryReset = false; + structItem.IsMenuEquipmentSetting = false; + structItem.IsMenuIOTest = false; + structItem.IsMenuDataStatistics = true; + structItem.IsMenuUserSetting = true; + structItem.IsMenuUserGroupSetting = false; + structItem.IsMenuDataViewer = true; - this.smartFileIO.WriteStructure_Begin(structItem, i); - } + 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; + + this.smartFileIO.WriteStructure_Begin(structItem, 1); + #endregion + + #region Level3 + structItem.IsMainDisplayProductNo = true; + structItem.IsMainDisplayWeightSetting = true; + structItem.IsMainDisplayClear = true; + structItem.IsMainDispalySubMenu = true; + + structItem.IsMenuTimeSetting = true; + structItem.IsMenuInformation = true; + structItem.IsMenuDataBackup = true; + structItem.IsMenuCalibration = true; + structItem.IsMenuCommunication = true; + structItem.IsMenuConfiguration = true; + structItem.IsMenuSystemSetting = true; + structItem.IsMenuMotorSetting = true; + structItem.IsMenuUpdate = true; + structItem.IsMenuFactoryReset = true; + structItem.IsMenuEquipmentSetting = true; + structItem.IsMenuIOTest = true; + structItem.IsMenuDataStatistics = true; + structItem.IsMenuUserSetting = true; + structItem.IsMenuUserGroupSetting = true; + structItem.IsMenuDataViewer = 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; + + this.smartFileIO.WriteStructure_Begin(structItem, 2); + #endregion + + #region NotLogin + structItem.IsMainDisplayProductNo = true; + structItem.IsMainDisplayWeightSetting = true; + structItem.IsMainDisplayClear = true; + structItem.IsMainDispalySubMenu = true; + + structItem.IsMenuTimeSetting = true; + structItem.IsMenuInformation = true; + structItem.IsMenuDataBackup = true; + structItem.IsMenuCalibration = true; + structItem.IsMenuCommunication = true; + structItem.IsMenuConfiguration = true; + structItem.IsMenuSystemSetting = true; + structItem.IsMenuMotorSetting = true; + structItem.IsMenuUpdate = true; + structItem.IsMenuFactoryReset = true; + structItem.IsMenuEquipmentSetting = true; + structItem.IsMenuIOTest = true; + structItem.IsMenuDataStatistics = false; + structItem.IsMenuUserSetting = false; + structItem.IsMenuUserGroupSetting = false; + structItem.IsMenuDataViewer = 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; + + this.smartFileIO.WriteStructure_Begin(structItem, 3); + #endregion + + this.smartFileIO.WriteStructure_End(); } public void SaveUserGroupFile(UserGroup item) diff --git a/INT69DC_7C/Forms/FormOptionSetting.Designer.cs b/INT69DC_7C/Forms/FormOptionSetting.Designer.cs index a501790..5c21271 100644 --- a/INT69DC_7C/Forms/FormOptionSetting.Designer.cs +++ b/INT69DC_7C/Forms/FormOptionSetting.Designer.cs @@ -43,6 +43,7 @@ this.labelBuadrateWarning2 = new SmartX.SmartLabel(); this.labelBuadrateWarning = new SmartX.SmartLabel(); this.buttonSave = new SmartX.SmartButton(); + this.smartLabel3 = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.smartGroupBox1.SuspendLayout(); this.smartGroupBox2.SuspendLayout(); @@ -191,6 +192,7 @@ // this.smartGroupBox2.BackPictureBox = this.smartForm1; this.smartGroupBox2.BackPictureBox1 = null; + this.smartGroupBox2.Controls.Add(this.smartLabel3); this.smartGroupBox2.Controls.Add(this.buttonPart11); this.smartGroupBox2.Controls.Add(this.smartLabel5); this.smartGroupBox2.Controls.Add(this.buttonDataStatistics); @@ -207,7 +209,7 @@ this.smartGroupBox2.Location = new System.Drawing.Point(269, 210); this.smartGroupBox2.Name = "smartGroupBox2"; this.smartGroupBox2.RoundRadius = 10; - this.smartGroupBox2.Size = new System.Drawing.Size(465, 175); + this.smartGroupBox2.Size = new System.Drawing.Size(465, 295); this.smartGroupBox2.TabIndex = 210; this.smartGroupBox2.Text = "Option"; this.smartGroupBox2.TextColor = System.Drawing.Color.Black; @@ -224,7 +226,7 @@ this.buttonPart11.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.DownImage"))); this.buttonPart11.GroupID = 0; this.buttonPart11.InitVisible = true; - this.buttonPart11.Location = new System.Drawing.Point(278, 114); + this.buttonPart11.Location = new System.Drawing.Point(278, 133); this.buttonPart11.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonPart11.Name = "buttonPart11"; this.buttonPart11.NestedClickEventPrevent = false; @@ -241,7 +243,7 @@ this.buttonPart11.TextLocation = new System.Drawing.Point(0, 0); this.buttonPart11.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonPart11.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.UpImage"))); - this.buttonPart11.Click += new System.EventHandler(this.Control_Click); + this.buttonPart11.Click += new System.EventHandler(this.buttonPart11_Click); // // smartLabel5 // @@ -253,7 +255,7 @@ this.smartLabel5.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.smartLabel5.InitVisible = true; this.smartLabel5.LineSpacing = 0F; - this.smartLabel5.Location = new System.Drawing.Point(72, 114); + this.smartLabel5.Location = new System.Drawing.Point(72, 133); this.smartLabel5.Name = "smartLabel5"; this.smartLabel5.Size = new System.Drawing.Size(200, 25); this.smartLabel5.TabIndex = 221; @@ -321,7 +323,7 @@ this.labelBuadrateWarning2.BorderColor = System.Drawing.Color.Black; this.labelBuadrateWarning2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelBuadrateWarning2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); - this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.Red; + this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.DarkRed; this.labelBuadrateWarning2.InitVisible = true; this.labelBuadrateWarning2.LineSpacing = 0F; this.labelBuadrateWarning2.Location = new System.Drawing.Point(14, 723); @@ -330,7 +332,7 @@ this.labelBuadrateWarning2.TabIndex = 209; this.labelBuadrateWarning2.Text = "※ 엔지니어 이외에 절대 변경하지 마십시오."; this.labelBuadrateWarning2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelBuadrateWarning2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelBuadrateWarning2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelBuadrateWarning2.Wordwrap = false; // // labelBuadrateWarning @@ -342,16 +344,16 @@ this.labelBuadrateWarning.BorderColor = System.Drawing.Color.Black; this.labelBuadrateWarning.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelBuadrateWarning.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); - this.labelBuadrateWarning.ForeColor = System.Drawing.Color.Red; + this.labelBuadrateWarning.ForeColor = System.Drawing.Color.DarkRed; this.labelBuadrateWarning.InitVisible = true; this.labelBuadrateWarning.LineSpacing = 0F; - this.labelBuadrateWarning.Location = new System.Drawing.Point(14, 702); + this.labelBuadrateWarning.Location = new System.Drawing.Point(14, 694); this.labelBuadrateWarning.Name = "labelBuadrateWarning"; this.labelBuadrateWarning.Size = new System.Drawing.Size(811, 23); this.labelBuadrateWarning.TabIndex = 208; this.labelBuadrateWarning.Text = "※ 설정 변경 후, 전원을 껐다 켜야 합니다"; this.labelBuadrateWarning.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelBuadrateWarning.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelBuadrateWarning.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelBuadrateWarning.Wordwrap = false; // // buttonSave @@ -385,6 +387,27 @@ this.buttonSave.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.UpImage"))); this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); // + // smartLabel3 + // + this.smartLabel3.BackColor = System.Drawing.Color.Silver; + this.smartLabel3.BackPictureBox = this.smartForm1; + this.smartLabel3.BackPictureBox1 = null; + this.smartLabel3.BackPictureBox2 = null; + this.smartLabel3.BorderColor = System.Drawing.Color.Black; + this.smartLabel3.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel3.ForeColor = System.Drawing.Color.DarkRed; + this.smartLabel3.InitVisible = true; + this.smartLabel3.LineSpacing = 0F; + this.smartLabel3.Location = new System.Drawing.Point(23, 164); + this.smartLabel3.Name = "smartLabel3"; + this.smartLabel3.Size = new System.Drawing.Size(420, 23); + this.smartLabel3.TabIndex = 223; + this.smartLabel3.Text = "※ Part11 ON : activate [Login], [Data backup], [Statistics]"; + this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel3.Wordwrap = false; + // // FormOptionSetting // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -418,5 +441,6 @@ private SmartX.SmartGroupBox smartGroupBox2; private SmartX.SmartButton buttonPart11; private SmartX.SmartLabel smartLabel5; + private SmartX.SmartLabel smartLabel3; } } \ No newline at end of file diff --git a/INT69DC_7C/Forms/FormOptionSetting.cs b/INT69DC_7C/Forms/FormOptionSetting.cs index 3beb493..c8649fe 100644 --- a/INT69DC_7C/Forms/FormOptionSetting.cs +++ b/INT69DC_7C/Forms/FormOptionSetting.cs @@ -9,6 +9,7 @@ using System.Windows.Forms; using SmartX; using INT69DC_ImageDll; +using INT69DC_7C.Part11_UserManager; namespace INT69DC_7C.Forms { @@ -174,12 +175,15 @@ namespace INT69DC_7C.Forms this.ParentForm.SystemConfig.IsPart11 = true; this.ParentForm.SystemConfig.IsLogin = true; this.ParentForm.SystemConfig.IsDataBackup = true; - this.ParentForm.SystemConfig.IsOptDataStatistics = true; } else { this.ParentForm.SystemConfig.IsPart11 = false; + this.ParentForm.SystemConfig.IsLogin = false; this.ParentForm.SystemConfig.IsDataBackup = false; + + // Delete user list + UserManager.UserManager_UserAllDel(); } this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); @@ -190,10 +194,23 @@ namespace INT69DC_7C.Forms private void Control_Click(object sender, EventArgs e) { if (this.buttonPart11.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - { - if (this.buttonDataStatistics.ButtonStatus == SmartButton.BUTSTATUS.UP) - this.buttonDataStatistics.ButtonDown(); - } + this.buttonDataStatistics.ButtonDown(); + + if (this.buttonSave.Visible == false) + this.buttonSave.Visible = true; + } + + private void buttonPart11_Click(object sender, EventArgs e) + { + SmartButton button = sender as SmartButton; + + if (button == null) + return; + + if (button.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + this.buttonDataStatistics.ButtonDown(); + else + this.buttonDataStatistics.ButtonUp(); if (this.buttonSave.Visible == false) this.buttonSave.Visible = true;