From 286df71c5a6e7a7b3986ac784aec46a5acdd8a80 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 15 Apr 2019 15:38:49 -0700 Subject: [PATCH] Hide sound type for nonyellow gen1 saves Closes #2283 Fix label name & update translation file for them --- PKHeX.Core/Resources/text/de/lang_de.txt | 2 +- PKHeX.Core/Resources/text/en/lang_en.txt | 2 +- PKHeX.Core/Resources/text/es/lang_es.txt | 2 +- PKHeX.Core/Resources/text/fr/lang_fr.txt | 2 +- PKHeX.Core/Resources/text/it/lang_it.txt | 2 +- PKHeX.Core/Resources/text/ja/lang_ja.txt | 2 +- PKHeX.Core/Resources/text/ko/lang_ko.txt | 2 +- PKHeX.Core/Resources/text/zh/lang_zh.txt | 2 +- .../SAV_SimpleTrainer.Designer.cs | 20 +++++++++---------- .../Save Editors/SAV_SimpleTrainer.cs | 5 ++++- 10 files changed, 22 insertions(+), 19 deletions(-) diff --git a/PKHeX.Core/Resources/text/de/lang_de.txt b/PKHeX.Core/Resources/text/de/lang_de.txt index 8361dd034..861ea5616 100644 --- a/PKHeX.Core/Resources/text/de/lang_de.txt +++ b/PKHeX.Core/Resources/text/de/lang_de.txt @@ -1014,7 +1014,7 @@ SAV_SimpleTrainer.L_TrainerName=Name: SAV_SimpleTrainer.L_X=X Coordinate: SAV_SimpleTrainer.L_Y=Y Coordinate: SAV_SimpleTrainer.L_Z=Z Coordinate: -SAV_SimpleTrainer.label1=Sound Type: +SAV_SimpleTrainer.LBL_SoundType=Sound Type: SAV_SimpleTrainer.LBL_BattleStyle=Battle Style: SAV_SimpleTrainer.LBL_TextSpeed=Text Speed: SAV_SuperTrain.B_Cancel=Cancel diff --git a/PKHeX.Core/Resources/text/en/lang_en.txt b/PKHeX.Core/Resources/text/en/lang_en.txt index 55be53077..12795f1d7 100644 --- a/PKHeX.Core/Resources/text/en/lang_en.txt +++ b/PKHeX.Core/Resources/text/en/lang_en.txt @@ -1010,7 +1010,7 @@ SAV_SimpleTrainer.L_TrainerName=Name: SAV_SimpleTrainer.L_X=X Coordinate: SAV_SimpleTrainer.L_Y=Y Coordinate: SAV_SimpleTrainer.L_Z=Z Coordinate: -SAV_SimpleTrainer.label1=Sound Type: +SAV_SimpleTrainer.LBL_SoundType=Sound Type: SAV_SimpleTrainer.LBL_BattleStyle=Battle Style: SAV_SimpleTrainer.LBL_TextSpeed=Text Speed: SAV_SuperTrain.B_Cancel=Cancel diff --git a/PKHeX.Core/Resources/text/es/lang_es.txt b/PKHeX.Core/Resources/text/es/lang_es.txt index fee332c3f..53bcb9135 100644 --- a/PKHeX.Core/Resources/text/es/lang_es.txt +++ b/PKHeX.Core/Resources/text/es/lang_es.txt @@ -1010,7 +1010,7 @@ SAV_SimpleTrainer.L_TrainerName=Nombre Entr.: SAV_SimpleTrainer.L_X=Coordenada X: SAV_SimpleTrainer.L_Y=Coordenada Y: SAV_SimpleTrainer.L_Z=Coordenada Z: -SAV_SimpleTrainer.label1=Tipo Son.: +SAV_SimpleTrainer.LBL_SoundType=Tipo Son.: SAV_SimpleTrainer.LBL_BattleStyle=Estilo Bat.: SAV_SimpleTrainer.LBL_TextSpeed=Vel. Texto: SAV_SuperTrain.B_Cancel=Cancelar diff --git a/PKHeX.Core/Resources/text/fr/lang_fr.txt b/PKHeX.Core/Resources/text/fr/lang_fr.txt index 19ae153d7..2883a96f2 100644 --- a/PKHeX.Core/Resources/text/fr/lang_fr.txt +++ b/PKHeX.Core/Resources/text/fr/lang_fr.txt @@ -1014,7 +1014,7 @@ SAV_SimpleTrainer.L_TrainerName=Nom SAV_SimpleTrainer.L_X=Coordonnées X SAV_SimpleTrainer.L_Y=Coordonnées Y SAV_SimpleTrainer.L_Z=Coordonnées Z -SAV_SimpleTrainer.label1=Type Son +SAV_SimpleTrainer.LBL_SoundType=Type Son SAV_SimpleTrainer.LBL_BattleStyle=Style Comb. SAV_SimpleTrainer.LBL_TextSpeed=Vit. Texte SAV_SuperTrain.B_Cancel=Cancel diff --git a/PKHeX.Core/Resources/text/it/lang_it.txt b/PKHeX.Core/Resources/text/it/lang_it.txt index 4115fc9d2..db49708bb 100644 --- a/PKHeX.Core/Resources/text/it/lang_it.txt +++ b/PKHeX.Core/Resources/text/it/lang_it.txt @@ -1020,7 +1020,7 @@ SAV_SimpleTrainer.L_TrainerName=Name: SAV_SimpleTrainer.L_X=X Coordinate: SAV_SimpleTrainer.L_Y=Y Coordinate: SAV_SimpleTrainer.L_Z=Z Coordinate: -SAV_SimpleTrainer.label1=Sound Type: +SAV_SimpleTrainer.LBL_SoundType=Sound Type: SAV_SimpleTrainer.LBL_BattleStyle=Battle Style: SAV_SimpleTrainer.LBL_TextSpeed=Text Speed: SAV_SuperTrain.B_Cancel=Cancel diff --git a/PKHeX.Core/Resources/text/ja/lang_ja.txt b/PKHeX.Core/Resources/text/ja/lang_ja.txt index 2f8d8314c..ee3b55c63 100644 --- a/PKHeX.Core/Resources/text/ja/lang_ja.txt +++ b/PKHeX.Core/Resources/text/ja/lang_ja.txt @@ -1014,7 +1014,7 @@ SAV_SimpleTrainer.L_TrainerName=名前 SAV_SimpleTrainer.L_X=X座標 SAV_SimpleTrainer.L_Y=Y座標 SAV_SimpleTrainer.L_Z=Z座標 -SAV_SimpleTrainer.label1=サウンド +SAV_SimpleTrainer.LBL_SoundType=サウンド SAV_SimpleTrainer.LBL_BattleStyle=試合のﾙｰﾙ SAV_SimpleTrainer.LBL_TextSpeed=話の速さ SAV_SuperTrain.B_Cancel=ｷｬﾝｾﾙ diff --git a/PKHeX.Core/Resources/text/ko/lang_ko.txt b/PKHeX.Core/Resources/text/ko/lang_ko.txt index 1a0461276..0cad9bf3d 100644 --- a/PKHeX.Core/Resources/text/ko/lang_ko.txt +++ b/PKHeX.Core/Resources/text/ko/lang_ko.txt @@ -1010,7 +1010,7 @@ SAV_SimpleTrainer.L_TrainerName=Name: SAV_SimpleTrainer.L_X=X Coordinate: SAV_SimpleTrainer.L_Y=Y Coordinate: SAV_SimpleTrainer.L_Z=Z Coordinate: -SAV_SimpleTrainer.label1=Sound Type: +SAV_SimpleTrainer.LBL_SoundType=Sound Type: SAV_SimpleTrainer.LBL_BattleStyle=Battle Style: SAV_SimpleTrainer.LBL_TextSpeed=Text Speed: SAV_SuperTrain.B_Cancel=Cancel diff --git a/PKHeX.Core/Resources/text/zh/lang_zh.txt b/PKHeX.Core/Resources/text/zh/lang_zh.txt index 867b966d4..5451956ee 100644 --- a/PKHeX.Core/Resources/text/zh/lang_zh.txt +++ b/PKHeX.Core/Resources/text/zh/lang_zh.txt @@ -1010,7 +1010,7 @@ SAV_SimpleTrainer.L_TrainerName=名称: SAV_SimpleTrainer.L_X=X坐标 SAV_SimpleTrainer.L_Y=Y坐标: SAV_SimpleTrainer.L_Z=Z坐标: -SAV_SimpleTrainer.label1=音效类型: +SAV_SimpleTrainer.LBL_SoundType=音效类型: SAV_SimpleTrainer.LBL_BattleStyle=比赛规则: SAV_SimpleTrainer.LBL_TextSpeed=语速: SAV_SuperTrain.B_Cancel=取消 diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs index 42c681d02..c0c5925bf 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs @@ -87,7 +87,7 @@ private void InitializeComponent() this.CHK_2 = new System.Windows.Forms.CheckBox(); this.CHK_1 = new System.Windows.Forms.CheckBox(); this.GB_Options = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); + this.LBL_SoundType = new System.Windows.Forms.Label(); this.CB_SoundType = new System.Windows.Forms.ComboBox(); this.LBL_TextSpeed = new System.Windows.Forms.Label(); this.CB_TextSpeed = new System.Windows.Forms.ComboBox(); @@ -739,7 +739,7 @@ private void InitializeComponent() // // GB_Options // - this.GB_Options.Controls.Add(this.label1); + this.GB_Options.Controls.Add(this.LBL_SoundType); this.GB_Options.Controls.Add(this.CB_SoundType); this.GB_Options.Controls.Add(this.LBL_TextSpeed); this.GB_Options.Controls.Add(this.CB_TextSpeed); @@ -754,14 +754,14 @@ private void InitializeComponent() this.GB_Options.Text = "Options"; this.GB_Options.Visible = false; // - // label1 + // LBL_SoundType // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 71); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(68, 13); - this.label1.TabIndex = 25; - this.label1.Text = "Sound Type:"; + this.LBL_SoundType.AutoSize = true; + this.LBL_SoundType.Location = new System.Drawing.Point(3, 71); + this.LBL_SoundType.Name = "LBL_SoundType"; + this.LBL_SoundType.Size = new System.Drawing.Size(68, 13); + this.LBL_SoundType.TabIndex = 25; + this.LBL_SoundType.Text = "Sound Type:"; // // CB_SoundType // @@ -910,7 +910,7 @@ private void InitializeComponent() private System.Windows.Forms.Label L_Coins; private System.Windows.Forms.MaskedTextBox MT_Coins; private System.Windows.Forms.GroupBox GB_Options; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label LBL_SoundType; private System.Windows.Forms.ComboBox CB_SoundType; private System.Windows.Forms.Label LBL_TextSpeed; private System.Windows.Forms.ComboBox CB_TextSpeed; diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.cs index 05d3afaa3..e2955b68b 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.cs @@ -63,8 +63,11 @@ public SAV_SimpleTrainer(SaveFile sav) CB_TextSpeed.SelectedIndex = sav1.TextSpeed; MT_PikaFriend.Text = sav1.PikaFriendship.ToString(); - if (!SAV.Version.Contains(GameVersion.YW)) + if (!sav1.Version.Contains(GameVersion.YW)) + { MT_PikaFriend.Visible = false; + CB_SoundType.Visible = LBL_SoundType.Visible = false; + } } if (SAV is SAV2 sav2)