From 19f24206708c5380d019559c0f4342acdcffcdf2 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 12 May 2018 20:04:58 -0700 Subject: [PATCH] Add settings for slotText & slotCry Closes #1939 --- 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/other/lang_pt.txt | 2 ++ PKHeX.Core/Resources/text/zh/lang_zh.txt | 2 ++ PKHeX.WinForms/App.config | 6 +++++ .../Controls/SAV Editor/SlotChangeManager.cs | 6 +++-- .../Properties/Settings.Designer.cs | 26 ++++++++++++++++++- PKHeX.WinForms/Properties/Settings.settings | 6 +++++ 13 files changed, 59 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Resources/text/de/lang_de.txt b/PKHeX.Core/Resources/text/de/lang_de.txt index c2b5a67e1..2825f5c9d 100644 --- a/PKHeX.Core/Resources/text/de/lang_de.txt +++ b/PKHeX.Core/Resources/text/de/lang_de.txt @@ -1079,6 +1079,8 @@ SettingsEditor.SetUpdateDex=Ändern Pokédex SettingsEditor.SetUpdatePKM=Ändern PKM Info SettingsEditor.ShinySprites=Shiny Sprites SettingsEditor.Unicode=Unicode +SettingsEditor.HoverSlotShowText=Show PKM Slot ToolTip on Hover +SettingsEditor.HoverSlotShowText=Play PKM Slot Cry on Hover SuperTrainingEditor.B_All=Alle SuperTrainingEditor.B_Cancel=Abbrechen SuperTrainingEditor.B_None=Nichts diff --git a/PKHeX.Core/Resources/text/en/lang_en.txt b/PKHeX.Core/Resources/text/en/lang_en.txt index 4140e3eb6..ccef8a8d9 100644 --- a/PKHeX.Core/Resources/text/en/lang_en.txt +++ b/PKHeX.Core/Resources/text/en/lang_en.txt @@ -1075,6 +1075,8 @@ SettingsEditor.SetUpdateDex=Modify Pokédex SettingsEditor.SetUpdatePKM=Modify PKM Info SettingsEditor.ShinySprites=Shiny Sprites SettingsEditor.Unicode=Unicode +SettingsEditor.HoverSlotShowText=Show PKM Slot ToolTip on Hover +SettingsEditor.HoverSlotShowText=Play PKM Slot Cry on Hover SuperTrainingEditor.B_All=Give All SuperTrainingEditor.B_Cancel=Cancel SuperTrainingEditor.B_None=Remove All diff --git a/PKHeX.Core/Resources/text/es/lang_es.txt b/PKHeX.Core/Resources/text/es/lang_es.txt index 96d9ea701..355c8c93d 100644 --- a/PKHeX.Core/Resources/text/es/lang_es.txt +++ b/PKHeX.Core/Resources/text/es/lang_es.txt @@ -1075,6 +1075,8 @@ SettingsEditor.SetUpdateDex=Modificar Pokédex SettingsEditor.SetUpdatePKM=Modificar info PKM SettingsEditor.ShinySprites=Shiny Sprites SettingsEditor.Unicode=Unicode +SettingsEditor.HoverSlotShowText=Show PKM Slot ToolTip on Hover +SettingsEditor.HoverSlotShowText=Play PKM Slot Cry on Hover SuperTrainingEditor.B_All=Dar todos SuperTrainingEditor.B_Cancel=Cancelar SuperTrainingEditor.B_None=Quitar todos diff --git a/PKHeX.Core/Resources/text/fr/lang_fr.txt b/PKHeX.Core/Resources/text/fr/lang_fr.txt index f1c86bb4a..6f61b9b92 100644 --- a/PKHeX.Core/Resources/text/fr/lang_fr.txt +++ b/PKHeX.Core/Resources/text/fr/lang_fr.txt @@ -1079,6 +1079,8 @@ SettingsEditor.SetUpdateDex=Modifier Infos Pokédex SettingsEditor.SetUpdatePKM=Modifier Infos Pokémon SettingsEditor.ShinySprites=Shiny Sprites SettingsEditor.Unicode=Unicode +SettingsEditor.HoverSlotShowText=Show PKM Slot ToolTip on Hover +SettingsEditor.HoverSlotShowText=Play PKM Slot Cry on Hover SuperTrainingEditor.B_All=Give All SuperTrainingEditor.B_Cancel=Cancel SuperTrainingEditor.B_None=Remove All diff --git a/PKHeX.Core/Resources/text/it/lang_it.txt b/PKHeX.Core/Resources/text/it/lang_it.txt index 9d6032404..59a133725 100644 --- a/PKHeX.Core/Resources/text/it/lang_it.txt +++ b/PKHeX.Core/Resources/text/it/lang_it.txt @@ -1085,6 +1085,8 @@ SettingsEditor.SetUpdateDex=Modify Pokédex SettingsEditor.SetUpdatePKM=Modify PKM Info SettingsEditor.ShinySprites=Shiny Sprites SettingsEditor.Unicode=Unicode +SettingsEditor.HoverSlotShowText=Show PKM Slot ToolTip on Hover +SettingsEditor.HoverSlotShowText=Play PKM Slot Cry on Hover SuperTrainingEditor.B_All=Give All SuperTrainingEditor.B_Cancel=Cancel SuperTrainingEditor.B_None=Remove All diff --git a/PKHeX.Core/Resources/text/ja/lang_ja.txt b/PKHeX.Core/Resources/text/ja/lang_ja.txt index 960048650..47dd390f5 100644 --- a/PKHeX.Core/Resources/text/ja/lang_ja.txt +++ b/PKHeX.Core/Resources/text/ja/lang_ja.txt @@ -1081,6 +1081,8 @@ SettingsEditor.SetUpdateDex=ポケモン図鑑に反映 SettingsEditor.SetUpdatePKM=PKM情報の変更 SettingsEditor.ShinySprites=色違いアイコン SettingsEditor.Unicode=Unicode +SettingsEditor.HoverSlotShowText=Show PKM Slot ToolTip on Hover +SettingsEditor.HoverSlotShowText=Play PKM Slot Cry on Hover SuperTrainingEditor.B_All=全て取得 SuperTrainingEditor.B_Cancel=キャンセル SuperTrainingEditor.B_None=全て消去 diff --git a/PKHeX.Core/Resources/text/ko/lang_ko.txt b/PKHeX.Core/Resources/text/ko/lang_ko.txt index 9a9c778a5..624965b2e 100644 --- a/PKHeX.Core/Resources/text/ko/lang_ko.txt +++ b/PKHeX.Core/Resources/text/ko/lang_ko.txt @@ -1075,6 +1075,8 @@ SettingsEditor.SetUpdateDex=포켓몬 도감 수정 SettingsEditor.SetUpdatePKM=포켓몬 정보 수정 SettingsEditor.ShinySprites=Shiny Sprites SettingsEditor.Unicode=Unicode +SettingsEditor.HoverSlotShowText=Show PKM Slot ToolTip on Hover +SettingsEditor.HoverSlotShowText=Play PKM Slot Cry on Hover SuperTrainingEditor.B_All=모두 주기 SuperTrainingEditor.B_Cancel=취소 SuperTrainingEditor.B_None=모두 제거 diff --git a/PKHeX.Core/Resources/text/other/lang_pt.txt b/PKHeX.Core/Resources/text/other/lang_pt.txt index 696fc0c03..b2a70c451 100644 --- a/PKHeX.Core/Resources/text/other/lang_pt.txt +++ b/PKHeX.Core/Resources/text/other/lang_pt.txt @@ -1088,6 +1088,8 @@ SettingsEditor.SetUpdateDex=Modificar Pokédex SettingsEditor.SetUpdatePKM=Modificar PKM Info SettingsEditor.ShinySprites=Shiny Sprites SettingsEditor.Unicode=Unicode +SettingsEditor.HoverSlotShowText=Show PKM Slot ToolTip on Hover +SettingsEditor.HoverSlotShowText=Play PKM Slot Cry on Hover SuperTrainingEditor.B_All=Give All SuperTrainingEditor.B_Cancel=Cancel SuperTrainingEditor.B_None=Remove All diff --git a/PKHeX.Core/Resources/text/zh/lang_zh.txt b/PKHeX.Core/Resources/text/zh/lang_zh.txt index bc3922f66..096413b51 100644 --- a/PKHeX.Core/Resources/text/zh/lang_zh.txt +++ b/PKHeX.Core/Resources/text/zh/lang_zh.txt @@ -1075,6 +1075,8 @@ SettingsEditor.SetUpdateDex=修改图鉴 SettingsEditor.SetUpdatePKM=修改宝可梦 SettingsEditor.ShinySprites=异色图标 SettingsEditor.Unicode=Unicode +SettingsEditor.HoverSlotShowText=Show PKM Slot ToolTip on Hover +SettingsEditor.HoverSlotShowText=Play PKM Slot Cry on Hover SuperTrainingEditor.B_All=获得全部 SuperTrainingEditor.B_Cancel=取消 SuperTrainingEditor.B_None=全部清除 diff --git a/PKHeX.WinForms/App.config b/PKHeX.WinForms/App.config index 1ef0696bd..2962a8698 100644 --- a/PKHeX.WinForms/App.config +++ b/PKHeX.WinForms/App.config @@ -37,6 +37,12 @@ True + + True + + + True + diff --git a/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs b/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs index 0ae987f56..e42e0e5db 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs @@ -59,8 +59,10 @@ public void MouseEnter(object sender, EventArgs e) var data = view.GetSlotData(pb); var pk = SAV.GetStoredSlot(data.Offset); - ShowSimulatorSetTooltip(pb, pk); - PlayCry(pk); + if (Settings.Default.HoverSlotShowText) + ShowSimulatorSetTooltip(pb, pk); + if (Settings.Default.HoverSlotPlayCry) + PlayCry(pk); } public void MouseLeave(object sender, EventArgs e) { diff --git a/PKHeX.WinForms/Properties/Settings.Designer.cs b/PKHeX.WinForms/Properties/Settings.Designer.cs index c7ee92545..fbce4264c 100644 --- a/PKHeX.WinForms/Properties/Settings.Designer.cs +++ b/PKHeX.WinForms/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace PKHeX.WinForms.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -142,5 +142,29 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio this["ApplyMarkings"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool HoverSlotShowText { + get { + return ((bool)(this["HoverSlotShowText"])); + } + set { + this["HoverSlotShowText"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool HoverSlotPlayCry { + get { + return ((bool)(this["HoverSlotPlayCry"])); + } + set { + this["HoverSlotPlayCry"] = value; + } + } } } diff --git a/PKHeX.WinForms/Properties/Settings.settings b/PKHeX.WinForms/Properties/Settings.settings index c20fa2a32..549e152ab 100644 --- a/PKHeX.WinForms/Properties/Settings.settings +++ b/PKHeX.WinForms/Properties/Settings.settings @@ -32,5 +32,11 @@ True + + True + + + True + \ No newline at end of file