From 473f55eaedd47929f2ca135054cd159d8d7eaf4d Mon Sep 17 00:00:00 2001 From: CJY Date: Thu, 22 Jan 2026 14:18:07 +0900 Subject: [PATCH] =?UTF-8?q?=20-=20=EC=9D=BC=EB=B3=B8=EC=96=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/Controls/ControlCalibration10.cs | 34 + INT69DC_7C/Controls/ControlCalibration11.cs | 34 + INT69DC_7C/Controls/ControlCalibration12.cs | 34 + INT69DC_7C/Controls/ControlCalibration7.cs | 34 + INT69DC_7C/Controls/ControlCalibration8.cs | 34 + .../Controls/ControlChildformSystemSetting.cs | 10 +- INT69DC_7C/Controls/ControlConfiguration1.cs | 3 + .../Controls/ControlMainDisplayAlarm.cs | 5 + .../Controls/ControlUserSetting.Designer.cs | 108 +-- INT69DC_7C/Controls/ControlUserSetting.cs | 22 +- .../DialogForms/DialogFormDataViewerFilter.cs | 3 + .../DialogForms/DialogFormHistoryData.cs | 7 + .../DialogForms/DialogFormLogOn.Designer.cs | 2 + INT69DC_7C/DialogForms/DialogFormLogOn.cs | 175 +++- .../DialogForms/DialogFormMessage.Designer.cs | 7 +- INT69DC_7C/DialogForms/DialogFormMessage.cs | 145 ++- INT69DC_7C/DialogForms/DialogFormMessage.resx | 242 ++--- INT69DC_7C/DialogForms/DialogFormNumKeyPad.cs | 7 + .../DialogForms/DialogFormPasswordKeyPad1.cs | 11 +- .../DialogFormUserEditorKeyboard.cs | 11 +- .../DialogForms/DialogFormYesNo.Designer.cs | 9 +- INT69DC_7C/DialogForms/DialogFormYesNo.cs | 30 +- INT69DC_7C/DialogForms/DialogFormYesNo.resx | 242 ++--- INT69DC_7C/Forms/FormCalibration.cs | 30 + INT69DC_7C/Forms/FormCommunication.cs | 24 +- INT69DC_7C/Forms/FormConfiguration.cs | 52 +- INT69DC_7C/Forms/FormDataBackup.cs | 20 + .../Forms/FormDataBackup_Part11.Designer.cs | 155 ++-- INT69DC_7C/Forms/FormDataBackup_Part11.cs | 12 + INT69DC_7C/Forms/FormDataStatistics.cs | 22 +- INT69DC_7C/Forms/FormDataViewer.Designer.cs | 7 + INT69DC_7C/Forms/FormDataViewer.cs | 17 + .../Forms/FormEquipmentSetting.Designer.cs | 289 +++--- INT69DC_7C/Forms/FormEquipmentSetting.cs | 61 +- INT69DC_7C/Forms/FormEquipmentTest.cs | 47 + INT69DC_7C/Forms/FormFactoryInitialize.cs | 7 + INT69DC_7C/Forms/FormIOTest.cs | 8 + INT69DC_7C/Forms/FormInformation.cs | 17 +- INT69DC_7C/Forms/FormMainDisplay.cs | 172 +++- INT69DC_7C/Forms/FormMenu.cs | 60 ++ INT69DC_7C/Forms/FormMotorSetting.Designer.cs | 220 ++--- INT69DC_7C/Forms/FormMotorSetting.cs | 134 ++- INT69DC_7C/Forms/FormOptionSetting.cs | 15 + INT69DC_7C/Forms/FormProgramUpdate.cs | 7 + .../Forms/FormSystemSetting.Designer.cs | 98 +- INT69DC_7C/Forms/FormSystemSetting.cs | 62 +- INT69DC_7C/Forms/FormTimeSetting.cs | 14 + INT69DC_7C/Forms/FormUserEditor.cs | 122 ++- INT69DC_7C/Forms/FormUserEditor.designer.cs | 129 +-- .../Forms/FormUserGroupEditor.Designer.cs | 868 +++++++++--------- INT69DC_7C/Forms/FormUserGroupEditor.cs | 40 +- INT69DC_7C/Version.txt | 5 + INT69DC_ImageDll/INT69DC_ImageDll.csproj | 3 + INT69DC_ImageDll/ImageDll.cs | 12 + INT69DC_ImageDll/Resource.Designer.cs | 45 +- INT69DC_ImageDll/Resource.resx | 9 + .../Resources/jpnPrintDisable.png | Bin 0 -> 4712 bytes INT69DC_ImageDll/Resources/jpnPrintDown.png | Bin 0 -> 7645 bytes INT69DC_ImageDll/Resources/jpnPrintUp.png | Bin 0 -> 5576 bytes INT69DC_ImageDll/version.txt | 4 + 60 files changed, 2689 insertions(+), 1307 deletions(-) create mode 100644 INT69DC_ImageDll/Resources/jpnPrintDisable.png create mode 100644 INT69DC_ImageDll/Resources/jpnPrintDown.png create mode 100644 INT69DC_ImageDll/Resources/jpnPrintUp.png diff --git a/INT69DC_7C/Controls/ControlCalibration10.cs b/INT69DC_7C/Controls/ControlCalibration10.cs index 436cbaf..98f0cc3 100644 --- a/INT69DC_7C/Controls/ControlCalibration10.cs +++ b/INT69DC_7C/Controls/ControlCalibration10.cs @@ -131,6 +131,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Gewichtsüberprüfung,"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("計算中..."); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -182,6 +187,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Kalibrierungsstart"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション開始"); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -232,6 +242,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Brechen Sie die "); this.ParentForm.listBoxHelp.Items.Add("Kalibrierung ab"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションを"); + this.ParentForm.listBoxHelp.Items.Add("キャンセルします。"); + } else { @@ -361,6 +376,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Gewicht auf den Förderer legen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("分銅を上げてください。"); + } else { @@ -403,6 +422,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Die Kalibrierung ist abgeschlossen."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション完了"); + } else { @@ -454,6 +477,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Fehler!"); this.ParentForm.listBoxHelp.Items.Add("Bitte noch einmal versuchen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションエラㅡ"); + this.ParentForm.listBoxHelp.Items.Add("もう一度試してください。"); + } else { @@ -521,6 +549,12 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Drücken Sie nach der Auswahl der"); this.ParentForm.listBoxHelp.Items.Add("Zeile die Taste [Start]."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション"); + this.ParentForm.listBoxHelp.Items.Add("レㅡンを選択したら、"); + this.ParentForm.listBoxHelp.Items.Add("［スタㅡト］ボタンを押します。"); + } else { diff --git a/INT69DC_7C/Controls/ControlCalibration11.cs b/INT69DC_7C/Controls/ControlCalibration11.cs index 1ad55a3..a34ed8c 100644 --- a/INT69DC_7C/Controls/ControlCalibration11.cs +++ b/INT69DC_7C/Controls/ControlCalibration11.cs @@ -128,6 +128,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Gewichtsüberprüfung,"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("計算中..."); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -179,6 +184,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Kalibrierungsstart"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション開始"); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -229,6 +239,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Brechen Sie die "); this.ParentForm.listBoxHelp.Items.Add("Kalibrierung ab"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションを"); + this.ParentForm.listBoxHelp.Items.Add("キャンセルします。"); + } else { @@ -362,6 +377,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Gewicht auf den Förderer legen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("分銅を上げてください。"); + } else { @@ -404,6 +423,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Die Kalibrierung ist abgeschlossen."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション完了"); + } else { @@ -455,6 +478,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Fehler!"); this.ParentForm.listBoxHelp.Items.Add("Bitte noch einmal versuchen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションエラㅡ"); + this.ParentForm.listBoxHelp.Items.Add("もう一度試してください。"); + } else { @@ -522,6 +550,12 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Drücken Sie nach der Auswahl der"); this.ParentForm.listBoxHelp.Items.Add("Zeile die Taste [Start]."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション"); + this.ParentForm.listBoxHelp.Items.Add("レㅡンを選択したら、"); + this.ParentForm.listBoxHelp.Items.Add("［スタㅡト］ボタンを押します。"); + } else { diff --git a/INT69DC_7C/Controls/ControlCalibration12.cs b/INT69DC_7C/Controls/ControlCalibration12.cs index 7017b0d..9da01da 100644 --- a/INT69DC_7C/Controls/ControlCalibration12.cs +++ b/INT69DC_7C/Controls/ControlCalibration12.cs @@ -129,6 +129,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Gewichtsüberprüfung,"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("計算中..."); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -180,6 +185,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Kalibrierungsstart"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション開始"); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -230,6 +240,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Brechen Sie die "); this.ParentForm.listBoxHelp.Items.Add("Kalibrierung ab"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションを"); + this.ParentForm.listBoxHelp.Items.Add("キャンセルします。"); + } else { @@ -367,6 +382,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Gewicht auf den Förderer legen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("分銅を上げてください。"); + } else { @@ -409,6 +428,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Die Kalibrierung ist abgeschlossen."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション完了"); + } else { @@ -460,6 +483,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Fehler!"); this.ParentForm.listBoxHelp.Items.Add("Bitte noch einmal versuchen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションエラㅡ"); + this.ParentForm.listBoxHelp.Items.Add("もう一度試してください。"); + } else { @@ -527,6 +555,12 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Drücken Sie nach der Auswahl der"); this.ParentForm.listBoxHelp.Items.Add("Zeile die Taste [Start]."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション"); + this.ParentForm.listBoxHelp.Items.Add("レㅡンを選択したら、"); + this.ParentForm.listBoxHelp.Items.Add("［スタㅡト］ボタンを押します。"); + } else { diff --git a/INT69DC_7C/Controls/ControlCalibration7.cs b/INT69DC_7C/Controls/ControlCalibration7.cs index 5f5daac..35a0bf9 100644 --- a/INT69DC_7C/Controls/ControlCalibration7.cs +++ b/INT69DC_7C/Controls/ControlCalibration7.cs @@ -129,6 +129,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Gewichtsüberprüfung,"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("計算中..."); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -180,6 +185,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Kalibrierungsstart"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション開始"); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -230,6 +240,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Brechen Sie die "); this.ParentForm.listBoxHelp.Items.Add("Kalibrierung ab"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションを"); + this.ParentForm.listBoxHelp.Items.Add("キャンセルします。"); + } else { @@ -347,6 +362,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Gewicht auf den Förderer legen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("分銅を上げてください。"); + } else { @@ -388,6 +407,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Die Kalibrierung ist abgeschlossen."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション完了"); + } else { @@ -439,6 +462,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Fehler!"); this.ParentForm.listBoxHelp.Items.Add("Bitte noch einmal versuchen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションエラㅡ"); + this.ParentForm.listBoxHelp.Items.Add("もう一度試してください。"); + } else { @@ -506,6 +534,12 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Drücken Sie nach der Auswahl der"); this.ParentForm.listBoxHelp.Items.Add("Zeile die Taste [Start]."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション"); + this.ParentForm.listBoxHelp.Items.Add("レㅡンを選択したら、"); + this.ParentForm.listBoxHelp.Items.Add("［スタㅡト］ボタンを押します。"); + } else { diff --git a/INT69DC_7C/Controls/ControlCalibration8.cs b/INT69DC_7C/Controls/ControlCalibration8.cs index 6fe9246..2b89a7c 100644 --- a/INT69DC_7C/Controls/ControlCalibration8.cs +++ b/INT69DC_7C/Controls/ControlCalibration8.cs @@ -129,6 +129,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Gewichtsüberprüfung,"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("計算中..."); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -180,6 +185,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Kalibrierungsstart"); this.ParentForm.listBoxHelp.Items.Add("bitte warten"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション開始"); + this.ParentForm.listBoxHelp.Items.Add("しばらくお待ちください。"); + } else { @@ -230,6 +240,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Brechen Sie die "); this.ParentForm.listBoxHelp.Items.Add("Kalibrierung ab"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションを"); + this.ParentForm.listBoxHelp.Items.Add("キャンセルします。"); + } else { @@ -351,6 +366,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Gewicht auf den Förderer legen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("分銅を上げてください。"); + } else { @@ -392,6 +411,10 @@ namespace INT69DC_7C.Controls { this.ParentForm.listBoxHelp.Items.Add("Die Kalibrierung ist abgeschlossen."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション完了"); + } else { @@ -443,6 +466,11 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Fehler!"); this.ParentForm.listBoxHelp.Items.Add("Bitte noch einmal versuchen"); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡションエラㅡ"); + this.ParentForm.listBoxHelp.Items.Add("もう一度試してください。"); + } else { @@ -510,6 +538,12 @@ namespace INT69DC_7C.Controls this.ParentForm.listBoxHelp.Items.Add("Drücken Sie nach der Auswahl der"); this.ParentForm.listBoxHelp.Items.Add("Zeile die Taste [Start]."); } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.ParentForm.listBoxHelp.Items.Add("キャリブレㅡション"); + this.ParentForm.listBoxHelp.Items.Add("レㅡンを選択したら、"); + this.ParentForm.listBoxHelp.Items.Add("［スタㅡト］ボタンを押します。"); + } else { diff --git a/INT69DC_7C/Controls/ControlChildformSystemSetting.cs b/INT69DC_7C/Controls/ControlChildformSystemSetting.cs index 8130b71..c60ff16 100644 --- a/INT69DC_7C/Controls/ControlChildformSystemSetting.cs +++ b/INT69DC_7C/Controls/ControlChildformSystemSetting.cs @@ -61,15 +61,21 @@ namespace INT69DC_7C.Controls else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) { this.groupBoxJudgment.Text = "Nastavení rozhodnutí2"; - this.labelStaticForcedZeroDelayTime.Font = new Font("New Gulim", 9F, System.Drawing.FontStyle.Bold); + this.labelStaticForcedZeroDelayTime.Font = new Font("새굴림", 9F, System.Drawing.FontStyle.Bold); this.labelStaticForcedZeroDelayTime.Text = "Vynucená doba nulového zpoždění"; } else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.German) { this.groupBoxJudgment.Text = "Tascheneinstellung2"; - this.labelStaticForcedZeroDelayTime.Font = new Font("New Gulim", 9F, System.Drawing.FontStyle.Bold); + this.labelStaticForcedZeroDelayTime.Font = new Font("새굴림", 9F, System.Drawing.FontStyle.Bold); this.labelStaticForcedZeroDelayTime.Text = "Erzwungene Null-Verzögerungszeit"; } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.groupBoxJudgment.Text = "判定設定2"; + this.labelStaticForcedZeroDelayTime.Font = new Font("새굴림", 9F, System.Drawing.FontStyle.Bold); + this.labelStaticForcedZeroDelayTime.Text = "強制ゼロ遅延時間"; + } else { diff --git a/INT69DC_7C/Controls/ControlConfiguration1.cs b/INT69DC_7C/Controls/ControlConfiguration1.cs index 76101c2..17a82f7 100644 --- a/INT69DC_7C/Controls/ControlConfiguration1.cs +++ b/INT69DC_7C/Controls/ControlConfiguration1.cs @@ -70,6 +70,9 @@ namespace INT69DC_7C.Controls else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German) { + } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { } else { diff --git a/INT69DC_7C/Controls/ControlMainDisplayAlarm.cs b/INT69DC_7C/Controls/ControlMainDisplayAlarm.cs index f679059..621001a 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayAlarm.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayAlarm.cs @@ -57,6 +57,11 @@ namespace INT69DC_7C.Controls this.labelTitle.Text = " Alarm"; this.buttonClose.Text = "Schließen"; } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = " アラㅡム"; + this.buttonClose.Text = "クロㅡズ"; + } else { diff --git a/INT69DC_7C/Controls/ControlUserSetting.Designer.cs b/INT69DC_7C/Controls/ControlUserSetting.Designer.cs index f8f87e6..4ae21ec 100644 --- a/INT69DC_7C/Controls/ControlUserSetting.Designer.cs +++ b/INT69DC_7C/Controls/ControlUserSetting.Designer.cs @@ -32,8 +32,8 @@ this.labelStatusExpireAccount = new SmartX.SmartLabel(); this.labelExpirePasswordDate = new SmartX.SmartLabel(); this.labelExpireAccountDate = new SmartX.SmartLabel(); - this.smartLabel2 = new SmartX.SmartLabel(); - this.labelTitleExpireAccount = new SmartX.SmartLabel(); + this.labelTitleExpiryPassword = new SmartX.SmartLabel(); + this.labelTitleExpiryAccount = new SmartX.SmartLabel(); this.labelPassword = new SmartX.SmartLabel(); this.labelTitlePassword = new SmartX.SmartLabel(); this.labelID = new SmartX.SmartLabel(); @@ -52,7 +52,7 @@ this.labelStatusExpirePassword.ForeColor = System.Drawing.Color.DarkRed; this.labelStatusExpirePassword.InitVisible = true; this.labelStatusExpirePassword.LineSpacing = 0F; - this.labelStatusExpirePassword.Location = new System.Drawing.Point(691, 332); + this.labelStatusExpirePassword.Location = new System.Drawing.Point(765, 323); this.labelStatusExpirePassword.Name = "labelStatusExpirePassword"; this.labelStatusExpirePassword.Size = new System.Drawing.Size(100, 30); this.labelStatusExpirePassword.TabIndex = 230; @@ -73,7 +73,7 @@ this.labelStatusExpireAccount.ForeColor = System.Drawing.Color.DarkRed; this.labelStatusExpireAccount.InitVisible = true; this.labelStatusExpireAccount.LineSpacing = 0F; - this.labelStatusExpireAccount.Location = new System.Drawing.Point(691, 296); + this.labelStatusExpireAccount.Location = new System.Drawing.Point(765, 287); this.labelStatusExpireAccount.Name = "labelStatusExpireAccount"; this.labelStatusExpireAccount.Size = new System.Drawing.Size(100, 30); this.labelStatusExpireAccount.TabIndex = 229; @@ -92,7 +92,7 @@ this.labelExpirePasswordDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labelExpirePasswordDate.InitVisible = true; this.labelExpirePasswordDate.LineSpacing = 0F; - this.labelExpirePasswordDate.Location = new System.Drawing.Point(394, 332); + this.labelExpirePasswordDate.Location = new System.Drawing.Point(468, 323); this.labelExpirePasswordDate.Name = "labelExpirePasswordDate"; this.labelExpirePasswordDate.Size = new System.Drawing.Size(291, 30); this.labelExpirePasswordDate.TabIndex = 232; @@ -111,7 +111,7 @@ this.labelExpireAccountDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labelExpireAccountDate.InitVisible = true; this.labelExpireAccountDate.LineSpacing = 0F; - this.labelExpireAccountDate.Location = new System.Drawing.Point(394, 296); + this.labelExpireAccountDate.Location = new System.Drawing.Point(468, 287); this.labelExpireAccountDate.Name = "labelExpireAccountDate"; this.labelExpireAccountDate.Size = new System.Drawing.Size(291, 30); this.labelExpireAccountDate.TabIndex = 231; @@ -120,45 +120,45 @@ this.labelExpireAccountDate.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelExpireAccountDate.Wordwrap = false; // - // smartLabel2 + // labelTitleExpiryPassword // - this.smartLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.smartLabel2.BackPictureBox = null; - this.smartLabel2.BackPictureBox1 = null; - 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("Arial", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel2.InitVisible = true; - this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(234, 332); - this.smartLabel2.Name = "smartLabel2"; - this.smartLabel2.Size = new System.Drawing.Size(154, 30); - this.smartLabel2.TabIndex = 227; - this.smartLabel2.Text = "ExpirePassword"; - this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel2.Wordwrap = false; + this.labelTitleExpiryPassword.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleExpiryPassword.BackPictureBox = null; + this.labelTitleExpiryPassword.BackPictureBox1 = null; + this.labelTitleExpiryPassword.BackPictureBox2 = null; + this.labelTitleExpiryPassword.BorderColor = System.Drawing.Color.Black; + this.labelTitleExpiryPassword.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleExpiryPassword.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleExpiryPassword.InitVisible = true; + this.labelTitleExpiryPassword.LineSpacing = 0F; + this.labelTitleExpiryPassword.Location = new System.Drawing.Point(242, 323); + this.labelTitleExpiryPassword.Name = "labelTitleExpiryPassword"; + this.labelTitleExpiryPassword.Size = new System.Drawing.Size(220, 30); + this.labelTitleExpiryPassword.TabIndex = 227; + this.labelTitleExpiryPassword.Text = "ExpirePassword"; + this.labelTitleExpiryPassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleExpiryPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleExpiryPassword.Wordwrap = false; // - // labelTitleExpireAccount + // labelTitleExpiryAccount // - this.labelTitleExpireAccount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleExpireAccount.BackPictureBox = null; - this.labelTitleExpireAccount.BackPictureBox1 = null; - this.labelTitleExpireAccount.BackPictureBox2 = null; - this.labelTitleExpireAccount.BorderColor = System.Drawing.Color.Black; - this.labelTitleExpireAccount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleExpireAccount.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.labelTitleExpireAccount.InitVisible = true; - this.labelTitleExpireAccount.LineSpacing = 0F; - this.labelTitleExpireAccount.Location = new System.Drawing.Point(234, 296); - this.labelTitleExpireAccount.Name = "labelTitleExpireAccount"; - this.labelTitleExpireAccount.Size = new System.Drawing.Size(154, 30); - this.labelTitleExpireAccount.TabIndex = 225; - this.labelTitleExpireAccount.Text = "ExpireAccount"; - this.labelTitleExpireAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleExpireAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleExpireAccount.Wordwrap = false; + this.labelTitleExpiryAccount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleExpiryAccount.BackPictureBox = null; + this.labelTitleExpiryAccount.BackPictureBox1 = null; + this.labelTitleExpiryAccount.BackPictureBox2 = null; + this.labelTitleExpiryAccount.BorderColor = System.Drawing.Color.Black; + this.labelTitleExpiryAccount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleExpiryAccount.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleExpiryAccount.InitVisible = true; + this.labelTitleExpiryAccount.LineSpacing = 0F; + this.labelTitleExpiryAccount.Location = new System.Drawing.Point(242, 287); + this.labelTitleExpiryAccount.Name = "labelTitleExpiryAccount"; + this.labelTitleExpiryAccount.Size = new System.Drawing.Size(220, 30); + this.labelTitleExpiryAccount.TabIndex = 225; + this.labelTitleExpiryAccount.Text = "ExpireAccount"; + this.labelTitleExpiryAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleExpiryAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleExpiryAccount.Wordwrap = false; // // labelPassword // @@ -170,7 +170,7 @@ this.labelPassword.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelPassword.InitVisible = true; this.labelPassword.LineSpacing = 0F; - this.labelPassword.Location = new System.Drawing.Point(394, 260); + this.labelPassword.Location = new System.Drawing.Point(468, 251); this.labelPassword.Name = "labelPassword"; this.labelPassword.Size = new System.Drawing.Size(291, 30); this.labelPassword.TabIndex = 224; @@ -188,12 +188,12 @@ this.labelTitlePassword.BackPictureBox2 = null; this.labelTitlePassword.BorderColor = System.Drawing.Color.Black; this.labelTitlePassword.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitlePassword.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.labelTitlePassword.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelTitlePassword.InitVisible = true; this.labelTitlePassword.LineSpacing = 0F; - this.labelTitlePassword.Location = new System.Drawing.Point(234, 260); + this.labelTitlePassword.Location = new System.Drawing.Point(242, 251); this.labelTitlePassword.Name = "labelTitlePassword"; - this.labelTitlePassword.Size = new System.Drawing.Size(154, 30); + this.labelTitlePassword.Size = new System.Drawing.Size(220, 30); this.labelTitlePassword.TabIndex = 223; this.labelTitlePassword.Text = "Password"; this.labelTitlePassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -210,7 +210,7 @@ this.labelID.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelID.InitVisible = true; this.labelID.LineSpacing = 0F; - this.labelID.Location = new System.Drawing.Point(394, 224); + this.labelID.Location = new System.Drawing.Point(468, 215); this.labelID.Name = "labelID"; this.labelID.Size = new System.Drawing.Size(291, 30); this.labelID.TabIndex = 222; @@ -227,12 +227,12 @@ this.labelTitleID.BackPictureBox2 = null; this.labelTitleID.BorderColor = System.Drawing.Color.Black; this.labelTitleID.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleID.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleID.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelTitleID.InitVisible = true; this.labelTitleID.LineSpacing = 0F; - this.labelTitleID.Location = new System.Drawing.Point(234, 224); + this.labelTitleID.Location = new System.Drawing.Point(242, 215); this.labelTitleID.Name = "labelTitleID"; - this.labelTitleID.Size = new System.Drawing.Size(154, 30); + this.labelTitleID.Size = new System.Drawing.Size(220, 30); this.labelTitleID.TabIndex = 221; this.labelTitleID.Text = "ID"; this.labelTitleID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -248,8 +248,8 @@ this.Controls.Add(this.labelStatusExpireAccount); this.Controls.Add(this.labelExpirePasswordDate); this.Controls.Add(this.labelExpireAccountDate); - this.Controls.Add(this.smartLabel2); - this.Controls.Add(this.labelTitleExpireAccount); + this.Controls.Add(this.labelTitleExpiryPassword); + this.Controls.Add(this.labelTitleExpiryAccount); this.Controls.Add(this.labelPassword); this.Controls.Add(this.labelTitlePassword); this.Controls.Add(this.labelID); @@ -266,8 +266,8 @@ private SmartX.SmartLabel labelStatusExpireAccount; private SmartX.SmartLabel labelExpirePasswordDate; private SmartX.SmartLabel labelExpireAccountDate; - private SmartX.SmartLabel smartLabel2; - private SmartX.SmartLabel labelTitleExpireAccount; + private SmartX.SmartLabel labelTitleExpiryPassword; + private SmartX.SmartLabel labelTitleExpiryAccount; private SmartX.SmartLabel labelPassword; private SmartX.SmartLabel labelTitlePassword; private SmartX.SmartLabel labelID; diff --git a/INT69DC_7C/Controls/ControlUserSetting.cs b/INT69DC_7C/Controls/ControlUserSetting.cs index 2ea8c7a..6cfaf96 100644 --- a/INT69DC_7C/Controls/ControlUserSetting.cs +++ b/INT69DC_7C/Controls/ControlUserSetting.cs @@ -51,6 +51,12 @@ namespace INT69DC_7C.Controls } else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) { + this.labelTitlePassword.Text = "Password"; + this.labelTitleExpiryAccount.Text = "ExpireAccount"; + this.labelTitleExpiryPassword.Text = "ExpirePassword"; + + this.labelStatusExpireAccount.Text = "Expired"; + this.labelStatusExpirePassword.Text = "Expired"; } else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) { @@ -61,6 +67,15 @@ namespace INT69DC_7C.Controls else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.German) { + } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitlePassword.Text = "パスワㅡド"; + this.labelTitleExpiryAccount.Text = "アカウントの有効期限"; + this.labelTitleExpiryPassword.Text = "パスワㅡドの有効期限"; + + this.labelStatusExpireAccount.Text = "満了"; + this.labelStatusExpirePassword.Text = "満了"; } else { @@ -123,7 +138,7 @@ namespace INT69DC_7C.Controls message2 = ""; break; case DataStore.LanguageID.English: - code = "user settings"; + code = "User settings"; message1 = "Password change complete!"; message2 = ""; break; @@ -142,6 +157,11 @@ namespace INT69DC_7C.Controls message1 = "Passwortänderung abgeschlossen!"; message2 = ""; break; + case DataStore.LanguageID.Japanese: + code = "ユㅡザㅡ設定"; + message1 = "パスワㅡドの変更が完了しました。"; + message2 = ""; + break; default: break; } diff --git a/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs b/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs index 2ea622e..e875f55 100644 --- a/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs +++ b/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs @@ -52,6 +52,9 @@ namespace INT69DC_7C.DialogForms else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.German) { + } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { } else { diff --git a/INT69DC_7C/DialogForms/DialogFormHistoryData.cs b/INT69DC_7C/DialogForms/DialogFormHistoryData.cs index 2a1fee6..e64db88 100644 --- a/INT69DC_7C/DialogForms/DialogFormHistoryData.cs +++ b/INT69DC_7C/DialogForms/DialogFormHistoryData.cs @@ -65,6 +65,13 @@ namespace INT69DC_7C.DialogForms this.buttonRead.Text = "Alles lesen"; this.buttonClose.Text = "Schließen"; } + else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitleDate.Text = "日付"; + + this.buttonRead.Text = "読む"; + this.buttonClose.Text = "クロㅡズ"; + } else { diff --git a/INT69DC_7C/DialogForms/DialogFormLogOn.Designer.cs b/INT69DC_7C/DialogForms/DialogFormLogOn.Designer.cs index 6687478..2866f08 100644 --- a/INT69DC_7C/DialogForms/DialogFormLogOn.Designer.cs +++ b/INT69DC_7C/DialogForms/DialogFormLogOn.Designer.cs @@ -105,6 +105,7 @@ this.textBoxID.TabIndex = 2; this.textBoxID.Text = "ABCDEFGHJK"; this.textBoxID.GotFocus += new System.EventHandler(this.textBoxID_GotFocus); + this.textBoxID.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxID_KeyPress); // // textBoxPassword // @@ -117,6 +118,7 @@ this.textBoxPassword.TabIndex = 5; this.textBoxPassword.Text = "ABCDEFGHJK"; this.textBoxPassword.GotFocus += new System.EventHandler(this.textBoxPassword_GotFocus); + this.textBoxPassword.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxPassword_KeyPress); // // buttonLogOn // diff --git a/INT69DC_7C/DialogForms/DialogFormLogOn.cs b/INT69DC_7C/DialogForms/DialogFormLogOn.cs index 625d226..025a387 100644 --- a/INT69DC_7C/DialogForms/DialogFormLogOn.cs +++ b/INT69DC_7C/DialogForms/DialogFormLogOn.cs @@ -30,7 +30,19 @@ namespace INT69DC_7C.DialogForms this.IsLoginMode = login; this.IsChangePassword = changePass; - this.InitializeDesign(); + if (this.IsChangePassword == false) + { + this.InitializeDesignForLogin(); + + this.textBoxID.PasswordChar = default(char); + } + else + { + this.InitializeDesignForChangePassword(); + + this.textBoxID.PasswordChar = '*'; + } + this.InitializeControl(); this.DefaultSetting(); } @@ -113,12 +125,16 @@ namespace INT69DC_7C.DialogForms return ret; } - private void InitializeDesign() + private void InitializeDesignForLogin() { ImageDll images = new ImageDll(); if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) { + this.labelTitle1.Text = "User Login"; + this.labelTitle2.Text = "ID"; + this.labelTitle3.Text = "Password"; + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginDisable)); this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginDown)); this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginUp)); @@ -128,6 +144,10 @@ namespace INT69DC_7C.DialogForms } else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) { + this.labelTitle1.Text = "用户登录"; + this.labelTitle2.Text = "ID"; + this.labelTitle3.Text = "密码"; + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginDisable)); this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginDown)); this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginUp)); @@ -146,6 +166,10 @@ namespace INT69DC_7C.DialogForms } else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German) { + this.labelTitle1.Text = "Einloggen"; + this.labelTitle2.Text = "ID"; + this.labelTitle3.Text = "Passwort"; + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginDisable)); this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginDown)); this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginUp)); @@ -153,9 +177,101 @@ namespace INT69DC_7C.DialogForms this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerMainCancelDown)); this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerMainCancelUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle1.Text = "ログイン"; + this.labelTitle2.Text = "ID"; + this.labelTitle3.Text = "パスワㅡド"; + + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginLoginDisable)); + this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginLoginDown)); + this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginLoginUp)); + this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginCancelDisable)); + this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginCancelDown)); + this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginCancelUp)); + } else { + this.labelTitle1.Text = "로그인"; + this.labelTitle2.Text = "ID"; + this.labelTitle3.Text = "비밀번호"; + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginLoginDisable)); + this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginLoginDown)); + this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginLoginUp)); + this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginCancelDisable)); + this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginCancelDown)); + this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginCancelUp)); + } + } + private void InitializeDesignForChangePassword() + { + ImageDll images = new ImageDll(); + + if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) + { + this.labelTitle1.Text = "Change Password"; + this.labelTitle2.Text = "New"; + this.labelTitle3.Text = "Verify"; + + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginChangeDisable)); + this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginChangeDown)); + this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginChangeUp)); + this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDisable)); + this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDown)); + this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelUp)); + } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) + { + this.labelTitle1.Text = "更改密码"; + this.labelTitle2.Text = "新密码"; + this.labelTitle3.Text = "验证密码"; + + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginChangeDisable)); + this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginChangeDown)); + this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginChangeUp)); + this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginCancelDisable)); + this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginCancelDown)); + this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginCancelUp)); + } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German) + { + this.labelTitle1.Text = "Kennwort ändern"; + this.labelTitle2.Text = "Neu"; + this.labelTitle3.Text = "Verifizieren"; + + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginChangeDisable)); + this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginChangeDown)); + this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginChangeUp)); + this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDisable)); + this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDown)); + this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelUp)); + } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle1.Text = "Changer le mot de passe"; + this.labelTitle2.Text = "Nouveau"; + this.labelTitle3.Text = "Vérifier"; + + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginChangeDisable)); + this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginChangeDown)); + this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginChangeUp)); + this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginCancelDisable)); + this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginCancelDown)); + this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginCancelUp)); + } + else + { + this.labelTitle1.Text = "비밀번호 변경"; + this.labelTitle2.Text = "새 비밀번호"; + this.labelTitle3.Text = "비밀번호 확인"; + + this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginChangeDisable)); + this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginChangeDown)); + this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginChangeUp)); + this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginCancelDisable)); + this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginCancelDown)); + this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.korMainLoginCancelUp)); } } private void InitializeControl() @@ -168,41 +284,6 @@ namespace INT69DC_7C.DialogForms this.Location = new Point(x, y); this.Size = new Size(710, 470); - if (this.IsChangePassword == false) - { - 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 - { - 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 = '*'; - } - this.textBoxID.Text = ""; this.textBoxPassword.Text = ""; @@ -501,6 +582,26 @@ namespace INT69DC_7C.DialogForms this.textBoxPassword.Select(this.textBoxPassword.Text.Length, 0); } + private void textBoxID_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar == '<' || e.KeyChar == '>' || e.KeyChar == '|' || e.KeyChar == '"' || e.KeyChar == '?' + || e.KeyChar == ':' || e.KeyChar == '/' || e.KeyChar == '\\' || e.KeyChar == ',' || e.KeyChar == ';' + || e.KeyChar == '`' || e.KeyChar == '=' || e.KeyChar == '(' || e.KeyChar == ')' || e.KeyChar == '{' || e.KeyChar == '}' + || e.KeyChar == '~' || e.KeyChar == '_' || e.KeyChar == '[' || e.KeyChar == ']' || e.KeyChar == '\'') + { + e.Handled = true; + } + } + private void textBoxPassword_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar == '<' || e.KeyChar == '>' || e.KeyChar == '|' || e.KeyChar == '"' || e.KeyChar == '?' + || e.KeyChar == ':' || e.KeyChar == '/' || e.KeyChar == '\\' || e.KeyChar == ',' || e.KeyChar == ';' + || e.KeyChar == '`' || e.KeyChar == '=' || e.KeyChar == '(' || e.KeyChar == ')' || e.KeyChar == '{' || e.KeyChar == '}' + || e.KeyChar == '~' || e.KeyChar == '_' || e.KeyChar == '[' || e.KeyChar == ']' || e.KeyChar == '\'') + { + e.Handled = true; + } + } private void smartKeyboard_OnXKeyClick(object sender, EventArgs e) { diff --git a/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs b/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs index 6306e74..b6db771 100644 --- a/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs +++ b/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs @@ -70,6 +70,7 @@ this.labelErrorCode.BackPictureBox2 = null; this.labelErrorCode.BorderColor = System.Drawing.Color.Black; this.labelErrorCode.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelErrorCode.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelErrorCode.InitVisible = true; this.labelErrorCode.LineSpacing = 0F; this.labelErrorCode.Location = new System.Drawing.Point(12, 0); @@ -88,7 +89,7 @@ this.labelMessage2.BackPictureBox2 = null; this.labelMessage2.BorderColor = System.Drawing.Color.Black; this.labelMessage2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMessage2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelMessage2.InitVisible = true; this.labelMessage2.LineSpacing = 0F; this.labelMessage2.Location = new System.Drawing.Point(78, 90); @@ -107,7 +108,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("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelMessage1.InitVisible = true; this.labelMessage1.LineSpacing = 0F; this.labelMessage1.Location = new System.Drawing.Point(78, 60); @@ -157,7 +158,7 @@ // buttonOK // this.buttonOK.BackColor = System.Drawing.Color.WhiteSmoke; - this.buttonOK.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.buttonOK.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.buttonOK.ForeColor = System.Drawing.Color.Black; this.buttonOK.Location = new System.Drawing.Point(335, 135); this.buttonOK.Name = "buttonOK"; diff --git a/INT69DC_7C/DialogForms/DialogFormMessage.cs b/INT69DC_7C/DialogForms/DialogFormMessage.cs index 6d4676b..a302b43 100644 --- a/INT69DC_7C/DialogForms/DialogFormMessage.cs +++ b/INT69DC_7C/DialogForms/DialogFormMessage.cs @@ -54,6 +54,9 @@ namespace INT69DC_7C.DialogForms this.buttonOK.Text = "Bestätigen"; this.labelMessage1.Text = str + " Dateien wurden gesichert"; break; + case DataStore.LanguageID.Japanese: + this.labelMessage1.Text = str + "個のファイルがバックアップされました"; + break; default: this.labelMessage1.Text = str + "개의 파일이 백업되었습니다."; break; @@ -917,27 +920,27 @@ namespace INT69DC_7C.DialogForms break; case 12: this.labelErrorCode.Text = "警告 12"; - this.labelMessage1.Text = "フィードバック設定を確認してください！"; - this.labelMessage2.Text = "デッドゾーン範囲"; + this.labelMessage1.Text = "フィㅡドバック設定を確認してください！"; + this.labelMessage2.Text = "デッドゾㅡン範囲"; break; case 13: this.labelErrorCode.Text = "エラㅡ 13"; - this.labelMessage1.Text = "このファイルはサポートされていません"; + this.labelMessage1.Text = "このファイルはサポㅡトされていません"; break; case 14: this.labelErrorCode.Text = "警告 14"; - this.labelMessage1.Text = "フィードバック設定を確認してください！"; + this.labelMessage1.Text = "フィㅡドバック設定を確認してください！"; this.labelMessage2.Text = "上限範囲"; break; case 15: this.labelErrorCode.Text = "警告 15"; - this.labelMessage1.Text = "フィードバック設定を確認してください！"; + this.labelMessage1.Text = "フィㅡドバック設定を確認してください！"; this.labelMessage2.Text = "下限範囲"; break; case 16: this.labelErrorCode.Text = "エラㅡ 16"; - this.labelMessage1.Text = "現在、ModbusはClientのみサポートされています。"; - this.labelMessage2.Text = "Client モードに切り替わります。"; + this.labelMessage1.Text = "現在、ModbusはClientのみサポㅡトされています。"; + this.labelMessage2.Text = "Client モㅡドに切り替わります。"; break; case 17: this.labelErrorCode.Text = "エラㅡ 17"; @@ -993,27 +996,27 @@ namespace INT69DC_7C.DialogForms break; case 38: this.labelErrorCode.Text = "エラㅡ 38"; - this.labelMessage1.Text = "パスワード: 6～20文字を入力してください"; + this.labelMessage1.Text = "パスワㅡド: 6～20文字を入力してください"; this.labelMessage2.Text = ""; break; case 39: this.labelErrorCode.Text = "エラㅡ 39"; - this.labelMessage1.Text = "パスワード: 同じ文字 (111,222,aaa...) は"; + this.labelMessage1.Text = "パスワㅡド: 同じ文字 (111,222,aaa...) は"; this.labelMessage2.Text = "3回以上使用できません"; break; case 40: this.labelErrorCode.Text = "エラㅡ 40"; - this.labelMessage1.Text = "パスワード: 連続する文字 (123,321,abc,cba...) は"; + this.labelMessage1.Text = "パスワㅡド: 連続する文字 (123,321,abc,cba...) は"; this.labelMessage2.Text = "使用できません"; break; case 41: this.labelErrorCode.Text = "エラㅡ 41"; - this.labelMessage1.Text = "パスワード: 英字、数字、特殊文字を"; + this.labelMessage1.Text = "パスワㅡド: 英字、数字、特殊文字を"; this.labelMessage2.Text = "それぞれ1文字以上含めてください"; break; case 42: this.labelErrorCode.Text = "エラㅡ 42"; - this.labelMessage1.Text = "パスワード: 以前に設定したパスワードです"; + this.labelMessage1.Text = "パスワㅡド: 以前に設定したパスワㅡドです"; this.labelMessage2.Text = ""; break; case 43: @@ -1121,6 +1124,21 @@ namespace INT69DC_7C.DialogForms } #endregion break; + case DataStore.LanguageID.Japanese: + #region 일본어 + switch (code) + { + case 11: + this.labelErrorCode.Text = "Error 11"; + this.labelMessage1.Text = "入力センサエラㅡにより停止しました。"; + break; + default: + this.labelErrorCode.Text = "Error 99"; + this.labelMessage1.Text = "メㅡカㅡにお問い合わせください。"; + break; + } + #endregion + break; default: #region 한글 switch (code) @@ -1230,6 +1248,22 @@ namespace INT69DC_7C.DialogForms } #endregion break; + case DataStore.LanguageID.Japanese: + #region 일본어 + switch (code) + { + case 1: + this.labelErrorCode.Text = "エラㅡ 01"; + this.labelMessage1.Text = "入力範囲を確認してください。"; + this.labelMessage2.Text = data; + break; + default: + this.labelErrorCode.Text = "エラㅡ 99"; + this.labelMessage1.Text = "メㅡカㅡにお問い合わせください。"; + break; + } + #endregion + break; default: #region 한글 switch (code) @@ -1694,6 +1728,93 @@ namespace INT69DC_7C.DialogForms } #endregion break; + case DataStore.LanguageID.Japanese: + #region 일본어 + switch (code) + { + case 1: + this.labelErrorCode.Text = "エラㅡ 04_01"; + this.labelMessage1.Text = "IDが見つかりません。"; + break; + case 2: + this.labelErrorCode.Text = "エラㅡ 04_02"; + this.labelMessage1.Text = "ID：同じIDがあります。"; + break; + case 3: + this.labelErrorCode.Text = "エラㅡ 04_03"; + this.labelMessage1.Text = "ID：6〜20文字を入力してください。"; + break; + case 4: + this.labelErrorCode.Text = "エラㅡ 04_04"; + this.labelMessage1.Text = "ID：6〜20文字を入力してください。"; + break; + case 5: + this.labelErrorCode.Text = "エラㅡ 04_05"; + this.labelMessage1.Text = "ID : 連続した文字(123,321,abc,cba...)"; + this.labelMessage2.Text = "または同じ文字(111,222,aaa...)は使用できません。"; + break; + case 6: + this.labelErrorCode.Text = "エラㅡ 04_06"; + this.labelMessage1.Text = "ID：使用できない文字が含まれています。"; + break; + case 7: + this.labelErrorCode.Text = "エラㅡ 04_07"; + this.labelMessage1.Text = "ID：ユㅡザㅡアカウントの有効期限が切れました。"; + break; + case 8: + this.labelErrorCode.Text = "エラㅡ 04_08"; + this.labelMessage1.Text = "PASSWORD：以前のパスワㅡドです。"; + break; + case 9: + this.labelErrorCode.Text = "エラㅡ 04_09"; + this.labelMessage1.Text = "PASSWORD：6〜20文字を入力してください。"; + break; + case 10: + this.labelErrorCode.Text = "エラㅡ 04_10"; + this.labelMessage1.Text = "PASSWORD：6〜20文字を入力してください。"; + break; + case 11: + this.labelErrorCode.Text = "エラㅡ 04_11"; + this.labelMessage1.Text = "PASSWORD：連続した文字（123,321、abc、cba ...）"; + this.labelMessage2.Text = "または同じ文字（111,222、aaa ...）を使用できません。"; + break; + case 12: + this.labelErrorCode.Text = "エラㅡ 04_12"; + this.labelMessage1.Text = "PASSWORD：使用できない文字が含まれています。"; + this.labelMessage2.Text = "利用可能な特殊文字 : !@#$%^&*+-."; + break; + case 13: + this.labelErrorCode.Text = "エラㅡ 04_13"; + this.labelMessage1.Text = "PASSWORD：英文1以上、数字1以上、"; + this.labelMessage2.Text = "特殊文字1以上含めてください。"; + break; + case 14: + this.labelErrorCode.Text = "エラㅡ 04_14"; + this.labelMessage1.Text = "パスワㅡドを確認してください。"; + break; + case 15: + this.labelErrorCode.Text = "エラㅡ 04_15"; + this.labelMessage1.Text = "PASSWORD：パスワㅡドが期限切れです。"; + break; + case 16: + this.labelErrorCode.Text = "エラㅡ 04_16"; + this.labelMessage1.Text = ""; + break; + case 17: + this.labelErrorCode.Text = "エラㅡ 04_17"; + this.labelMessage1.Text = ""; + break; + case 18: + this.labelErrorCode.Text = "エラㅡ 04_18"; + this.labelMessage1.Text = ""; + break; + default: + this.labelErrorCode.Text = "エラㅡ 04_99"; + this.labelMessage1.Text = "メㅡカㅡにお問い合わせください。"; + break; + } + #endregion + break; default: break; } diff --git a/INT69DC_7C/DialogForms/DialogFormMessage.resx b/INT69DC_7C/DialogForms/DialogFormMessage.resx index 71fa9a5..fa3bf41 100644 --- a/INT69DC_7C/DialogForms/DialogFormMessage.resx +++ b/INT69DC_7C/DialogForms/DialogFormMessage.resx @@ -168,17 +168,18 @@ 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 + gg== @@ -228,19 +229,19 @@ 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 @@ -290,41 +291,42 @@ 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 + 0AAAAABJRU5ErkJggg== @@ -374,32 +376,32 @@ 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 - SUVORK5CYII= + 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 @@ -449,41 +451,41 @@ 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 - IP8HtFPN//2XDj4AAAAASUVORK5CYII= + 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 + AAAAAElFTkSuQmCC diff --git a/INT69DC_7C/DialogForms/DialogFormNumKeyPad.cs b/INT69DC_7C/DialogForms/DialogFormNumKeyPad.cs index 115efbf..988f6b6 100644 --- a/INT69DC_7C/DialogForms/DialogFormNumKeyPad.cs +++ b/INT69DC_7C/DialogForms/DialogFormNumKeyPad.cs @@ -99,6 +99,13 @@ namespace INT69DC_7C.DialogForms this.buttonCancel.Text = "X"; this.buttonEnter.Text = "Enter"; } + else if (language == DataStore.LanguageID.Japanese) + { + this.label1.Text = "キㅡパッド"; + + this.buttonCancel.Text = "X"; + this.buttonEnter.Text = "入力"; + } else { diff --git a/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs b/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs index 291f14d..77143c5 100644 --- a/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs +++ b/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs @@ -113,12 +113,19 @@ namespace INT69DC_7C.DialogForms this.buttonCancel.Text = "X"; this.buttonEnter.Text = "Enter"; } + else if (language == DataStore.LanguageID.Japanese) + { + this.labelSubject.Text = "キㅡパッド"; + + this.buttonCancel.Text = "X"; + this.buttonEnter.Text = "入力"; + } else { } } - private void InitializeContnrol() + private void InitializeControl() { int x = 0, y = 0; @@ -139,7 +146,7 @@ namespace INT69DC_7C.DialogForms { base.OnLoad(e); - this.InitializeContnrol(); + this.InitializeControl(); } #endregion diff --git a/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.cs b/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.cs index 065da00..fe5b23f 100644 --- a/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.cs +++ b/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.cs @@ -74,10 +74,13 @@ namespace INT69DC_7C.DialogForms #region Event Handler private void textBox_KeyPress(object sender, KeyPressEventArgs e) { - //if (e.KeyChar == '\r') - // this.KeyActionEnter(); - //else if (e.KeyChar == 27) - // this.KeyActionEsc(); + if (e.KeyChar == '<' || e.KeyChar == '>' || e.KeyChar == '|' || e.KeyChar == '"' || e.KeyChar == '?' + || e.KeyChar == ':' || e.KeyChar == '/' || e.KeyChar == '\\' || e.KeyChar == ',' || e.KeyChar == ';' + || e.KeyChar == '`' || e.KeyChar == '=' || e.KeyChar == '(' || e.KeyChar == ')' || e.KeyChar == '{' || e.KeyChar == '}' + || e.KeyChar == '~' || e.KeyChar == '_' || e.KeyChar == '[' || e.KeyChar == ']' || e.KeyChar == '\'') + { + e.Handled = true; + } } private void smartKeyboard_OnXKeyClick(object sender, EventArgs e) diff --git a/INT69DC_7C/DialogForms/DialogFormYesNo.Designer.cs b/INT69DC_7C/DialogForms/DialogFormYesNo.Designer.cs index 801210f..7f2dc35 100644 --- a/INT69DC_7C/DialogForms/DialogFormYesNo.Designer.cs +++ b/INT69DC_7C/DialogForms/DialogFormYesNo.Designer.cs @@ -45,7 +45,7 @@ // buttonNo // this.buttonNo.BackColor = System.Drawing.Color.WhiteSmoke; - this.buttonNo.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.buttonNo.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.buttonNo.ForeColor = System.Drawing.Color.Black; this.buttonNo.Location = new System.Drawing.Point(335, 135); this.buttonNo.Name = "buttonNo"; @@ -58,7 +58,7 @@ // buttonYes // this.buttonYes.BackColor = System.Drawing.Color.WhiteSmoke; - this.buttonYes.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.buttonYes.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.buttonYes.ForeColor = System.Drawing.Color.Black; this.buttonYes.Location = new System.Drawing.Point(229, 135); this.buttonYes.Name = "buttonYes"; @@ -75,7 +75,7 @@ this.labelMessage2.BackPictureBox2 = null; this.labelMessage2.BorderColor = System.Drawing.Color.Black; this.labelMessage2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMessage2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelMessage2.InitVisible = true; this.labelMessage2.LineSpacing = 0F; this.labelMessage2.Location = new System.Drawing.Point(78, 90); @@ -109,7 +109,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("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelMessage1.InitVisible = true; this.labelMessage1.LineSpacing = 0F; this.labelMessage1.Location = new System.Drawing.Point(78, 60); @@ -164,6 +164,7 @@ this.labelErrorCode.BackPictureBox2 = null; this.labelErrorCode.BorderColor = System.Drawing.Color.Black; this.labelErrorCode.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelErrorCode.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelErrorCode.InitVisible = true; this.labelErrorCode.LineSpacing = 0F; this.labelErrorCode.Location = new System.Drawing.Point(12, 0); diff --git a/INT69DC_7C/DialogForms/DialogFormYesNo.cs b/INT69DC_7C/DialogForms/DialogFormYesNo.cs index 5cc1446..47261ed 100644 --- a/INT69DC_7C/DialogForms/DialogFormYesNo.cs +++ b/INT69DC_7C/DialogForms/DialogFormYesNo.cs @@ -431,16 +431,16 @@ namespace INT69DC_7C.DialogForms this.labelMessage1.Text = "このユㅡザㅡを削除しますか?"; break; case 15: - this.labelErrorCode.Text = "イーサネット"; - this.labelMessage1.Text = "ローカル IP アドレスを静的に設定しますか?"; + this.labelErrorCode.Text = "イㅡサネット"; + this.labelMessage1.Text = "ロㅡカル IP アドレスを静的に設定しますか?"; break; case 16: - this.labelErrorCode.Text = "イーサネット"; - this.labelMessage1.Text = "ローカル IP アドレスを DHCP に設定しますか?"; + this.labelErrorCode.Text = "イㅡサネット"; + this.labelMessage1.Text = "ロㅡカル IP アドレスを DHCP に設定しますか?"; break; case 17: this.labelErrorCode.Text = "ログイン"; - this.labelMessage1.Text = "パスワードをリセットしますか?"; + this.labelMessage1.Text = "パスワㅡドをリセットしますか?"; break; default: break; @@ -522,6 +522,26 @@ namespace INT69DC_7C.DialogForms break; case DataStore.LanguageID.German: break; + case DataStore.LanguageID.Japanese: + switch (ok) + { + case 2: + this.labelErrorCode.Text = "ログイン"; + if (int.Parse(msg) == 0) + this.labelMessage1.Text = "パスワㅡドが期限切れです。"; + else + this.labelMessage1.Text = string.Format("パスワㅡドの有効期限{0}日前です", msg); + this.labelMessage2.Text = "パスワㅡドを変更しますか？"; + break; + case 31: + this.labelErrorCode.Text = "ファイル"; + this.labelMessage1.Text = string.Format("ファイル {0} は既に存在します。", msg); + this.labelMessage2.Text = "交換してもよろしいですか？"; + break; + default: + break; + } + break; default: break; } diff --git a/INT69DC_7C/DialogForms/DialogFormYesNo.resx b/INT69DC_7C/DialogForms/DialogFormYesNo.resx index 5123137..b1dbca3 100644 --- a/INT69DC_7C/DialogForms/DialogFormYesNo.resx +++ b/INT69DC_7C/DialogForms/DialogFormYesNo.resx @@ -165,17 +165,18 @@ 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 + gg== @@ -225,19 +226,19 @@ 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 @@ -287,41 +288,42 @@ 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 + 0AAAAABJRU5ErkJggg== @@ -371,32 +373,32 @@ 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 - SUVORK5CYII= + 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 @@ -446,41 +448,41 @@ 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 - IP8HtFPN//2XDj4AAAAASUVORK5CYII= + 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 + AAAAAElFTkSuQmCC diff --git a/INT69DC_7C/Forms/FormCalibration.cs b/INT69DC_7C/Forms/FormCalibration.cs index 0aea34f..541cd45 100644 --- a/INT69DC_7C/Forms/FormCalibration.cs +++ b/INT69DC_7C/Forms/FormCalibration.cs @@ -124,6 +124,24 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "キャリブレㅡション"; + + this.buttonStart.Text = "スタㅡト"; + this.buttonBalance.Text = "分銅"; + this.buttonCancel.Text = "キャンセル"; + + this.groupBoxSetting.Text = "設定"; + this.groupBoxHelp.Text = "ヘルプ"; + this.labelStaticBalanceWeight.Text = "バランス重量"; + this.labelStaticMaxWeight.Text = "最大重量"; + this.labelStaticDigit.Text = "目量"; + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { @@ -205,6 +223,12 @@ namespace INT69DC_7C.Forms this.listBoxHelp.Items.Add("Drücken Sie nach der Auswahl der"); this.listBoxHelp.Items.Add("Zeile die Taste [Start]."); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.listBoxHelp.Items.Add("キャリブレㅡション"); + this.listBoxHelp.Items.Add("レㅡンを選択したら、"); + this.listBoxHelp.Items.Add("［スタㅡト］ボタンを押します。"); + } else { @@ -276,6 +300,12 @@ namespace INT69DC_7C.Forms this.listBoxHelp.Items.Add("Drücken Sie nach der Auswahl der"); this.listBoxHelp.Items.Add("Zeile die Taste [Start]."); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.listBoxHelp.Items.Add("キャリブレㅡション"); + this.listBoxHelp.Items.Add("レㅡンを選択したら、"); + this.listBoxHelp.Items.Add("［スタㅡト］ボタンを押します。"); + } else { diff --git a/INT69DC_7C/Forms/FormCommunication.cs b/INT69DC_7C/Forms/FormCommunication.cs index 36107a6..5e0c772 100644 --- a/INT69DC_7C/Forms/FormCommunication.cs +++ b/INT69DC_7C/Forms/FormCommunication.cs @@ -54,7 +54,7 @@ namespace INT69DC_7C.Forms this.labelTitle.Text = "Communication"; this.labelStaticTcpOperationMode.Text = "Operation mode"; - this.labelStaticTcpMode.Text = "mode"; + this.labelStaticTcpMode.Text = "Mode"; this.labelStaticSerialBaudrate.Text = "Baudrate"; this.labelStaticSerialMode.Text = "Mode"; this.labelHelp.Text = "When IP configuration is changed, it is normally connected after rebooting."; @@ -137,6 +137,28 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "通信設定"; + + this.labelStaticTcpOperationMode.Text = "動作モㅡド"; + this.labelStaticTcpMode.Text = "モㅡド"; + this.labelStaticSerialBaudrate.Text = "ボㅡレㅡト"; + this.labelStaticSerialMode.Text = "モㅡド"; + this.labelHelp.Text = "※ IP Configurationの変更時には、再起動後に正常に接続されます。"; + + this.buttonTcpSave1.Text = "保存"; + this.buttonTcpSave2.Text = "保存"; + this.buttonSerialSave.Text = "保存"; + this.buttonStart.Text = "スタㅡト"; + this.buttonStop.Text = "ストップ"; + this.buttonSend.Text = "送信"; + this.buttonSerialSend.Text = "送信"; + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { diff --git a/INT69DC_7C/Forms/FormConfiguration.cs b/INT69DC_7C/Forms/FormConfiguration.cs index ee8cca5..9e8e1f6 100644 --- a/INT69DC_7C/Forms/FormConfiguration.cs +++ b/INT69DC_7C/Forms/FormConfiguration.cs @@ -72,7 +72,7 @@ namespace INT69DC_7C.Forms this.labelStaticRelayOnTime.Text = "Relay ON time"; this.labelStaticBypass.Text = "Bypass"; - this.groupBoxCount.Text = "counter"; + this.groupBoxCount.Text = "Counter"; this.labelStaticATPC.Text = "Pass alarm"; this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engScreenDisable)); @@ -259,6 +259,51 @@ namespace INT69DC_7C.Forms new Bitmap(images.GetImage(ImageDll.ButtonImages.gerDisable)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "構成"; + + this.groupBoxAutoZero.Text = "自動ゼロ"; + this.labelStaticTime.Text = "時間"; + this.labelStaticRange.Text = "範囲"; + this.labelStaticVariable.Text = "変化"; + this.labelStaticMode.Text = "モㅡド"; + + this.groupBoxOption.Text = "オプション"; + this.labelStaticDoubleEntry.Text = "二重進入"; + this.labelStaticChattering.Text = "チャタリング"; + this.labelStaticDecimalPoint.Text = "小数点"; + this.labelStaticAlarmContinuousNG.Text = "連続不良"; + this.labelStaticBuzzerOnTime.Text = "ブザㅡON時間"; + this.labelStaticRelayOnTime.Text = "リレㅡON時間"; + + this.groupBoxBypass.Text = "バイパス"; + + this.labelTitleLine1.Text = "列1"; + this.labelTitleLine2.Text = "列2"; + this.labelTitleLine3.Text = "列3"; + this.labelTitleLine4.Text = "列4"; + this.labelTitleLine5.Text = "列5"; + this.labelTitleLine6.Text = "列6"; + this.labelTitleLine7.Text = "列7"; + this.labelTitleLine8.Text = "列8"; + this.labelTitleLine9.Text = "列9"; + this.labelTitleLine10.Text = "列10"; + this.labelTitleLine11.Text = "列11"; + this.labelTitleLine12.Text = "列12"; + this.labelStaticBypass.Text = "バイパス"; + this.buttonSaveBypass.Text = "保存"; + + this.groupBoxCount.Text = "カウンタ"; + this.labelStaticATPC.Text = "パスアラㅡム"; + + this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDisable)); + this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDown)); + this.buttonScreen.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { @@ -305,6 +350,11 @@ namespace INT69DC_7C.Forms this.comboBoxZeroParameterMode.Items.Add("Modus1"); this.comboBoxZeroParameterMode.Items.Add("Modus2"); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.comboBoxZeroParameterMode.Items.Add("モㅡド1"); + this.comboBoxZeroParameterMode.Items.Add("モㅡド2"); + } else { this.comboBoxZeroParameterMode.Items.Add("Mode1"); diff --git a/INT69DC_7C/Forms/FormDataBackup.cs b/INT69DC_7C/Forms/FormDataBackup.cs index 1b07020..365ec7f 100644 --- a/INT69DC_7C/Forms/FormDataBackup.cs +++ b/INT69DC_7C/Forms/FormDataBackup.cs @@ -124,6 +124,26 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "デㅡタバックアップ"; + + this.radioButtonEnable.Text = "使用"; + this.radioButtonDisable.Text = "未使用"; + + this.labelStaticBackupEnable.Text = "バックアップ機能"; + this.labelStaticSaveFile.Text = "ファイル"; + this.labelStaticWarning1.Text = "※ 注意"; + this.labelStaticWarning2.Text = "システム内のデㅡタは削除されるUSBメモリにデㅡタをバックアップする場合"; + + this.buttonBackup.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupDisable)); + this.buttonBackup.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupDown)); + this.buttonBackup.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupUp)); + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { diff --git a/INT69DC_7C/Forms/FormDataBackup_Part11.Designer.cs b/INT69DC_7C/Forms/FormDataBackup_Part11.Designer.cs index aa63414..48588d4 100644 --- a/INT69DC_7C/Forms/FormDataBackup_Part11.Designer.cs +++ b/INT69DC_7C/Forms/FormDataBackup_Part11.Designer.cs @@ -32,11 +32,11 @@ this.smartForm1 = new SmartX.SmartForm(); this.labelTitle = new SmartX.SmartLabel(); this.buttonBack = new SmartX.SmartButton(); - this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.groupBoxInspection = new SmartX.SmartGroupBox(); this.treeViewInspection = new System.Windows.Forms.TreeView(); this.buttonInspectionBackup = new SmartX.SmartButton(); this.labelInspectionFileCount = new SmartX.SmartLabel(); - this.smartGroupBox2 = new SmartX.SmartGroupBox(); + this.groupBoxHistory = new SmartX.SmartGroupBox(); this.treeViewHistory = new System.Windows.Forms.TreeView(); this.buttonHistoryBackup = new SmartX.SmartButton(); this.labelHistoryFileCount = new SmartX.SmartLabel(); @@ -44,14 +44,14 @@ this.labelPercentage = new SmartX.SmartLabel(); this.timerEncryption = new System.Windows.Forms.Timer(); this.timerFileCopy = new System.Windows.Forms.Timer(); - this.smartGroupBox3 = new SmartX.SmartGroupBox(); + this.groupBoxOther = new SmartX.SmartGroupBox(); this.listBoxOther = new System.Windows.Forms.ListBox(); this.buttonOtherBackup = new SmartX.SmartButton(); this.labelOtherFileCount = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); - this.smartGroupBox1.SuspendLayout(); - this.smartGroupBox2.SuspendLayout(); - this.smartGroupBox3.SuspendLayout(); + this.groupBoxInspection.SuspendLayout(); + this.groupBoxHistory.SuspendLayout(); + this.groupBoxOther.SuspendLayout(); this.SuspendLayout(); // // smartForm1 @@ -119,31 +119,32 @@ this.buttonBack.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonBack.UpImage"))); this.buttonBack.Click += new System.EventHandler(this.buttonBack_Click); // - // smartGroupBox1 + // groupBoxInspection // - this.smartGroupBox1.BackPictureBox = null; - this.smartGroupBox1.BackPictureBox1 = null; - this.smartGroupBox1.Controls.Add(this.treeViewInspection); - this.smartGroupBox1.Controls.Add(this.buttonInspectionBackup); - this.smartGroupBox1.Controls.Add(this.labelInspectionFileCount); - this.smartGroupBox1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); - this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black; - this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; - this.smartGroupBox1.FrameLineThickness = 1; - this.smartGroupBox1.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; - this.smartGroupBox1.Image = null; - this.smartGroupBox1.InitVisible = true; - this.smartGroupBox1.Location = new System.Drawing.Point(0, 73); - this.smartGroupBox1.Name = "smartGroupBox1"; - this.smartGroupBox1.RoundRadius = 5; - this.smartGroupBox1.Size = new System.Drawing.Size(341, 587); - this.smartGroupBox1.TabIndex = 3; - this.smartGroupBox1.Text = "Inspection"; - this.smartGroupBox1.TextColor = System.Drawing.Color.Black; + this.groupBoxInspection.BackPictureBox = null; + this.groupBoxInspection.BackPictureBox1 = null; + this.groupBoxInspection.Controls.Add(this.treeViewInspection); + this.groupBoxInspection.Controls.Add(this.buttonInspectionBackup); + this.groupBoxInspection.Controls.Add(this.labelInspectionFileCount); + this.groupBoxInspection.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.groupBoxInspection.FrameLineColor1 = System.Drawing.Color.Black; + this.groupBoxInspection.FrameLineColor2 = System.Drawing.Color.Black; + this.groupBoxInspection.FrameLineThickness = 1; + this.groupBoxInspection.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; + this.groupBoxInspection.Image = null; + this.groupBoxInspection.InitVisible = true; + this.groupBoxInspection.Location = new System.Drawing.Point(0, 73); + this.groupBoxInspection.Name = "groupBoxInspection"; + this.groupBoxInspection.RoundRadius = 5; + this.groupBoxInspection.Size = new System.Drawing.Size(341, 587); + this.groupBoxInspection.TabIndex = 3; + this.groupBoxInspection.Text = "Inspection"; + this.groupBoxInspection.TextColor = System.Drawing.Color.Black; // // treeViewInspection // this.treeViewInspection.CheckBoxes = true; + this.treeViewInspection.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular); this.treeViewInspection.Location = new System.Drawing.Point(19, 82); this.treeViewInspection.Name = "treeViewInspection"; this.treeViewInspection.Size = new System.Drawing.Size(300, 485); @@ -200,31 +201,32 @@ this.labelInspectionFileCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelInspectionFileCount.Wordwrap = false; // - // smartGroupBox2 + // groupBoxHistory // - this.smartGroupBox2.BackPictureBox = null; - this.smartGroupBox2.BackPictureBox1 = null; - this.smartGroupBox2.Controls.Add(this.treeViewHistory); - this.smartGroupBox2.Controls.Add(this.buttonHistoryBackup); - this.smartGroupBox2.Controls.Add(this.labelHistoryFileCount); - this.smartGroupBox2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); - this.smartGroupBox2.FrameLineColor1 = System.Drawing.Color.Black; - this.smartGroupBox2.FrameLineColor2 = System.Drawing.Color.Black; - this.smartGroupBox2.FrameLineThickness = 1; - this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; - this.smartGroupBox2.Image = null; - this.smartGroupBox2.InitVisible = true; - this.smartGroupBox2.Location = new System.Drawing.Point(341, 73); - this.smartGroupBox2.Name = "smartGroupBox2"; - this.smartGroupBox2.RoundRadius = 5; - this.smartGroupBox2.Size = new System.Drawing.Size(342, 587); - this.smartGroupBox2.TabIndex = 4; - this.smartGroupBox2.Text = "History"; - this.smartGroupBox2.TextColor = System.Drawing.Color.Black; + this.groupBoxHistory.BackPictureBox = null; + this.groupBoxHistory.BackPictureBox1 = null; + this.groupBoxHistory.Controls.Add(this.treeViewHistory); + this.groupBoxHistory.Controls.Add(this.buttonHistoryBackup); + this.groupBoxHistory.Controls.Add(this.labelHistoryFileCount); + this.groupBoxHistory.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.groupBoxHistory.FrameLineColor1 = System.Drawing.Color.Black; + this.groupBoxHistory.FrameLineColor2 = System.Drawing.Color.Black; + this.groupBoxHistory.FrameLineThickness = 1; + this.groupBoxHistory.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; + this.groupBoxHistory.Image = null; + this.groupBoxHistory.InitVisible = true; + this.groupBoxHistory.Location = new System.Drawing.Point(341, 73); + this.groupBoxHistory.Name = "groupBoxHistory"; + this.groupBoxHistory.RoundRadius = 5; + this.groupBoxHistory.Size = new System.Drawing.Size(342, 587); + this.groupBoxHistory.TabIndex = 4; + this.groupBoxHistory.Text = "History"; + this.groupBoxHistory.TextColor = System.Drawing.Color.Black; // // treeViewHistory // this.treeViewHistory.CheckBoxes = true; + this.treeViewHistory.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular); this.treeViewHistory.Location = new System.Drawing.Point(19, 82); this.treeViewHistory.Name = "treeViewHistory"; this.treeViewHistory.Size = new System.Drawing.Size(300, 485); @@ -325,33 +327,34 @@ // this.timerFileCopy.Tick += new System.EventHandler(this.timerFileCopy_Tick); // - // smartGroupBox3 + // groupBoxOther // - this.smartGroupBox3.BackPictureBox = null; - this.smartGroupBox3.BackPictureBox1 = null; - this.smartGroupBox3.Controls.Add(this.listBoxOther); - this.smartGroupBox3.Controls.Add(this.buttonOtherBackup); - this.smartGroupBox3.Controls.Add(this.labelOtherFileCount); - this.smartGroupBox3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); - this.smartGroupBox3.FrameLineColor1 = System.Drawing.Color.Black; - this.smartGroupBox3.FrameLineColor2 = System.Drawing.Color.Black; - this.smartGroupBox3.FrameLineThickness = 1; - this.smartGroupBox3.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; - this.smartGroupBox3.Image = null; - this.smartGroupBox3.InitVisible = true; - this.smartGroupBox3.Location = new System.Drawing.Point(683, 73); - this.smartGroupBox3.Name = "smartGroupBox3"; - this.smartGroupBox3.RoundRadius = 5; - this.smartGroupBox3.Size = new System.Drawing.Size(341, 587); - this.smartGroupBox3.TabIndex = 5; - this.smartGroupBox3.Text = "Other"; - this.smartGroupBox3.TextColor = System.Drawing.Color.Black; + this.groupBoxOther.BackPictureBox = null; + this.groupBoxOther.BackPictureBox1 = null; + this.groupBoxOther.Controls.Add(this.listBoxOther); + this.groupBoxOther.Controls.Add(this.buttonOtherBackup); + this.groupBoxOther.Controls.Add(this.labelOtherFileCount); + this.groupBoxOther.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.groupBoxOther.FrameLineColor1 = System.Drawing.Color.Black; + this.groupBoxOther.FrameLineColor2 = System.Drawing.Color.Black; + this.groupBoxOther.FrameLineThickness = 1; + this.groupBoxOther.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; + this.groupBoxOther.Image = null; + this.groupBoxOther.InitVisible = true; + this.groupBoxOther.Location = new System.Drawing.Point(683, 73); + this.groupBoxOther.Name = "groupBoxOther"; + this.groupBoxOther.RoundRadius = 5; + this.groupBoxOther.Size = new System.Drawing.Size(341, 587); + this.groupBoxOther.TabIndex = 5; + this.groupBoxOther.Text = "Other"; + this.groupBoxOther.TextColor = System.Drawing.Color.Black; // // listBoxOther // + this.listBoxOther.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular); this.listBoxOther.Location = new System.Drawing.Point(19, 82); this.listBoxOther.Name = "listBoxOther"; - this.listBoxOther.Size = new System.Drawing.Size(300, 482); + this.listBoxOther.Size = new System.Drawing.Size(300, 477); this.listBoxOther.TabIndex = 25; // // buttonOtherBackup @@ -410,20 +413,20 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(1024, 768); - this.Controls.Add(this.smartGroupBox3); + this.Controls.Add(this.groupBoxOther); this.Controls.Add(this.labelPercentage); this.Controls.Add(this.labelFileName); - this.Controls.Add(this.smartGroupBox2); - this.Controls.Add(this.smartGroupBox1); + this.Controls.Add(this.groupBoxHistory); + this.Controls.Add(this.groupBoxInspection); this.Controls.Add(this.buttonBack); this.Controls.Add(this.labelTitle); this.Controls.Add(this.smartForm1); this.Name = "FormDataBackup_Part11"; this.Text = "FormDataBackup_Part11"; ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).EndInit(); - this.smartGroupBox1.ResumeLayout(false); - this.smartGroupBox2.ResumeLayout(false); - this.smartGroupBox3.ResumeLayout(false); + this.groupBoxInspection.ResumeLayout(false); + this.groupBoxHistory.ResumeLayout(false); + this.groupBoxOther.ResumeLayout(false); this.ResumeLayout(false); } @@ -433,8 +436,8 @@ private SmartX.SmartForm smartForm1; private SmartX.SmartLabel labelTitle; private SmartX.SmartButton buttonBack; - private SmartX.SmartGroupBox smartGroupBox1; - private SmartX.SmartGroupBox smartGroupBox2; + private SmartX.SmartGroupBox groupBoxInspection; + private SmartX.SmartGroupBox groupBoxHistory; private SmartX.SmartLabel labelInspectionFileCount; private SmartX.SmartButton buttonInspectionBackup; private SmartX.SmartLabel labelHistoryFileCount; @@ -445,7 +448,7 @@ private SmartX.SmartLabel labelPercentage; private System.Windows.Forms.Timer timerEncryption; private System.Windows.Forms.Timer timerFileCopy; - private SmartX.SmartGroupBox smartGroupBox3; + private SmartX.SmartGroupBox groupBoxOther; private SmartX.SmartButton buttonOtherBackup; private SmartX.SmartLabel labelOtherFileCount; private System.Windows.Forms.ListBox listBoxOther; diff --git a/INT69DC_7C/Forms/FormDataBackup_Part11.cs b/INT69DC_7C/Forms/FormDataBackup_Part11.cs index 8f98cc3..6c9776a 100644 --- a/INT69DC_7C/Forms/FormDataBackup_Part11.cs +++ b/INT69DC_7C/Forms/FormDataBackup_Part11.cs @@ -92,6 +92,18 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "デㅡタバックアップ"; + + this.groupBoxInspection.Text = "判定ログ"; + this.groupBoxHistory.Text = "履歴ログ"; + this.groupBoxOther.Text = "その他"; + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { diff --git a/INT69DC_7C/Forms/FormDataStatistics.cs b/INT69DC_7C/Forms/FormDataStatistics.cs index a53ee40..45ca348 100644 --- a/INT69DC_7C/Forms/FormDataStatistics.cs +++ b/INT69DC_7C/Forms/FormDataStatistics.cs @@ -121,7 +121,7 @@ namespace INT69DC_7C.Forms this.labelTitleTotalCnt.Text = "전체수량[ea]"; this.labelTitleTotalNgCnt.Text = "전체불량[ea]"; - this.labelTitleExngCnt.Font = new Font("New Gulim", 9F, FontStyle.Bold); + this.labelTitleExngCnt.Font = new Font("새굴림", 9F, FontStyle.Bold); } else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) { @@ -199,6 +199,26 @@ namespace INT69DC_7C.Forms this.buttonPrinter.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engPrintDown)); this.buttonPrinter.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engPrintUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "デㅡタ統計"; + + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupUp)); + + this.buttonFileSelect.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFileSelectDisable)); + this.buttonFileSelect.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFileSelectDown)); + this.buttonFileSelect.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFileSelectUp)); + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + + this.buttonPrinter.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnPrintDisable)); + this.buttonPrinter.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnPrintDown)); + this.buttonPrinter.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnPrintUp)); + } else { diff --git a/INT69DC_7C/Forms/FormDataViewer.Designer.cs b/INT69DC_7C/Forms/FormDataViewer.Designer.cs index 90c93c9..5117365 100644 --- a/INT69DC_7C/Forms/FormDataViewer.Designer.cs +++ b/INT69DC_7C/Forms/FormDataViewer.Designer.cs @@ -643,6 +643,7 @@ this.smartLabel8.BackPictureBox2 = null; this.smartLabel8.BorderColor = System.Drawing.Color.Black; this.smartLabel8.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel8.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.smartLabel8.ForeColor = System.Drawing.Color.White; this.smartLabel8.InitVisible = true; this.smartLabel8.LineSpacing = 0F; @@ -663,6 +664,7 @@ this.smartLabel7.BackPictureBox2 = null; this.smartLabel7.BorderColor = System.Drawing.Color.Black; this.smartLabel7.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel7.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.smartLabel7.ForeColor = System.Drawing.Color.White; this.smartLabel7.InitVisible = true; this.smartLabel7.LineSpacing = 0F; @@ -683,6 +685,7 @@ 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("새굴림", 10F, System.Drawing.FontStyle.Regular); this.smartLabel6.ForeColor = System.Drawing.Color.White; this.smartLabel6.InitVisible = true; this.smartLabel6.LineSpacing = 0F; @@ -703,6 +706,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.ForeColor = System.Drawing.Color.White; this.smartLabel5.InitVisible = true; this.smartLabel5.LineSpacing = 0F; @@ -723,6 +727,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.ForeColor = System.Drawing.Color.White; this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; @@ -743,6 +748,7 @@ 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.Regular); this.smartLabel3.ForeColor = System.Drawing.Color.White; this.smartLabel3.InitVisible = true; this.smartLabel3.LineSpacing = 0F; @@ -763,6 +769,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.ForeColor = System.Drawing.Color.White; this.smartLabel2.InitVisible = true; this.smartLabel2.LineSpacing = 0F; diff --git a/INT69DC_7C/Forms/FormDataViewer.cs b/INT69DC_7C/Forms/FormDataViewer.cs index 67c0b07..bd6af96 100644 --- a/INT69DC_7C/Forms/FormDataViewer.cs +++ b/INT69DC_7C/Forms/FormDataViewer.cs @@ -143,6 +143,23 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "デㅡタビュㅡア"; + + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveUp)); + this.buttonFilter.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFilterDisable)); + this.buttonFilter.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFilterDown)); + this.buttonFilter.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFilterUp)); + this.buttonFileSelect.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFileSelectDisable)); + this.buttonFileSelect.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFileSelectDown)); + this.buttonFileSelect.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFileSelectUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { diff --git a/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs b/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs index bbab14c..969a175 100644 --- a/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs +++ b/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs @@ -33,18 +33,18 @@ this.groupBoxSpecialMenu = new SmartX.SmartGroupBox(); this.buttonSerialDLL = new SmartX.SmartButton(); this.labelStaticSerialDll = new SmartX.SmartLabel(); - this.smartLabel5 = new SmartX.SmartLabel(); - this.smartLabel6 = new SmartX.SmartLabel(); + this.labelTitleCautionLogin = new SmartX.SmartLabel(); + this.labelTitleMonths = new SmartX.SmartLabel(); this.labelDataStoragePeriod = new SmartX.SmartLabel(); this.labelStaticDataStoragePeriod = new SmartX.SmartLabel(); - this.smartLabel4 = new SmartX.SmartLabel(); + this.labelTitleCautionIntegratedTransmission = new SmartX.SmartLabel(); this.buttonIntegratedTransmission = new SmartX.SmartButton(); this.labelStaticIntegratedTransmission = new SmartX.SmartLabel(); this.comboBoxStepMotorType = new System.Windows.Forms.ComboBox(); this.labelTitleStepMotorType = new SmartX.SmartLabel(); this.buttonLogin = new SmartX.SmartButton(); this.labelStaticLogin = new SmartX.SmartLabel(); - this.smartLabel2 = new SmartX.SmartLabel(); + this.labelTitleCautionIndividualTransmission = new SmartX.SmartLabel(); this.buttonIndividualTransmission = new SmartX.SmartButton(); this.labelStaticIndividualTransmission = new SmartX.SmartLabel(); this.buttonEmergencyStopEntrySensorError = new SmartX.SmartButton(); @@ -53,6 +53,7 @@ this.comboBoxInputSensorSelect = new System.Windows.Forms.ComboBox(); this.buttonSave = new SmartX.SmartButton(); this.panel7 = new System.Windows.Forms.Panel(); + this.radioButtonLanguageJapanese = new System.Windows.Forms.RadioButton(); this.radioButtonLanguageGerman = new System.Windows.Forms.RadioButton(); this.radioButtonLanguageCzech = new System.Windows.Forms.RadioButton(); this.radioButtonLanguageChinese = new System.Windows.Forms.RadioButton(); @@ -63,8 +64,8 @@ this.radioButtonWeightViewForward = new System.Windows.Forms.RadioButton(); this.labelStaticInputSensorSelect = new SmartX.SmartLabel(); this.labelBuadrateWarning2 = new SmartX.SmartLabel(); - this.smartLabel3 = new SmartX.SmartLabel(); - this.smartLabel1 = new SmartX.SmartLabel(); + this.labelTitleCautionInputSensorSelect = new SmartX.SmartLabel(); + this.labelTitleCautionIndividualNG = new SmartX.SmartLabel(); this.labelBuadrateWarning = new SmartX.SmartLabel(); this.panel5 = new System.Windows.Forms.Panel(); this.radioButtonImpellerMotorBaudrate115200 = new System.Windows.Forms.RadioButton(); @@ -103,7 +104,6 @@ this.labelStaticLine = new SmartX.SmartLabel(); this.labelStaticEquipmentID = new SmartX.SmartLabel(); this.labelTitle = new SmartX.SmartLabel(); - this.radioButtonLanguageJapanese = new System.Windows.Forms.RadioButton(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.groupBoxSpecialMenu.SuspendLayout(); this.panel7.SuspendLayout(); @@ -136,18 +136,18 @@ this.groupBoxSpecialMenu.BackPictureBox1 = null; this.groupBoxSpecialMenu.Controls.Add(this.buttonSerialDLL); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticSerialDll); - this.groupBoxSpecialMenu.Controls.Add(this.smartLabel5); - this.groupBoxSpecialMenu.Controls.Add(this.smartLabel6); + this.groupBoxSpecialMenu.Controls.Add(this.labelTitleCautionLogin); + this.groupBoxSpecialMenu.Controls.Add(this.labelTitleMonths); this.groupBoxSpecialMenu.Controls.Add(this.labelDataStoragePeriod); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticDataStoragePeriod); - this.groupBoxSpecialMenu.Controls.Add(this.smartLabel4); + this.groupBoxSpecialMenu.Controls.Add(this.labelTitleCautionIntegratedTransmission); this.groupBoxSpecialMenu.Controls.Add(this.buttonIntegratedTransmission); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticIntegratedTransmission); this.groupBoxSpecialMenu.Controls.Add(this.comboBoxStepMotorType); this.groupBoxSpecialMenu.Controls.Add(this.labelTitleStepMotorType); this.groupBoxSpecialMenu.Controls.Add(this.buttonLogin); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticLogin); - this.groupBoxSpecialMenu.Controls.Add(this.smartLabel2); + this.groupBoxSpecialMenu.Controls.Add(this.labelTitleCautionIndividualTransmission); this.groupBoxSpecialMenu.Controls.Add(this.buttonIndividualTransmission); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticIndividualTransmission); this.groupBoxSpecialMenu.Controls.Add(this.buttonEmergencyStopEntrySensorError); @@ -159,8 +159,8 @@ this.groupBoxSpecialMenu.Controls.Add(this.panel2); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticInputSensorSelect); this.groupBoxSpecialMenu.Controls.Add(this.labelBuadrateWarning2); - this.groupBoxSpecialMenu.Controls.Add(this.smartLabel3); - this.groupBoxSpecialMenu.Controls.Add(this.smartLabel1); + this.groupBoxSpecialMenu.Controls.Add(this.labelTitleCautionInputSensorSelect); + this.groupBoxSpecialMenu.Controls.Add(this.labelTitleCautionIndividualNG); this.groupBoxSpecialMenu.Controls.Add(this.labelBuadrateWarning); this.groupBoxSpecialMenu.Controls.Add(this.panel5); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticImpellerBaudrate); @@ -247,45 +247,45 @@ this.labelStaticSerialDll.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelStaticSerialDll.Wordwrap = false; // - // smartLabel5 + // labelTitleCautionLogin // - 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("새굴림", 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(509, 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; + this.labelTitleCautionLogin.BackColor = System.Drawing.Color.Silver; + this.labelTitleCautionLogin.BackPictureBox = this.smartForm1; + this.labelTitleCautionLogin.BackPictureBox1 = null; + this.labelTitleCautionLogin.BackPictureBox2 = null; + this.labelTitleCautionLogin.BorderColor = System.Drawing.Color.Black; + this.labelTitleCautionLogin.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleCautionLogin.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleCautionLogin.ForeColor = System.Drawing.Color.DarkRed; + this.labelTitleCautionLogin.InitVisible = true; + this.labelTitleCautionLogin.LineSpacing = 0F; + this.labelTitleCautionLogin.Location = new System.Drawing.Point(574, 493); + this.labelTitleCautionLogin.Name = "labelTitleCautionLogin"; + this.labelTitleCautionLogin.Size = new System.Drawing.Size(377, 25); + this.labelTitleCautionLogin.TabIndex = 229; + this.labelTitleCautionLogin.Text = "OFF : delete user list"; + this.labelTitleCautionLogin.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleCautionLogin.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleCautionLogin.Wordwrap = false; // - // smartLabel6 + // labelTitleMonths // - this.smartLabel6.BackPictureBox = this.smartForm1; - this.smartLabel6.BackPictureBox1 = null; - this.smartLabel6.BackPictureBox2 = null; - this.smartLabel6.BorderColor = System.Drawing.Color.Black; - this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel6.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.smartLabel6.InitVisible = true; - this.smartLabel6.LineSpacing = 0F; - this.smartLabel6.Location = new System.Drawing.Point(490, 344); - this.smartLabel6.Name = "smartLabel6"; - this.smartLabel6.Size = new System.Drawing.Size(100, 25); - this.smartLabel6.TabIndex = 221; - this.smartLabel6.Text = "months"; - this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel6.Wordwrap = false; + this.labelTitleMonths.BackPictureBox = this.smartForm1; + this.labelTitleMonths.BackPictureBox1 = null; + this.labelTitleMonths.BackPictureBox2 = null; + this.labelTitleMonths.BorderColor = System.Drawing.Color.Black; + this.labelTitleMonths.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleMonths.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleMonths.InitVisible = true; + this.labelTitleMonths.LineSpacing = 0F; + this.labelTitleMonths.Location = new System.Drawing.Point(490, 344); + this.labelTitleMonths.Name = "labelTitleMonths"; + this.labelTitleMonths.Size = new System.Drawing.Size(100, 25); + this.labelTitleMonths.TabIndex = 221; + this.labelTitleMonths.Text = "months"; + this.labelTitleMonths.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleMonths.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleMonths.Wordwrap = false; // // labelDataStoragePeriod // @@ -327,26 +327,26 @@ this.labelStaticDataStoragePeriod.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelStaticDataStoragePeriod.Wordwrap = false; // - // smartLabel4 + // labelTitleCautionIntegratedTransmission // - this.smartLabel4.BackColor = System.Drawing.Color.Silver; - this.smartLabel4.BackPictureBox = this.smartForm1; - this.smartLabel4.BackPictureBox1 = null; - 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.DarkRed; - this.smartLabel4.InitVisible = true; - this.smartLabel4.LineSpacing = 0F; - this.smartLabel4.Location = new System.Drawing.Point(588, 127); - this.smartLabel4.Name = "smartLabel4"; - this.smartLabel4.Size = new System.Drawing.Size(262, 25); - this.smartLabel4.TabIndex = 211; - this.smartLabel4.Text = "Active Only Stick II (OPT2,3,5)"; - this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel4.Wordwrap = false; + this.labelTitleCautionIntegratedTransmission.BackColor = System.Drawing.Color.Silver; + this.labelTitleCautionIntegratedTransmission.BackPictureBox = this.smartForm1; + this.labelTitleCautionIntegratedTransmission.BackPictureBox1 = null; + this.labelTitleCautionIntegratedTransmission.BackPictureBox2 = null; + this.labelTitleCautionIntegratedTransmission.BorderColor = System.Drawing.Color.Black; + this.labelTitleCautionIntegratedTransmission.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleCautionIntegratedTransmission.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleCautionIntegratedTransmission.ForeColor = System.Drawing.Color.DarkRed; + this.labelTitleCautionIntegratedTransmission.InitVisible = true; + this.labelTitleCautionIntegratedTransmission.LineSpacing = 0F; + this.labelTitleCautionIntegratedTransmission.Location = new System.Drawing.Point(574, 127); + this.labelTitleCautionIntegratedTransmission.Name = "labelTitleCautionIntegratedTransmission"; + this.labelTitleCautionIntegratedTransmission.Size = new System.Drawing.Size(377, 25); + this.labelTitleCautionIntegratedTransmission.TabIndex = 211; + this.labelTitleCautionIntegratedTransmission.Text = "Active Only Stick II (OPT2,3,5)"; + this.labelTitleCautionIntegratedTransmission.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleCautionIntegratedTransmission.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleCautionIntegratedTransmission.Wordwrap = false; // // buttonIntegratedTransmission // @@ -476,26 +476,26 @@ this.labelStaticLogin.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelStaticLogin.Wordwrap = false; // - // smartLabel2 + // labelTitleCautionIndividualTransmission // - this.smartLabel2.BackColor = System.Drawing.Color.Silver; - this.smartLabel2.BackPictureBox = this.smartForm1; - this.smartLabel2.BackPictureBox1 = null; - 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.DarkRed; - this.smartLabel2.InitVisible = true; - this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(588, 158); - this.smartLabel2.Name = "smartLabel2"; - this.smartLabel2.Size = new System.Drawing.Size(262, 25); - this.smartLabel2.TabIndex = 182; - this.smartLabel2.Text = "Active Only Stick I, III"; - this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel2.Wordwrap = false; + this.labelTitleCautionIndividualTransmission.BackColor = System.Drawing.Color.Silver; + this.labelTitleCautionIndividualTransmission.BackPictureBox = this.smartForm1; + this.labelTitleCautionIndividualTransmission.BackPictureBox1 = null; + this.labelTitleCautionIndividualTransmission.BackPictureBox2 = null; + this.labelTitleCautionIndividualTransmission.BorderColor = System.Drawing.Color.Black; + this.labelTitleCautionIndividualTransmission.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleCautionIndividualTransmission.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleCautionIndividualTransmission.ForeColor = System.Drawing.Color.DarkRed; + this.labelTitleCautionIndividualTransmission.InitVisible = true; + this.labelTitleCautionIndividualTransmission.LineSpacing = 0F; + this.labelTitleCautionIndividualTransmission.Location = new System.Drawing.Point(574, 158); + this.labelTitleCautionIndividualTransmission.Name = "labelTitleCautionIndividualTransmission"; + this.labelTitleCautionIndividualTransmission.Size = new System.Drawing.Size(377, 25); + this.labelTitleCautionIndividualTransmission.TabIndex = 182; + this.labelTitleCautionIndividualTransmission.Text = "Active Only Stick I, III"; + this.labelTitleCautionIndividualTransmission.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleCautionIndividualTransmission.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleCautionIndividualTransmission.Wordwrap = false; // // buttonIndividualTransmission // @@ -630,10 +630,10 @@ // // comboBoxInputSensorSelect // - this.comboBoxInputSensorSelect.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.comboBoxInputSensorSelect.Location = new System.Drawing.Point(400, 189); + this.comboBoxInputSensorSelect.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Bold); + this.comboBoxInputSensorSelect.Location = new System.Drawing.Point(400, 186); this.comboBoxInputSensorSelect.Name = "comboBoxInputSensorSelect"; - this.comboBoxInputSensorSelect.Size = new System.Drawing.Size(162, 25); + this.comboBoxInputSensorSelect.Size = new System.Drawing.Size(162, 29); this.comboBoxInputSensorSelect.TabIndex = 146; this.comboBoxInputSensorSelect.SelectedIndexChanged += new System.EventHandler(this.control_Click); // @@ -681,6 +681,17 @@ this.panel7.Name = "panel7"; this.panel7.Size = new System.Drawing.Size(551, 50); // + // radioButtonLanguageJapanese + // + this.radioButtonLanguageJapanese.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.radioButtonLanguageJapanese.Location = new System.Drawing.Point(272, 3); + this.radioButtonLanguageJapanese.Name = "radioButtonLanguageJapanese"; + this.radioButtonLanguageJapanese.Size = new System.Drawing.Size(120, 20); + this.radioButtonLanguageJapanese.TabIndex = 7; + this.radioButtonLanguageJapanese.TabStop = false; + this.radioButtonLanguageJapanese.Text = "日本語"; + this.radioButtonLanguageJapanese.Click += new System.EventHandler(this.control_Click); + // // radioButtonLanguageGerman // this.radioButtonLanguageGerman.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); @@ -806,47 +817,47 @@ this.labelBuadrateWarning2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelBuadrateWarning2.Wordwrap = false; // - // smartLabel3 + // labelTitleCautionInputSensorSelect // - 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("새굴림", 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(588, 189); - this.smartLabel3.Name = "smartLabel3"; - this.smartLabel3.Size = new System.Drawing.Size(262, 25); - this.smartLabel3.TabIndex = 138; - this.smartLabel3.Text = "Active Only Stick I, III"; - this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel3.Wordwrap = false; + this.labelTitleCautionInputSensorSelect.BackColor = System.Drawing.Color.Silver; + this.labelTitleCautionInputSensorSelect.BackPictureBox = this.smartForm1; + this.labelTitleCautionInputSensorSelect.BackPictureBox1 = null; + this.labelTitleCautionInputSensorSelect.BackPictureBox2 = null; + this.labelTitleCautionInputSensorSelect.BorderColor = System.Drawing.Color.Black; + this.labelTitleCautionInputSensorSelect.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleCautionInputSensorSelect.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleCautionInputSensorSelect.ForeColor = System.Drawing.Color.DarkRed; + this.labelTitleCautionInputSensorSelect.InitVisible = true; + this.labelTitleCautionInputSensorSelect.LineSpacing = 0F; + this.labelTitleCautionInputSensorSelect.Location = new System.Drawing.Point(574, 189); + this.labelTitleCautionInputSensorSelect.Name = "labelTitleCautionInputSensorSelect"; + this.labelTitleCautionInputSensorSelect.Size = new System.Drawing.Size(377, 25); + this.labelTitleCautionInputSensorSelect.TabIndex = 138; + this.labelTitleCautionInputSensorSelect.Text = "Active Only Stick I, III"; + this.labelTitleCautionInputSensorSelect.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleCautionInputSensorSelect.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleCautionInputSensorSelect.Wordwrap = false; // - // smartLabel1 + // labelTitleCautionIndividualNG // - this.smartLabel1.BackColor = System.Drawing.Color.Silver; - this.smartLabel1.BackPictureBox = this.smartForm1; - this.smartLabel1.BackPictureBox1 = null; - 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.DarkRed; - this.smartLabel1.InitVisible = true; - this.smartLabel1.LineSpacing = 0F; - this.smartLabel1.Location = new System.Drawing.Point(588, 96); - this.smartLabel1.Name = "smartLabel1"; - this.smartLabel1.Size = new System.Drawing.Size(262, 25); - this.smartLabel1.TabIndex = 138; - this.smartLabel1.Text = "Active Only Stick I"; - this.smartLabel1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel1.Wordwrap = false; + this.labelTitleCautionIndividualNG.BackColor = System.Drawing.Color.Silver; + this.labelTitleCautionIndividualNG.BackPictureBox = this.smartForm1; + this.labelTitleCautionIndividualNG.BackPictureBox1 = null; + this.labelTitleCautionIndividualNG.BackPictureBox2 = null; + this.labelTitleCautionIndividualNG.BorderColor = System.Drawing.Color.Black; + this.labelTitleCautionIndividualNG.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleCautionIndividualNG.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleCautionIndividualNG.ForeColor = System.Drawing.Color.DarkRed; + this.labelTitleCautionIndividualNG.InitVisible = true; + this.labelTitleCautionIndividualNG.LineSpacing = 0F; + this.labelTitleCautionIndividualNG.Location = new System.Drawing.Point(574, 96); + this.labelTitleCautionIndividualNG.Name = "labelTitleCautionIndividualNG"; + this.labelTitleCautionIndividualNG.Size = new System.Drawing.Size(377, 25); + this.labelTitleCautionIndividualNG.TabIndex = 138; + this.labelTitleCautionIndividualNG.Text = "Active Only Stick I"; + this.labelTitleCautionIndividualNG.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleCautionIndividualNG.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleCautionIndividualNG.Wordwrap = false; // // labelBuadrateWarning // @@ -1424,16 +1435,6 @@ this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitle.Wordwrap = false; // - // radioButtonLanguageJapanese - // - this.radioButtonLanguageJapanese.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); - this.radioButtonLanguageJapanese.Location = new System.Drawing.Point(272, 3); - this.radioButtonLanguageJapanese.Name = "radioButtonLanguageJapanese"; - this.radioButtonLanguageJapanese.Size = new System.Drawing.Size(120, 20); - this.radioButtonLanguageJapanese.TabIndex = 7; - this.radioButtonLanguageJapanese.TabStop = false; - this.radioButtonLanguageJapanese.Text = "日本語"; - // // FormEquipmentSetting // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -1502,11 +1503,11 @@ private SmartX.SmartLabel labelStaticLine; private SmartX.SmartLabel labelStaticEquipmentID; private SmartX.SmartLabel labelTitle; - private SmartX.SmartLabel smartLabel1; + private SmartX.SmartLabel labelTitleCautionIndividualNG; public System.Windows.Forms.RadioButton radioButtonEquipmentModeStick2; private System.Windows.Forms.ComboBox comboBoxInputSensorSelect; private SmartX.SmartLabel labelStaticInputSensorSelect; - private SmartX.SmartLabel smartLabel3; + private SmartX.SmartLabel labelTitleCautionInputSensorSelect; private System.Windows.Forms.Panel panel8; public System.Windows.Forms.RadioButton radioButtonFeedingConveyorRunNg; public System.Windows.Forms.RadioButton radioButtonFeedingConveyorRunPass; @@ -1521,16 +1522,16 @@ private SmartX.SmartLabel labelStaticIndividualTransmission; private SmartX.SmartLabel labelStaticLogin; private SmartX.SmartButton buttonLogin; - private SmartX.SmartLabel smartLabel2; + private SmartX.SmartLabel labelTitleCautionIndividualTransmission; private System.Windows.Forms.ComboBox comboBoxStepMotorType; private SmartX.SmartLabel labelTitleStepMotorType; - private SmartX.SmartLabel smartLabel4; + private SmartX.SmartLabel labelTitleCautionIntegratedTransmission; private SmartX.SmartButton buttonIntegratedTransmission; private SmartX.SmartLabel labelStaticIntegratedTransmission; - private SmartX.SmartLabel smartLabel6; + private SmartX.SmartLabel labelTitleMonths; public SmartX.SmartLabel labelDataStoragePeriod; private SmartX.SmartLabel labelStaticDataStoragePeriod; - private SmartX.SmartLabel smartLabel5; + private SmartX.SmartLabel labelTitleCautionLogin; public System.Windows.Forms.RadioButton radioButtonEquipmentModeDual; private SmartX.SmartButton buttonSerialDLL; private SmartX.SmartLabel labelStaticSerialDll; diff --git a/INT69DC_7C/Forms/FormEquipmentSetting.cs b/INT69DC_7C/Forms/FormEquipmentSetting.cs index 2170e76..2288127 100644 --- a/INT69DC_7C/Forms/FormEquipmentSetting.cs +++ b/INT69DC_7C/Forms/FormEquipmentSetting.cs @@ -119,9 +119,9 @@ namespace INT69DC_7C.Forms this.labelBuadrateWarning.Text = "※ 电源重启后，设置会自动更新"; this.labelBuadrateWarning2.Text = "※ 除了工程师之外，不要改变这个值"; - this.smartLabel1.Text = "球杆-I"; - this.smartLabel2.Text = this.smartLabel3.Text = "球杆-I,III"; - this.smartLabel4.Text = "球杆-II"; + this.labelTitleCautionIndividualNG.Text = "球杆-I"; + this.labelTitleCautionIndividualTransmission.Text = this.labelTitleCautionInputSensorSelect.Text = "球杆-I,III"; + this.labelTitleCautionIntegratedTransmission.Text = "球杆-II"; this.buttonEachNG.DownImage = this.buttonLogin.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnEnable)); this.buttonEachNG.UpImage = this.buttonLogin.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnDisable)); @@ -226,6 +226,57 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "装置設定"; + + this.labelStaticType.Text = "タイプ"; + this.labelStaticLine.Text = "ライン"; + this.labelStaticOrder.Text = "重量表示"; + this.labelStaticIndividualNG.Text = "個別NG"; + this.labelStaticIndividualTransmission.Text = "個別搬送"; + this.labelStaticRejectCV.Text = "排出コンベア"; + this.labelStaticFeedingCV.Text = "供給コンベア"; + this.labelStaticEquipmentID.Text = "装置ID"; + this.labelStaticDataStoragePeriod.Text = "保管期間"; + this.labelStaticImpellerBaudrate.Text = "ステップモㅡタㅡボㅡレㅡト"; + this.labelStaticImpellerRotation.Text = "ステップモㅡタㅡ回転"; + this.labelStaticLanguage.Text = "言語"; + this.labelStaticInputSensorSelect.Text = "入力センサㅡの選択"; + this.labelStaticEmergencyStopEntrySensorError.Text = "入力センサエラㅡにより停止しました。"; + this.labelStaticLogin.Text = "ログイン"; + this.labelTitleStepMotorType.Text = "ステップモㅡタㅡタイプ"; + this.labelStaticIntegratedTransmission.Text = "統合搬送"; + this.labelTitleMonths.Text = "月"; + this.labelTitleCautionLogin.Text = "OFF時、ユㅡザㅡリストは削除されます。"; + + this.radioButtonEquipmentModeConveyor.Font = new Font("새굴림", 9, FontStyle.Bold); + this.radioButtonEquipmentModeConveyor.Text = "コンベア"; + this.radioButtonEquipmentModeStick1.Font = new Font("새굴림", 9, FontStyle.Bold); + this.radioButtonEquipmentModeStick1.Text = "スティックI"; + this.radioButtonEquipmentModeStick2.Font = new Font("새굴림", 9, FontStyle.Bold); + this.radioButtonEquipmentModeStick2.Text = "スティックII"; + this.radioButtonEquipmentModeStick3.Font = new Font("새굴림", 9, FontStyle.Bold); + this.radioButtonEquipmentModeStick3.Text = "スティックIII"; + this.radioButtonEquipmentModeDual.Font = new Font("새굴림", 10, FontStyle.Bold); + this.radioButtonEquipmentModeDual.Text = "両型"; + + this.labelTitleCautionIndividualNG.Text = "スティック1モㅡドでのみ有効"; + this.labelTitleCautionIntegratedTransmission.Text = "スティック2モㅡド(OPT2,3,5)でのみ有効"; + this.labelTitleCautionIndividualTransmission.Text = "スティック1,3モㅡドでのみ有効"; + this.labelTitleCautionInputSensorSelect.Text = "スティック1,3モㅡドでのみ有効"; + + this.labelBuadrateWarning.Text = "※ 設定を変更した後、電源をオフにして再度オンにします"; + this.labelBuadrateWarning2.Text = "※ エンジニア以外は値を変更しないでください"; + + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveUp)); + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { @@ -375,6 +426,8 @@ namespace INT69DC_7C.Forms this.radioButtonLanguageKorean.Checked = true; else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German) this.radioButtonLanguageGerman.Checked = true; + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + this.radioButtonLanguageJapanese.Checked = true; else this.radioButtonLanguageKorean.Checked = true; @@ -609,6 +662,8 @@ namespace INT69DC_7C.Forms this.ParentForm.SystemConfig.Language = DataStore.LanguageID.Czech; else if (this.radioButtonLanguageGerman.Checked == true) this.ParentForm.SystemConfig.Language = DataStore.LanguageID.German; + else if (this.radioButtonLanguageJapanese.Checked == true) + this.ParentForm.SystemConfig.Language = DataStore.LanguageID.Japanese; else this.ParentForm.SystemConfig.Language = DataStore.LanguageID.Korean; diff --git a/INT69DC_7C/Forms/FormEquipmentTest.cs b/INT69DC_7C/Forms/FormEquipmentTest.cs index a4f6b08..b3ff287 100644 --- a/INT69DC_7C/Forms/FormEquipmentTest.cs +++ b/INT69DC_7C/Forms/FormEquipmentTest.cs @@ -277,6 +277,53 @@ namespace INT69DC_7C.Forms this.buttonDisplay.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerScreenDown)); this.buttonDisplay.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerScreenUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "装置テスト"; + + this.buttonAllContinue.Font = new Font("새굴림", 9, FontStyle.Bold); + this.buttonAllContinue.Text = "連続"; + + this.buttonForwardDirectionAll.Text = "正転"; + this.buttonForwardDirection1.Text = "正転"; + this.buttonForwardDirection2.Text = "正転"; + this.buttonForwardDirection3.Text = "正転"; + this.buttonForwardDirection4.Text = "正転"; + this.buttonForwardDirection5.Text = "正転"; + this.buttonForwardDirection6.Text = "正転"; + this.buttonForwardDirection7.Text = "正転"; + this.buttonForwardDirection8.Text = "正転"; + this.buttonForwardDirection9.Text = "正転"; + this.buttonForwardDirection10.Text = "正転"; + this.buttonForwardDirection11.Text = "正転"; + this.buttonForwardDirection12.Text = "正転"; + + this.buttonReverseDirectionAll.Text = "逆回転"; + this.buttonReverseDirection1.Text = "逆回転"; + this.buttonReverseDirection2.Text = "逆回転"; + this.buttonReverseDirection3.Text = "逆回転"; + this.buttonReverseDirection4.Text = "逆回転"; + this.buttonReverseDirection5.Text = "逆回転"; + this.buttonReverseDirection6.Text = "逆回転"; + this.buttonReverseDirection7.Text = "逆回転"; + this.buttonReverseDirection8.Text = "逆回転"; + this.buttonReverseDirection9.Text = "逆回転"; + this.buttonReverseDirection10.Text = "逆回転"; + this.buttonReverseDirection11.Text = "逆回転"; + this.buttonReverseDirection12.Text = "逆回転"; + + this.labelStaticCutInput.Text = "[カット] 入力"; + this.buttonCut.Text = "カット"; + this.checkBoxCutMainDisplayView.Text = "[CUT]メイン画面に表示"; + this.checkBoxSamplingMainDisplayView.Text = "[Sampling]メイン画面に表示"; + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + this.buttonDisplay.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDisable)); + this.buttonDisplay.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDown)); + this.buttonDisplay.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenUp)); + } else { diff --git a/INT69DC_7C/Forms/FormFactoryInitialize.cs b/INT69DC_7C/Forms/FormFactoryInitialize.cs index 4e33ffd..3bad628 100644 --- a/INT69DC_7C/Forms/FormFactoryInitialize.cs +++ b/INT69DC_7C/Forms/FormFactoryInitialize.cs @@ -71,6 +71,13 @@ namespace INT69DC_7C.Forms this.labelResetWait.Text = "Initialisierung wird ausgeführt"; this.labelResetRestart.Text = "Mit dem Hauptschalter aus- und einschalten"; } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "初期化"; + + this.labelResetWait.Text = "しばらくお待ちください。"; + this.labelResetRestart.Text = "再起動が必要です。"; + } else { diff --git a/INT69DC_7C/Forms/FormIOTest.cs b/INT69DC_7C/Forms/FormIOTest.cs index d1f6253..90eea73 100644 --- a/INT69DC_7C/Forms/FormIOTest.cs +++ b/INT69DC_7C/Forms/FormIOTest.cs @@ -85,6 +85,14 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "I/Oテスト"; + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index 3997308..f791b64 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -59,7 +59,7 @@ namespace INT69DC_7C.Forms this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engScreenDisable)); this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engScreenDown)); this.buttonScreen.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engScreenUp)); - this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDisable)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDisable)); this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackUp)); } @@ -70,7 +70,7 @@ namespace INT69DC_7C.Forms this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnScreenDisable)); this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnScreenDown)); this.buttonScreen.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnScreenUp)); - this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackDisable)); + 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)); } @@ -96,6 +96,17 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "インフォメㅡション"; + + this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDisable)); + this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDown)); + this.buttonScreen.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { @@ -142,7 +153,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "12.4.2"; + this.labelDisplayVer.Text = "12.5.0"; if(this.ParentForm.SystemConfig.EquipmentMode == 7) this.labelTitleMainboardName.Text = "INT68M-2A"; diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index 44b5dd1..1e610b0 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -266,14 +266,14 @@ namespace INT69DC_7C.Forms this.buttonATPC_Reset.Text = "重置"; // Font & Location & Size - this.labelTitleTotalCount.Font = new Font("New Gulim", 14, FontStyle.Bold); + this.labelTitleTotalCount.Font = new Font("새굴림", 14, FontStyle.Bold); this.labelTitleTotalCount.Location = new Point(34, 696); this.labelTitleTotalCount.Size = new Size(200, 27); this.labelTotalCount.Location = new Point(34, 720); this.labelTotalCount.Size = new Size(200, 27); - this.labelTitleNGCount.Font = new Font("New Gulim", 14, FontStyle.Bold); + this.labelTitleNGCount.Font = new Font("새굴림", 14, FontStyle.Bold); this.labelTitleNGCount.Location = new Point(285, 696); this.labelTitleNGCount.Size = new Size(200, 27); @@ -366,17 +366,17 @@ namespace INT69DC_7C.Forms this.buttonATPC_Reset.Text = "RST"; // Font & Location & Size - this.labelTitleScreen.Font = new Font("New Gulim", 10F, FontStyle.Bold); - this.labelStaticJudgmentDelayTime.Font = new Font("Arial", 9, FontStyle.Bold); + this.labelTitleScreen.Font = new Font("새굴림", 10F, FontStyle.Bold); + this.labelStaticJudgmentDelayTime.Font = new Font("새굴림", 9, FontStyle.Bold); - this.labelTitleTotalCount.Font = new Font("New Gulim", 14, FontStyle.Bold); + this.labelTitleTotalCount.Font = new Font("새굴림", 14, FontStyle.Bold); this.labelTitleTotalCount.Location = new Point(34, 696); this.labelTitleTotalCount.Size = new Size(200, 27); this.labelTotalCount.Location = new Point(34, 720); this.labelTotalCount.Size = new Size(200, 27); - this.labelTitleNGCount.Font = new Font("New Gulim", 14, FontStyle.Bold); + this.labelTitleNGCount.Font = new Font("새굴림", 14, FontStyle.Bold); this.labelTitleNGCount.Location = new Point(285, 696); this.labelTitleNGCount.Size = new Size(200, 27); @@ -470,16 +470,16 @@ namespace INT69DC_7C.Forms this.buttonATPC_Reset.Text = "RST"; // Font & Location & Size - this.labelTitleScreen.Font = new Font("New Gulim", 10F, FontStyle.Bold); + this.labelTitleScreen.Font = new Font("새굴림", 10F, FontStyle.Bold); - this.labelTitleTotalCount.Font = new Font("New Gulim", 14, FontStyle.Bold); + this.labelTitleTotalCount.Font = new Font("새굴림", 14, FontStyle.Bold); this.labelTitleTotalCount.Location = new Point(34, 696); this.labelTitleTotalCount.Size = new Size(200, 27); this.labelTotalCount.Location = new Point(34, 720); this.labelTotalCount.Size = new Size(200, 27); - this.labelTitleNGCount.Font = new Font("New Gulim", 14, FontStyle.Bold); + this.labelTitleNGCount.Font = new Font("새굴림", 14, FontStyle.Bold); this.labelTitleNGCount.Location = new Point(285, 696); this.labelTitleNGCount.Size = new Size(200, 27); @@ -487,6 +487,110 @@ namespace INT69DC_7C.Forms this.labelNGCount.Size = new Size(200, 27); #endregion } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + #region Japanese + this.buttonOver.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainOverDisable)); + this.buttonOver.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainOverDown)); + this.buttonOver.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainOverUp)); + this.buttonPass.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainPassDisable)); + this.buttonPass.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainPassDown)); + this.buttonPass.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainPassUp)); + this.buttonUnder.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainUnderDisable)); + this.buttonUnder.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainUnderDown)); + this.buttonUnder.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainUnderUp)); + this.buttonTare.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainTareDisable)); + this.buttonTare.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainTareDown)); + this.buttonTare.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainTareUp)); + + this.buttonScaleZero.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainZeroDown)); + this.buttonScaleZero.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainZeroUp)); + this.buttonClear.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainClearDisable)); + this.buttonClear.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainClearDown)); + this.buttonClear.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainClearUp)); + this.buttonMenu.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainMenuDisable)); + this.buttonMenu.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainMenuDown)); + this.buttonMenu.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainMenuUp)); + this.buttonSubMenu.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainSubMenuDisable)); + this.buttonSubMenu.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainSubMenuDown)); + this.buttonSubMenu.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainSubMenuUp)); + this.buttonBypassDirection.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSubMenuNGUp)); + this.buttonBypassDirection.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSubMenuPassUp)); + this.buttonBypassOnce.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSubMenuContinueUp)); + this.buttonBypassOnce.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSubMenuOnceUp)); + this.buttonUser.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainLoginDisable)); + this.buttonUser.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainLogoffUp)); + this.buttonUser.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainLoginUp)); + + if (this.ParentForm.SystemConfig.IsLogin == true) + { + this.buttonMenu.Location = new Point(929, 663); + + this.buttonMenu.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainMenuSmallDisable)); + this.buttonMenu.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainMenuSmallDown)); + this.buttonMenu.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainMenuSmallUp)); + } + else + { + this.buttonMenu.Location = new Point(839, 663); + + this.buttonMenu.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainMenuDisable)); + this.buttonMenu.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainMenuDown)); + this.buttonMenu.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormMainMenuUp)); + } + + this.groupBoxSorter.Text = "選別機設定"; + this.labelStaticSorterDelayTime.Text = "遅延時間"; + this.labelStaticSorterRunTime.Text = "運転時間"; + + this.groupBoxConveyor.Text = "コンベアの設定"; + this.labelStaticRejectConveyor.Text = "排出コンベア"; + this.labelStaticRejectConveyorDelayTime.Text = "遅延時間"; + this.labelStaticRejectConveyorRunTime.Text = "運転時間"; + this.labelStaticFeedingConveyor.Text = "供給コンベア"; + this.labelStaticFeedingDelayTime.Text = "遅延時間"; + this.labelStaticFeedingRunTime.Text = "運転時間"; + + this.labelMessage1.Text = "アラㅡム - 二重進入"; + + this.groupBoxJudgment.Text = "判定設定"; + this.labelStaticFilter.Text = "フィルタㅡ"; + this.labelStaticJudgmentDelayTime.Text = "判定遅延"; + this.labelStaticDoubleDelayTime.Text = "二重遅延"; + this.labelStaticJudgmentCount.Text = "判定数"; + + this.labelStaticAlarmContinuousNG.Text = "連続不良"; + this.labelMessage3.Text = "連続NGを検出してください。"; + + this.labelStaticATPC.Text = "定量アラㅡム"; + this.labelStaticATPC_Count.Text = "数量"; + this.labelStaticATPC_Pass.Text = "基準"; + this.labelStaticATPC_Lack.Text = "不足"; + this.buttonATPC_Reset.Text = "リセット"; + + this.labelTitleTotalCount.Font = new Font("새굴림", 15, FontStyle.Bold); + this.labelTitleTotalCount.Text = "総数"; + this.labelTitleNGCount.Font = new Font("새굴림", 15, FontStyle.Bold); + this.labelTitleNGCount.Text = "不良"; + this.labelTitleBypass.Text = "バイパス"; + this.labelTitleScreen.Text = "画面"; + + // Font & Location & Size + //this.labelTitleTotalCount.Font = new Font("새굴림", 14, FontStyle.Bold); + //this.labelTitleTotalCount.Location = new Point(34, 696); + //this.labelTitleTotalCount.Size = new Size(200, 27); + + //this.labelTotalCount.Location = new Point(34, 720); + //this.labelTotalCount.Size = new Size(200, 27); + + //this.labelTitleNGCount.Font = new Font("새굴림", 14, FontStyle.Bold); + //this.labelTitleNGCount.Location = new Point(285, 696); + //this.labelTitleNGCount.Size = new Size(200, 27); + + //this.labelNGCount.Location = new Point(285, 720); + //this.labelNGCount.Size = new Size(200, 27); + #endregion + } else { @@ -1256,6 +1360,8 @@ namespace INT69DC_7C.Forms group = "Administrator"; else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) group = "行政"; + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + group = "管理者"; else group = "Administrator"; @@ -1282,6 +1388,8 @@ namespace INT69DC_7C.Forms group = "Entwickler"; else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) group = "开发商"; + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + group = "開発者"; else group = "Developer"; @@ -1325,6 +1433,8 @@ namespace INT69DC_7C.Forms group = "Ausloggen"; else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) group = "登出"; + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + group = "ログアウト"; else group = "Log out"; @@ -2692,6 +2802,11 @@ namespace INT69DC_7C.Forms message1 = "You will be logged out after a while"; message2 = ""; break; + case DataStore.LanguageID.Japanese: + code = "ログイン"; + message1 = "しばらくするとログアウトします。"; + message2 = ""; + break; default: break; } @@ -2715,7 +2830,7 @@ namespace INT69DC_7C.Forms break; case DataStore.LanguageID.English: code = "Login"; - message1 = "automatically logged out"; + message1 = "Automatically logged out"; message2 = ""; break; case DataStore.LanguageID.Chinese: @@ -2733,6 +2848,11 @@ namespace INT69DC_7C.Forms message1 = "automatically logged out"; message2 = ""; break; + case DataStore.LanguageID.Japanese: + code = "ログイン"; + message1 = "自動ログアウトしました。"; + message2 = ""; + break; default: break; } @@ -2811,6 +2931,19 @@ namespace INT69DC_7C.Forms break; } break; + case DataStore.LanguageID.Japanese: + switch (mode) + { + case DataStore.E_TotalCnt.f0_Total: + txt = "総数"; + break; + case DataStore.E_TotalCnt.f1_Pass: + txt = "基準"; + break; + default: + break; + } + break; default: break; } @@ -2901,6 +3034,25 @@ namespace INT69DC_7C.Forms break; } break; + case DataStore.LanguageID.Japanese: + switch (mode) + { + case DataStore.E_TotalCntNG.f0_NG: + txt = "不良"; + break; + case DataStore.E_TotalCntNG.f1_Under: + txt = "下限"; + break; + case DataStore.E_TotalCntNG.f2_Over: + txt = "上限"; + break; + case DataStore.E_TotalCntNG.f3_ExNG: + txt = "他の不良"; + break; + default: + break; + } + break; default: break; } diff --git a/INT69DC_7C/Forms/FormMenu.cs b/INT69DC_7C/Forms/FormMenu.cs index 141e92d..554880f 100644 --- a/INT69DC_7C/Forms/FormMenu.cs +++ b/INT69DC_7C/Forms/FormMenu.cs @@ -286,6 +286,66 @@ namespace INT69DC_7C.Forms this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); #endregion } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + #region Japanese + this.buttonTimeSetting.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuTimeDisable)); + this.buttonTimeSetting.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuTimeDown)); + this.buttonTimeSetting.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuTimeUp)); + this.buttonInformation.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuInformationDisable)); + this.buttonInformation.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuInformationDown)); + this.buttonInformation.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuInformationUp)); + this.buttonConfiguration.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuConfigurationDisable)); + this.buttonConfiguration.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuConfigurationDown)); + this.buttonConfiguration.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuConfigurationUp)); + this.buttonDataBackup.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuDataBackupDisable)); + this.buttonDataBackup.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuDataBackupDown)); + this.buttonDataBackup.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuDataBackupUp)); + this.buttonDataStatistics.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuDataStatisticsDisable)); + this.buttonDataStatistics.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuDataStatisticsDown)); + this.buttonDataStatistics.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuDataStatisticsUp)); + this.buttonCalibration.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuCalibrationDisable)); + this.buttonCalibration.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuCalibrationDown)); + this.buttonCalibration.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuCalibrationUp)); + this.buttonUpdate.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuUpdateDisable)); + this.buttonUpdate.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuUpdateDown)); + this.buttonUpdate.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuUpdateUp)); + this.buttonSysConfig.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuSystemSettingDisable)); + this.buttonSysConfig.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuSystemSettingDown)); + this.buttonSysConfig.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuSystemSettingUp)); + this.buttonFactoryInitialize.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuInitializationDisable)); + this.buttonFactoryInitialize.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuInitializationDown)); + this.buttonFactoryInitialize.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuInitializationUp)); + this.buttonMotorSetting.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuMotorSettingDisable)); + this.buttonMotorSetting.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuMotorSettingDown)); + this.buttonMotorSetting.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuMotorSettingUp)); + this.buttonEquipmentSetting.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuEquipmentSettingDisable)); + this.buttonEquipmentSetting.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuEquipmentSettingDown)); + this.buttonEquipmentSetting.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuEquipmentSettingUp)); + this.buttonIOTest.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuIOTestDisable)); + this.buttonIOTest.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuIOTestDown)); + this.buttonIOTest.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuIOTestUp)); + this.buttonEquipmentTest.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuEquipmentTestDisable)); + this.buttonEquipmentTest.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuEquipmentTestDown)); + this.buttonEquipmentTest.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuEquipmentTestUp)); + this.buttonUser.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuUserSettingDisable)); + this.buttonUser.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuUserSettingDown)); + this.buttonUser.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuUserSettingUp)); + this.buttonOptionSetting.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuOptionDisable)); + this.buttonOptionSetting.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuOptionDown)); + this.buttonOptionSetting.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuOptionUp)); + this.buttonCommunication.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuCommunicationDisable)); + this.buttonCommunication.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuCommunicationDown)); + this.buttonCommunication.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuCommunicationUp)); + this.buttonDataViewer.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuDataViewerDisable)); + this.buttonDataViewer.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuDataViewerDown)); + this.buttonDataViewer.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMenuDataViewerUp)); + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + #endregion + } else { diff --git a/INT69DC_7C/Forms/FormMotorSetting.Designer.cs b/INT69DC_7C/Forms/FormMotorSetting.Designer.cs index df397c3..4808d1b 100644 --- a/INT69DC_7C/Forms/FormMotorSetting.Designer.cs +++ b/INT69DC_7C/Forms/FormMotorSetting.Designer.cs @@ -92,14 +92,14 @@ this.buttonLine1 = new SmartX.SmartButton(); this.buttonBack = new SmartX.SmartButton(); this.groupBoxEach = new SmartX.SmartGroupBox(); - this.smartLabel1 = new SmartX.SmartLabel(); + this.labelTitleCautionEach = new SmartX.SmartLabel(); this.labelIntervalEach = new SmartX.SmartLabel(); this.buttonEachContinue = new SmartX.SmartButton(); this.buttonEachUnlock = new SmartX.SmartButton(); this.buttonEachReverse = new SmartX.SmartButton(); this.buttonEachForward = new SmartX.SmartButton(); this.groupBoxAll = new SmartX.SmartGroupBox(); - this.smartLabel8 = new SmartX.SmartLabel(); + this.labelTitleCautionAll = new SmartX.SmartLabel(); this.labelIntervalAll = new SmartX.SmartLabel(); this.buttonAllContinue = new SmartX.SmartButton(); this.buttonAllForward = new SmartX.SmartButton(); @@ -188,7 +188,7 @@ this.groupBoxMotorTest.Controls.Add(this.labelStaticWarning3); this.groupBoxMotorTest.Controls.Add(this.buttonCom1TestForward); this.groupBoxMotorTest.Controls.Add(this.buttonCom1TestReverse); - this.groupBoxMotorTest.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxMotorTest.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.groupBoxMotorTest.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxMotorTest.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxMotorTest.FrameLineThickness = 1; @@ -198,7 +198,7 @@ this.groupBoxMotorTest.Location = new System.Drawing.Point(38, 251); this.groupBoxMotorTest.Name = "groupBoxMotorTest"; this.groupBoxMotorTest.RoundRadius = 10; - this.groupBoxMotorTest.Size = new System.Drawing.Size(469, 159); + this.groupBoxMotorTest.Size = new System.Drawing.Size(469, 175); this.groupBoxMotorTest.TabIndex = 226; this.groupBoxMotorTest.Text = "모터 테스트(COM1, RS485)"; this.groupBoxMotorTest.TextColor = System.Drawing.Color.Black; @@ -211,11 +211,11 @@ this.labelStaticWarning3.BackPictureBox2 = null; this.labelStaticWarning3.BorderColor = System.Drawing.Color.Black; this.labelStaticWarning3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticWarning3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticWarning3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticWarning3.ForeColor = System.Drawing.Color.DarkRed; this.labelStaticWarning3.InitVisible = true; this.labelStaticWarning3.LineSpacing = 0F; - this.labelStaticWarning3.Location = new System.Drawing.Point(21, 32); + this.labelStaticWarning3.Location = new System.Drawing.Point(21, 39); this.labelStaticWarning3.Name = "labelStaticWarning3"; this.labelStaticWarning3.Size = new System.Drawing.Size(428, 31); this.labelStaticWarning3.TabIndex = 256; @@ -234,10 +234,10 @@ this.buttonCom1TestForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonCom1TestForward.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonCom1TestForward.DisableImage"))); this.buttonCom1TestForward.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCom1TestForward.DownImage"))); - this.buttonCom1TestForward.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonCom1TestForward.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonCom1TestForward.GroupID = 0; this.buttonCom1TestForward.InitVisible = true; - this.buttonCom1TestForward.Location = new System.Drawing.Point(127, 72); + this.buttonCom1TestForward.Location = new System.Drawing.Point(127, 79); this.buttonCom1TestForward.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonCom1TestForward.Name = "buttonCom1TestForward"; this.buttonCom1TestForward.NestedClickEventPrevent = false; @@ -267,10 +267,10 @@ this.buttonCom1TestReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonCom1TestReverse.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonCom1TestReverse.DisableImage"))); this.buttonCom1TestReverse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCom1TestReverse.DownImage"))); - this.buttonCom1TestReverse.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonCom1TestReverse.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonCom1TestReverse.GroupID = 0; this.buttonCom1TestReverse.InitVisible = true; - this.buttonCom1TestReverse.Location = new System.Drawing.Point(233, 72); + this.buttonCom1TestReverse.Location = new System.Drawing.Point(233, 79); this.buttonCom1TestReverse.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonCom1TestReverse.Name = "buttonCom1TestReverse"; this.buttonCom1TestReverse.NestedClickEventPrevent = false; @@ -300,7 +300,7 @@ this.groupBoxInitialDownload.Controls.Add(this.progressBarDownload); this.groupBoxInitialDownload.Controls.Add(this.labelStaticWarning2); this.groupBoxInitialDownload.Controls.Add(this.labelStaticWarning1); - this.groupBoxInitialDownload.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxInitialDownload.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.groupBoxInitialDownload.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxInitialDownload.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxInitialDownload.FrameLineThickness = 1; @@ -326,7 +326,7 @@ this.buttonDeviceIDChange.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonDeviceIDChange.DisableImage = null; this.buttonDeviceIDChange.DownImage = null; - this.buttonDeviceIDChange.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonDeviceIDChange.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonDeviceIDChange.GroupID = 0; this.buttonDeviceIDChange.InitVisible = true; this.buttonDeviceIDChange.Location = new System.Drawing.Point(233, 48); @@ -360,7 +360,7 @@ this.buttonInitialDownload.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonInitialDownload.DisableImage = null; this.buttonInitialDownload.DownImage = null; - this.buttonInitialDownload.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonInitialDownload.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonInitialDownload.GroupID = 0; this.buttonInitialDownload.InitVisible = true; this.buttonInitialDownload.Location = new System.Drawing.Point(67, 48); @@ -415,7 +415,7 @@ this.labelStaticWarning2.BackPictureBox2 = null; this.labelStaticWarning2.BorderColor = System.Drawing.Color.Black; this.labelStaticWarning2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticWarning2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticWarning2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticWarning2.ForeColor = System.Drawing.Color.DarkRed; this.labelStaticWarning2.InitVisible = true; this.labelStaticWarning2.LineSpacing = 0F; @@ -436,7 +436,7 @@ this.labelStaticWarning1.BackPictureBox2 = null; this.labelStaticWarning1.BorderColor = System.Drawing.Color.Black; this.labelStaticWarning1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticWarning1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticWarning1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticWarning1.ForeColor = System.Drawing.Color.DarkRed; this.labelStaticWarning1.InitVisible = true; this.labelStaticWarning1.LineSpacing = 0F; @@ -476,7 +476,7 @@ this.groupBoxEachDownload.Controls.Add(this.label3); this.groupBoxEachDownload.Controls.Add(this.labelTitle6); this.groupBoxEachDownload.Controls.Add(this.label2); - this.groupBoxEachDownload.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxEachDownload.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.groupBoxEachDownload.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxEachDownload.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxEachDownload.FrameLineThickness = 1; @@ -486,7 +486,7 @@ this.groupBoxEachDownload.Location = new System.Drawing.Point(513, 10); this.groupBoxEachDownload.Name = "groupBoxEachDownload"; this.groupBoxEachDownload.RoundRadius = 5; - this.groupBoxEachDownload.Size = new System.Drawing.Size(469, 400); + this.groupBoxEachDownload.Size = new System.Drawing.Size(469, 416); this.groupBoxEachDownload.TabIndex = 230; this.groupBoxEachDownload.Text = "개별 설정(COM2)"; this.groupBoxEachDownload.TextColor = System.Drawing.Color.Black; @@ -502,7 +502,7 @@ this.buttonDownloadExistingMotorAll.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonDownloadExistingMotorAll.DisableImage = null; this.buttonDownloadExistingMotorAll.DownImage = null; - this.buttonDownloadExistingMotorAll.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonDownloadExistingMotorAll.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonDownloadExistingMotorAll.GroupID = 0; this.buttonDownloadExistingMotorAll.InitVisible = true; this.buttonDownloadExistingMotorAll.Location = new System.Drawing.Point(277, 195); @@ -536,7 +536,7 @@ this.buttonDownloadExistingMotorEach.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonDownloadExistingMotorEach.DisableImage = null; this.buttonDownloadExistingMotorEach.DownImage = null; - this.buttonDownloadExistingMotorEach.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonDownloadExistingMotorEach.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonDownloadExistingMotorEach.GroupID = 0; this.buttonDownloadExistingMotorEach.InitVisible = true; this.buttonDownloadExistingMotorEach.Location = new System.Drawing.Point(111, 195); @@ -570,7 +570,7 @@ this.buttonDefault.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonDefault.DisableImage = null; this.buttonDefault.DownImage = null; - this.buttonDefault.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonDefault.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonDefault.GroupID = 0; this.buttonDefault.InitVisible = true; this.buttonDefault.Location = new System.Drawing.Point(28, 195); @@ -601,12 +601,12 @@ this.labelDiscription1.BackPictureBox2 = null; this.labelDiscription1.BorderColor = System.Drawing.Color.Black; this.labelDiscription1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelDiscription1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelDiscription1.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); this.labelDiscription1.InitVisible = true; this.labelDiscription1.LineSpacing = 0F; - this.labelDiscription1.Location = new System.Drawing.Point(26, 247); + this.labelDiscription1.Location = new System.Drawing.Point(23, 247); this.labelDiscription1.Name = "labelDiscription1"; - this.labelDiscription1.Size = new System.Drawing.Size(416, 16); + this.labelDiscription1.Size = new System.Drawing.Size(425, 16); this.labelDiscription1.TabIndex = 231; this.labelDiscription1.Text = "Rc : 모터 구동 전류(값은 퍼센트로 정의, 최대값 : 100)"; this.labelDiscription1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -621,12 +621,12 @@ this.labelDiscription2.BackPictureBox2 = null; this.labelDiscription2.BorderColor = System.Drawing.Color.Black; this.labelDiscription2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelDiscription2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelDiscription2.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); this.labelDiscription2.InitVisible = true; this.labelDiscription2.LineSpacing = 0F; - this.labelDiscription2.Location = new System.Drawing.Point(26, 269); + this.labelDiscription2.Location = new System.Drawing.Point(23, 269); this.labelDiscription2.Name = "labelDiscription2"; - this.labelDiscription2.Size = new System.Drawing.Size(416, 16); + this.labelDiscription2.Size = new System.Drawing.Size(425, 16); this.labelDiscription2.TabIndex = 232; this.labelDiscription2.Text = "Hc : 모터 중지 전류(값은 퍼센트로 정의, 최대값 : 100)"; this.labelDiscription2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -663,12 +663,12 @@ this.labelDiscription3.BackPictureBox2 = null; this.labelDiscription3.BorderColor = System.Drawing.Color.Black; this.labelDiscription3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelDiscription3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelDiscription3.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); this.labelDiscription3.InitVisible = true; this.labelDiscription3.LineSpacing = 0F; - this.labelDiscription3.Location = new System.Drawing.Point(26, 291); + this.labelDiscription3.Location = new System.Drawing.Point(23, 291); this.labelDiscription3.Name = "labelDiscription3"; - this.labelDiscription3.Size = new System.Drawing.Size(416, 16); + this.labelDiscription3.Size = new System.Drawing.Size(425, 16); this.labelDiscription3.TabIndex = 233; this.labelDiscription3.Text = "Ms : 마이크로스텝 분해능을 제어"; this.labelDiscription3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -704,17 +704,17 @@ this.labelDiscription6.BackPictureBox2 = null; this.labelDiscription6.BorderColor = System.Drawing.Color.Black; this.labelDiscription6.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelDiscription6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelDiscription6.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); this.labelDiscription6.InitVisible = true; this.labelDiscription6.LineSpacing = 0F; - this.labelDiscription6.Location = new System.Drawing.Point(26, 357); + this.labelDiscription6.Location = new System.Drawing.Point(23, 357); this.labelDiscription6.Name = "labelDiscription6"; - this.labelDiscription6.Size = new System.Drawing.Size(416, 16); + this.labelDiscription6.Size = new System.Drawing.Size(427, 35); this.labelDiscription6.TabIndex = 236; this.labelDiscription6.Text = "A : Sec²당 스텝으로 MDrive에 의해 도달되는 최대 가속을 셋팅"; this.labelDiscription6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelDiscription6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelDiscription6.Wordwrap = false; + this.labelDiscription6.Wordwrap = true; // // progressBarExistingDownload // @@ -748,12 +748,12 @@ this.labelDiscription4.BackPictureBox2 = null; this.labelDiscription4.BorderColor = System.Drawing.Color.Black; this.labelDiscription4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelDiscription4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelDiscription4.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); this.labelDiscription4.InitVisible = true; this.labelDiscription4.LineSpacing = 0F; - this.labelDiscription4.Location = new System.Drawing.Point(26, 313); + this.labelDiscription4.Location = new System.Drawing.Point(23, 313); this.labelDiscription4.Name = "labelDiscription4"; - this.labelDiscription4.Size = new System.Drawing.Size(416, 16); + this.labelDiscription4.Size = new System.Drawing.Size(425, 16); this.labelDiscription4.TabIndex = 234; this.labelDiscription4.Text = "Vi : 모든 모션 명령에 대한 초기 속도(Vm값보다 낮게 셋팅되어야 함)"; this.labelDiscription4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -789,12 +789,12 @@ this.labelDiscription5.BackPictureBox2 = null; this.labelDiscription5.BorderColor = System.Drawing.Color.Black; this.labelDiscription5.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelDiscription5.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelDiscription5.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); this.labelDiscription5.InitVisible = true; this.labelDiscription5.LineSpacing = 0F; - this.labelDiscription5.Location = new System.Drawing.Point(26, 335); + this.labelDiscription5.Location = new System.Drawing.Point(23, 335); this.labelDiscription5.Name = "labelDiscription5"; - this.labelDiscription5.Size = new System.Drawing.Size(416, 16); + this.labelDiscription5.Size = new System.Drawing.Size(425, 16); this.labelDiscription5.TabIndex = 235; this.labelDiscription5.Text = "Vm : 축이 도달하는 초당 스텝/카운트에서의 최대 속도 지정"; this.labelDiscription5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -1023,7 +1023,7 @@ this.groupBoxSelectImpeller.Controls.Add(this.buttonLine3); this.groupBoxSelectImpeller.Controls.Add(this.buttonLine2); this.groupBoxSelectImpeller.Controls.Add(this.buttonLine1); - this.groupBoxSelectImpeller.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxSelectImpeller.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.groupBoxSelectImpeller.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxSelectImpeller.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxSelectImpeller.FrameLineThickness = 1; @@ -1913,13 +1913,13 @@ // this.groupBoxEach.BackPictureBox = this.smartForm1; this.groupBoxEach.BackPictureBox1 = null; - this.groupBoxEach.Controls.Add(this.smartLabel1); + this.groupBoxEach.Controls.Add(this.labelTitleCautionEach); this.groupBoxEach.Controls.Add(this.labelIntervalEach); this.groupBoxEach.Controls.Add(this.buttonEachContinue); this.groupBoxEach.Controls.Add(this.buttonEachUnlock); this.groupBoxEach.Controls.Add(this.buttonEachReverse); this.groupBoxEach.Controls.Add(this.buttonEachForward); - this.groupBoxEach.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxEach.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.groupBoxEach.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxEach.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxEach.FrameLineThickness = 1; @@ -1934,26 +1934,26 @@ this.groupBoxEach.Text = "개별 동작 테스트"; this.groupBoxEach.TextColor = System.Drawing.Color.Black; // - // smartLabel1 + // labelTitleCautionEach // - this.smartLabel1.BackColor = System.Drawing.Color.Silver; - this.smartLabel1.BackPictureBox = this.smartForm1; - this.smartLabel1.BackPictureBox1 = null; - 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("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(26, 151); - this.smartLabel1.Name = "smartLabel1"; - this.smartLabel1.Size = new System.Drawing.Size(428, 23); - this.smartLabel1.TabIndex = 245; - this.smartLabel1.Text = "※ Click button for 200ms"; - this.smartLabel1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel1.Wordwrap = false; + this.labelTitleCautionEach.BackColor = System.Drawing.Color.Silver; + this.labelTitleCautionEach.BackPictureBox = this.smartForm1; + this.labelTitleCautionEach.BackPictureBox1 = null; + this.labelTitleCautionEach.BackPictureBox2 = null; + this.labelTitleCautionEach.BorderColor = System.Drawing.Color.Black; + this.labelTitleCautionEach.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleCautionEach.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleCautionEach.ForeColor = System.Drawing.Color.DarkRed; + this.labelTitleCautionEach.InitVisible = true; + this.labelTitleCautionEach.LineSpacing = 0F; + this.labelTitleCautionEach.Location = new System.Drawing.Point(26, 157); + this.labelTitleCautionEach.Name = "labelTitleCautionEach"; + this.labelTitleCautionEach.Size = new System.Drawing.Size(428, 23); + this.labelTitleCautionEach.TabIndex = 245; + this.labelTitleCautionEach.Text = "※ Click button for 200ms"; + this.labelTitleCautionEach.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleCautionEach.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelTitleCautionEach.Wordwrap = false; // // labelIntervalEach // @@ -1966,7 +1966,7 @@ this.labelIntervalEach.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); this.labelIntervalEach.InitVisible = true; this.labelIntervalEach.LineSpacing = 0F; - this.labelIntervalEach.Location = new System.Drawing.Point(344, 39); + this.labelIntervalEach.Location = new System.Drawing.Point(342, 41); this.labelIntervalEach.Name = "labelIntervalEach"; this.labelIntervalEach.Size = new System.Drawing.Size(100, 30); this.labelIntervalEach.TabIndex = 193; @@ -1986,10 +1986,10 @@ this.buttonEachContinue.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonEachContinue.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonEachContinue.DisableImage"))); this.buttonEachContinue.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachContinue.DownImage"))); - this.buttonEachContinue.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); + this.buttonEachContinue.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.buttonEachContinue.GroupID = 0; this.buttonEachContinue.InitVisible = true; - this.buttonEachContinue.Location = new System.Drawing.Point(344, 75); + this.buttonEachContinue.Location = new System.Drawing.Point(342, 77); this.buttonEachContinue.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonEachContinue.Name = "buttonEachContinue"; this.buttonEachContinue.NestedClickEventPrevent = false; @@ -2019,10 +2019,10 @@ this.buttonEachUnlock.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonEachUnlock.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonEachUnlock.DisableImage"))); this.buttonEachUnlock.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachUnlock.DownImage"))); - this.buttonEachUnlock.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); + this.buttonEachUnlock.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.buttonEachUnlock.GroupID = 0; this.buttonEachUnlock.InitVisible = true; - this.buttonEachUnlock.Location = new System.Drawing.Point(238, 75); + this.buttonEachUnlock.Location = new System.Drawing.Point(236, 77); this.buttonEachUnlock.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonEachUnlock.Name = "buttonEachUnlock"; this.buttonEachUnlock.NestedClickEventPrevent = false; @@ -2052,10 +2052,10 @@ this.buttonEachReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonEachReverse.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonEachReverse.DisableImage"))); this.buttonEachReverse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachReverse.DownImage"))); - this.buttonEachReverse.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); + this.buttonEachReverse.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.buttonEachReverse.GroupID = 0; this.buttonEachReverse.InitVisible = true; - this.buttonEachReverse.Location = new System.Drawing.Point(132, 75); + this.buttonEachReverse.Location = new System.Drawing.Point(130, 77); this.buttonEachReverse.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonEachReverse.Name = "buttonEachReverse"; this.buttonEachReverse.NestedClickEventPrevent = false; @@ -2085,10 +2085,10 @@ this.buttonEachForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonEachForward.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonEachForward.DisableImage"))); this.buttonEachForward.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachForward.DownImage"))); - this.buttonEachForward.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); + this.buttonEachForward.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.buttonEachForward.GroupID = 0; this.buttonEachForward.InitVisible = true; - this.buttonEachForward.Location = new System.Drawing.Point(26, 75); + this.buttonEachForward.Location = new System.Drawing.Point(24, 77); this.buttonEachForward.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonEachForward.Name = "buttonEachForward"; this.buttonEachForward.NestedClickEventPrevent = false; @@ -2112,13 +2112,13 @@ // this.groupBoxAll.BackPictureBox = this.smartForm1; this.groupBoxAll.BackPictureBox1 = null; - this.groupBoxAll.Controls.Add(this.smartLabel8); + this.groupBoxAll.Controls.Add(this.labelTitleCautionAll); this.groupBoxAll.Controls.Add(this.labelIntervalAll); this.groupBoxAll.Controls.Add(this.buttonAllContinue); this.groupBoxAll.Controls.Add(this.buttonAllForward); this.groupBoxAll.Controls.Add(this.buttonAllUnlock); this.groupBoxAll.Controls.Add(this.buttonAllReverse); - this.groupBoxAll.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxAll.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.groupBoxAll.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxAll.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxAll.FrameLineThickness = 1; @@ -2133,26 +2133,26 @@ this.groupBoxAll.Text = "전체 동작 테스트"; this.groupBoxAll.TextColor = System.Drawing.Color.Black; // - // smartLabel8 + // labelTitleCautionAll // - this.smartLabel8.BackColor = System.Drawing.Color.Silver; - this.smartLabel8.BackPictureBox = this.smartForm1; - this.smartLabel8.BackPictureBox1 = null; - this.smartLabel8.BackPictureBox2 = null; - this.smartLabel8.BorderColor = System.Drawing.Color.Black; - this.smartLabel8.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel8.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); - this.smartLabel8.ForeColor = System.Drawing.Color.DarkRed; - this.smartLabel8.InitVisible = true; - this.smartLabel8.LineSpacing = 0F; - this.smartLabel8.Location = new System.Drawing.Point(26, 157); - this.smartLabel8.Name = "smartLabel8"; - this.smartLabel8.Size = new System.Drawing.Size(428, 23); - this.smartLabel8.TabIndex = 246; - this.smartLabel8.Text = "※ Click button for 200ms"; - this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel8.Wordwrap = false; + this.labelTitleCautionAll.BackColor = System.Drawing.Color.Silver; + this.labelTitleCautionAll.BackPictureBox = this.smartForm1; + this.labelTitleCautionAll.BackPictureBox1 = null; + this.labelTitleCautionAll.BackPictureBox2 = null; + this.labelTitleCautionAll.BorderColor = System.Drawing.Color.Black; + this.labelTitleCautionAll.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleCautionAll.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleCautionAll.ForeColor = System.Drawing.Color.DarkRed; + this.labelTitleCautionAll.InitVisible = true; + this.labelTitleCautionAll.LineSpacing = 0F; + this.labelTitleCautionAll.Location = new System.Drawing.Point(26, 157); + this.labelTitleCautionAll.Name = "labelTitleCautionAll"; + this.labelTitleCautionAll.Size = new System.Drawing.Size(428, 23); + this.labelTitleCautionAll.TabIndex = 246; + this.labelTitleCautionAll.Text = "※ Click button for 200ms"; + this.labelTitleCautionAll.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleCautionAll.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelTitleCautionAll.Wordwrap = false; // // labelIntervalAll // @@ -2185,7 +2185,7 @@ this.buttonAllContinue.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonAllContinue.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonAllContinue.DisableImage"))); this.buttonAllContinue.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllContinue.DownImage"))); - this.buttonAllContinue.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); + this.buttonAllContinue.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.buttonAllContinue.GroupID = 0; this.buttonAllContinue.InitVisible = true; this.buttonAllContinue.Location = new System.Drawing.Point(344, 77); @@ -2218,7 +2218,7 @@ this.buttonAllForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonAllForward.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonAllForward.DisableImage"))); this.buttonAllForward.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllForward.DownImage"))); - this.buttonAllForward.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); + this.buttonAllForward.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.buttonAllForward.GroupID = 0; this.buttonAllForward.InitVisible = true; this.buttonAllForward.Location = new System.Drawing.Point(26, 77); @@ -2251,7 +2251,7 @@ this.buttonAllUnlock.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonAllUnlock.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonAllUnlock.DisableImage"))); this.buttonAllUnlock.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllUnlock.DownImage"))); - this.buttonAllUnlock.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); + this.buttonAllUnlock.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.buttonAllUnlock.GroupID = 0; this.buttonAllUnlock.InitVisible = true; this.buttonAllUnlock.Location = new System.Drawing.Point(238, 77); @@ -2284,7 +2284,7 @@ this.buttonAllReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonAllReverse.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonAllReverse.DisableImage"))); this.buttonAllReverse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllReverse.DownImage"))); - this.buttonAllReverse.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); + this.buttonAllReverse.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.buttonAllReverse.GroupID = 0; this.buttonAllReverse.InitVisible = true; this.buttonAllReverse.Location = new System.Drawing.Point(132, 77); @@ -2314,7 +2314,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); @@ -2357,7 +2357,7 @@ this.groupBoxDirection.Controls.Add(this.buttonDirectionLine5); this.groupBoxDirection.Controls.Add(this.buttonDirectionLine3); this.groupBoxDirection.Controls.Add(this.buttonDirectionLine1); - this.groupBoxDirection.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxDirection.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.groupBoxDirection.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxDirection.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxDirection.FrameLineThickness = 1; @@ -2863,7 +2863,7 @@ this.groupBoxAngle.Controls.Add(this.comboBoxTwoStepPassAngle); this.groupBoxAngle.Controls.Add(this.labelTitleNG); this.groupBoxAngle.Controls.Add(this.labelTitlePass); - this.groupBoxAngle.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxAngle.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.groupBoxAngle.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxAngle.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxAngle.FrameLineThickness = 1; @@ -2885,7 +2885,7 @@ this.radioButtonImpellerMotorAngle60.BackPictureBox1 = null; this.radioButtonImpellerMotorAngle60.BackPictureBox2 = null; this.radioButtonImpellerMotorAngle60.Checked = false; - this.radioButtonImpellerMotorAngle60.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle60.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorAngle60.GroupID = 0; this.radioButtonImpellerMotorAngle60.ImageCheckRadioButton = null; this.radioButtonImpellerMotorAngle60.ImageUnCheckRadioButton = null; @@ -2911,7 +2911,7 @@ this.radioButtonImpellerMotorAngle180.BackPictureBox1 = null; this.radioButtonImpellerMotorAngle180.BackPictureBox2 = null; this.radioButtonImpellerMotorAngle180.Checked = false; - this.radioButtonImpellerMotorAngle180.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle180.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorAngle180.GroupID = 0; this.radioButtonImpellerMotorAngle180.ImageCheckRadioButton = null; this.radioButtonImpellerMotorAngle180.ImageUnCheckRadioButton = null; @@ -2937,7 +2937,7 @@ this.radioButtonImpellerMotorAngle120.BackPictureBox1 = null; this.radioButtonImpellerMotorAngle120.BackPictureBox2 = null; this.radioButtonImpellerMotorAngle120.Checked = false; - this.radioButtonImpellerMotorAngle120.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle120.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorAngle120.GroupID = 0; this.radioButtonImpellerMotorAngle120.ImageCheckRadioButton = null; this.radioButtonImpellerMotorAngle120.ImageUnCheckRadioButton = null; @@ -2963,7 +2963,7 @@ this.radioButtonImpellerMotorAngle90.BackPictureBox1 = null; this.radioButtonImpellerMotorAngle90.BackPictureBox2 = null; this.radioButtonImpellerMotorAngle90.Checked = false; - this.radioButtonImpellerMotorAngle90.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle90.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorAngle90.GroupID = 0; this.radioButtonImpellerMotorAngle90.ImageCheckRadioButton = null; this.radioButtonImpellerMotorAngle90.ImageUnCheckRadioButton = null; @@ -2990,7 +2990,7 @@ this.labelTitleStep2.BackPictureBox2 = null; this.labelTitleStep2.BorderColor = System.Drawing.Color.Black; this.labelTitleStep2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleStep2.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleStep2.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelTitleStep2.ForeColor = System.Drawing.Color.Black; this.labelTitleStep2.InitVisible = true; this.labelTitleStep2.LineSpacing = 0F; @@ -3011,7 +3011,7 @@ this.labelTitleStep1.BackPictureBox2 = null; this.labelTitleStep1.BorderColor = System.Drawing.Color.Black; this.labelTitleStep1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleStep1.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleStep1.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelTitleStep1.ForeColor = System.Drawing.Color.Black; this.labelTitleStep1.InitVisible = true; this.labelTitleStep1.LineSpacing = 0F; @@ -3032,7 +3032,7 @@ this.labelTwoStepNGAngle.BackPictureBox2 = null; this.labelTwoStepNGAngle.BorderColor = System.Drawing.Color.Black; this.labelTwoStepNGAngle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTwoStepNGAngle.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTwoStepNGAngle.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelTwoStepNGAngle.ForeColor = System.Drawing.Color.Black; this.labelTwoStepNGAngle.InitVisible = true; this.labelTwoStepNGAngle.LineSpacing = 0F; @@ -3053,7 +3053,7 @@ this.labelTwoStepPassAngle.BackPictureBox2 = null; this.labelTwoStepPassAngle.BorderColor = System.Drawing.Color.Black; this.labelTwoStepPassAngle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTwoStepPassAngle.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTwoStepPassAngle.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelTwoStepPassAngle.ForeColor = System.Drawing.Color.Black; this.labelTwoStepPassAngle.InitVisible = true; this.labelTwoStepPassAngle.LineSpacing = 0F; @@ -3092,7 +3092,7 @@ 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("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleNG.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelTitleNG.ForeColor = System.Drawing.Color.Black; this.labelTitleNG.InitVisible = true; this.labelTitleNG.LineSpacing = 0F; @@ -3113,7 +3113,7 @@ this.labelTitlePass.BackPictureBox2 = null; this.labelTitlePass.BorderColor = System.Drawing.Color.Black; this.labelTitlePass.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitlePass.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTitlePass.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelTitlePass.ForeColor = System.Drawing.Color.Black; this.labelTitlePass.InitVisible = true; this.labelTitlePass.LineSpacing = 0F; @@ -3253,8 +3253,8 @@ private System.Windows.Forms.Timer timerMotorContinuousAll; private System.Windows.Forms.Timer timerEachProgramDownload; private SmartX.SmartLabel labelStaticWarning1; - private SmartX.SmartLabel smartLabel1; - private SmartX.SmartLabel smartLabel8; + private SmartX.SmartLabel labelTitleCautionEach; + private SmartX.SmartLabel labelTitleCautionAll; private System.IO.Ports.SerialPort serialPort1; private SmartX.SmartGroupBox groupBoxDirection; private SmartX.SmartButton buttonSave; diff --git a/INT69DC_7C/Forms/FormMotorSetting.cs b/INT69DC_7C/Forms/FormMotorSetting.cs index f0822be..f936480 100644 --- a/INT69DC_7C/Forms/FormMotorSetting.cs +++ b/INT69DC_7C/Forms/FormMotorSetting.cs @@ -166,6 +166,7 @@ namespace INT69DC_7C.Forms } else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) { + #region English this.labelTitle.Text = "Motor settings"; this.groupBoxSelectImpeller.Text = "Select impeller"; @@ -187,12 +188,16 @@ namespace INT69DC_7C.Forms this.buttonAllForward.Text = this.buttonEachForward.Text = this.buttonCom1TestForward.Text = "Normal"; this.buttonAllReverse.Text = this.buttonEachReverse.Text = this.buttonCom1TestReverse.Text = "Reverse"; - this.buttonAllContinue.Font = new Font("Arial", 9, FontStyle.Bold); - this.buttonEachContinue.Font = new Font("Arial", 9, FontStyle.Bold); + this.buttonAllContinue.Font = new Font("새굴림", 9, FontStyle.Bold); + this.buttonEachContinue.Font = new Font("새굴림", 9, FontStyle.Bold); this.buttonAllContinue.Text = this.buttonEachContinue.Text = "Consecutively"; - this.labelDiscription1.Text = this.labelDiscription2.Text = this.labelDiscription3.Text - = this.labelDiscription4.Text = this.labelDiscription5.Text = this.labelDiscription6.Text = ""; + this.labelDiscription1.Text = "Rc : Motor running current (%, max: 100)"; + this.labelDiscription2.Text = "Hc : Motor stall current (%, max: 100)"; + this.labelDiscription3.Text = "Ms : Controls the microstep resolution"; + this.labelDiscription4.Text = "Vi : Initial velocity for all motion commands (< Vm)"; + this.labelDiscription5.Text = "Vm : Specifies the maximum velocity in steps/counts per second"; + this.labelDiscription6.Text = "A : Sets the maximum acceleration achieved by the MDrive in steps per second²"; this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engScreenDisable)); this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engScreenDown)); @@ -205,10 +210,12 @@ namespace INT69DC_7C.Forms this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackUp)); this.buttonClearAlarm.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engClearAlarmDisable)); this.buttonClearAlarm.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engClearAlarmDown)); - this.buttonClearAlarm.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engClearAlarmUp)); + this.buttonClearAlarm.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engClearAlarmUp)); + #endregion } else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) { + #region Chinese this.labelTitle.Text = "设置电机"; this.groupBoxSelectImpeller.Text = "选择叶轮"; @@ -228,7 +235,7 @@ namespace INT69DC_7C.Forms this.labelStaticWarning2.Text = "※ 电源重启后，设置会自动更新"; this.labelStaticWarning3.Text = "※ 关闭电源并重新打开，然后继续测试。"; - this.smartLabel1.Text = this.smartLabel8.Text = "※ 点击按钮200ms"; + this.labelTitleCautionEach.Text = this.labelTitleCautionAll.Text = "※ 点击按钮200ms"; this.buttonAllForward.Text = this.buttonEachForward.Text = this.buttonCom1TestForward.Text = "正向"; this.buttonAllReverse.Text = this.buttonEachReverse.Text = this.buttonCom1TestReverse.Text = "反向"; @@ -239,8 +246,12 @@ namespace INT69DC_7C.Forms this.buttonDownloadExistingMotorEach.Text = "下载每个"; this.buttonDownloadExistingMotorAll.Text = "大量下载"; - this.labelDiscription1.Text = this.labelDiscription2.Text = this.labelDiscription3.Text - = this.labelDiscription4.Text = this.labelDiscription5.Text = this.labelDiscription6.Text = ""; + this.labelDiscription1.Text = "Rc：电机运行电流（%，最大值：100）"; + this.labelDiscription2.Text = "Hc：电机堵转电流（%，最大值：100）"; + this.labelDiscription3.Text = "Ms：控制微步分辨率"; + this.labelDiscription4.Text = "Vi：所有运动指令的初始速度（< Vm）"; + this.labelDiscription5.Text = "Vm：指定最大速度（步/秒）"; + this.labelDiscription6.Text = "A：设置 MDrive 达到的最大加速度（步/秒²）"; this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnScreenDisable)); this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnScreenDown)); @@ -254,9 +265,11 @@ namespace INT69DC_7C.Forms this.buttonClearAlarm.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnClearAlarmDisable)); this.buttonClearAlarm.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnClearAlarmDown)); this.buttonClearAlarm.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnClearAlarmUp)); + #endregion } else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) { + #region Czech this.labelTitle.Text = "Nastavení motoru"; this.groupBoxSelectImpeller.Text = "Výběr pohonu"; @@ -271,7 +284,7 @@ namespace INT69DC_7C.Forms this.groupBoxSelectImpeller.Text = "Linka"; this.groupBoxAngle.Text = "Úhel natočení"; - this.smartLabel1.Text = this.smartLabel8.Text = "※ Stiskněte tlačítko na dobu 200ms"; + this.labelTitleCautionEach.Text = this.labelTitleCautionAll.Text = "※ Stiskněte tlačítko na dobu 200ms"; this.buttonInitialDownload.Text = "Stahování programu"; @@ -285,15 +298,19 @@ namespace INT69DC_7C.Forms this.buttonAllForward.Text = this.buttonEachForward.Text = this.buttonCom1TestForward.Text = "Vpřed"; this.buttonAllReverse.Text = this.buttonEachReverse.Text = this.buttonCom1TestReverse.Text = "Vzad"; - this.buttonEachUnlock.Font = new Font("Arial", 9, FontStyle.Bold); - this.buttonAllUnlock.Font = new Font("Arial", 9, FontStyle.Bold); + this.buttonEachUnlock.Font = new Font("새굴림", 9, FontStyle.Bold); + this.buttonAllUnlock.Font = new Font("새굴림", 9, FontStyle.Bold); this.buttonAllUnlock.Text = this.buttonEachUnlock.Text = "Odemknout"; - this.buttonAllContinue.Font = new Font("Arial", 9, FontStyle.Bold); - this.buttonEachContinue.Font = new Font("Arial", 9, FontStyle.Bold); + this.buttonAllContinue.Font = new Font("새굴림", 9, FontStyle.Bold); + this.buttonEachContinue.Font = new Font("새굴림", 9, FontStyle.Bold); this.buttonAllContinue.Text = this.buttonEachContinue.Text = "Nepřetržitě"; - this.labelDiscription1.Text = this.labelDiscription2.Text = this.labelDiscription3.Text - = this.labelDiscription4.Text = this.labelDiscription5.Text = this.labelDiscription6.Text = ""; + this.labelDiscription1.Text = "Rc: Proud motoru při běhu (%, max: 100)"; + this.labelDiscription2.Text = "Hc: Proud zastavení motoru (%, max: 100)"; + this.labelDiscription3.Text = "Ms: Řídí rozlišení mikrokroků"; + this.labelDiscription4.Text = "Vi: Počáteční rychlost pro všechny povely pohybu (< Vm)"; + this.labelDiscription5.Text = "Vm: Určuje maximální rychlost v krocích/počtech za sekundu"; + this.labelDiscription6.Text = "A: Nastavuje maximální zrychlení dosažené pohonem MDrive v krocích za sekundu²"; this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeScreenDisable)); this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeScreenDown)); @@ -307,9 +324,11 @@ namespace INT69DC_7C.Forms this.buttonClearAlarm.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeClearAlarmDisable)); this.buttonClearAlarm.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeClearAlarmDown)); this.buttonClearAlarm.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeClearAlarmUp)); + #endregion } else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German) { + #region German this.labelTitle.Text = "Motoreinstellung"; this.groupBoxSelectImpeller.Text = "Laufrad wählen"; @@ -326,7 +345,7 @@ namespace INT69DC_7C.Forms this.groupBoxDirection.Text = "Drehrichtung(Standard:Vorwärts, Klicken:Rückwärts)"; this.groupBoxAngle.Text = "Drehwinkel"; - this.smartLabel1.Text = this.smartLabel8.Text = "※ Taste 200ms gedrückt halten"; + this.labelTitleCautionEach.Text = this.labelTitleCautionAll.Text = "※ Taste 200ms gedrückt halten"; this.buttonInitialDownload.Text = "Herunterladen"; this.labelStaticWarning1.Text = "※ Programm lädt erst herunter, NACHDEM ein neuer Motor ANGESCHLOSSEN WURDE"; @@ -335,15 +354,19 @@ namespace INT69DC_7C.Forms this.buttonAllForward.Text = this.buttonEachForward.Text = this.buttonCom1TestForward.Text = "Vorwärts"; this.buttonAllReverse.Text = this.buttonEachReverse.Text = this.buttonCom1TestReverse.Text = "Rückwärts"; - this.buttonEachUnlock.Font = new Font("Arial", 9, FontStyle.Bold); - this.buttonAllUnlock.Font = new Font("Arial", 9, FontStyle.Bold); + this.buttonEachUnlock.Font = new Font("새굴림", 9, FontStyle.Bold); + this.buttonAllUnlock.Font = new Font("새굴림", 9, FontStyle.Bold); this.buttonAllUnlock.Text = this.buttonEachUnlock.Text = "Aufsperren"; - this.buttonAllContinue.Font = new Font("Arial", 9, FontStyle.Bold); - this.buttonEachContinue.Font = new Font("Arial", 9, FontStyle.Bold); + this.buttonAllContinue.Font = new Font("새굴림", 9, FontStyle.Bold); + this.buttonEachContinue.Font = new Font("새굴림", 9, FontStyle.Bold); this.buttonAllContinue.Text = this.buttonEachContinue.Text = "Dauerhafter"; - this.labelDiscription1.Text = this.labelDiscription2.Text = this.labelDiscription3.Text - = this.labelDiscription4.Text = this.labelDiscription5.Text = this.labelDiscription6.Text = ""; + this.labelDiscription1.Text = "Rc: Motorbetriebsstrom (%), max.: 100"; + this.labelDiscription2.Text = "Hc: Motorblockierstrom (%), max.: 100"; + this.labelDiscription3.Text = "Ms: Steuert die Mikroschrittauflösung"; + this.labelDiscription4.Text = "Vi: Anfangsgeschwindigkeit für alle Bewegungsbefehle (< Vm)"; + this.labelDiscription5.Text = "Vm: Gibt die maximale Geschwindigkeit in Schritten/Zählungen pro Sekunde an"; + this.labelDiscription6.Text = "A: Legt die maximale Beschleunigung fest, die vom MDrive erreicht wird, in Schritten pro Sekunde²"; this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerScreenDisable)); this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerScreenDown)); @@ -357,6 +380,65 @@ namespace INT69DC_7C.Forms this.buttonClearAlarm.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerClearAlarmDisable)); this.buttonClearAlarm.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerClearAlarmDown)); this.buttonClearAlarm.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerClearAlarmUp)); + #endregion + } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + #region Japanese + this.labelTitle.Text = "モㅡタㅡ設定"; + + this.groupBoxSelectImpeller.Text = "インペラㅡ選択"; + this.groupBoxEachDownload.Text = "個別モㅡタㅡプログラムのダウンロㅡド"; + this.groupBoxEach.Text = "個々のモㅡタㅡテスト"; + this.groupBoxAll.Text = "フルモㅡタㅡテスト"; + this.groupBoxMotorTest.Text = "モㅡタㅡテスト(COM1, RS485)"; + this.groupBoxInitialDownload.Text = "プログラムのダウンロㅡド(COM1, RS485)"; + + this.groupBoxSelectImpeller.Text = "列"; + this.groupBoxDirection.Text = "個々モㅡタㅡ方向(デフォルト:正転, クリック:逆回転)"; + this.groupBoxAngle.Text = "角度設定"; + this.buttonEachUnlock.Text = this.buttonAllUnlock.Text = "ロック解除"; + + this.buttonInitialDownload.Text = "ダウンロㅡド"; + + this.labelStaticWarning1.Text = "※ モㅡタㅡ接続後、ダウンロㅡドしてください。"; + this.labelStaticWarning2.Text = "※ 電源を入れ直すと設定が反映されます。."; + this.labelStaticWarning3.Text = "※ 電源を入れ直した後、テストを進めてください。"; + + this.buttonAllForward.Text = this.buttonEachForward.Text = this.buttonCom1TestForward.Text = "正転"; + this.buttonAllReverse.Text = this.buttonEachReverse.Text = this.buttonCom1TestReverse.Text = "逆回転"; + this.buttonAllContinue.Text = this.buttonEachContinue.Text = "連続"; + + this.labelTitleCautionAll.Text = this.labelTitleCautionEach.Text = "※ボタンを200msクリック"; + this.labelTitlePass.Text = "定量 : "; + this.labelTitleNG.Text = "不良 : "; + this.labelTitleStep1.Text = "ステップ1"; + this.labelTitleStep2.Text = "ステップ2"; + + this.buttonDefault.Text = "デフォルト"; + this.buttonDownloadExistingMotorEach.Text = "ダウンロㅡド(個別)"; + this.buttonDownloadExistingMotorAll.Text = "ダウンロㅡド(全体)"; + + this.labelDiscription1.Text = "Rc：モㅡタ駆動電流（%、最大値：100）"; + this.labelDiscription2.Text = "Hc：モㅡタ停止電流（%、最大値：100）"; + this.labelDiscription3.Text = "Ms：マイクロステップ分解能を制御"; + this.labelDiscription4.Text = "Vi：すべてのモㅡションコマンドの初期速度（< Vm）"; + this.labelDiscription5.Text = "Vm：軸が到達する1秒あたりのステップ/カウントでの最大速度の指定"; + this.labelDiscription6.Text = "A：Sec²あたりのステップでMDriveによって到達される最大加速を設定します"; + + this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDisable)); + this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDown)); + this.buttonScreen.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenUp)); + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + this.buttonClearAlarm.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnClearAlarmDisable)); + this.buttonClearAlarm.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnClearAlarmDown)); + this.buttonClearAlarm.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnClearAlarmUp)); + #endregion } else { @@ -1520,6 +1602,8 @@ namespace INT69DC_7C.Forms this.buttonEachUnlock.Text = "Sperren"; else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) this.buttonEachUnlock.Text = "锁住"; + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + this.buttonEachUnlock.Text = "ロック"; else this.buttonEachUnlock.Text = "Lock"; @@ -1565,6 +1649,8 @@ namespace INT69DC_7C.Forms this.buttonEachUnlock.Text = "Aufsperren"; else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) this.buttonEachUnlock.Text = "解锁"; + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + this.buttonEachUnlock.Text = "ロック解除"; else this.buttonEachUnlock.Text = "Unlock"; @@ -1699,6 +1785,8 @@ namespace INT69DC_7C.Forms this.buttonAllUnlock.Text = "Sperren"; else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) this.buttonAllUnlock.Text = "锁住"; + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + this.buttonAllUnlock.Text = "ロック"; else this.buttonAllUnlock.Text = "Lock"; @@ -1744,6 +1832,8 @@ namespace INT69DC_7C.Forms this.buttonAllUnlock.Text = "Aufsperren"; else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) this.buttonAllUnlock.Text = "解锁"; + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + this.buttonAllUnlock.Text = "ロック解除"; else this.buttonAllUnlock.Text = "Unlock"; diff --git a/INT69DC_7C/Forms/FormOptionSetting.cs b/INT69DC_7C/Forms/FormOptionSetting.cs index de50b40..99e064d 100644 --- a/INT69DC_7C/Forms/FormOptionSetting.cs +++ b/INT69DC_7C/Forms/FormOptionSetting.cs @@ -108,6 +108,21 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "オプション設定"; + + this.labelBuadrateWarning.Text = "※ 設定を変更したら、電源を入れ直してください。"; + this.labelBuadrateWarning2.Text = "※ エンジニア以外に絶対に変更しないでください。"; + + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveUp)); + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { diff --git a/INT69DC_7C/Forms/FormProgramUpdate.cs b/INT69DC_7C/Forms/FormProgramUpdate.cs index 3cb1a95..032c89d 100644 --- a/INT69DC_7C/Forms/FormProgramUpdate.cs +++ b/INT69DC_7C/Forms/FormProgramUpdate.cs @@ -84,6 +84,13 @@ namespace INT69DC_7C.Forms this.labelUpdateWait2.Text = "USB nicht vom Gerät trennen"; this.labelUpdateRestart.Text = "Mit dem Hauptschalter aus- und einschalten"; } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "更新"; + this.labelUpdateWait.Text = "しばらくお待ちください。"; + this.labelUpdateWait2.Text = "USBを本体から外さないでください。"; + this.labelUpdateRestart.Text = "電源を入れ直してください。"; + } else { diff --git a/INT69DC_7C/Forms/FormSystemSetting.Designer.cs b/INT69DC_7C/Forms/FormSystemSetting.Designer.cs index 037df3d..ff79c02 100644 --- a/INT69DC_7C/Forms/FormSystemSetting.Designer.cs +++ b/INT69DC_7C/Forms/FormSystemSetting.Designer.cs @@ -79,7 +79,7 @@ this.labelStaticDoubleDelayTime = new SmartX.SmartLabel(); this.labelStaticJudgmentDelayTime = new SmartX.SmartLabel(); this.labelStaticFilter = new SmartX.SmartLabel(); - this.smartLabel33 = new SmartX.SmartLabel(); + this.labelTitleWeight = new SmartX.SmartLabel(); this.labelWeightValue = new SmartX.SmartLabel(); this.buttonWeightReference = new SmartX.SmartButton(); this.smartLabel32 = new SmartX.SmartLabel(); @@ -137,7 +137,7 @@ this.labelTitleNo.BackPictureBox2 = null; this.labelTitleNo.BorderColor = System.Drawing.Color.Black; this.labelTitleNo.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleNo.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleNo.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelTitleNo.InitVisible = true; this.labelTitleNo.LineSpacing = 0F; this.labelTitleNo.Location = new System.Drawing.Point(34, 33); @@ -242,7 +242,7 @@ this.buttonCopy.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonCopy.DisableImage = null; this.buttonCopy.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCopy.DownImage"))); - this.buttonCopy.Font = new System.Drawing.Font("Gulim", 18F, System.Drawing.FontStyle.Bold); + this.buttonCopy.Font = new System.Drawing.Font("굴림", 18F, System.Drawing.FontStyle.Bold); this.buttonCopy.GroupID = 0; this.buttonCopy.InitVisible = true; this.buttonCopy.Location = new System.Drawing.Point(30, 666); @@ -289,7 +289,7 @@ this.groupBoxConveyor.Controls.Add(this.labelStaticFeedingRunTime); this.groupBoxConveyor.Controls.Add(this.labelStaticFeedingDelayTime); this.groupBoxConveyor.Controls.Add(this.labelStaticRejectConveyorRunTime); - this.groupBoxConveyor.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxConveyor.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.groupBoxConveyor.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxConveyor.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxConveyor.FrameLineThickness = 1; @@ -312,7 +312,7 @@ this.labelStaticFeedingConveyor.BackPictureBox2 = null; this.labelStaticFeedingConveyor.BorderColor = System.Drawing.Color.Black; this.labelStaticFeedingConveyor.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFeedingConveyor.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFeedingConveyor.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFeedingConveyor.InitVisible = true; this.labelStaticFeedingConveyor.LineSpacing = 0F; this.labelStaticFeedingConveyor.Location = new System.Drawing.Point(20, 109); @@ -332,7 +332,7 @@ this.labelStaticRejectConveyor.BackPictureBox2 = null; this.labelStaticRejectConveyor.BorderColor = System.Drawing.Color.Black; this.labelStaticRejectConveyor.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticRejectConveyor.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticRejectConveyor.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticRejectConveyor.InitVisible = true; this.labelStaticRejectConveyor.LineSpacing = 0F; this.labelStaticRejectConveyor.Location = new System.Drawing.Point(20, 19); @@ -415,7 +415,7 @@ this.labelStaticRejectConveyorDelayTime.BackPictureBox2 = null; this.labelStaticRejectConveyorDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticRejectConveyorDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticRejectConveyorDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticRejectConveyorDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticRejectConveyorDelayTime.InitVisible = true; this.labelStaticRejectConveyorDelayTime.LineSpacing = 0F; this.labelStaticRejectConveyorDelayTime.Location = new System.Drawing.Point(16, 39); @@ -456,7 +456,7 @@ this.labelStaticFeedingRunTime.BackPictureBox2 = null; this.labelStaticFeedingRunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticFeedingRunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFeedingRunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFeedingRunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFeedingRunTime.InitVisible = true; this.labelStaticFeedingRunTime.LineSpacing = 0F; this.labelStaticFeedingRunTime.Location = new System.Drawing.Point(16, 167); @@ -476,7 +476,7 @@ this.labelStaticFeedingDelayTime.BackPictureBox2 = null; this.labelStaticFeedingDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticFeedingDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFeedingDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFeedingDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFeedingDelayTime.InitVisible = true; this.labelStaticFeedingDelayTime.LineSpacing = 0F; this.labelStaticFeedingDelayTime.Location = new System.Drawing.Point(16, 131); @@ -496,7 +496,7 @@ this.labelStaticRejectConveyorRunTime.BackPictureBox2 = null; this.labelStaticRejectConveyorRunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticRejectConveyorRunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticRejectConveyorRunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticRejectConveyorRunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticRejectConveyorRunTime.InitVisible = true; this.labelStaticRejectConveyorRunTime.LineSpacing = 0F; this.labelStaticRejectConveyorRunTime.Location = new System.Drawing.Point(16, 75); @@ -546,7 +546,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); @@ -575,7 +575,7 @@ this.smartGroupBox1.Controls.Add(this.labelTitleName); this.smartGroupBox1.Controls.Add(this.labelTitleNo); this.smartGroupBox1.Controls.Add(this.listBoxProductList); - this.smartGroupBox1.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartGroupBox1.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineThickness = 1; @@ -748,7 +748,7 @@ // // buttonLotEdit // - this.buttonLotEdit.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.buttonLotEdit.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.buttonLotEdit.Location = new System.Drawing.Point(358, 104); this.buttonLotEdit.Name = "buttonLotEdit"; this.buttonLotEdit.Size = new System.Drawing.Size(82, 30); @@ -758,7 +758,7 @@ // // buttonNameEdit // - this.buttonNameEdit.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.buttonNameEdit.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.buttonNameEdit.Location = new System.Drawing.Point(358, 68); this.buttonNameEdit.Name = "buttonNameEdit"; this.buttonNameEdit.Size = new System.Drawing.Size(82, 30); @@ -773,7 +773,7 @@ this.labelTitleLOT.BackPictureBox2 = null; this.labelTitleLOT.BorderColor = System.Drawing.Color.Black; this.labelTitleLOT.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleLOT.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleLOT.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelTitleLOT.InitVisible = true; this.labelTitleLOT.LineSpacing = 0F; this.labelTitleLOT.Location = new System.Drawing.Point(34, 104); @@ -792,7 +792,7 @@ this.labelTitleName.BackPictureBox2 = null; this.labelTitleName.BorderColor = System.Drawing.Color.Black; this.labelTitleName.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleName.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleName.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelTitleName.InitVisible = true; this.labelTitleName.LineSpacing = 0F; this.labelTitleName.Location = new System.Drawing.Point(34, 68); @@ -818,7 +818,7 @@ this.groupBoxJudgment.BackPictureBox = this.smartForm1; this.groupBoxJudgment.BackPictureBox1 = null; this.groupBoxJudgment.Controls.Add(this.groupBoxJudgmentSetting); - this.groupBoxJudgment.Controls.Add(this.smartLabel33); + this.groupBoxJudgment.Controls.Add(this.labelTitleWeight); this.groupBoxJudgment.Controls.Add(this.labelWeightValue); this.groupBoxJudgment.Controls.Add(this.buttonWeightReference); this.groupBoxJudgment.Controls.Add(this.smartLabel32); @@ -829,7 +829,7 @@ this.groupBoxJudgment.Controls.Add(this.groupBoxConveyor); this.groupBoxJudgment.Controls.Add(this.labelWeightReference); this.groupBoxJudgment.Controls.Add(this.smartDraw); - this.groupBoxJudgment.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxJudgment.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.groupBoxJudgment.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxJudgment.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxJudgment.FrameLineThickness = 1; @@ -946,7 +946,7 @@ this.labelStaticSorterDelayTime.BackPictureBox2 = null; this.labelStaticSorterDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorterDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorterDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorterDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorterDelayTime.ForeColor = System.Drawing.Color.Black; this.labelStaticSorterDelayTime.InitVisible = true; this.labelStaticSorterDelayTime.LineSpacing = 0F; @@ -966,7 +966,7 @@ this.labelStaticFeedSpeed.BackPictureBox2 = null; this.labelStaticFeedSpeed.BorderColor = System.Drawing.Color.Black; this.labelStaticFeedSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFeedSpeed.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFeedSpeed.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFeedSpeed.ForeColor = System.Drawing.Color.Black; this.labelStaticFeedSpeed.InitVisible = true; this.labelStaticFeedSpeed.LineSpacing = 0F; @@ -986,7 +986,7 @@ this.labelStaticSorterRunTime.BackPictureBox2 = null; this.labelStaticSorterRunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorterRunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorterRunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorterRunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorterRunTime.ForeColor = System.Drawing.Color.Black; this.labelStaticSorterRunTime.InitVisible = true; this.labelStaticSorterRunTime.LineSpacing = 0F; @@ -1090,7 +1090,7 @@ this.labelStaticJudgmentCount.BackPictureBox2 = null; this.labelStaticJudgmentCount.BorderColor = System.Drawing.Color.Black; this.labelStaticJudgmentCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticJudgmentCount.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticJudgmentCount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticJudgmentCount.ForeColor = System.Drawing.Color.Black; this.labelStaticJudgmentCount.InitVisible = true; this.labelStaticJudgmentCount.LineSpacing = 0F; @@ -1110,7 +1110,7 @@ this.labelStaticDoubleDelayTime.BackPictureBox2 = null; this.labelStaticDoubleDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticDoubleDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticDoubleDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticDoubleDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticDoubleDelayTime.ForeColor = System.Drawing.Color.Black; this.labelStaticDoubleDelayTime.InitVisible = true; this.labelStaticDoubleDelayTime.LineSpacing = 0F; @@ -1130,7 +1130,7 @@ this.labelStaticJudgmentDelayTime.BackPictureBox2 = null; this.labelStaticJudgmentDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticJudgmentDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticJudgmentDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticJudgmentDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticJudgmentDelayTime.ForeColor = System.Drawing.Color.Black; this.labelStaticJudgmentDelayTime.InitVisible = true; this.labelStaticJudgmentDelayTime.LineSpacing = 0F; @@ -1150,7 +1150,7 @@ this.labelStaticFilter.BackPictureBox2 = null; this.labelStaticFilter.BorderColor = System.Drawing.Color.Black; this.labelStaticFilter.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFilter.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFilter.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFilter.ForeColor = System.Drawing.Color.Black; this.labelStaticFilter.InitVisible = true; this.labelStaticFilter.LineSpacing = 0F; @@ -1163,25 +1163,25 @@ this.labelStaticFilter.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelStaticFilter.Wordwrap = false; // - // smartLabel33 + // labelTitleWeight // - this.smartLabel33.BackPictureBox = this.smartForm1; - this.smartLabel33.BackPictureBox1 = null; - this.smartLabel33.BackPictureBox2 = null; - this.smartLabel33.BorderColor = System.Drawing.Color.Black; - this.smartLabel33.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.smartLabel33.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); - this.smartLabel33.ForeColor = System.Drawing.Color.Black; - this.smartLabel33.InitVisible = true; - this.smartLabel33.LineSpacing = 0F; - this.smartLabel33.Location = new System.Drawing.Point(412, 305); - this.smartLabel33.Name = "smartLabel33"; - this.smartLabel33.Size = new System.Drawing.Size(80, 20); - this.smartLabel33.TabIndex = 170; - this.smartLabel33.Text = "Weight"; - this.smartLabel33.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel33.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel33.Wordwrap = false; + this.labelTitleWeight.BackPictureBox = this.smartForm1; + this.labelTitleWeight.BackPictureBox1 = null; + this.labelTitleWeight.BackPictureBox2 = null; + this.labelTitleWeight.BorderColor = System.Drawing.Color.Black; + this.labelTitleWeight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelTitleWeight.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleWeight.ForeColor = System.Drawing.Color.Black; + this.labelTitleWeight.InitVisible = true; + this.labelTitleWeight.LineSpacing = 0F; + this.labelTitleWeight.Location = new System.Drawing.Point(412, 305); + this.labelTitleWeight.Name = "labelTitleWeight"; + this.labelTitleWeight.Size = new System.Drawing.Size(80, 20); + this.labelTitleWeight.TabIndex = 170; + this.labelTitleWeight.Text = "Weight"; + this.labelTitleWeight.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleWeight.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleWeight.Wordwrap = false; // // labelWeightValue // @@ -1213,7 +1213,7 @@ this.buttonWeightReference.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonWeightReference.DisableImage = null; this.buttonWeightReference.DownImage = null; - this.buttonWeightReference.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.buttonWeightReference.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.buttonWeightReference.GroupID = 0; this.buttonWeightReference.InitVisible = true; this.buttonWeightReference.Location = new System.Drawing.Point(132, 305); @@ -1243,7 +1243,7 @@ this.smartLabel32.BackPictureBox2 = null; this.smartLabel32.BorderColor = System.Drawing.Color.Black; this.smartLabel32.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.smartLabel32.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel32.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel32.ForeColor = System.Drawing.Color.Black; this.smartLabel32.InitVisible = true; this.smartLabel32.LineSpacing = 0F; @@ -1283,7 +1283,7 @@ this.labelStaticJudgment.BackPictureBox2 = null; this.labelStaticJudgment.BorderColor = System.Drawing.Color.Black; this.labelStaticJudgment.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelStaticJudgment.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticJudgment.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelStaticJudgment.ForeColor = System.Drawing.Color.Black; this.labelStaticJudgment.InitVisible = true; this.labelStaticJudgment.LineSpacing = 0F; @@ -1383,7 +1383,7 @@ this.labelTitleImpellerDelayTime.BackPictureBox2 = null; this.labelTitleImpellerDelayTime.BorderColor = System.Drawing.Color.Black; this.labelTitleImpellerDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleImpellerDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleImpellerDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelTitleImpellerDelayTime.ForeColor = System.Drawing.Color.Black; this.labelTitleImpellerDelayTime.InitVisible = true; this.labelTitleImpellerDelayTime.LineSpacing = 0F; @@ -1426,7 +1426,7 @@ this.labelStaticDynamic.BackPictureBox2 = null; this.labelStaticDynamic.BorderColor = System.Drawing.Color.Black; this.labelStaticDynamic.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticDynamic.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticDynamic.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelStaticDynamic.ForeColor = System.Drawing.Color.Black; this.labelStaticDynamic.InitVisible = true; this.labelStaticDynamic.LineSpacing = 0F; @@ -1588,7 +1588,7 @@ private SmartX.SmartLabel labelStaticDoubleDelayTime; private SmartX.SmartLabel labelStaticJudgmentDelayTime; private SmartX.SmartLabel labelStaticFilter; - private SmartX.SmartLabel smartLabel33; + private SmartX.SmartLabel labelTitleWeight; private SmartX.SmartLabel labelWeightValue; private SmartX.SmartButton buttonWeightReference; private SmartX.SmartLabel smartLabel32; diff --git a/INT69DC_7C/Forms/FormSystemSetting.cs b/INT69DC_7C/Forms/FormSystemSetting.cs index ffc7a96..f5474b5 100644 --- a/INT69DC_7C/Forms/FormSystemSetting.cs +++ b/INT69DC_7C/Forms/FormSystemSetting.cs @@ -138,7 +138,7 @@ namespace INT69DC_7C.Forms this.buttonNameEdit.Text = this.buttonLotEdit.Text = "编辑"; - this.smartLabel33.Text = "重量"; + this.labelTitleWeight.Text = "重量"; this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackDisable)); this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackDown)); @@ -169,7 +169,7 @@ namespace INT69DC_7C.Forms this.buttonWeightReference.Text = "Reference"; this.labelStaticJudgment.Text = "Výsledek"; this.labelStaticFilter.Text = "Filtrovat"; - this.labelStaticJudgmentDelayTime.Font = new Font("Arial", 9, FontStyle.Bold); + this.labelStaticJudgmentDelayTime.Font = new Font("새굴림", 9, FontStyle.Bold); this.labelStaticJudgmentDelayTime.Text = "Zpoždění rozhodnutí"; this.labelStaticDoubleDelayTime.Text = "Přesah"; this.labelStaticJudgmentCount.Text = "Počet rozhodnutí"; @@ -190,7 +190,7 @@ namespace INT69DC_7C.Forms this.buttonNameEdit.Text = this.buttonLotEdit.Text = "Editovat"; this.labelTitleNo.Text = "Počet"; this.labelTitleName.Text = "Jméno"; - this.smartLabel33.Text = "Hmotnost"; + this.labelTitleWeight.Text = "Hmotnost"; this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeBackDisable)); this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeBackDown)); @@ -241,7 +241,7 @@ namespace INT69DC_7C.Forms this.buttonNameEdit.Text = this.buttonLotEdit.Text = "Bearbeiten"; this.labelTitleNo.Text = "Nummer"; this.labelTitleName.Text = "Name"; - this.smartLabel33.Text = "Gewicht"; + this.labelTitleWeight.Text = "Gewicht"; this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDisable)); this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); @@ -263,6 +263,60 @@ namespace INT69DC_7C.Forms this.buttonUnder.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerFormSystemUnderDown)); this.buttonUnder.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerFormSystemUnderUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "システム設定"; + this.smartGroupBox1.Text = "製品設定"; + this.groupBoxJudgment.Text = "判定設定"; + + this.labelTitleNo.Text = "番号"; + this.labelTitleName.Text = "名称"; + this.labelTitleLOT.Text = "ロット"; + this.buttonNameEdit.Text = "編集"; + this.buttonLotEdit.Text = "編集"; + + this.buttonWeightReference.Text = "基準"; + this.labelStaticJudgment.Text = "結果"; + this.labelStaticFilter.Text = "フィルタㅡ"; + this.labelStaticJudgmentDelayTime.Text = "判定遅延"; + this.labelStaticDoubleDelayTime.Text = "二重遅延"; + this.labelStaticJudgmentCount.Text = "判定数"; + this.labelStaticDynamic.Text = "動的定数"; + this.labelStaticFeedSpeed.Text = "速度"; + + this.labelStaticSorterDelayTime.Text = "ソㅡタㅡ遅延"; + this.labelStaticSorterRunTime.Text = "ソㅡタㅡ運転"; + + this.groupBoxConveyor.Text = "コンベアの設定"; + this.labelStaticRejectConveyor.Text = "排出コンベア"; + this.labelStaticRejectConveyorDelayTime.Text = "遅延時間"; + this.labelStaticRejectConveyorRunTime.Text = "運転時間"; + this.labelStaticFeedingConveyor.Text = "供給コンベア"; + this.labelStaticFeedingDelayTime.Text = "遅延時間"; + this.labelStaticFeedingRunTime.Text = "運転時間"; + + this.labelTitleWeight.Text = "重量"; + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + + this.buttonCopy.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemCopyDown)); + this.buttonCopy.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemCopyUp)); + this.buttonPaste.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemPasteDown)); + this.buttonPaste.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemPasteUp)); + this.buttonPasteAll.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemPasteAllDown)); + this.buttonPasteAll.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemPasteAllUp)); + + this.buttonOver.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemOverDown)); + this.buttonOver.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemOverUp)); + this.buttonPass.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemPassDown)); + this.buttonPass.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemPassUp)); + this.buttonTare.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemTareDown)); + this.buttonTare.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemTareUp)); + this.buttonUnder.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemUnderDown)); + this.buttonUnder.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnFormSystemUnderUp)); + } else { diff --git a/INT69DC_7C/Forms/FormTimeSetting.cs b/INT69DC_7C/Forms/FormTimeSetting.cs index 103b0ea..ac2fed2 100644 --- a/INT69DC_7C/Forms/FormTimeSetting.cs +++ b/INT69DC_7C/Forms/FormTimeSetting.cs @@ -101,6 +101,20 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "時間設定"; + this.labelStaticCurrentTime.Text = "現在時刻"; + this.labelStaticTimeSetting.Text = "設定"; + + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveUp)); + + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs index 0b018b4..7ec420a 100644 --- a/INT69DC_7C/Forms/FormUserEditor.cs +++ b/INT69DC_7C/Forms/FormUserEditor.cs @@ -123,6 +123,48 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) + { + this.labelTitle.Text = "ユㅡザㅡ設定"; + + this.labelTitlePassword.Text = "パスワㅡド"; + this.labelTitleAccessRight.Text = "アクセス権"; + + this.labelStatusExpiryAccount.Text = "満了"; + this.labelStatusExpiryPassword.Text = "満了"; + this.labelAutoLogoutWarning.Text = "* すべてのユㅡザㅡに適用されます"; + + this.groupBoxAccessRight.Text = "アクセス権"; + this.labelMain.Text = "メイン"; + this.labelMenu.Text = "メニュㅡ"; + this.buttonResetPW.Text = "リセット"; + + this.labelProductNo.Text = "アイテム変更"; + this.labelWeightSetting.Text = "重量値設定"; + this.labelClear.Text = "クリア"; + this.labelSubMenu.Text = "サブメニュㅡ"; + this.labelInformation.Text = "インフォメㅡション"; + this.labelConfiguration.Text = "構成"; + this.labelCommunication.Text = "通信設定"; + this.labelCalibration.Text = "キャリブレㅡション"; + this.labelSystem.Text = "システム設定"; + this.labelMotor.Text = "モㅡタㅡ設定"; + this.labelIOTest.Text = "I/Oテスト"; + this.labelUpdate.Text = "更新"; + this.labelInitialization.Text = "初期化"; + this.labelTime.Text = "時間設定"; + this.labelDataBackup.Text = "デㅡタバックアップ"; + this.labelEquipment.Text = "装置設定"; + this.labelStatistics.Text = "デㅡタ統計"; + this.labelViewer.Text = "デㅡタビュㅡア"; + + this.buttonGroupEditor.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnGroupEditorDisable)); + this.buttonGroupEditor.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnGroupEditorDown)); + this.buttonGroupEditor.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnGroupEditorUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + } else { @@ -220,6 +262,7 @@ namespace INT69DC_7C.Forms else isNewReg = false; + #region listbox 미선택 시 신규 유저 등록, 선택 시 기존 유저 정보 수정 if (isNewReg == true) { switch (this.ParentForm.SystemConfig.Language) @@ -249,6 +292,11 @@ namespace INT69DC_7C.Forms message1 = "Would you like to register as a user?"; message2 = ""; break; + case DataStore.LanguageID.Japanese: + code = "ユㅡザㅡ設定"; + message1 = "新規ユㅡザㅡを追加しますか？"; + message2 = ""; + break; default: break; } @@ -282,10 +330,16 @@ namespace INT69DC_7C.Forms message1 = "Are you sure you want to edit the"; message2 = "selected user's information?"; break; + case DataStore.LanguageID.Japanese: + code = "ユㅡザㅡ設定"; + message1 = "選択したユㅡザㅡの情報を編集しますか？"; + message2 = ""; + break; default: break; } } + #endregion DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2); if (dlg.ShowDialog() == DialogResult.Yes) @@ -330,20 +384,15 @@ namespace INT69DC_7C.Forms } else { - item.ExpireId = 0; - item.ExpirePassword = 0; + item.ExpireId = -1; + item.ExpirePassword = -1; } //item.IsAdmin = this.cbAdministrator.Checked; - if (isNewReg == true) - item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1; + if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin) + item.ActiveLevel = 9; else - { - if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin) - item.ActiveLevel = 9; - else - item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1; - } + item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1; menuId.fMenu = new bool[UserManager.USER_MENU_ID_MAX]; for (int i = 0; i < UserManager.USER_MENU_ID_MAX; i++) @@ -372,6 +421,8 @@ namespace INT69DC_7C.Forms //UserManager.UserManager_AutoLogoutSetTimeout(this.ParentForm.ParentForm.SystemConfig.AUTOMATIC_LOGOUT, this.ParentForm.ParentForm.FlagAutomaticLogoutWarningTime); #endregion + + this.buttonSave.Visible = false; } } private void UserNew() @@ -817,6 +868,11 @@ namespace INT69DC_7C.Forms message1 = "Benutzer hinzufügen abgeschlossen!"; message2 = ""; break; + case DataStore.LanguageID.Japanese: + code = "ユㅡザㅡ設定"; + message1 = "ユㅡザㅡ追加完了！"; + message2 = ""; + break; default: break; } @@ -881,6 +937,11 @@ namespace INT69DC_7C.Forms message1 = "Benutzerinformationen geändert!"; message2 = ""; break; + case DataStore.LanguageID.Japanese: + code = "ユㅡザㅡ設定"; + message1 = "ユㅡザㅡ情報修正完了！"; + message2 = ""; + break; default: break; } @@ -947,6 +1008,11 @@ namespace INT69DC_7C.Forms message1 = string.Format("{0} Benutzerlöschung abgeschlossen!", user.user_id); message2 = ""; break; + case DataStore.LanguageID.Japanese: + code = "ユㅡザㅡ設定"; + message1 = string.Format("{0} ユㅡザㅡ削除完了！", user.user_id); + message2 = ""; + break; default: break; } @@ -1204,23 +1270,28 @@ namespace INT69DC_7C.Forms message2 = ""; break; case DataStore.LanguageID.English: - code = "유저설정"; - message1 = "사용자 잠금 해제 하시겠습니까?"; + code = "User settings"; + message1 = "Do you want to unlock the user?"; message2 = ""; break; case DataStore.LanguageID.Chinese: - code = "유저설정"; - message1 = "사용자 잠금 해제 하시겠습니까?"; + code = "用户设置"; + message1 = "是否要解锁用户？"; message2 = ""; break; case DataStore.LanguageID.Czech: - code = "유저설정"; + code = "Uživatelské nastavení"; message1 = "사용자 잠금 해제 하시겠습니까?"; message2 = ""; break; case DataStore.LanguageID.German: - code = "유저설정"; - message1 = "사용자 잠금 해제 하시겠습니까?"; + code = "Benutzereinstellungen"; + message1 = "Möchten Sie den Benutzer entsperren?"; + message2 = ""; + break; + case DataStore.LanguageID.Japanese: + code = "ユㅡザㅡ設定"; + message1 = "ユㅡザㅡのロックを解除しますか？"; message2 = ""; break; default: @@ -1243,13 +1314,13 @@ namespace INT69DC_7C.Forms message2 = ""; break; case DataStore.LanguageID.English: - code = "유저설정"; - message1 = "비밀번호 잠금 해제 하시겠습니까?"; + code = "User settings"; + message1 = "Do you want to unlock the password?"; message2 = ""; break; case DataStore.LanguageID.Chinese: - code = "유저설정"; - message1 = "비밀번호 잠금 해제 하시겠습니까?"; + code = "用户设置"; + message1 = "是否要解锁密码？"; message2 = ""; break; case DataStore.LanguageID.Czech: @@ -1258,8 +1329,13 @@ namespace INT69DC_7C.Forms message2 = ""; break; case DataStore.LanguageID.German: - code = "유저설정"; - message1 = "비밀번호 잠금 해제 하시겠습니까?"; + code = "Benutzereinstellungen"; + message1 = "Möchten Sie das Passwort entsperren?"; + message2 = ""; + break; + case DataStore.LanguageID.Japanese: + code = "ユㅡザㅡ設定"; + message1 = "パスワㅡドのロックを解除しますか？"; message2 = ""; break; default: diff --git a/INT69DC_7C/Forms/FormUserEditor.designer.cs b/INT69DC_7C/Forms/FormUserEditor.designer.cs index 47678d4..d9609b0 100644 --- a/INT69DC_7C/Forms/FormUserEditor.designer.cs +++ b/INT69DC_7C/Forms/FormUserEditor.designer.cs @@ -49,7 +49,7 @@ this.labelStatusExpiryAccount = new SmartX.SmartLabel(); this.labelAutomaticLogoutTime = new SmartX.SmartLabel(); this.buttonDelete = new SmartX.SmartButton(); - this.smartGroupBox2 = new SmartX.SmartGroupBox(); + this.groupBoxAccessRight = new SmartX.SmartGroupBox(); this.labelEquipment = new SmartX.SmartLabel(); this.labelMenu = new SmartX.SmartLabel(); this.labelMain = new SmartX.SmartLabel(); @@ -86,7 +86,7 @@ this.listBoxUserList = new System.Windows.Forms.ListBox(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.smartGroupBox1.SuspendLayout(); - this.smartGroupBox2.SuspendLayout(); + this.groupBoxAccessRight.SuspendLayout(); this.SuspendLayout(); // // smartForm1 @@ -111,7 +111,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); @@ -175,7 +175,7 @@ this.smartGroupBox1.Controls.Add(this.labelStatusExpiryAccount); this.smartGroupBox1.Controls.Add(this.labelAutomaticLogoutTime); this.smartGroupBox1.Controls.Add(this.buttonDelete); - this.smartGroupBox1.Controls.Add(this.smartGroupBox2); + this.smartGroupBox1.Controls.Add(this.groupBoxAccessRight); this.smartGroupBox1.Controls.Add(this.labelTitleAutomaticLogoutTime); this.smartGroupBox1.Controls.Add(this.buttonSave); this.smartGroupBox1.Controls.Add(this.labelExpiryDateOfPassword2); @@ -235,7 +235,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(199, 156); this.comboBoxAccessRight.Name = "comboBoxAccessRight"; this.comboBoxAccessRight.Size = new System.Drawing.Size(291, 29); @@ -271,7 +271,7 @@ this.labelAutoLogoutWarning.BackPictureBox2 = null; this.labelAutoLogoutWarning.BorderColor = System.Drawing.Color.White; this.labelAutoLogoutWarning.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelAutoLogoutWarning.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Bold); + this.labelAutoLogoutWarning.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Bold); this.labelAutoLogoutWarning.ForeColor = System.Drawing.Color.DarkRed; this.labelAutoLogoutWarning.InitVisible = true; this.labelAutoLogoutWarning.LineSpacing = 0F; @@ -322,7 +322,7 @@ this.labelTitleAccessRight.BackPictureBox2 = null; this.labelTitleAccessRight.BorderColor = System.Drawing.Color.Black; this.labelTitleAccessRight.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleAccessRight.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleAccessRight.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelTitleAccessRight.ForeColor = System.Drawing.Color.White; this.labelTitleAccessRight.InitVisible = true; this.labelTitleAccessRight.LineSpacing = 0F; @@ -444,7 +444,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 +465,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; @@ -531,43 +531,44 @@ this.buttonDelete.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonDelete.UpImage"))); this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); // - // smartGroupBox2 + // groupBoxAccessRight // - 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); - this.smartGroupBox2.Controls.Add(this.labelStatistics); - this.smartGroupBox2.Controls.Add(this.labelUpdate); - this.smartGroupBox2.Controls.Add(this.labelIOTest); - this.smartGroupBox2.Controls.Add(this.labelMotor); - this.smartGroupBox2.Controls.Add(this.labelSystem); - this.smartGroupBox2.Controls.Add(this.labelDataBackup); - this.smartGroupBox2.Controls.Add(this.labelCalibration); - this.smartGroupBox2.Controls.Add(this.labelCommunication); - this.smartGroupBox2.Controls.Add(this.labelTime); - this.smartGroupBox2.Controls.Add(this.labelInitialization); - this.smartGroupBox2.Controls.Add(this.labelConfiguration); - this.smartGroupBox2.Controls.Add(this.labelInformation); - this.smartGroupBox2.Controls.Add(this.labelSubMenu); - this.smartGroupBox2.Controls.Add(this.labelClear); - this.smartGroupBox2.Controls.Add(this.labelWeightSetting); - this.smartGroupBox2.Controls.Add(this.labelProductNo); - this.smartGroupBox2.FrameLineColor1 = System.Drawing.Color.Black; - this.smartGroupBox2.FrameLineColor2 = System.Drawing.Color.Black; - this.smartGroupBox2.FrameLineThickness = 1; - this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; - this.smartGroupBox2.Image = null; - this.smartGroupBox2.InitVisible = true; - this.smartGroupBox2.Location = new System.Drawing.Point(3, 192); - this.smartGroupBox2.Name = "smartGroupBox2"; - this.smartGroupBox2.RoundRadius = 5; - this.smartGroupBox2.Size = new System.Drawing.Size(587, 190); - this.smartGroupBox2.TabIndex = 217; - this.smartGroupBox2.Text = "Access right"; - this.smartGroupBox2.TextColor = System.Drawing.Color.Black; + this.groupBoxAccessRight.BackPictureBox = this.smartForm1; + this.groupBoxAccessRight.BackPictureBox1 = null; + this.groupBoxAccessRight.Controls.Add(this.labelEquipment); + this.groupBoxAccessRight.Controls.Add(this.labelMenu); + this.groupBoxAccessRight.Controls.Add(this.labelMain); + this.groupBoxAccessRight.Controls.Add(this.labelViewer); + this.groupBoxAccessRight.Controls.Add(this.labelStatistics); + this.groupBoxAccessRight.Controls.Add(this.labelUpdate); + this.groupBoxAccessRight.Controls.Add(this.labelIOTest); + this.groupBoxAccessRight.Controls.Add(this.labelMotor); + this.groupBoxAccessRight.Controls.Add(this.labelSystem); + this.groupBoxAccessRight.Controls.Add(this.labelDataBackup); + this.groupBoxAccessRight.Controls.Add(this.labelCalibration); + this.groupBoxAccessRight.Controls.Add(this.labelCommunication); + this.groupBoxAccessRight.Controls.Add(this.labelTime); + this.groupBoxAccessRight.Controls.Add(this.labelInitialization); + this.groupBoxAccessRight.Controls.Add(this.labelConfiguration); + this.groupBoxAccessRight.Controls.Add(this.labelInformation); + this.groupBoxAccessRight.Controls.Add(this.labelSubMenu); + this.groupBoxAccessRight.Controls.Add(this.labelClear); + this.groupBoxAccessRight.Controls.Add(this.labelWeightSetting); + this.groupBoxAccessRight.Controls.Add(this.labelProductNo); + this.groupBoxAccessRight.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.groupBoxAccessRight.FrameLineColor1 = System.Drawing.Color.Black; + this.groupBoxAccessRight.FrameLineColor2 = System.Drawing.Color.Black; + this.groupBoxAccessRight.FrameLineThickness = 1; + this.groupBoxAccessRight.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; + this.groupBoxAccessRight.Image = null; + this.groupBoxAccessRight.InitVisible = true; + this.groupBoxAccessRight.Location = new System.Drawing.Point(3, 192); + this.groupBoxAccessRight.Name = "groupBoxAccessRight"; + this.groupBoxAccessRight.RoundRadius = 5; + this.groupBoxAccessRight.Size = new System.Drawing.Size(587, 190); + this.groupBoxAccessRight.TabIndex = 217; + this.groupBoxAccessRight.Text = "Access right"; + this.groupBoxAccessRight.TextColor = System.Drawing.Color.Black; // // labelEquipment // @@ -576,6 +577,7 @@ this.labelEquipment.BackPictureBox2 = null; this.labelEquipment.BorderColor = System.Drawing.Color.Black; this.labelEquipment.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelEquipment.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelEquipment.InitVisible = true; this.labelEquipment.LineSpacing = 0F; this.labelEquipment.Location = new System.Drawing.Point(427, 79); @@ -595,7 +597,7 @@ this.labelMenu.BackPictureBox2 = null; this.labelMenu.BorderColor = System.Drawing.Color.Black; this.labelMenu.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMenu.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelMenu.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelMenu.ForeColor = System.Drawing.Color.White; this.labelMenu.InitVisible = true; this.labelMenu.LineSpacing = 0F; @@ -616,7 +618,7 @@ this.labelMain.BackPictureBox2 = null; this.labelMain.BorderColor = System.Drawing.Color.Black; this.labelMain.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMain.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelMain.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelMain.ForeColor = System.Drawing.Color.White; this.labelMain.InitVisible = true; this.labelMain.LineSpacing = 0F; @@ -636,6 +638,7 @@ this.labelViewer.BackPictureBox2 = null; this.labelViewer.BorderColor = System.Drawing.Color.Black; this.labelViewer.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelViewer.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelViewer.InitVisible = true; this.labelViewer.LineSpacing = 0F; this.labelViewer.Location = new System.Drawing.Point(427, 127); @@ -654,6 +657,7 @@ this.labelStatistics.BackPictureBox2 = null; this.labelStatistics.BorderColor = System.Drawing.Color.Black; this.labelStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelStatistics.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelStatistics.InitVisible = true; this.labelStatistics.LineSpacing = 0F; this.labelStatistics.Location = new System.Drawing.Point(427, 103); @@ -672,6 +676,7 @@ this.labelUpdate.BackPictureBox2 = null; this.labelUpdate.BorderColor = System.Drawing.Color.Black; this.labelUpdate.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelUpdate.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelUpdate.InitVisible = true; this.labelUpdate.LineSpacing = 0F; this.labelUpdate.Location = new System.Drawing.Point(291, 103); @@ -690,6 +695,7 @@ this.labelIOTest.BackPictureBox2 = null; this.labelIOTest.BorderColor = System.Drawing.Color.Black; this.labelIOTest.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelIOTest.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelIOTest.InitVisible = true; this.labelIOTest.LineSpacing = 0F; this.labelIOTest.Location = new System.Drawing.Point(291, 79); @@ -708,6 +714,7 @@ this.labelMotor.BackPictureBox2 = null; this.labelMotor.BorderColor = System.Drawing.Color.Black; this.labelMotor.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelMotor.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelMotor.InitVisible = true; this.labelMotor.LineSpacing = 0F; this.labelMotor.Location = new System.Drawing.Point(291, 55); @@ -726,6 +733,7 @@ this.labelSystem.BackPictureBox2 = null; this.labelSystem.BorderColor = System.Drawing.Color.Black; this.labelSystem.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelSystem.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelSystem.InitVisible = true; this.labelSystem.LineSpacing = 0F; this.labelSystem.Location = new System.Drawing.Point(155, 151); @@ -744,6 +752,7 @@ this.labelDataBackup.BackPictureBox2 = null; this.labelDataBackup.BorderColor = System.Drawing.Color.Black; this.labelDataBackup.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelDataBackup.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelDataBackup.InitVisible = true; this.labelDataBackup.LineSpacing = 0F; this.labelDataBackup.Location = new System.Drawing.Point(427, 55); @@ -762,6 +771,7 @@ this.labelCalibration.BackPictureBox2 = null; this.labelCalibration.BorderColor = System.Drawing.Color.Black; this.labelCalibration.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelCalibration.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelCalibration.InitVisible = true; this.labelCalibration.LineSpacing = 0F; this.labelCalibration.Location = new System.Drawing.Point(155, 127); @@ -780,6 +790,7 @@ this.labelCommunication.BackPictureBox2 = null; this.labelCommunication.BorderColor = System.Drawing.Color.Black; this.labelCommunication.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelCommunication.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelCommunication.InitVisible = true; this.labelCommunication.LineSpacing = 0F; this.labelCommunication.Location = new System.Drawing.Point(155, 103); @@ -798,6 +809,7 @@ this.labelTime.BackPictureBox2 = null; this.labelTime.BorderColor = System.Drawing.Color.Black; this.labelTime.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelTime.InitVisible = true; this.labelTime.LineSpacing = 0F; this.labelTime.Location = new System.Drawing.Point(291, 151); @@ -816,6 +828,7 @@ this.labelInitialization.BackPictureBox2 = null; this.labelInitialization.BorderColor = System.Drawing.Color.Black; this.labelInitialization.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelInitialization.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInitialization.InitVisible = true; this.labelInitialization.LineSpacing = 0F; this.labelInitialization.Location = new System.Drawing.Point(291, 127); @@ -834,6 +847,7 @@ this.labelConfiguration.BackPictureBox2 = null; this.labelConfiguration.BorderColor = System.Drawing.Color.Black; this.labelConfiguration.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelConfiguration.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelConfiguration.InitVisible = true; this.labelConfiguration.LineSpacing = 0F; this.labelConfiguration.Location = new System.Drawing.Point(155, 79); @@ -852,6 +866,7 @@ this.labelInformation.BackPictureBox2 = null; this.labelInformation.BorderColor = System.Drawing.Color.Black; this.labelInformation.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelInformation.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInformation.InitVisible = true; this.labelInformation.LineSpacing = 0F; this.labelInformation.Location = new System.Drawing.Point(155, 55); @@ -870,6 +885,7 @@ this.labelSubMenu.BackPictureBox2 = null; this.labelSubMenu.BorderColor = System.Drawing.Color.Black; this.labelSubMenu.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelSubMenu.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelSubMenu.InitVisible = true; this.labelSubMenu.LineSpacing = 0F; this.labelSubMenu.Location = new System.Drawing.Point(19, 127); @@ -888,6 +904,7 @@ this.labelClear.BackPictureBox2 = null; this.labelClear.BorderColor = System.Drawing.Color.Black; this.labelClear.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelClear.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelClear.InitVisible = true; this.labelClear.LineSpacing = 0F; this.labelClear.Location = new System.Drawing.Point(19, 103); @@ -906,6 +923,7 @@ this.labelWeightSetting.BackPictureBox2 = null; this.labelWeightSetting.BorderColor = System.Drawing.Color.Black; this.labelWeightSetting.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelWeightSetting.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelWeightSetting.InitVisible = true; this.labelWeightSetting.LineSpacing = 0F; this.labelWeightSetting.Location = new System.Drawing.Point(19, 79); @@ -924,6 +942,7 @@ this.labelProductNo.BackPictureBox2 = null; this.labelProductNo.BorderColor = System.Drawing.Color.Black; this.labelProductNo.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelProductNo.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelProductNo.ForeColor = System.Drawing.Color.Black; this.labelProductNo.InitVisible = true; this.labelProductNo.LineSpacing = 0F; @@ -944,7 +963,7 @@ this.labelTitleAutomaticLogoutTime.BackPictureBox2 = null; this.labelTitleAutomaticLogoutTime.BorderColor = System.Drawing.Color.Black; this.labelTitleAutomaticLogoutTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleAutomaticLogoutTime.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleAutomaticLogoutTime.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelTitleAutomaticLogoutTime.ForeColor = System.Drawing.Color.White; this.labelTitleAutomaticLogoutTime.InitVisible = true; this.labelTitleAutomaticLogoutTime.LineSpacing = 0F; @@ -1088,7 +1107,7 @@ this.labelTitleExpiryDateOfPassword.BackPictureBox2 = null; this.labelTitleExpiryDateOfPassword.BorderColor = System.Drawing.Color.Black; this.labelTitleExpiryDateOfPassword.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleExpiryDateOfPassword.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleExpiryDateOfPassword.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelTitleExpiryDateOfPassword.ForeColor = System.Drawing.Color.White; this.labelTitleExpiryDateOfPassword.InitVisible = true; this.labelTitleExpiryDateOfPassword.LineSpacing = 0F; @@ -1109,7 +1128,7 @@ this.labelTitleExpiryDateOfAccount.BackPictureBox2 = null; this.labelTitleExpiryDateOfAccount.BorderColor = System.Drawing.Color.Black; this.labelTitleExpiryDateOfAccount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleExpiryDateOfAccount.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleExpiryDateOfAccount.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelTitleExpiryDateOfAccount.ForeColor = System.Drawing.Color.White; this.labelTitleExpiryDateOfAccount.InitVisible = true; this.labelTitleExpiryDateOfAccount.LineSpacing = 0F; @@ -1150,7 +1169,7 @@ this.labelTitlePassword.BackPictureBox2 = null; this.labelTitlePassword.BorderColor = System.Drawing.Color.Black; this.labelTitlePassword.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitlePassword.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.labelTitlePassword.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelTitlePassword.ForeColor = System.Drawing.Color.White; this.labelTitlePassword.InitVisible = true; this.labelTitlePassword.LineSpacing = 0F; @@ -1191,7 +1210,7 @@ this.labelTitleID.BackPictureBox2 = null; this.labelTitleID.BorderColor = System.Drawing.Color.Black; this.labelTitleID.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleID.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.labelTitleID.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelTitleID.ForeColor = System.Drawing.Color.White; this.labelTitleID.InitVisible = true; this.labelTitleID.LineSpacing = 0F; @@ -1237,7 +1256,7 @@ // // listBoxUserList // - this.listBoxUserList.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); + this.listBoxUserList.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold); this.listBoxUserList.Location = new System.Drawing.Point(16, 101); this.listBoxUserList.Name = "listBoxUserList"; this.listBoxUserList.Size = new System.Drawing.Size(357, 560); @@ -1260,7 +1279,7 @@ this.Text = "FormUserEditor"; ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).EndInit(); this.smartGroupBox1.ResumeLayout(false); - this.smartGroupBox2.ResumeLayout(false); + this.groupBoxAccessRight.ResumeLayout(false); this.ResumeLayout(false); } @@ -1284,7 +1303,7 @@ private SmartX.SmartCheckBox cbAdministrator; private SmartX.SmartLabel labelExpiryDateOfPassword2; private SmartX.SmartLabel labelExpiryDateOfAccount2; - private SmartX.SmartGroupBox smartGroupBox2; + private SmartX.SmartGroupBox groupBoxAccessRight; private SmartX.SmartButton buttonNew; private SmartX.SmartButton buttonDelete; private SmartX.SmartButton buttonSave; diff --git a/INT69DC_7C/Forms/FormUserGroupEditor.Designer.cs b/INT69DC_7C/Forms/FormUserGroupEditor.Designer.cs index 41a994e..6f325bb 100644 --- a/INT69DC_7C/Forms/FormUserGroupEditor.Designer.cs +++ b/INT69DC_7C/Forms/FormUserGroupEditor.Designer.cs @@ -38,12 +38,12 @@ this.checkBoxL3MenuViewer = new SmartX.SmartCheckBox(); this.checkBoxL2MenuViewer = new SmartX.SmartCheckBox(); this.checkBoxL1MenuViewer = new SmartX.SmartCheckBox(); - this.labelTitleViewer = new SmartX.SmartLabel(); + this.labelViewer = new SmartX.SmartLabel(); this.checkBoxNotLoginMenuCommunication = new SmartX.SmartCheckBox(); this.checkBoxL3MenuCommunication = new SmartX.SmartCheckBox(); this.checkBoxL2MenuCommunication = new SmartX.SmartCheckBox(); this.checkBoxL1MenuCommunication = new SmartX.SmartCheckBox(); - this.labelTitleCommunication = new SmartX.SmartLabel(); + this.labelCommunication = new SmartX.SmartLabel(); this.smartLabel26 = new SmartX.SmartLabel(); this.smartLabel25 = new SmartX.SmartLabel(); this.smartSeparatorLine1 = new SmartX.SmartSeparatorLine(); @@ -59,7 +59,7 @@ this.checkBoxL3MenuStatistics = new SmartX.SmartCheckBox(); this.checkBoxL2MenuStatistics = new SmartX.SmartCheckBox(); this.checkBoxL1MenuStatistics = new SmartX.SmartCheckBox(); - this.labelTitleStatistics = new SmartX.SmartLabel(); + this.labelStatistics = new SmartX.SmartLabel(); this.checkBoxNotLoginMenuCalibration = new SmartX.SmartCheckBox(); this.checkBoxL3MenuCalibration = new SmartX.SmartCheckBox(); this.checkBoxNotLoginMainSubMenu = new SmartX.SmartCheckBox(); @@ -124,23 +124,23 @@ this.labelTitle3 = new SmartX.SmartLabel(); this.labelTitle2 = new SmartX.SmartLabel(); this.labelTitle1 = new SmartX.SmartLabel(); - this.smartLabel21 = new SmartX.SmartLabel(); - this.smartLabel18 = new SmartX.SmartLabel(); - this.smartLabel16 = new SmartX.SmartLabel(); - this.smartLabel15 = new SmartX.SmartLabel(); - this.smartLabel14 = new SmartX.SmartLabel(); - this.smartLabel13 = new SmartX.SmartLabel(); - this.smartLabel12 = new SmartX.SmartLabel(); - this.smartLabel11 = new SmartX.SmartLabel(); - this.smartLabel10 = new SmartX.SmartLabel(); - this.smartLabel9 = new SmartX.SmartLabel(); - this.smartLabel8 = new SmartX.SmartLabel(); - this.smartLabel7 = new SmartX.SmartLabel(); - this.smartLabel6 = new SmartX.SmartLabel(); - this.smartLabel5 = new SmartX.SmartLabel(); - this.smartLabel3 = new SmartX.SmartLabel(); - this.smartLabel2 = new SmartX.SmartLabel(); - this.smartLabel1 = new SmartX.SmartLabel(); + this.labelEquipment = new SmartX.SmartLabel(); + this.labelInitialization = new SmartX.SmartLabel(); + this.labelUpdate = new SmartX.SmartLabel(); + this.labelIOTest = new SmartX.SmartLabel(); + this.labelMotor = new SmartX.SmartLabel(); + this.labelSystem = new SmartX.SmartLabel(); + this.labelCalibration = new SmartX.SmartLabel(); + this.labelConfiguration = new SmartX.SmartLabel(); + this.labelDataBackup = new SmartX.SmartLabel(); + this.labelInformation = new SmartX.SmartLabel(); + this.labelTime = new SmartX.SmartLabel(); + this.labelMenu = new SmartX.SmartLabel(); + this.labelSubMenu = new SmartX.SmartLabel(); + this.labelClear = new SmartX.SmartLabel(); + this.labelWeightSetting = new SmartX.SmartLabel(); + this.labelProductNo = new SmartX.SmartLabel(); + this.labelMain = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -171,12 +171,12 @@ this.smartGroupBox1.Controls.Add(this.checkBoxL3MenuViewer); this.smartGroupBox1.Controls.Add(this.checkBoxL2MenuViewer); this.smartGroupBox1.Controls.Add(this.checkBoxL1MenuViewer); - this.smartGroupBox1.Controls.Add(this.labelTitleViewer); + this.smartGroupBox1.Controls.Add(this.labelViewer); this.smartGroupBox1.Controls.Add(this.checkBoxNotLoginMenuCommunication); this.smartGroupBox1.Controls.Add(this.checkBoxL3MenuCommunication); this.smartGroupBox1.Controls.Add(this.checkBoxL2MenuCommunication); this.smartGroupBox1.Controls.Add(this.checkBoxL1MenuCommunication); - this.smartGroupBox1.Controls.Add(this.labelTitleCommunication); + this.smartGroupBox1.Controls.Add(this.labelCommunication); this.smartGroupBox1.Controls.Add(this.smartLabel26); this.smartGroupBox1.Controls.Add(this.smartLabel25); this.smartGroupBox1.Controls.Add(this.smartSeparatorLine1); @@ -192,7 +192,7 @@ this.smartGroupBox1.Controls.Add(this.checkBoxL3MenuStatistics); this.smartGroupBox1.Controls.Add(this.checkBoxL2MenuStatistics); this.smartGroupBox1.Controls.Add(this.checkBoxL1MenuStatistics); - this.smartGroupBox1.Controls.Add(this.labelTitleStatistics); + this.smartGroupBox1.Controls.Add(this.labelStatistics); this.smartGroupBox1.Controls.Add(this.checkBoxNotLoginMenuCalibration); this.smartGroupBox1.Controls.Add(this.checkBoxL3MenuCalibration); this.smartGroupBox1.Controls.Add(this.checkBoxNotLoginMainSubMenu); @@ -257,23 +257,23 @@ this.smartGroupBox1.Controls.Add(this.labelTitle3); this.smartGroupBox1.Controls.Add(this.labelTitle2); this.smartGroupBox1.Controls.Add(this.labelTitle1); - this.smartGroupBox1.Controls.Add(this.smartLabel21); - this.smartGroupBox1.Controls.Add(this.smartLabel18); - this.smartGroupBox1.Controls.Add(this.smartLabel16); - this.smartGroupBox1.Controls.Add(this.smartLabel15); - this.smartGroupBox1.Controls.Add(this.smartLabel14); - this.smartGroupBox1.Controls.Add(this.smartLabel13); - this.smartGroupBox1.Controls.Add(this.smartLabel12); - this.smartGroupBox1.Controls.Add(this.smartLabel11); - this.smartGroupBox1.Controls.Add(this.smartLabel10); - this.smartGroupBox1.Controls.Add(this.smartLabel9); - this.smartGroupBox1.Controls.Add(this.smartLabel8); - this.smartGroupBox1.Controls.Add(this.smartLabel7); - this.smartGroupBox1.Controls.Add(this.smartLabel6); - this.smartGroupBox1.Controls.Add(this.smartLabel5); - this.smartGroupBox1.Controls.Add(this.smartLabel3); - this.smartGroupBox1.Controls.Add(this.smartLabel2); - this.smartGroupBox1.Controls.Add(this.smartLabel1); + this.smartGroupBox1.Controls.Add(this.labelEquipment); + this.smartGroupBox1.Controls.Add(this.labelInitialization); + this.smartGroupBox1.Controls.Add(this.labelUpdate); + this.smartGroupBox1.Controls.Add(this.labelIOTest); + this.smartGroupBox1.Controls.Add(this.labelMotor); + this.smartGroupBox1.Controls.Add(this.labelSystem); + this.smartGroupBox1.Controls.Add(this.labelCalibration); + this.smartGroupBox1.Controls.Add(this.labelConfiguration); + this.smartGroupBox1.Controls.Add(this.labelDataBackup); + this.smartGroupBox1.Controls.Add(this.labelInformation); + this.smartGroupBox1.Controls.Add(this.labelTime); + this.smartGroupBox1.Controls.Add(this.labelMenu); + this.smartGroupBox1.Controls.Add(this.labelSubMenu); + this.smartGroupBox1.Controls.Add(this.labelClear); + this.smartGroupBox1.Controls.Add(this.labelWeightSetting); + this.smartGroupBox1.Controls.Add(this.labelProductNo); + this.smartGroupBox1.Controls.Add(this.labelMain); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineThickness = 1; @@ -443,26 +443,27 @@ this.checkBoxL1MenuViewer.Visible = false; this.checkBoxL1MenuViewer.Click += new System.EventHandler(this.checkBox_Click); // - // labelTitleViewer + // labelViewer // - this.labelTitleViewer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.labelTitleViewer.BackPictureBox = this.smartForm1; - this.labelTitleViewer.BackPictureBox1 = null; - this.labelTitleViewer.BackPictureBox2 = null; - this.labelTitleViewer.BorderColor = System.Drawing.Color.Black; - this.labelTitleViewer.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleViewer.ForeColor = System.Drawing.Color.Black; - this.labelTitleViewer.InitVisible = true; - this.labelTitleViewer.LineSpacing = 0F; - 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; - this.labelTitleViewer.Text = "Viewer"; - this.labelTitleViewer.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleViewer.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleViewer.Visible = false; - this.labelTitleViewer.Wordwrap = false; + this.labelViewer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelViewer.BackPictureBox = this.smartForm1; + this.labelViewer.BackPictureBox1 = null; + this.labelViewer.BackPictureBox2 = null; + this.labelViewer.BorderColor = System.Drawing.Color.Black; + this.labelViewer.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelViewer.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelViewer.ForeColor = System.Drawing.Color.Black; + this.labelViewer.InitVisible = true; + this.labelViewer.LineSpacing = 0F; + this.labelViewer.Location = new System.Drawing.Point(535, 593); + this.labelViewer.Name = "labelViewer"; + this.labelViewer.Size = new System.Drawing.Size(200, 30); + this.labelViewer.TabIndex = 852; + this.labelViewer.Text = "Viewer"; + this.labelViewer.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelViewer.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelViewer.Visible = false; + this.labelViewer.Wordwrap = false; // // checkBoxNotLoginMenuCommunication // @@ -548,25 +549,26 @@ this.checkBoxL1MenuCommunication.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL1MenuCommunication.Click += new System.EventHandler(this.checkBox_Click); // - // labelTitleCommunication + // labelCommunication // - this.labelTitleCommunication.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.labelTitleCommunication.BackPictureBox = this.smartForm1; - this.labelTitleCommunication.BackPictureBox1 = null; - this.labelTitleCommunication.BackPictureBox2 = null; - this.labelTitleCommunication.BorderColor = System.Drawing.Color.Black; - this.labelTitleCommunication.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleCommunication.ForeColor = System.Drawing.Color.Black; - this.labelTitleCommunication.InitVisible = true; - this.labelTitleCommunication.LineSpacing = 0F; - this.labelTitleCommunication.Location = new System.Drawing.Point(35, 469); - this.labelTitleCommunication.Name = "labelTitleCommunication"; - this.labelTitleCommunication.Size = new System.Drawing.Size(200, 30); - this.labelTitleCommunication.TabIndex = 847; - this.labelTitleCommunication.Text = "Communication"; - this.labelTitleCommunication.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleCommunication.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleCommunication.Wordwrap = false; + this.labelCommunication.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelCommunication.BackPictureBox = this.smartForm1; + this.labelCommunication.BackPictureBox1 = null; + this.labelCommunication.BackPictureBox2 = null; + this.labelCommunication.BorderColor = System.Drawing.Color.Black; + this.labelCommunication.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelCommunication.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelCommunication.ForeColor = System.Drawing.Color.Black; + this.labelCommunication.InitVisible = true; + this.labelCommunication.LineSpacing = 0F; + this.labelCommunication.Location = new System.Drawing.Point(35, 469); + this.labelCommunication.Name = "labelCommunication"; + this.labelCommunication.Size = new System.Drawing.Size(200, 30); + this.labelCommunication.TabIndex = 847; + this.labelCommunication.Text = "Communication"; + this.labelCommunication.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelCommunication.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelCommunication.Wordwrap = false; // // smartLabel26 // @@ -803,7 +805,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); @@ -903,26 +905,27 @@ this.checkBoxL1MenuStatistics.Visible = false; this.checkBoxL1MenuStatistics.Click += new System.EventHandler(this.checkBox_Click); // - // labelTitleStatistics + // labelStatistics // - this.labelTitleStatistics.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.labelTitleStatistics.BackPictureBox = this.smartForm1; - this.labelTitleStatistics.BackPictureBox1 = null; - this.labelTitleStatistics.BackPictureBox2 = null; - this.labelTitleStatistics.BorderColor = System.Drawing.Color.Black; - this.labelTitleStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleStatistics.ForeColor = System.Drawing.Color.Black; - this.labelTitleStatistics.InitVisible = true; - this.labelTitleStatistics.LineSpacing = 0F; - 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; - this.labelTitleStatistics.Text = "Statistics"; - this.labelTitleStatistics.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleStatistics.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleStatistics.Visible = false; - this.labelTitleStatistics.Wordwrap = false; + this.labelStatistics.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelStatistics.BackPictureBox = this.smartForm1; + this.labelStatistics.BackPictureBox1 = null; + this.labelStatistics.BackPictureBox2 = null; + this.labelStatistics.BorderColor = System.Drawing.Color.Black; + this.labelStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelStatistics.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelStatistics.ForeColor = System.Drawing.Color.Black; + this.labelStatistics.InitVisible = true; + this.labelStatistics.LineSpacing = 0F; + this.labelStatistics.Location = new System.Drawing.Point(535, 562); + this.labelStatistics.Name = "labelStatistics"; + this.labelStatistics.Size = new System.Drawing.Size(200, 30); + this.labelStatistics.TabIndex = 628; + this.labelStatistics.Text = "Statistics"; + this.labelStatistics.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelStatistics.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelStatistics.Visible = false; + this.labelStatistics.Wordwrap = false; // // checkBoxNotLoginMenuCalibration // @@ -2274,347 +2277,362 @@ this.labelTitle1.Wordwrap = false; this.labelTitle1.Click += new System.EventHandler(this.labelTitle1_Click); // - // smartLabel21 + // labelEquipment // - this.smartLabel21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel21.BackPictureBox = this.smartForm1; - this.smartLabel21.BackPictureBox1 = null; - this.smartLabel21.BackPictureBox2 = null; - this.smartLabel21.BorderColor = System.Drawing.Color.Black; - this.smartLabel21.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel21.ForeColor = System.Drawing.Color.Black; - this.smartLabel21.InitVisible = true; - this.smartLabel21.LineSpacing = 0F; - 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"; - this.smartLabel21.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel21.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel21.Wordwrap = false; + this.labelEquipment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + 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.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelEquipment.ForeColor = System.Drawing.Color.Black; + this.labelEquipment.InitVisible = true; + this.labelEquipment.LineSpacing = 0F; + this.labelEquipment.Location = new System.Drawing.Point(535, 500); + this.labelEquipment.Name = "labelEquipment"; + this.labelEquipment.Size = new System.Drawing.Size(200, 30); + this.labelEquipment.TabIndex = 555; + this.labelEquipment.Text = "Equipment"; + this.labelEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelEquipment.Wordwrap = false; // - // smartLabel18 + // labelInitialization // - this.smartLabel18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel18.BackPictureBox = this.smartForm1; - this.smartLabel18.BackPictureBox1 = null; - this.smartLabel18.BackPictureBox2 = null; - this.smartLabel18.BorderColor = System.Drawing.Color.Black; - this.smartLabel18.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel18.ForeColor = System.Drawing.Color.Black; - this.smartLabel18.InitVisible = true; - this.smartLabel18.LineSpacing = 0F; - this.smartLabel18.Location = new System.Drawing.Point(535, 438); - this.smartLabel18.Name = "smartLabel18"; - this.smartLabel18.Size = new System.Drawing.Size(200, 30); - this.smartLabel18.TabIndex = 552; - this.smartLabel18.Text = "Initialization"; - this.smartLabel18.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel18.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel18.Wordwrap = false; + this.labelInitialization.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelInitialization.BackPictureBox = this.smartForm1; + this.labelInitialization.BackPictureBox1 = null; + this.labelInitialization.BackPictureBox2 = null; + this.labelInitialization.BorderColor = System.Drawing.Color.Black; + this.labelInitialization.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelInitialization.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelInitialization.ForeColor = System.Drawing.Color.Black; + this.labelInitialization.InitVisible = true; + this.labelInitialization.LineSpacing = 0F; + this.labelInitialization.Location = new System.Drawing.Point(535, 438); + this.labelInitialization.Name = "labelInitialization"; + this.labelInitialization.Size = new System.Drawing.Size(200, 30); + this.labelInitialization.TabIndex = 552; + this.labelInitialization.Text = "Initialization"; + this.labelInitialization.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelInitialization.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelInitialization.Wordwrap = false; // - // smartLabel16 + // labelUpdate // - this.smartLabel16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel16.BackPictureBox = this.smartForm1; - this.smartLabel16.BackPictureBox1 = null; - this.smartLabel16.BackPictureBox2 = null; - this.smartLabel16.BorderColor = System.Drawing.Color.Black; - this.smartLabel16.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel16.ForeColor = System.Drawing.Color.Black; - this.smartLabel16.InitVisible = true; - this.smartLabel16.LineSpacing = 0F; - this.smartLabel16.Location = new System.Drawing.Point(535, 407); - this.smartLabel16.Name = "smartLabel16"; - this.smartLabel16.Size = new System.Drawing.Size(200, 30); - this.smartLabel16.TabIndex = 551; - this.smartLabel16.Text = "Update"; - this.smartLabel16.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel16.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel16.Wordwrap = false; + this.labelUpdate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelUpdate.BackPictureBox = this.smartForm1; + this.labelUpdate.BackPictureBox1 = null; + this.labelUpdate.BackPictureBox2 = null; + this.labelUpdate.BorderColor = System.Drawing.Color.Black; + this.labelUpdate.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelUpdate.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelUpdate.ForeColor = System.Drawing.Color.Black; + this.labelUpdate.InitVisible = true; + this.labelUpdate.LineSpacing = 0F; + this.labelUpdate.Location = new System.Drawing.Point(535, 407); + this.labelUpdate.Name = "labelUpdate"; + this.labelUpdate.Size = new System.Drawing.Size(200, 30); + this.labelUpdate.TabIndex = 551; + this.labelUpdate.Text = "Update"; + this.labelUpdate.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelUpdate.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelUpdate.Wordwrap = false; // - // smartLabel15 + // labelIOTest // - this.smartLabel15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel15.BackPictureBox = this.smartForm1; - this.smartLabel15.BackPictureBox1 = null; - this.smartLabel15.BackPictureBox2 = null; - this.smartLabel15.BorderColor = System.Drawing.Color.Black; - this.smartLabel15.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel15.ForeColor = System.Drawing.Color.Black; - this.smartLabel15.InitVisible = true; - this.smartLabel15.LineSpacing = 0F; - this.smartLabel15.Location = new System.Drawing.Point(35, 593); - this.smartLabel15.Name = "smartLabel15"; - this.smartLabel15.Size = new System.Drawing.Size(200, 30); - this.smartLabel15.TabIndex = 550; - this.smartLabel15.Text = "IO Test"; - this.smartLabel15.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel15.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel15.Wordwrap = false; + this.labelIOTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelIOTest.BackPictureBox = this.smartForm1; + this.labelIOTest.BackPictureBox1 = null; + this.labelIOTest.BackPictureBox2 = null; + this.labelIOTest.BorderColor = System.Drawing.Color.Black; + this.labelIOTest.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelIOTest.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelIOTest.ForeColor = System.Drawing.Color.Black; + this.labelIOTest.InitVisible = true; + this.labelIOTest.LineSpacing = 0F; + this.labelIOTest.Location = new System.Drawing.Point(35, 593); + this.labelIOTest.Name = "labelIOTest"; + this.labelIOTest.Size = new System.Drawing.Size(200, 30); + this.labelIOTest.TabIndex = 550; + this.labelIOTest.Text = "IO Test"; + this.labelIOTest.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelIOTest.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelIOTest.Wordwrap = false; // - // smartLabel14 + // labelMotor // - this.smartLabel14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel14.BackPictureBox = this.smartForm1; - this.smartLabel14.BackPictureBox1 = null; - this.smartLabel14.BackPictureBox2 = null; - this.smartLabel14.BorderColor = System.Drawing.Color.Black; - this.smartLabel14.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel14.ForeColor = System.Drawing.Color.Black; - this.smartLabel14.InitVisible = true; - this.smartLabel14.LineSpacing = 0F; - this.smartLabel14.Location = new System.Drawing.Point(35, 562); - this.smartLabel14.Name = "smartLabel14"; - this.smartLabel14.Size = new System.Drawing.Size(200, 30); - this.smartLabel14.TabIndex = 549; - this.smartLabel14.Text = "Mortor"; - this.smartLabel14.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel14.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel14.Wordwrap = false; + this.labelMotor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelMotor.BackPictureBox = this.smartForm1; + this.labelMotor.BackPictureBox1 = null; + this.labelMotor.BackPictureBox2 = null; + this.labelMotor.BorderColor = System.Drawing.Color.Black; + this.labelMotor.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelMotor.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelMotor.ForeColor = System.Drawing.Color.Black; + this.labelMotor.InitVisible = true; + this.labelMotor.LineSpacing = 0F; + this.labelMotor.Location = new System.Drawing.Point(35, 562); + this.labelMotor.Name = "labelMotor"; + this.labelMotor.Size = new System.Drawing.Size(200, 30); + this.labelMotor.TabIndex = 549; + this.labelMotor.Text = "Mortor"; + this.labelMotor.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelMotor.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelMotor.Wordwrap = false; // - // smartLabel13 + // labelSystem // - this.smartLabel13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel13.BackPictureBox = this.smartForm1; - this.smartLabel13.BackPictureBox1 = null; - this.smartLabel13.BackPictureBox2 = null; - this.smartLabel13.BorderColor = System.Drawing.Color.Black; - this.smartLabel13.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel13.ForeColor = System.Drawing.Color.Black; - this.smartLabel13.InitVisible = true; - this.smartLabel13.LineSpacing = 0F; - this.smartLabel13.Location = new System.Drawing.Point(35, 531); - this.smartLabel13.Name = "smartLabel13"; - this.smartLabel13.Size = new System.Drawing.Size(200, 30); - this.smartLabel13.TabIndex = 548; - this.smartLabel13.Text = "System"; - this.smartLabel13.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel13.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel13.Wordwrap = false; + this.labelSystem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelSystem.BackPictureBox = this.smartForm1; + this.labelSystem.BackPictureBox1 = null; + this.labelSystem.BackPictureBox2 = null; + this.labelSystem.BorderColor = System.Drawing.Color.Black; + this.labelSystem.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelSystem.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelSystem.ForeColor = System.Drawing.Color.Black; + this.labelSystem.InitVisible = true; + this.labelSystem.LineSpacing = 0F; + this.labelSystem.Location = new System.Drawing.Point(35, 531); + this.labelSystem.Name = "labelSystem"; + this.labelSystem.Size = new System.Drawing.Size(200, 30); + this.labelSystem.TabIndex = 548; + this.labelSystem.Text = "System"; + this.labelSystem.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelSystem.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelSystem.Wordwrap = false; // - // smartLabel12 + // labelCalibration // - this.smartLabel12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel12.BackPictureBox = this.smartForm1; - this.smartLabel12.BackPictureBox1 = null; - this.smartLabel12.BackPictureBox2 = null; - this.smartLabel12.BorderColor = System.Drawing.Color.Black; - this.smartLabel12.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel12.ForeColor = System.Drawing.Color.Black; - this.smartLabel12.InitVisible = true; - this.smartLabel12.LineSpacing = 0F; - this.smartLabel12.Location = new System.Drawing.Point(35, 500); - this.smartLabel12.Name = "smartLabel12"; - this.smartLabel12.Size = new System.Drawing.Size(200, 30); - this.smartLabel12.TabIndex = 547; - this.smartLabel12.Text = "Calibration"; - this.smartLabel12.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel12.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel12.Wordwrap = false; + this.labelCalibration.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelCalibration.BackPictureBox = this.smartForm1; + this.labelCalibration.BackPictureBox1 = null; + this.labelCalibration.BackPictureBox2 = null; + this.labelCalibration.BorderColor = System.Drawing.Color.Black; + this.labelCalibration.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelCalibration.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelCalibration.ForeColor = System.Drawing.Color.Black; + this.labelCalibration.InitVisible = true; + this.labelCalibration.LineSpacing = 0F; + this.labelCalibration.Location = new System.Drawing.Point(35, 500); + this.labelCalibration.Name = "labelCalibration"; + this.labelCalibration.Size = new System.Drawing.Size(200, 30); + this.labelCalibration.TabIndex = 547; + this.labelCalibration.Text = "Calibration"; + this.labelCalibration.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelCalibration.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelCalibration.Wordwrap = false; // - // smartLabel11 + // labelConfiguration // - this.smartLabel11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel11.BackPictureBox = this.smartForm1; - this.smartLabel11.BackPictureBox1 = null; - this.smartLabel11.BackPictureBox2 = null; - this.smartLabel11.BorderColor = System.Drawing.Color.Black; - this.smartLabel11.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel11.ForeColor = System.Drawing.Color.Black; - this.smartLabel11.InitVisible = true; - this.smartLabel11.LineSpacing = 0F; - this.smartLabel11.Location = new System.Drawing.Point(35, 438); - this.smartLabel11.Name = "smartLabel11"; - this.smartLabel11.Size = new System.Drawing.Size(200, 30); - this.smartLabel11.TabIndex = 546; - this.smartLabel11.Text = "Configuration"; - this.smartLabel11.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel11.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel11.Wordwrap = false; + this.labelConfiguration.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelConfiguration.BackPictureBox = this.smartForm1; + this.labelConfiguration.BackPictureBox1 = null; + this.labelConfiguration.BackPictureBox2 = null; + this.labelConfiguration.BorderColor = System.Drawing.Color.Black; + this.labelConfiguration.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelConfiguration.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelConfiguration.ForeColor = System.Drawing.Color.Black; + this.labelConfiguration.InitVisible = true; + this.labelConfiguration.LineSpacing = 0F; + this.labelConfiguration.Location = new System.Drawing.Point(35, 438); + this.labelConfiguration.Name = "labelConfiguration"; + this.labelConfiguration.Size = new System.Drawing.Size(200, 30); + this.labelConfiguration.TabIndex = 546; + this.labelConfiguration.Text = "Configuration"; + this.labelConfiguration.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelConfiguration.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelConfiguration.Wordwrap = false; // - // smartLabel10 + // labelDataBackup // - this.smartLabel10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel10.BackPictureBox = this.smartForm1; - this.smartLabel10.BackPictureBox1 = null; - this.smartLabel10.BackPictureBox2 = null; - this.smartLabel10.BorderColor = System.Drawing.Color.Black; - this.smartLabel10.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel10.ForeColor = System.Drawing.Color.Black; - this.smartLabel10.InitVisible = true; - this.smartLabel10.LineSpacing = 0F; - this.smartLabel10.Location = new System.Drawing.Point(535, 469); - this.smartLabel10.Name = "smartLabel10"; - this.smartLabel10.Size = new System.Drawing.Size(200, 30); - this.smartLabel10.TabIndex = 545; - this.smartLabel10.Text = "DataBackup"; - this.smartLabel10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel10.Wordwrap = false; + this.labelDataBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelDataBackup.BackPictureBox = this.smartForm1; + this.labelDataBackup.BackPictureBox1 = null; + this.labelDataBackup.BackPictureBox2 = null; + this.labelDataBackup.BorderColor = System.Drawing.Color.Black; + this.labelDataBackup.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelDataBackup.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelDataBackup.ForeColor = System.Drawing.Color.Black; + this.labelDataBackup.InitVisible = true; + this.labelDataBackup.LineSpacing = 0F; + this.labelDataBackup.Location = new System.Drawing.Point(535, 469); + this.labelDataBackup.Name = "labelDataBackup"; + this.labelDataBackup.Size = new System.Drawing.Size(200, 30); + this.labelDataBackup.TabIndex = 545; + this.labelDataBackup.Text = "DataBackup"; + this.labelDataBackup.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelDataBackup.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelDataBackup.Wordwrap = false; // - // smartLabel9 + // labelInformation // - this.smartLabel9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel9.BackPictureBox = this.smartForm1; - this.smartLabel9.BackPictureBox1 = null; - this.smartLabel9.BackPictureBox2 = null; - this.smartLabel9.BorderColor = System.Drawing.Color.Black; - this.smartLabel9.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel9.ForeColor = System.Drawing.Color.Black; - this.smartLabel9.InitVisible = true; - this.smartLabel9.LineSpacing = 0F; - this.smartLabel9.Location = new System.Drawing.Point(35, 407); - this.smartLabel9.Name = "smartLabel9"; - this.smartLabel9.Size = new System.Drawing.Size(200, 30); - this.smartLabel9.TabIndex = 544; - this.smartLabel9.Text = "Information"; - this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel9.Wordwrap = false; + this.labelInformation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelInformation.BackPictureBox = this.smartForm1; + this.labelInformation.BackPictureBox1 = null; + this.labelInformation.BackPictureBox2 = null; + this.labelInformation.BorderColor = System.Drawing.Color.Black; + this.labelInformation.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelInformation.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelInformation.ForeColor = System.Drawing.Color.Black; + this.labelInformation.InitVisible = true; + this.labelInformation.LineSpacing = 0F; + this.labelInformation.Location = new System.Drawing.Point(35, 407); + this.labelInformation.Name = "labelInformation"; + this.labelInformation.Size = new System.Drawing.Size(200, 30); + this.labelInformation.TabIndex = 544; + this.labelInformation.Text = "Information"; + this.labelInformation.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelInformation.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelInformation.Wordwrap = false; // - // smartLabel8 + // labelTime // - this.smartLabel8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.smartLabel8.BackPictureBox = this.smartForm1; - this.smartLabel8.BackPictureBox1 = null; - this.smartLabel8.BackPictureBox2 = null; - this.smartLabel8.BorderColor = System.Drawing.Color.Black; - this.smartLabel8.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel8.ForeColor = System.Drawing.Color.Black; - this.smartLabel8.InitVisible = true; - this.smartLabel8.LineSpacing = 0F; - 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; - this.smartLabel8.Text = "Time"; - this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel8.Wordwrap = false; + this.labelTime.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.labelTime.BackPictureBox = this.smartForm1; + this.labelTime.BackPictureBox1 = null; + this.labelTime.BackPictureBox2 = null; + this.labelTime.BorderColor = System.Drawing.Color.Black; + this.labelTime.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelTime.ForeColor = System.Drawing.Color.Black; + this.labelTime.InitVisible = true; + this.labelTime.LineSpacing = 0F; + this.labelTime.Location = new System.Drawing.Point(535, 531); + this.labelTime.Name = "labelTime"; + this.labelTime.Size = new System.Drawing.Size(200, 30); + this.labelTime.TabIndex = 543; + this.labelTime.Text = "Time"; + this.labelTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTime.Wordwrap = false; // - // smartLabel7 + // labelMenu // - this.smartLabel7.BackColor = System.Drawing.Color.Gainsboro; - this.smartLabel7.BackPictureBox = null; - this.smartLabel7.BackPictureBox1 = null; - this.smartLabel7.BackPictureBox2 = null; - this.smartLabel7.BorderColor = System.Drawing.Color.Black; - this.smartLabel7.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel7.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.smartLabel7.ForeColor = System.Drawing.Color.Black; - this.smartLabel7.InitVisible = true; - this.smartLabel7.LineSpacing = 0F; - this.smartLabel7.Location = new System.Drawing.Point(35, 371); - this.smartLabel7.Name = "smartLabel7"; - this.smartLabel7.Size = new System.Drawing.Size(958, 30); - this.smartLabel7.TabIndex = 542; - this.smartLabel7.Text = "Menu"; - this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel7.Wordwrap = false; + this.labelMenu.BackColor = System.Drawing.Color.Gainsboro; + this.labelMenu.BackPictureBox = null; + this.labelMenu.BackPictureBox1 = null; + this.labelMenu.BackPictureBox2 = null; + this.labelMenu.BorderColor = System.Drawing.Color.Black; + this.labelMenu.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelMenu.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.labelMenu.ForeColor = System.Drawing.Color.Black; + this.labelMenu.InitVisible = true; + this.labelMenu.LineSpacing = 0F; + this.labelMenu.Location = new System.Drawing.Point(35, 371); + this.labelMenu.Name = "labelMenu"; + this.labelMenu.Size = new System.Drawing.Size(958, 30); + this.labelMenu.TabIndex = 542; + this.labelMenu.Text = "Menu"; + this.labelMenu.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelMenu.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelMenu.Wordwrap = false; // - // smartLabel6 + // labelSubMenu // - this.smartLabel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); - this.smartLabel6.BackPictureBox = null; - this.smartLabel6.BackPictureBox1 = null; - this.smartLabel6.BackPictureBox2 = null; - this.smartLabel6.BorderColor = System.Drawing.Color.Black; - this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel6.ForeColor = System.Drawing.Color.Black; - this.smartLabel6.InitVisible = true; - this.smartLabel6.LineSpacing = 0F; - this.smartLabel6.Location = new System.Drawing.Point(35, 335); - this.smartLabel6.Name = "smartLabel6"; - this.smartLabel6.Size = new System.Drawing.Size(200, 30); - this.smartLabel6.TabIndex = 541; - this.smartLabel6.Text = "SubMenu"; - this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel6.Wordwrap = false; + this.labelSubMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); + this.labelSubMenu.BackPictureBox = null; + this.labelSubMenu.BackPictureBox1 = null; + this.labelSubMenu.BackPictureBox2 = null; + this.labelSubMenu.BorderColor = System.Drawing.Color.Black; + this.labelSubMenu.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelSubMenu.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelSubMenu.ForeColor = System.Drawing.Color.Black; + this.labelSubMenu.InitVisible = true; + this.labelSubMenu.LineSpacing = 0F; + this.labelSubMenu.Location = new System.Drawing.Point(35, 335); + this.labelSubMenu.Name = "labelSubMenu"; + this.labelSubMenu.Size = new System.Drawing.Size(200, 30); + this.labelSubMenu.TabIndex = 541; + this.labelSubMenu.Text = "SubMenu"; + this.labelSubMenu.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelSubMenu.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelSubMenu.Wordwrap = false; // - // smartLabel5 + // labelClear // - this.smartLabel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); - this.smartLabel5.BackPictureBox = null; - 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.ForeColor = System.Drawing.Color.Black; - this.smartLabel5.InitVisible = true; - this.smartLabel5.LineSpacing = 0F; - this.smartLabel5.Location = new System.Drawing.Point(35, 304); - this.smartLabel5.Name = "smartLabel5"; - this.smartLabel5.Size = new System.Drawing.Size(200, 30); - this.smartLabel5.TabIndex = 540; - this.smartLabel5.Text = "Clear"; - this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel5.Wordwrap = false; + this.labelClear.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); + this.labelClear.BackPictureBox = null; + this.labelClear.BackPictureBox1 = null; + this.labelClear.BackPictureBox2 = null; + this.labelClear.BorderColor = System.Drawing.Color.Black; + this.labelClear.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelClear.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelClear.ForeColor = System.Drawing.Color.Black; + this.labelClear.InitVisible = true; + this.labelClear.LineSpacing = 0F; + this.labelClear.Location = new System.Drawing.Point(35, 304); + this.labelClear.Name = "labelClear"; + this.labelClear.Size = new System.Drawing.Size(200, 30); + this.labelClear.TabIndex = 540; + this.labelClear.Text = "Clear"; + this.labelClear.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelClear.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelClear.Wordwrap = false; // - // smartLabel3 + // labelWeightSetting // - this.smartLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); - this.smartLabel3.BackPictureBox = null; - 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.ForeColor = System.Drawing.Color.Black; - this.smartLabel3.InitVisible = true; - this.smartLabel3.LineSpacing = 0F; - this.smartLabel3.Location = new System.Drawing.Point(35, 273); - this.smartLabel3.Name = "smartLabel3"; - this.smartLabel3.Size = new System.Drawing.Size(200, 30); - this.smartLabel3.TabIndex = 539; - this.smartLabel3.Text = "WeightSetting"; - this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel3.Wordwrap = false; + this.labelWeightSetting.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); + this.labelWeightSetting.BackPictureBox = null; + this.labelWeightSetting.BackPictureBox1 = null; + this.labelWeightSetting.BackPictureBox2 = null; + this.labelWeightSetting.BorderColor = System.Drawing.Color.Black; + this.labelWeightSetting.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelWeightSetting.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelWeightSetting.ForeColor = System.Drawing.Color.Black; + this.labelWeightSetting.InitVisible = true; + this.labelWeightSetting.LineSpacing = 0F; + this.labelWeightSetting.Location = new System.Drawing.Point(35, 273); + this.labelWeightSetting.Name = "labelWeightSetting"; + this.labelWeightSetting.Size = new System.Drawing.Size(200, 30); + this.labelWeightSetting.TabIndex = 539; + this.labelWeightSetting.Text = "WeightSetting"; + this.labelWeightSetting.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelWeightSetting.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelWeightSetting.Wordwrap = false; // - // smartLabel2 + // labelProductNo // - this.smartLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); - this.smartLabel2.BackPictureBox = null; - this.smartLabel2.BackPictureBox1 = null; - this.smartLabel2.BackPictureBox2 = null; - this.smartLabel2.BorderColor = System.Drawing.Color.Black; - this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel2.ForeColor = System.Drawing.Color.Black; - this.smartLabel2.InitVisible = true; - this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(35, 242); - this.smartLabel2.Name = "smartLabel2"; - this.smartLabel2.Size = new System.Drawing.Size(200, 30); - this.smartLabel2.TabIndex = 538; - this.smartLabel2.Text = "ProductNo"; - this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel2.Wordwrap = false; + this.labelProductNo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); + this.labelProductNo.BackPictureBox = null; + this.labelProductNo.BackPictureBox1 = null; + this.labelProductNo.BackPictureBox2 = null; + this.labelProductNo.BorderColor = System.Drawing.Color.Black; + this.labelProductNo.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelProductNo.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelProductNo.ForeColor = System.Drawing.Color.Black; + this.labelProductNo.InitVisible = true; + this.labelProductNo.LineSpacing = 0F; + this.labelProductNo.Location = new System.Drawing.Point(35, 242); + this.labelProductNo.Name = "labelProductNo"; + this.labelProductNo.Size = new System.Drawing.Size(200, 30); + this.labelProductNo.TabIndex = 538; + this.labelProductNo.Text = "ProductNo"; + this.labelProductNo.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelProductNo.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelProductNo.Wordwrap = false; // - // smartLabel1 + // labelMain // - this.smartLabel1.BackColor = System.Drawing.Color.Gainsboro; - this.smartLabel1.BackPictureBox = null; - this.smartLabel1.BackPictureBox1 = null; - this.smartLabel1.BackPictureBox2 = null; - this.smartLabel1.BorderColor = System.Drawing.Color.Wheat; - this.smartLabel1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.smartLabel1.ForeColor = System.Drawing.Color.Black; - this.smartLabel1.InitVisible = true; - this.smartLabel1.LineSpacing = 0F; - this.smartLabel1.Location = new System.Drawing.Point(35, 206); - this.smartLabel1.Name = "smartLabel1"; - this.smartLabel1.Size = new System.Drawing.Size(958, 30); - this.smartLabel1.TabIndex = 537; - this.smartLabel1.Text = "Main"; - this.smartLabel1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel1.Wordwrap = false; + this.labelMain.BackColor = System.Drawing.Color.Gainsboro; + this.labelMain.BackPictureBox = null; + this.labelMain.BackPictureBox1 = null; + this.labelMain.BackPictureBox2 = null; + this.labelMain.BorderColor = System.Drawing.Color.Wheat; + this.labelMain.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelMain.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.labelMain.ForeColor = System.Drawing.Color.Black; + this.labelMain.InitVisible = true; + this.labelMain.LineSpacing = 0F; + this.labelMain.Location = new System.Drawing.Point(35, 206); + this.labelMain.Name = "labelMain"; + this.labelMain.Size = new System.Drawing.Size(958, 30); + this.labelMain.TabIndex = 537; + this.labelMain.Text = "Main"; + this.labelMain.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelMain.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelMain.Wordwrap = false; // // FormUserGroupEditor // @@ -2640,7 +2658,7 @@ private SmartX.SmartCheckBox checkBoxL3MenuStatistics; private SmartX.SmartCheckBox checkBoxL2MenuStatistics; private SmartX.SmartCheckBox checkBoxL1MenuStatistics; - private SmartX.SmartLabel labelTitleStatistics; + private SmartX.SmartLabel labelStatistics; private SmartX.SmartCheckBox checkBoxNotLoginMenuCalibration; private SmartX.SmartCheckBox checkBoxL3MenuCalibration; private SmartX.SmartCheckBox checkBoxNotLoginMainSubMenu; @@ -2705,23 +2723,23 @@ private SmartX.SmartLabel labelTitle3; private SmartX.SmartLabel labelTitle2; private SmartX.SmartLabel labelTitle1; - private SmartX.SmartLabel smartLabel21; - private SmartX.SmartLabel smartLabel18; - private SmartX.SmartLabel smartLabel16; - private SmartX.SmartLabel smartLabel15; - private SmartX.SmartLabel smartLabel14; - private SmartX.SmartLabel smartLabel13; - private SmartX.SmartLabel smartLabel12; - private SmartX.SmartLabel smartLabel11; - private SmartX.SmartLabel smartLabel10; - private SmartX.SmartLabel smartLabel9; - private SmartX.SmartLabel smartLabel8; - private SmartX.SmartLabel smartLabel7; - private SmartX.SmartLabel smartLabel6; - private SmartX.SmartLabel smartLabel5; - private SmartX.SmartLabel smartLabel3; - private SmartX.SmartLabel smartLabel2; - private SmartX.SmartLabel smartLabel1; + private SmartX.SmartLabel labelEquipment; + private SmartX.SmartLabel labelInitialization; + private SmartX.SmartLabel labelUpdate; + private SmartX.SmartLabel labelIOTest; + private SmartX.SmartLabel labelMotor; + private SmartX.SmartLabel labelSystem; + private SmartX.SmartLabel labelCalibration; + private SmartX.SmartLabel labelConfiguration; + private SmartX.SmartLabel labelDataBackup; + private SmartX.SmartLabel labelInformation; + private SmartX.SmartLabel labelTime; + private SmartX.SmartLabel labelMenu; + private SmartX.SmartLabel labelSubMenu; + private SmartX.SmartLabel labelClear; + private SmartX.SmartLabel labelWeightSetting; + private SmartX.SmartLabel labelProductNo; + private SmartX.SmartLabel labelMain; private SmartX.SmartButton buttonBack; private SmartX.SmartLabel labelTitle; private SmartX.SmartButton buttonSave; @@ -2737,12 +2755,12 @@ private SmartX.SmartCheckBox checkBoxL3MenuCommunication; private SmartX.SmartCheckBox checkBoxL2MenuCommunication; private SmartX.SmartCheckBox checkBoxL1MenuCommunication; - private SmartX.SmartLabel labelTitleCommunication; + private SmartX.SmartLabel labelCommunication; private SmartX.SmartCheckBox checkBoxNotLoginMenuViewer; private SmartX.SmartCheckBox checkBoxL3MenuViewer; private SmartX.SmartCheckBox checkBoxL2MenuViewer; private SmartX.SmartCheckBox checkBoxL1MenuViewer; - private SmartX.SmartLabel labelTitleViewer; + private SmartX.SmartLabel labelViewer; private SmartX.SmartLabel labelLevel1Name; private SmartX.SmartLabel labelLevel3Name; private SmartX.SmartLabel labelLevel2Name; diff --git a/INT69DC_7C/Forms/FormUserGroupEditor.cs b/INT69DC_7C/Forms/FormUserGroupEditor.cs index 8f6b3af..cfbae4f 100644 --- a/INT69DC_7C/Forms/FormUserGroupEditor.cs +++ b/INT69DC_7C/Forms/FormUserGroupEditor.cs @@ -103,6 +103,38 @@ namespace INT69DC_7C.Forms this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); break; + case DataStore.LanguageID.Japanese: + this.labelTitle.Text = "グルㅡプエディタㅡ"; + + this.labelMain.Text = "メイン"; + this.labelMenu.Text = "メニュㅡ"; + + this.labelProductNo.Text = "アイテム変更"; + this.labelWeightSetting.Text = "重量値設定"; + this.labelClear.Text = "クリア"; + this.labelSubMenu.Text = "サブメニュㅡ"; + this.labelInformation.Text = "インフォメㅡション"; + this.labelConfiguration.Text = "構成"; + this.labelCommunication.Text = "通信設定"; + this.labelCalibration.Text = "キャリブレㅡション"; + this.labelSystem.Text = "システム設定"; + this.labelMotor.Text = "モㅡタㅡ設定"; + this.labelIOTest.Text = "I/Oテスト"; + this.labelUpdate.Text = "更新"; + this.labelInitialization.Text = "初期化"; + this.labelTime.Text = "時間設定"; + this.labelDataBackup.Text = "デㅡタバックアップ"; + this.labelEquipment.Text = "装置設定"; + this.labelStatistics.Text = "デㅡタ統計"; + this.labelViewer.Text = "デㅡタビュㅡア"; + + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSaveUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); + break; default: break; } @@ -361,13 +393,13 @@ namespace INT69DC_7C.Forms { if (this.ParentForm.SystemConfig.IsOptPart11 == false) { - this.labelTitleStatistics.Visible = false; + this.labelStatistics.Visible = false; this.checkBoxL1MenuStatistics.Visible = false; this.checkBoxL2MenuStatistics.Visible = false; this.checkBoxL3MenuStatistics.Visible = false; this.checkBoxNotLoginMenuStatistics.Visible = false; - this.labelTitleViewer.Visible = false; + this.labelViewer.Visible = false; this.checkBoxL1MenuViewer.Visible = false; this.checkBoxL2MenuViewer.Visible = false; this.checkBoxL3MenuViewer.Visible = false; @@ -375,13 +407,13 @@ namespace INT69DC_7C.Forms } else { - this.labelTitleStatistics.Visible = true; + this.labelStatistics.Visible = true; this.checkBoxL1MenuStatistics.Visible = true; this.checkBoxL2MenuStatistics.Visible = true; this.checkBoxL3MenuStatistics.Visible = true; this.checkBoxNotLoginMenuStatistics.Visible = true; - this.labelTitleViewer.Visible = true; + this.labelViewer.Visible = true; this.checkBoxL1MenuViewer.Visible = true; this.checkBoxL2MenuViewer.Visible = true; this.checkBoxL3MenuViewer.Visible = true; diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index ea096a9..0ad6091 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -24,6 +24,11 @@ Ƽ 8,10,12 /ƽ 跮 */ +@ Ver 12.5.0 by CJY + - 2026.01.22 + - Ver 12.4.2 Modify + - Ϻ ߰ + @ Ver 12.4.2 by LSJ - 2026.01.16 - Ver 12.4.1 Modify diff --git a/INT69DC_ImageDll/INT69DC_ImageDll.csproj b/INT69DC_ImageDll/INT69DC_ImageDll.csproj index 5b9e56c..224c348 100644 --- a/INT69DC_ImageDll/INT69DC_ImageDll.csproj +++ b/INT69DC_ImageDll/INT69DC_ImageDll.csproj @@ -858,6 +858,9 @@ + + + diff --git a/INT69DC_ImageDll/ImageDll.cs b/INT69DC_ImageDll/ImageDll.cs index 8386119..e840d69 100644 --- a/INT69DC_ImageDll/ImageDll.cs +++ b/INT69DC_ImageDll/ImageDll.cs @@ -724,6 +724,9 @@ namespace INT69DC_ImageDll jpnMenuUserSettingDisable, jpnMenuUserSettingDown, jpnMenuUserSettingUp, + jpnPrintDisable, + jpnPrintDown, + jpnPrintUp, jpnSaveDisable, jpnSaveDown, jpnSaveUp, @@ -2880,6 +2883,15 @@ namespace INT69DC_ImageDll case ButtonImages.jpnMenuUserSettingUp: bt = new Bitmap(Resource.jpnMenuUserSettingUp); break; + case ButtonImages.jpnPrintDisable: + bt = new Bitmap(Resource.jpnPrintDisable); + break; + case ButtonImages.jpnPrintDown: + bt = new Bitmap(Resource.jpnPrintDown); + break; + case ButtonImages.jpnPrintUp: + bt = new Bitmap(Resource.jpnPrintUp); + break; case ButtonImages.jpnSaveDisable: bt = new Bitmap(Resource.jpnSaveDisable); break; diff --git a/INT69DC_ImageDll/Resource.Designer.cs b/INT69DC_ImageDll/Resource.Designer.cs index 01270e0..8a39a33 100644 --- a/INT69DC_ImageDll/Resource.Designer.cs +++ b/INT69DC_ImageDll/Resource.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:2.0.50727.9179 +// 이 코드는 도구를 사용하여 생성되었습니다. +// 런타임 버전:2.0.50727.9151 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 +// 이러한 변경 내용이 손실됩니다. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace INT69DC_ImageDll { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder + // 클래스에서 자동으로 생성되었습니다. + // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 + // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] internal class Resource { @@ -30,7 +30,7 @@ namespace INT69DC_ImageDll { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -44,8 +44,8 @@ namespace INT69DC_ImageDll { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대한 현재 스레드의 CurrentUICulture + /// 속성을 재정의합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -4901,6 +4901,27 @@ namespace INT69DC_ImageDll { } } + internal static System.Drawing.Bitmap jpnPrintDisable { + get { + object obj = ResourceManager.GetObject("jpnPrintDisable", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap jpnPrintDown { + get { + object obj = ResourceManager.GetObject("jpnPrintDown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap jpnPrintUp { + get { + object obj = ResourceManager.GetObject("jpnPrintUp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap jpnSaveDisable { get { object obj = ResourceManager.GetObject("jpnSaveDisable", resourceCulture); diff --git a/INT69DC_ImageDll/Resource.resx b/INT69DC_ImageDll/Resource.resx index a2fd75b..b42b811 100644 --- a/INT69DC_ImageDll/Resource.resx +++ b/INT69DC_ImageDll/Resource.resx @@ -2284,4 +2284,13 @@ Resources\engPrintUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Resources\jpnPrintDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\jpnPrintDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\jpnPrintUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/INT69DC_ImageDll/Resources/jpnPrintDisable.png b/INT69DC_ImageDll/Resources/jpnPrintDisable.png new file mode 100644 index 0000000000000000000000000000000000000000..1aa7a4aae870a3f24ddbf5360a023da697ba3216 GIT binary patch literal 4712 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 LNkvXXu0mjfWt_i1 literal 0 HcmV?d00001 diff --git a/INT69DC_ImageDll/Resources/jpnPrintUp.png b/INT69DC_ImageDll/Resources/jpnPrintUp.png new file mode 100644 index 0000000000000000000000000000000000000000..9201284e5c0720d71cd42c9408d018cf20cf915e GIT binary patch literal 5576 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 WW%59CRjF410000