diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs index 252d9e4..6628e2f 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs @@ -383,6 +383,7 @@ namespace ITC81DB_2.Controls this.ParentForm.ParentForm.ChildFormMenu.CenterEquipTest.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMenu.CenterEquipUpdate.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMenu.CenterEquipUser.InitializeDesign(); + this.ParentForm.ParentForm.ChildFormMenu.CenterEquipEngineer.InitializeDesign(); Thread.Sleep(50); this.ParentForm.ParentForm.ChildFormMenu.CenterInforAS.InitializeDesign(); diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipHelp.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipHelp.cs index 03f22de..f96f94d 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipHelp.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipHelp.cs @@ -63,6 +63,9 @@ namespace ITC81DB_2.Controls this.buttonEquipmentTest.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpEquipmentTestDisable)); this.buttonEquipmentTest.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpEquipmentTestDown)); this.buttonEquipmentTest.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpEquipmentTestUp)); + this.buttonEngineerSetting.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpEngineerDisable)); + this.buttonEngineerSetting.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpEngineerDown)); + this.buttonEngineerSetting.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpEngineerUp)); } else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) { @@ -90,6 +93,9 @@ namespace ITC81DB_2.Controls this.buttonEquipmentTest.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpEquipmentTestDisable)); this.buttonEquipmentTest.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpEquipmentTestDown)); this.buttonEquipmentTest.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpEquipmentTestUp)); + this.buttonEngineerSetting.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpEngineerDisable)); + this.buttonEngineerSetting.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpEngineerDown)); + this.buttonEngineerSetting.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpEngineerUp)); } } private void DefaultSetting() diff --git a/ITC81DB_2/Forms/FormMenu.cs b/ITC81DB_2/Forms/FormMenu.cs index 2691066..612c7c7 100644 --- a/ITC81DB_2/Forms/FormMenu.cs +++ b/ITC81DB_2/Forms/FormMenu.cs @@ -735,6 +735,9 @@ namespace ITC81DB_2.Forms case DataStore.DisplayStore.EquipUser: this.labelTitleRoot.Text = "Equipment > User Settings"; break; + case DataStore.DisplayStore.EquipEngineer: + this.labelTitleRoot.Text = "Equipment > Engineer Settings"; + break; case DataStore.DisplayStore.InforAS: this.labelTitleRoot.Text = "Information > A/S"; break; @@ -823,6 +826,9 @@ namespace ITC81DB_2.Forms case DataStore.DisplayStore.EquipUser: this.labelTitleRoot.Text = "장비설정 > 유저설정"; break; + case DataStore.DisplayStore.EquipEngineer: + this.labelTitleRoot.Text = "장비설정 > 엔지니어설정"; + break; case DataStore.DisplayStore.InforAS: this.labelTitleRoot.Text = "ì •ë³´ > A/S"; break; diff --git a/ITC81DB_2/Version.txt b/ITC81DB_2/Version.txt index 61a218c..15c2308 100644 --- a/ITC81DB_2/Version.txt +++ b/ITC81DB_2/Version.txt @@ -13,6 +13,12 @@ 2¿­ ±âº»Çü ÄÁº£¾î °è·®±â */ +@ Ver 2.0.1 by CJY + - 2020.07.24 + - Ver 2.0.0 Modify + - ¾ð¾î - ¿µ¾î º¯°æ ½Ã ¿£Áö´Ï¾î ¼³Á¤ ¹öÆ° ¹× È­¸é ¿µ¹® Àüȯ ¾ÈµÇ´Â ¹ö±× ¼öÁ¤ + - Á¦¸ñ Ç¥±â Á¦´ë·Î ¾ÈµÇ´Â ¹ö±× ¼öÁ¤ + @ Ver 2.0.0 by CJY - 2020.07.15 - Ver 1.9.0 Modify diff --git a/ITC81DB_2/bin/Release/ITC81DB_2.exe b/ITC81DB_2/bin/Release/ITC81DB_2.exe index 55d83cd..6ef1928 100644 Binary files a/ITC81DB_2/bin/Release/ITC81DB_2.exe and b/ITC81DB_2/bin/Release/ITC81DB_2.exe differ diff --git a/ITC81DB_2/bin/Release/ITC81DB_2_ImageDll.dll b/ITC81DB_2/bin/Release/ITC81DB_2_ImageDll.dll index 30c1c29..1a80a3c 100644 Binary files a/ITC81DB_2/bin/Release/ITC81DB_2_ImageDll.dll and b/ITC81DB_2/bin/Release/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2/obj/Release/ITC81DB_2.exe b/ITC81DB_2/obj/Release/ITC81DB_2.exe index 55d83cd..6ef1928 100644 Binary files a/ITC81DB_2/obj/Release/ITC81DB_2.exe and b/ITC81DB_2/obj/Release/ITC81DB_2.exe differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Class1.cs b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Class1.cs index 6eaf18b..cf8eee9 100644 --- a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Class1.cs +++ b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Class1.cs @@ -104,6 +104,9 @@ namespace ITC81DB_2_ImageDll engHelpDataStatisticsDisable, engHelpDataStatisticsDown, engHelpDataStatisticsUp, + engHelpEngineerDisable, + engHelpEngineerDown, + engHelpEngineerUp, engHelpEquipmentTestDisable, engHelpEquipmentTestDown, engHelpEquipmentTestUp, @@ -264,6 +267,9 @@ namespace ITC81DB_2_ImageDll korHelpDataStatisticsDisable, korHelpDataStatisticsDown, korHelpDataStatisticsUp, + korHelpEngineerDisable, + korHelpEngineerDown, + korHelpEngineerUp, korHelpEquipmentTestDisable, korHelpEquipmentTestDown, korHelpEquipmentTestUp, @@ -625,6 +631,15 @@ namespace ITC81DB_2_ImageDll case ButtonImages.engHelpDataStatisticsUp: bt = new Bitmap(Resource1.engHelpDataStatisticsUp); break; + case ButtonImages.engHelpEngineerDisable: + bt = new Bitmap(Resource1.engHelpEngineerDisable); + break; + case ButtonImages.engHelpEngineerDown: + bt = new Bitmap(Resource1.engHelpEngineerDown); + break; + case ButtonImages.engHelpEngineerUp: + bt = new Bitmap(Resource1.engHelpEngineerUp); + break; case ButtonImages.engHelpEquipmentTestDisable: bt = new Bitmap(Resource1.engHelpEquipmentTestDisable); break; @@ -1090,6 +1105,15 @@ namespace ITC81DB_2_ImageDll case ButtonImages.korHelpDataStatisticsUp: bt = new Bitmap(Resource1.korHelpDataStatisticsUp); break; + case ButtonImages.korHelpEngineerDisable: + bt = new Bitmap(Resource1.korHelpEngineerDisable); + break; + case ButtonImages.korHelpEngineerDown: + bt = new Bitmap(Resource1.korHelpEngineerDown); + break; + case ButtonImages.korHelpEngineerUp: + bt = new Bitmap(Resource1.korHelpEngineerUp); + break; case ButtonImages.korHelpEquipmentTestDisable: bt = new Bitmap(Resource1.korHelpEquipmentTestDisable); break; diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll.csproj b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll.csproj index 40c36f3..1a08f86 100644 --- a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll.csproj +++ b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll.csproj @@ -1030,6 +1030,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resource1.Designer.cs b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resource1.Designer.cs index 9ea7352..a21d039 100644 --- a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resource1.Designer.cs +++ b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resource1.Designer.cs @@ -694,6 +694,27 @@ namespace ITC81DB_2_ImageDll { } } + internal static System.Drawing.Bitmap engHelpEngineerDisable { + get { + object obj = ResourceManager.GetObject("engHelpEngineerDisable", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap engHelpEngineerDown { + get { + object obj = ResourceManager.GetObject("engHelpEngineerDown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap engHelpEngineerUp { + get { + object obj = ResourceManager.GetObject("engHelpEngineerUp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap engHelpEquipmentTestDisable { get { object obj = ResourceManager.GetObject("engHelpEquipmentTestDisable", resourceCulture); @@ -1793,6 +1814,27 @@ namespace ITC81DB_2_ImageDll { } } + internal static System.Drawing.Bitmap korHelpEngineerDisable { + get { + object obj = ResourceManager.GetObject("korHelpEngineerDisable", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap korHelpEngineerDown { + get { + object obj = ResourceManager.GetObject("korHelpEngineerDown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap korHelpEngineerUp { + get { + object obj = ResourceManager.GetObject("korHelpEngineerUp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap korHelpEquipmentTestDisable { get { object obj = ResourceManager.GetObject("korHelpEquipmentTestDisable", resourceCulture); diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resource1.resx b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resource1.resx index 2daa2a3..4fefd25 100644 --- a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resource1.resx +++ b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resource1.resx @@ -1060,4 +1060,22 @@ Resources\korJudgmentStandardUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Resources\engHelpEngineerDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\engHelpEngineerDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\engHelpEngineerUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\korHelpEngineerDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\korHelpEngineerDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\korHelpEngineerUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/engHelpEngineerDisable.png b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/engHelpEngineerDisable.png new file mode 100644 index 0000000..dde4916 Binary files /dev/null and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/engHelpEngineerDisable.png differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/engHelpEngineerDown.png b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/engHelpEngineerDown.png new file mode 100644 index 0000000..e9bb021 Binary files /dev/null and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/engHelpEngineerDown.png differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/engHelpEngineerUp.png b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/engHelpEngineerUp.png new file mode 100644 index 0000000..13d549e Binary files /dev/null and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/engHelpEngineerUp.png differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/korHelpEngineerDisable.png b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/korHelpEngineerDisable.png new file mode 100644 index 0000000..16835bc Binary files /dev/null and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/korHelpEngineerDisable.png differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/korHelpEngineerDown.png b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/korHelpEngineerDown.png new file mode 100644 index 0000000..1bef6f5 Binary files /dev/null and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/korHelpEngineerDown.png differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/korHelpEngineerUp.png b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/korHelpEngineerUp.png new file mode 100644 index 0000000..dc43fb7 Binary files /dev/null and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/Resources/korHelpEngineerUp.png differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Release/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Release/ITC81DB_2_ImageDll.dll index 30c1c29..1a80a3c 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Release/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Release/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/ITC81DB_2_ImageDll.dll index 30c1c29..1a80a3c 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/TempPE/Resource1.Designer.cs.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/TempPE/Resource1.Designer.cs.dll index ea9f225..77233b8 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/TempPE/Resource1.Designer.cs.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/TempPE/Resource1.Designer.cs.dll differ