diff --git a/INT63DC_2C.suo b/INT63DC_2C.suo index 7baf8fd..cb2bdbe 100644 Binary files a/INT63DC_2C.suo and b/INT63DC_2C.suo differ diff --git a/INT63DC_2C/DialogForms/DialogFormLogOn.cs b/INT63DC_2C/DialogForms/DialogFormLogOn.cs index 1e8ead5..eb9d818 100644 --- a/INT63DC_2C/DialogForms/DialogFormLogOn.cs +++ b/INT63DC_2C/DialogForms/DialogFormLogOn.cs @@ -64,9 +64,12 @@ namespace INT63DC_2C.DialogForms break; case DataStore.LanguageID.Chinese: #region Chinese - this.labelTitle1.Text = "用户登录"; - this.labelTitle2.Text = "ID"; - this.labelTitle3.Text = "密码"; + this.labelTitle1.Visible = false; + this.labelTitle2.Visible = false; + this.labelTitle3.Visible = false; + this.pictureBoxImage.Visible = false; + + this.smartForm1.Image = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackgroundUserLogin)); this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginDisable)); this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginDown)); diff --git a/INT63DC_2C/Forms/FormCalibration.cs b/INT63DC_2C/Forms/FormCalibration.cs index 5c7b1ba..a36c32b 100644 --- a/INT63DC_2C/Forms/FormCalibration.cs +++ b/INT63DC_2C/Forms/FormCalibration.cs @@ -80,9 +80,9 @@ namespace INT63DC_2C.Forms #region Chinese this.labelTitle.Text = "校准"; - this.buttonStart.Text = "开启"; - this.buttonBalance.Text = "砝码"; - this.buttonCancel.Text = "取消"; + this.buttonStart.Text = ""; + this.buttonBalance.Text = ""; + this.buttonCancel.Text = ""; this.groupBoxSetting.Text = "设定"; this.groupBoxHelp.Text = "帮助"; @@ -93,6 +93,16 @@ namespace INT63DC_2C.Forms this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackDisable)); this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackUp)); + + this.buttonStart.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormCalibrationStartDisable)); + this.buttonStart.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormCalibrationStartDown)); + this.buttonStart.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormCalibrationStartUp)); + this.buttonBalance.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormCalibrationBalanceDisable)); + this.buttonBalance.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormCalibrationBalanceDown)); + this.buttonBalance.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormCalibrationBalanceUp)); + this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormCalibrationCancelDisable)); + this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormCalibrationCancelDown)); + this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormCalibrationCancelUp)); #endregion break; case DataStore.LanguageID.Czech: diff --git a/INT63DC_2C/Forms/FormInformation.cs b/INT63DC_2C/Forms/FormInformation.cs index 27f5770..8a75d5d 100644 --- a/INT63DC_2C/Forms/FormInformation.cs +++ b/INT63DC_2C/Forms/FormInformation.cs @@ -153,7 +153,7 @@ namespace INT63DC_2C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "8.2.1"; + this.labelDisplayVer.Text = "8.2.2"; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; this.textBoxSerialNo.Location = new Point(395, 225); this.textBoxSerialNo.Visible = false; diff --git a/INT63DC_2C/Forms/FormMainDisplay.Designer.cs b/INT63DC_2C/Forms/FormMainDisplay.Designer.cs index 39f810d..be0311b 100644 --- a/INT63DC_2C/Forms/FormMainDisplay.Designer.cs +++ b/INT63DC_2C/Forms/FormMainDisplay.Designer.cs @@ -445,12 +445,12 @@ this.labelTotalCount.BackPictureBox2 = null; this.labelTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); + this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Regular); this.labelTotalCount.InitVisible = true; this.labelTotalCount.LineSpacing = 0F; - this.labelTotalCount.Location = new System.Drawing.Point(144, 704); + this.labelTotalCount.Location = new System.Drawing.Point(130, 704); this.labelTotalCount.Name = "labelTotalCount"; - this.labelTotalCount.Size = new System.Drawing.Size(128, 41); + this.labelTotalCount.Size = new System.Drawing.Size(142, 41); this.labelTotalCount.TabIndex = 444; this.labelTotalCount.Text = "12345678"; this.labelTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -465,7 +465,7 @@ this.labelProductionSpeed.BackPictureBox2 = null; this.labelProductionSpeed.BorderColor = System.Drawing.Color.Black; this.labelProductionSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Bold); + this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); this.labelProductionSpeed.InitVisible = true; this.labelProductionSpeed.LineSpacing = 0F; this.labelProductionSpeed.Location = new System.Drawing.Point(524, 704); @@ -484,7 +484,7 @@ 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("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.smartLabel1.Font = new System.Drawing.Font("Tahoma", 15F, System.Drawing.FontStyle.Bold); this.smartLabel1.InitVisible = true; this.smartLabel1.LineSpacing = 0F; this.smartLabel1.Location = new System.Drawing.Point(585, 704); @@ -503,12 +503,12 @@ this.labelNGCount.BackPictureBox2 = null; this.labelNGCount.BorderColor = System.Drawing.Color.Black; this.labelNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); + this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Regular); this.labelNGCount.InitVisible = true; this.labelNGCount.LineSpacing = 0F; - this.labelNGCount.Location = new System.Drawing.Point(384, 704); + this.labelNGCount.Location = new System.Drawing.Point(371, 704); this.labelNGCount.Name = "labelNGCount"; - this.labelNGCount.Size = new System.Drawing.Size(111, 41); + this.labelNGCount.Size = new System.Drawing.Size(124, 41); this.labelNGCount.TabIndex = 442; this.labelNGCount.Text = "1234567"; this.labelNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -727,7 +727,7 @@ this.groupBoxJudgmentSetting.Controls.Add(this.labelFilter); this.groupBoxJudgmentSetting.Controls.Add(this.labelStaticJudgmentDelayTime); this.groupBoxJudgmentSetting.Controls.Add(this.labelJudgmentCount); - this.groupBoxJudgmentSetting.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxJudgmentSetting.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.groupBoxJudgmentSetting.ForeColor = System.Drawing.Color.White; this.groupBoxJudgmentSetting.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxJudgmentSetting.FrameLineColor2 = System.Drawing.Color.Black; @@ -772,7 +772,7 @@ this.labelStaticTurnDelayTime.BackPictureBox2 = null; this.labelStaticTurnDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticTurnDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticTurnDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticTurnDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticTurnDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticTurnDelayTime.InitVisible = true; this.labelStaticTurnDelayTime.LineSpacing = 0F; @@ -814,7 +814,7 @@ this.labelStaticForcedZeroDelayTime.BackPictureBox2 = null; this.labelStaticForcedZeroDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticForcedZeroDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticForcedZeroDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticForcedZeroDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticForcedZeroDelayTime.ForeColor = System.Drawing.Color.WhiteSmoke; this.labelStaticForcedZeroDelayTime.InitVisible = true; this.labelStaticForcedZeroDelayTime.LineSpacing = 0F; @@ -835,7 +835,7 @@ this.labelStaticFilter.BackPictureBox2 = null; this.labelStaticFilter.BorderColor = System.Drawing.Color.SteelBlue; this.labelStaticFilter.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFilter.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFilter.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFilter.ForeColor = System.Drawing.Color.White; this.labelStaticFilter.InitVisible = true; this.labelStaticFilter.LineSpacing = 0F; @@ -856,7 +856,7 @@ this.labelStaticJudgmentCount.BackPictureBox2 = null; this.labelStaticJudgmentCount.BorderColor = System.Drawing.Color.SteelBlue; this.labelStaticJudgmentCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticJudgmentCount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticJudgmentCount.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticJudgmentCount.ForeColor = System.Drawing.Color.White; this.labelStaticJudgmentCount.InitVisible = true; this.labelStaticJudgmentCount.LineSpacing = 0F; @@ -919,7 +919,7 @@ this.labelStaticJudgmentDelayTime.BackPictureBox2 = null; this.labelStaticJudgmentDelayTime.BorderColor = System.Drawing.Color.SteelBlue; this.labelStaticJudgmentDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticJudgmentDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticJudgmentDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticJudgmentDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticJudgmentDelayTime.InitVisible = true; this.labelStaticJudgmentDelayTime.LineSpacing = 0F; @@ -986,7 +986,7 @@ // // buttonClose // - this.buttonClose.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonClose.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonClose.Location = new System.Drawing.Point(460, 413); this.buttonClose.Name = "buttonClose"; this.buttonClose.Size = new System.Drawing.Size(100, 30); @@ -1019,7 +1019,7 @@ this.groupBoxSorter.Controls.Add(this.labelStaticSorter1DelayTime); this.groupBoxSorter.Controls.Add(this.labelSorter1RunTime); this.groupBoxSorter.Controls.Add(this.labelStaticSorter1RunTime); - this.groupBoxSorter.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxSorter.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.groupBoxSorter.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxSorter.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxSorter.FrameLineThickness = 1; @@ -1042,7 +1042,7 @@ this.labelStaticDischargeStopperRunTime.BackPictureBox2 = null; this.labelStaticDischargeStopperRunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticDischargeStopperRunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticDischargeStopperRunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticDischargeStopperRunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticDischargeStopperRunTime.ForeColor = System.Drawing.Color.White; this.labelStaticDischargeStopperRunTime.InitVisible = true; this.labelStaticDischargeStopperRunTime.LineSpacing = 0F; @@ -1063,7 +1063,7 @@ this.labelStaticDischargeStopperDelayTime.BackPictureBox2 = null; this.labelStaticDischargeStopperDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticDischargeStopperDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticDischargeStopperDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticDischargeStopperDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticDischargeStopperDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticDischargeStopperDelayTime.InitVisible = true; this.labelStaticDischargeStopperDelayTime.LineSpacing = 0F; @@ -1084,7 +1084,7 @@ this.labelStaticEntryGateRunTime.BackPictureBox2 = null; this.labelStaticEntryGateRunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticEntryGateRunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticEntryGateRunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticEntryGateRunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticEntryGateRunTime.ForeColor = System.Drawing.Color.White; this.labelStaticEntryGateRunTime.InitVisible = true; this.labelStaticEntryGateRunTime.LineSpacing = 0F; @@ -1105,7 +1105,7 @@ this.labelStaticEntryGateDelayTime.BackPictureBox2 = null; this.labelStaticEntryGateDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticEntryGateDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticEntryGateDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticEntryGateDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticEntryGateDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticEntryGateDelayTime.InitVisible = true; this.labelStaticEntryGateDelayTime.LineSpacing = 0F; @@ -1231,7 +1231,7 @@ this.labelStaticSorter3DelayTime.BackPictureBox2 = null; this.labelStaticSorter3DelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorter3DelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorter3DelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorter3DelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorter3DelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorter3DelayTime.InitVisible = true; this.labelStaticSorter3DelayTime.LineSpacing = 0F; @@ -1273,7 +1273,7 @@ this.labelStaticSorter3RunTime.BackPictureBox2 = null; this.labelStaticSorter3RunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorter3RunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorter3RunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorter3RunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorter3RunTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorter3RunTime.InitVisible = true; this.labelStaticSorter3RunTime.LineSpacing = 0F; @@ -1315,7 +1315,7 @@ this.labelStaticSorter2DelayTime.BackPictureBox2 = null; this.labelStaticSorter2DelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorter2DelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorter2DelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorter2DelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorter2DelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorter2DelayTime.InitVisible = true; this.labelStaticSorter2DelayTime.LineSpacing = 0F; @@ -1357,7 +1357,7 @@ this.labelStaticSorter2RunTime.BackPictureBox2 = null; this.labelStaticSorter2RunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorter2RunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorter2RunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorter2RunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorter2RunTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorter2RunTime.InitVisible = true; this.labelStaticSorter2RunTime.LineSpacing = 0F; @@ -1399,7 +1399,7 @@ this.labelStaticSorter1DelayTime.BackPictureBox2 = null; this.labelStaticSorter1DelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorter1DelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorter1DelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorter1DelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorter1DelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorter1DelayTime.InitVisible = true; this.labelStaticSorter1DelayTime.LineSpacing = 0F; @@ -1441,7 +1441,7 @@ this.labelStaticSorter1RunTime.BackPictureBox2 = null; this.labelStaticSorter1RunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorter1RunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorter1RunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorter1RunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorter1RunTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorter1RunTime.InitVisible = true; this.labelStaticSorter1RunTime.LineSpacing = 0F; @@ -1530,7 +1530,7 @@ this.smartListBox1.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.smartListBox1.ColumnDelimiter = '\0'; this.smartListBox1.ColumnOffsets = null; - this.smartListBox1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartListBox1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartListBox1.FontColor = System.Drawing.Color.Black; this.smartListBox1.InitVisible = true; this.smartListBox1.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD; @@ -1569,7 +1569,7 @@ this.labelAlarm2ErrorCode.BackPictureBox2 = null; this.labelAlarm2ErrorCode.BorderColor = System.Drawing.Color.Black; this.labelAlarm2ErrorCode.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelAlarm2ErrorCode.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelAlarm2ErrorCode.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelAlarm2ErrorCode.InitVisible = true; this.labelAlarm2ErrorCode.LineSpacing = 0F; this.labelAlarm2ErrorCode.Location = new System.Drawing.Point(11, 4); @@ -1630,7 +1630,7 @@ this.labelMessage1.BackPictureBox2 = null; this.labelMessage1.BorderColor = System.Drawing.Color.Black; this.labelMessage1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelMessage1.InitVisible = true; this.labelMessage1.LineSpacing = 0F; this.labelMessage1.Location = new System.Drawing.Point(75, 62); @@ -1649,7 +1649,7 @@ 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.Regular); + this.smartLabel2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel2.InitVisible = true; this.smartLabel2.LineSpacing = 0F; this.smartLabel2.Location = new System.Drawing.Point(11, 4); @@ -1727,7 +1727,7 @@ this.labelUserID.BackPictureBox2 = null; this.labelUserID.BorderColor = System.Drawing.Color.LightGray; this.labelUserID.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUserID.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelUserID.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelUserID.InitVisible = true; this.labelUserID.LineSpacing = 0F; this.labelUserID.Location = new System.Drawing.Point(310, 5); @@ -1747,7 +1747,7 @@ this.labelUserLevel.BackPictureBox2 = null; this.labelUserLevel.BorderColor = System.Drawing.Color.LightGray; this.labelUserLevel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUserLevel.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelUserLevel.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelUserLevel.ForeColor = System.Drawing.Color.Black; this.labelUserLevel.InitVisible = true; this.labelUserLevel.LineSpacing = 0F; @@ -1767,7 +1767,7 @@ this.labelTitleScreen.BackPictureBox2 = null; this.labelTitleScreen.BorderColor = System.Drawing.Color.Black; this.labelTitleScreen.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleScreen.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleScreen.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); this.labelTitleScreen.InitVisible = true; this.labelTitleScreen.LineSpacing = 0F; this.labelTitleScreen.Location = new System.Drawing.Point(664, 583); @@ -1786,12 +1786,12 @@ this.labelTitleNG.BackPictureBox2 = null; this.labelTitleNG.BorderColor = System.Drawing.Color.Black; this.labelTitleNG.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleNG.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleNG.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); this.labelTitleNG.InitVisible = true; this.labelTitleNG.LineSpacing = 0F; this.labelTitleNG.Location = new System.Drawing.Point(307, 704); this.labelTitleNG.Name = "labelTitleNG"; - this.labelTitleNG.Size = new System.Drawing.Size(71, 41); + this.labelTitleNG.Size = new System.Drawing.Size(58, 41); this.labelTitleNG.TabIndex = 526; this.labelTitleNG.Text = "NG"; this.labelTitleNG.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1805,12 +1805,12 @@ this.labelTitleTotalCount.BackPictureBox2 = null; this.labelTitleTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTitleTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleTotalCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleTotalCount.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); this.labelTitleTotalCount.InitVisible = true; this.labelTitleTotalCount.LineSpacing = 0F; this.labelTitleTotalCount.Location = new System.Drawing.Point(25, 704); this.labelTitleTotalCount.Name = "labelTitleTotalCount"; - this.labelTitleTotalCount.Size = new System.Drawing.Size(113, 41); + this.labelTitleTotalCount.Size = new System.Drawing.Size(99, 41); this.labelTitleTotalCount.TabIndex = 525; this.labelTitleTotalCount.Text = "Total"; this.labelTitleTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1906,7 +1906,7 @@ this.labelTitleSampling.BackPictureBox2 = null; this.labelTitleSampling.BorderColor = System.Drawing.Color.Black; this.labelTitleSampling.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleSampling.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleSampling.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); this.labelTitleSampling.InitVisible = true; this.labelTitleSampling.LineSpacing = 0F; this.labelTitleSampling.Location = new System.Drawing.Point(238, 8); @@ -1933,7 +1933,7 @@ this.labelStaticSamplingCount.BackPictureBox2 = null; this.labelStaticSamplingCount.BorderColor = System.Drawing.Color.Black; this.labelStaticSamplingCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSamplingCount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSamplingCount.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSamplingCount.InitVisible = true; this.labelStaticSamplingCount.LineSpacing = 0F; this.labelStaticSamplingCount.Location = new System.Drawing.Point(238, 78); @@ -1953,7 +1953,7 @@ this.labelStaticSamplingTime.BackPictureBox2 = null; this.labelStaticSamplingTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSamplingTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSamplingTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSamplingTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSamplingTime.InitVisible = true; this.labelStaticSamplingTime.LineSpacing = 0F; this.labelStaticSamplingTime.Location = new System.Drawing.Point(238, 44); @@ -2107,7 +2107,7 @@ this.labelTitleBypass.BackPictureBox2 = null; this.labelTitleBypass.BorderColor = System.Drawing.Color.Black; this.labelTitleBypass.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleBypass.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleBypass.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); this.labelTitleBypass.InitVisible = true; this.labelTitleBypass.LineSpacing = 0F; this.labelTitleBypass.Location = new System.Drawing.Point(35, 8); @@ -2292,7 +2292,7 @@ this.labelMessage4.BackPictureBox2 = null; this.labelMessage4.BorderColor = System.Drawing.Color.Black; this.labelMessage4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMessage4.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelMessage4.InitVisible = true; this.labelMessage4.LineSpacing = 0F; this.labelMessage4.Location = new System.Drawing.Point(75, 79); @@ -2311,7 +2311,7 @@ this.labelMessage3.BackPictureBox2 = null; this.labelMessage3.BorderColor = System.Drawing.Color.Black; this.labelMessage3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMessage3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelMessage3.InitVisible = true; this.labelMessage3.LineSpacing = 0F; this.labelMessage3.Location = new System.Drawing.Point(75, 56); @@ -2330,7 +2330,7 @@ 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.Regular); + this.smartLabel4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; this.smartLabel4.Location = new System.Drawing.Point(11, 4); @@ -2406,7 +2406,7 @@ this.labelStaticOverRangeLimit.BackPictureBox2 = null; this.labelStaticOverRangeLimit.BorderColor = System.Drawing.Color.SteelBlue; this.labelStaticOverRangeLimit.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticOverRangeLimit.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticOverRangeLimit.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticOverRangeLimit.ForeColor = System.Drawing.Color.Black; this.labelStaticOverRangeLimit.InitVisible = true; this.labelStaticOverRangeLimit.LineSpacing = 0F; @@ -2476,7 +2476,7 @@ this.labelStaticUnderRangeLimit.BackPictureBox2 = null; this.labelStaticUnderRangeLimit.BorderColor = System.Drawing.Color.SteelBlue; this.labelStaticUnderRangeLimit.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticUnderRangeLimit.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticUnderRangeLimit.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticUnderRangeLimit.ForeColor = System.Drawing.Color.Black; this.labelStaticUnderRangeLimit.InitVisible = true; this.labelStaticUnderRangeLimit.LineSpacing = 0F; @@ -2497,7 +2497,7 @@ this.labelStaticOverRange.BackPictureBox2 = null; this.labelStaticOverRange.BorderColor = System.Drawing.Color.Black; this.labelStaticOverRange.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticOverRange.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticOverRange.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticOverRange.InitVisible = true; this.labelStaticOverRange.LineSpacing = 0F; this.labelStaticOverRange.Location = new System.Drawing.Point(64, 10); @@ -2538,7 +2538,7 @@ this.labelStaticUnderRange.BackPictureBox2 = null; this.labelStaticUnderRange.BorderColor = System.Drawing.Color.Black; this.labelStaticUnderRange.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticUnderRange.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticUnderRange.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticUnderRange.InitVisible = true; this.labelStaticUnderRange.LineSpacing = 0F; this.labelStaticUnderRange.Location = new System.Drawing.Point(64, 78); @@ -2558,7 +2558,7 @@ this.labelStaticPassRange.BackPictureBox2 = null; this.labelStaticPassRange.BorderColor = System.Drawing.Color.Black; this.labelStaticPassRange.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticPassRange.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticPassRange.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticPassRange.InitVisible = true; this.labelStaticPassRange.LineSpacing = 0F; this.labelStaticPassRange.Location = new System.Drawing.Point(64, 44); @@ -2696,7 +2696,7 @@ this.labelMessage5.BackPictureBox2 = null; this.labelMessage5.BorderColor = System.Drawing.Color.Black; this.labelMessage5.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMessage5.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage5.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelMessage5.InitVisible = true; this.labelMessage5.LineSpacing = 0F; this.labelMessage5.Location = new System.Drawing.Point(75, 62); @@ -2715,7 +2715,7 @@ 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("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel5.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel5.InitVisible = true; this.smartLabel5.LineSpacing = 0F; this.smartLabel5.Location = new System.Drawing.Point(11, 4); diff --git a/INT63DC_2C/Forms/FormMainDisplay.cs b/INT63DC_2C/Forms/FormMainDisplay.cs index 85ab0f1..d5fb2a5 100644 --- a/INT63DC_2C/Forms/FormMainDisplay.cs +++ b/INT63DC_2C/Forms/FormMainDisplay.cs @@ -526,6 +526,23 @@ namespace INT63DC_2C.Forms this.labelStaticUnderRange.Text = "不足"; this.labelStaticOverRangeLimit.Text = "上限リミット"; this.labelStaticUnderRangeLimit.Text = "下限リミット"; + + // label 크기 재조정 및 글씨 크기 재조정 + this.labelTitleTotalCount.Font = new Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleTotalCount.Location = new Point(25, 704); + this.labelTitleTotalCount.Size = new Size(113, 41); + + this.labelTotalCount.Font = new Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); + this.labelTotalCount.Location = new Point(144, 704); + this.labelTotalCount.Size = new Size(128, 41); + + this.labelTitleNG.Font = new Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleNG.Location = new Point(307, 704); + this.labelTitleNG.Size = new Size(71, 41); + + this.labelNGCount.Font = new Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); + this.labelNGCount.Location = new Point(384, 704); + this.labelNGCount.Size = new Size(111, 41); #endregion break; default: diff --git a/INT63DC_2C/Version.txt b/INT63DC_2C/Version.txt index 73706b5..206200d 100644 Binary files a/INT63DC_2C/Version.txt and b/INT63DC_2C/Version.txt differ diff --git a/INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache b/INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache index d1c194b..9b05bcf 100644 Binary files a/INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache and b/INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache differ