From 17b771632e9b9580e83e776a1fdadcb20adaaaa6 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 23 Mar 2018 22:54:26 -0700 Subject: [PATCH] Add settings editor to main navigation shortcut ctrl-n (CoNfig) Closes #1864 add debug lines for triggering translations to update --- PKHeX.Core/Resources/text/de/lang_de.txt | 11 +- PKHeX.Core/Resources/text/en/lang_en.txt | 11 +- PKHeX.Core/Resources/text/es/lang_es.txt | 11 +- PKHeX.Core/Resources/text/fr/lang_fr.txt | 11 +- PKHeX.Core/Resources/text/it/lang_it.txt | 11 +- PKHeX.Core/Resources/text/ja/lang_ja.txt | 11 +- PKHeX.Core/Resources/text/ko/lang_ko.txt | 11 +- PKHeX.Core/Resources/text/other/lang_pt.txt | 11 +- PKHeX.Core/Resources/text/zh/lang_zh.txt | 11 +- PKHeX.WinForms/MainWindow/Main.Designer.cs | 145 ++++-------------- PKHeX.WinForms/MainWindow/Main.cs | 61 +++----- PKHeX.WinForms/MainWindow/Main.resx | 22 --- PKHeX.WinForms/PKHeX.WinForms.csproj | 1 + .../Properties/Resources.Designer.cs | 26 ++-- PKHeX.WinForms/Properties/Resources.resx | 3 + PKHeX.WinForms/Resources/img/Program/bak.png | Bin 352 -> 413 bytes PKHeX.WinForms/Resources/img/Program/redo.png | Bin 0 -> 352 bytes 17 files changed, 138 insertions(+), 219 deletions(-) create mode 100644 PKHeX.WinForms/Resources/img/Program/redo.png diff --git a/PKHeX.Core/Resources/text/de/lang_de.txt b/PKHeX.Core/Resources/text/de/lang_de.txt index 7c3c563d4..b36b9d350 100644 --- a/PKHeX.Core/Resources/text/de/lang_de.txt +++ b/PKHeX.Core/Resources/text/de/lang_de.txt @@ -130,7 +130,6 @@ Main.Label_TID=TID: Main.Label_Total=Gesamt: Main.Label_Tough=Stärke Main.Menu_About=Über PKHeX -Main.Menu_ApplyMarkings=Apply Markings on Import Main.Menu_BatchEditor=Batch Editor Main.Menu_Data=Daten Main.Menu_Database=PKM Datenbank @@ -144,9 +143,6 @@ Main.Menu_Folder=Öffne Ordner Main.Menu_Language=Sprache Main.Menu_LoadBoxes=Lade Boxen Main.Menu_MGDatabase=Wunderkarten Datenbank -Main.Menu_Modify=Bei Einstellung auf SAV -Main.Menu_ModifyDex=Ändern Pokédex -Main.Menu_ModifyPKM=Ändern PKM Info Main.Menu_Open=Öffnen... Main.Menu_Options=Optionen Main.Menu_Report=Box-Datenreport @@ -582,6 +578,13 @@ SAV_Wondercard.B_Output=Export SAV_Wondercard.B_Save=Speichern SAV_Wondercard.L_Details=Details: SAV_Wondercard.L_Received=Received List: +SettingsEditor.ApplyMarkings=Apply Markings on Import +SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.ModifyUnset=Notify Unset Changes +SettingsEditor.SetUpdateDex=Ändern Pokédex +SettingsEditor.SetUpdatePKM=Ändern PKM Info +SettingsEditor.ShinySprites=Shiny Sprites +SettingsEditor.Unicode=Unicode SuperTrain.B_Cancel=Abbrechen SuperTrain.B_Save=Speichern SuperTrain.L_Bags=Sandsäcke diff --git a/PKHeX.Core/Resources/text/en/lang_en.txt b/PKHeX.Core/Resources/text/en/lang_en.txt index d0a591f96..29cd83856 100644 --- a/PKHeX.Core/Resources/text/en/lang_en.txt +++ b/PKHeX.Core/Resources/text/en/lang_en.txt @@ -130,7 +130,6 @@ Main.Label_TID=TID: Main.Label_Total=Total: Main.Label_Tough=Tough Main.Menu_About=About PKHeX -Main.Menu_ApplyMarkings=Apply Markings on Import Main.Menu_BatchEditor=Batch Editor Main.Menu_Data=Data Main.Menu_Database=PKM Database @@ -144,9 +143,6 @@ Main.Menu_Folder=Open Folder Main.Menu_Language=Language Main.Menu_LoadBoxes=Load Boxes Main.Menu_MGDatabase=Mystery Gift Database -Main.Menu_Modify=Set to SAV -Main.Menu_ModifyDex=Modify Pokédex -Main.Menu_ModifyPKM=Modify PKM Info Main.Menu_Open=Open... Main.Menu_Options=Options Main.Menu_Report=Box Data Report @@ -578,6 +574,13 @@ SAV_Wondercard.B_Output=Export SAV_Wondercard.B_Save=Save SAV_Wondercard.L_Details=Details: SAV_Wondercard.L_Received=Received List: +SettingsEditor.ApplyMarkings=Apply Markings on Import +SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.ModifyUnset=Notify Unset Changes +SettingsEditor.SetUpdateDex=Modify Pokédex +SettingsEditor.SetUpdatePKM=Modify PKM Info +SettingsEditor.ShinySprites=Shiny Sprites +SettingsEditor.Unicode=Unicode SuperTrain.B_Cancel=Cancel SuperTrain.B_Save=Save SuperTrain.L_Bags=Training Bags diff --git a/PKHeX.Core/Resources/text/es/lang_es.txt b/PKHeX.Core/Resources/text/es/lang_es.txt index d57440559..4a66f6a20 100644 --- a/PKHeX.Core/Resources/text/es/lang_es.txt +++ b/PKHeX.Core/Resources/text/es/lang_es.txt @@ -136,7 +136,6 @@ Main.Label_TID=ID: Main.Label_Total=Total: Main.Label_Tough=Dureza Main.Menu_About=Sobre PKHeX -Main.Menu_ApplyMarkings=Apply Markings on Import Main.Menu_BatchEditor=Editor por lotes Main.Menu_Data=Data Main.Menu_Database=Base de datos de PKM @@ -150,9 +149,6 @@ Main.Menu_Folder=Abrir carpeta Main.Menu_Language=Idioma Main.Menu_LoadBoxes=Cargar Cajas Main.Menu_MGDatabase=Base de datos de Regalo Misterioso -Main.Menu_Modify=Ajuste a SAV -Main.Menu_ModifyDex=Modificar Pokédex -Main.Menu_ModifyPKM=Modificar info PKM Main.Menu_Open=Abrir... Main.Menu_Options=Opciones Main.Menu_Report=Informe de la caja @@ -646,6 +642,13 @@ SAV_Wondercard.B_Output=Exportar SAV_Wondercard.B_Save=Guardar SAV_Wondercard.L_Details=Detalles: SAV_Wondercard.L_Received=Lista de recibidos: +SettingsEditor.ApplyMarkings=Apply Markings on Import +SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.ModifyUnset=Notify Unset Changes +SettingsEditor.SetUpdateDex=Modificar Pokédex +SettingsEditor.SetUpdatePKM=Modificar info PKM +SettingsEditor.ShinySprites=Shiny Sprites +SettingsEditor.Unicode=Unicode SuperTrain.B_Cancel=Cancel SuperTrain.B_Save=Save SuperTrain.L_Bags=Training Bags diff --git a/PKHeX.Core/Resources/text/fr/lang_fr.txt b/PKHeX.Core/Resources/text/fr/lang_fr.txt index 559815322..bdd8055c3 100644 --- a/PKHeX.Core/Resources/text/fr/lang_fr.txt +++ b/PKHeX.Core/Resources/text/fr/lang_fr.txt @@ -130,7 +130,6 @@ Main.Label_TID=ID : Main.Label_Total=Total : Main.Label_Tough=Robus. Main.Menu_About=À propos de PKHeX -Main.Menu_ApplyMarkings=Appliquer des marques de l'importation Main.Menu_BatchEditor=Éditeur en vrac Main.Menu_Data=Données Main.Menu_Database=Base de données PKM @@ -144,9 +143,6 @@ Main.Menu_Folder=Ouvrir le dossier Main.Menu_Language=Langue Main.Menu_LoadBoxes=Charger Boîtes Main.Menu_MGDatabase=Base de données de cadeaux de mystère -Main.Menu_Modify=Réglez SAV -Main.Menu_ModifyDex=Modifier Infos Pokédex -Main.Menu_ModifyPKM=Modifier Infos Pokémon Main.Menu_Open=Ouvrir... Main.Menu_Options=Options Main.Menu_Report=Rapport de données Box @@ -592,6 +588,13 @@ SAV_Wondercard.B_Output=Export SAV_Wondercard.B_Save=Save SAV_Wondercard.L_Details=Details: SAV_Wondercard.L_Received=Received List: +SettingsEditor.ApplyMarkings=Appliquer des marques de l'importation +SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.ModifyUnset=Notify Unset Changes +SettingsEditor.SetUpdateDex=Modifier Infos Pokédex +SettingsEditor.SetUpdatePKM=Modifier Infos Pokémon +SettingsEditor.ShinySprites=Shiny Sprites +SettingsEditor.Unicode=Unicode SuperTrain.B_Cancel=Cancel SuperTrain.B_Save=Save SuperTrain.L_Bags=Training Bags diff --git a/PKHeX.Core/Resources/text/it/lang_it.txt b/PKHeX.Core/Resources/text/it/lang_it.txt index 0c1ed4c6a..2ab685772 100644 --- a/PKHeX.Core/Resources/text/it/lang_it.txt +++ b/PKHeX.Core/Resources/text/it/lang_it.txt @@ -130,7 +130,6 @@ Main.Label_TID=TID: Main.Label_Total=Total: Main.Label_Tough=Tough Main.Menu_About=About PKHeX -Main.Menu_ApplyMarkings=Apply Markings on Import Main.Menu_BatchEditor=Batch Editor Main.Menu_Data=Data Main.Menu_Database=PKM Database @@ -144,9 +143,6 @@ Main.Menu_Folder=Open Folder Main.Menu_Language=Language Main.Menu_LoadBoxes=Load Boxes Main.Menu_MGDatabase=Mystery Gift Database -Main.Menu_Modify=Set to SAV -Main.Menu_ModifyDex=Modify Pokédex -Main.Menu_ModifyPKM=Modify PKM Info Main.Menu_Open=Open... Main.Menu_Options=Options Main.Menu_Report=Box Data Report @@ -588,6 +584,13 @@ SAV_Wondercard.B_Output=Export SAV_Wondercard.B_Save=Save SAV_Wondercard.L_Details=Details: SAV_Wondercard.L_Received=Received List: +SettingsEditor.ApplyMarkings=Apply Markings on Import +SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.ModifyUnset=Notify Unset Changes +SettingsEditor.SetUpdateDex=Modify Pokédex +SettingsEditor.SetUpdatePKM=Modify PKM Info +SettingsEditor.ShinySprites=Shiny Sprites +SettingsEditor.Unicode=Unicode SuperTrain.B_Cancel=Cancel SuperTrain.B_Save=Save SuperTrain.L_Bags=Training Bags diff --git a/PKHeX.Core/Resources/text/ja/lang_ja.txt b/PKHeX.Core/Resources/text/ja/lang_ja.txt index 054f48f74..426df8509 100644 --- a/PKHeX.Core/Resources/text/ja/lang_ja.txt +++ b/PKHeX.Core/Resources/text/ja/lang_ja.txt @@ -140,7 +140,6 @@ Main.Label_TID=ID Main.Label_Total=合計 Main.Label_Tough=たくましさ Main.Menu_About=PKHeXについて -Main.Menu_ApplyMarkings=Apply Markings on Import Main.Menu_BatchEditor=バルクエディタ Main.Menu_Data=データ Main.Menu_Database=PKMデータベース @@ -154,9 +153,6 @@ Main.Menu_Folder=オープンフォルダ Main.Menu_Language=言語 Main.Menu_LoadBoxes=ロードボックス Main.Menu_MGDatabase=ふしぎなおくりものデータベース -Main.Menu_Modify=SAVに設定 -Main.Menu_ModifyDex=ポケモン図鑑に反映 -Main.Menu_ModifyPKM=PKM情報の変更 Main.Menu_Open=読み込み... Main.Menu_Options=設定 Main.Menu_Report=ボックスデータレポート @@ -603,6 +599,13 @@ SAV_Wondercard.B_Output=Export SAV_Wondercard.B_Save=Save SAV_Wondercard.L_Details=Details: SAV_Wondercard.L_Received=Received List: +SettingsEditor.ApplyMarkings=Apply Markings on Import +SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.ModifyUnset=Notify Unset Changes +SettingsEditor.SetUpdateDex=ポケモン図鑑に反映 +SettingsEditor.SetUpdatePKM=PKM情報の変更 +SettingsEditor.ShinySprites=Shiny Sprites +SettingsEditor.Unicode=Unicode SuperTrain.B_Cancel=Cancel SuperTrain.B_Save=Save SuperTrain.L_Bags=Training Bags diff --git a/PKHeX.Core/Resources/text/ko/lang_ko.txt b/PKHeX.Core/Resources/text/ko/lang_ko.txt index ffcdf9524..77a7c8b59 100644 --- a/PKHeX.Core/Resources/text/ko/lang_ko.txt +++ b/PKHeX.Core/Resources/text/ko/lang_ko.txt @@ -130,7 +130,6 @@ Main.Label_TID=TID: Main.Label_Total=합계: Main.Label_Tough=강인함 Main.Menu_About=PKHeX 정보 -Main.Menu_ApplyMarkings=가져오기 중 마킹하기 Main.Menu_BatchEditor=일괄 수정 Main.Menu_Data=데이터 Main.Menu_Database=포켓몬 데이터베이스 @@ -144,9 +143,6 @@ Main.Menu_Folder=폴더 열기 Main.Menu_Language=언어 Main.Menu_LoadBoxes=박스 불러오기 Main.Menu_MGDatabase=이상한 카드 데이터베이스 -Main.Menu_Modify=SAV 파일 수정 -Main.Menu_ModifyDex=포켓몬 도감 수정 -Main.Menu_ModifyPKM=포켓몬 정보 수정 Main.Menu_Open=열기... Main.Menu_Options=옵션 Main.Menu_Report=박스 데이터 보고서 @@ -578,6 +574,13 @@ SAV_Wondercard.B_Output=내보내기 SAV_Wondercard.B_Save=저장 SAV_Wondercard.L_Details=세부 사항: SAV_Wondercard.L_Received=받은 목록: +SettingsEditor.ApplyMarkings=가져오기 중 마킹하기 +SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.ModifyUnset=Notify Unset Changes +SettingsEditor.SetUpdateDex=포켓몬 도감 수정 +SettingsEditor.SetUpdatePKM=포켓몬 정보 수정 +SettingsEditor.ShinySprites=Shiny Sprites +SettingsEditor.Unicode=Unicode SuperTrain.B_Cancel=취소 SuperTrain.B_Save=저장 SuperTrain.L_Bags=샌드백 diff --git a/PKHeX.Core/Resources/text/other/lang_pt.txt b/PKHeX.Core/Resources/text/other/lang_pt.txt index 50496b40d..05bf41119 100644 --- a/PKHeX.Core/Resources/text/other/lang_pt.txt +++ b/PKHeX.Core/Resources/text/other/lang_pt.txt @@ -130,7 +130,6 @@ Main.Label_TID=TID: Main.Label_Total=Total: Main.Label_Tough=Tough Main.Menu_About=Sobre o PKHeX -Main.Menu_ApplyMarkings=Apply Markings on Import Main.Menu_BatchEditor=Editor de lote Main.Menu_Data=Dados Main.Menu_Database=PKM Database @@ -144,9 +143,6 @@ Main.Menu_Folder=Abrir pasta Main.Menu_Language=Idioma Main.Menu_LoadBoxes=Carregar Boxes Main.Menu_MGDatabase=Mystery Gift Database -Main.Menu_Modify=Defina para SAV -Main.Menu_ModifyDex=Modificar Pokédex -Main.Menu_ModifyPKM=Modificar PKM Info Main.Menu_Open=Abrir... Main.Menu_Options=Opções Main.Menu_Report=Relatório de Dados das Boxes @@ -591,6 +587,13 @@ SAV_Wondercard.B_Output=Exportar SAV_Wondercard.B_Save=Gravar SAV_Wondercard.L_Details=Detalhes: SAV_Wondercard.L_Received=Lista de Recebidos: +SettingsEditor.ApplyMarkings=Apply Markings on Import +SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.ModifyUnset=Notify Unset Changes +SettingsEditor.SetUpdateDex=Modificar Pokédex +SettingsEditor.SetUpdatePKM=Modificar PKM Info +SettingsEditor.ShinySprites=Shiny Sprites +SettingsEditor.Unicode=Unicode SuperTrain.B_Cancel=Cancel SuperTrain.B_Save=Save SuperTrain.L_Bags=Training Bags diff --git a/PKHeX.Core/Resources/text/zh/lang_zh.txt b/PKHeX.Core/Resources/text/zh/lang_zh.txt index 2e780cf49..9200d92d7 100644 --- a/PKHeX.Core/Resources/text/zh/lang_zh.txt +++ b/PKHeX.Core/Resources/text/zh/lang_zh.txt @@ -130,7 +130,6 @@ Main.Label_TID=表ID Main.Label_Total=合计: Main.Label_Tough=强壮 Main.Menu_About=关于PKHeX -Main.Menu_ApplyMarkings=导入时标记 Main.Menu_BatchEditor=批量编辑器 Main.Menu_Data=数据 Main.Menu_Database=PKM数据库 @@ -144,9 +143,6 @@ Main.Menu_Folder=打开文件夹 Main.Menu_Language=语言 Main.Menu_LoadBoxes=加载盒子信息 Main.Menu_MGDatabase=神秘礼物数据库 -Main.Menu_Modify=对SAV的设置 -Main.Menu_ModifyDex=修改图鉴 -Main.Menu_ModifyPKM=修改宝可梦 Main.Menu_Open=读取... Main.Menu_Options=设置 Main.Menu_Report=盒子数据报告 @@ -578,6 +574,13 @@ SAV_Wondercard.B_Output=导出 SAV_Wondercard.B_Save=保存 SAV_Wondercard.L_Details=说明: SAV_Wondercard.L_Received=收到的列表: +SettingsEditor.ApplyMarkings=导入时标记 +SettingsEditor.FlagIllegal=Flag Illegal +SettingsEditor.ModifyUnset=Notify Unset Changes +SettingsEditor.SetUpdateDex=修改图鉴 +SettingsEditor.SetUpdatePKM=修改宝可梦 +SettingsEditor.ShinySprites=Shiny Sprites +SettingsEditor.Unicode=Unicode SuperTrain.B_Cancel=取消 SuperTrain.B_Save=保存 SuperTrain.L_Bags=训练沙袋 diff --git a/PKHeX.WinForms/MainWindow/Main.Designer.cs b/PKHeX.WinForms/MainWindow/Main.Designer.cs index a6c88aa96..d73245b78 100644 --- a/PKHeX.WinForms/MainWindow/Main.Designer.cs +++ b/PKHeX.WinForms/MainWindow/Main.Designer.cs @@ -56,20 +56,13 @@ public void InitializeComponent() this.Menu_Options = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Language = new System.Windows.Forms.ToolStripMenuItem(); this.CB_MainLanguage = new System.Windows.Forms.ToolStripComboBox(); - this.Menu_Modify = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_ModifyDex = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_ModifyPKM = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_ModifyUnset = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Undo = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Redo = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_Unicode = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_ShinySprites = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_FlagIllegal = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_Settings = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_About = new System.Windows.Forms.ToolStripMenuItem(); this.dragout = new System.Windows.Forms.PictureBox(); this.PB_Legal = new System.Windows.Forms.PictureBox(); this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); - this.Menu_ApplyMarkings = new System.Windows.Forms.ToolStripMenuItem(); this.C_SAV = new PKHeX.WinForms.Controls.SAVEditor(); this.PKME_Tabs = new PKHeX.WinForms.Controls.PKMEditor(); this.menuStrip1.SuspendLayout(); @@ -107,7 +100,7 @@ public void InitializeComponent() this.Menu_Open.Name = "Menu_Open"; this.Menu_Open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.Menu_Open.ShowShortcutKeys = false; - this.Menu_Open.Size = new System.Drawing.Size(139, 22); + this.Menu_Open.Size = new System.Drawing.Size(152, 22); this.Menu_Open.Text = "&Open..."; this.Menu_Open.Click += new System.EventHandler(this.MainMenuOpen); // @@ -117,7 +110,7 @@ public void InitializeComponent() this.Menu_Save.Name = "Menu_Save"; this.Menu_Save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.Menu_Save.ShowShortcutKeys = false; - this.Menu_Save.Size = new System.Drawing.Size(139, 22); + this.Menu_Save.Size = new System.Drawing.Size(152, 22); this.Menu_Save.Text = "&Save PK6..."; this.Menu_Save.Click += new System.EventHandler(this.MainMenuSave); // @@ -129,7 +122,7 @@ public void InitializeComponent() this.Menu_ExportSAV.Enabled = false; this.Menu_ExportSAV.Image = ((System.Drawing.Image)(resources.GetObject("Menu_ExportSAV.Image"))); this.Menu_ExportSAV.Name = "Menu_ExportSAV"; - this.Menu_ExportSAV.Size = new System.Drawing.Size(139, 22); + this.Menu_ExportSAV.Size = new System.Drawing.Size(152, 22); this.Menu_ExportSAV.Text = "&Export SAV..."; // // Menu_ExportMAIN @@ -138,17 +131,17 @@ public void InitializeComponent() this.Menu_ExportMAIN.Name = "Menu_ExportMAIN"; this.Menu_ExportMAIN.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.Menu_ExportMAIN.ShowShortcutKeys = false; - this.Menu_ExportMAIN.Size = new System.Drawing.Size(142, 22); + this.Menu_ExportMAIN.Size = new System.Drawing.Size(152, 22); this.Menu_ExportMAIN.Text = "&Export main"; this.Menu_ExportMAIN.Click += new System.EventHandler(this.ClickExportSAV); // // Menu_ExportBAK // - this.Menu_ExportBAK.Image = ((System.Drawing.Image)(resources.GetObject("Menu_ExportBAK.Image"))); + this.Menu_ExportBAK.Image = global::PKHeX.WinForms.Properties.Resources.bak; this.Menu_ExportBAK.Name = "Menu_ExportBAK"; this.Menu_ExportBAK.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); this.Menu_ExportBAK.ShowShortcutKeys = false; - this.Menu_ExportBAK.Size = new System.Drawing.Size(142, 22); + this.Menu_ExportBAK.Size = new System.Drawing.Size(152, 22); this.Menu_ExportBAK.Text = "Export &Backup"; this.Menu_ExportBAK.Click += new System.EventHandler(this.ClickExportSAVBAK); // @@ -158,7 +151,7 @@ public void InitializeComponent() this.Menu_Exit.Name = "Menu_Exit"; this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); this.Menu_Exit.ShowShortcutKeys = false; - this.Menu_Exit.Size = new System.Drawing.Size(139, 22); + this.Menu_Exit.Size = new System.Drawing.Size(152, 22); this.Menu_Exit.Text = "&Quit"; this.Menu_Exit.Click += new System.EventHandler(this.MainMenuExit); // @@ -178,11 +171,10 @@ public void InitializeComponent() this.Menu_ShowdownImportPKM, this.Menu_ShowdownExportPKM, this.Menu_ShowdownExportParty, - this.Menu_ShowdownExportBattleBox, - this.Menu_ApplyMarkings}); + this.Menu_ShowdownExportBattleBox}); this.Menu_Showdown.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Showdown.Image"))); this.Menu_Showdown.Name = "Menu_Showdown"; - this.Menu_Showdown.Size = new System.Drawing.Size(152, 22); + this.Menu_Showdown.Size = new System.Drawing.Size(133, 22); this.Menu_Showdown.Text = "Showdown"; // // Menu_ShowdownImportPKM @@ -234,7 +226,7 @@ public void InitializeComponent() this.Menu_BatchEditor}); this.Menu_Data.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Data.Image"))); this.Menu_Data.Name = "Menu_Data"; - this.Menu_Data.Size = new System.Drawing.Size(152, 22); + this.Menu_Data.Size = new System.Drawing.Size(133, 22); this.Menu_Data.Text = "Data"; // // Menu_LoadBoxes @@ -307,7 +299,7 @@ public void InitializeComponent() this.Menu_Folder.Name = "Menu_Folder"; this.Menu_Folder.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); this.Menu_Folder.ShowShortcutKeys = false; - this.Menu_Folder.Size = new System.Drawing.Size(152, 22); + this.Menu_Folder.Size = new System.Drawing.Size(133, 22); this.Menu_Folder.Text = "Open Folder"; this.Menu_Folder.Click += new System.EventHandler(this.MainMenuFolder); // @@ -315,10 +307,9 @@ public void InitializeComponent() // this.Menu_Options.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Menu_Language, - this.Menu_Modify, - this.Menu_Unicode, - this.Menu_ShinySprites, - this.Menu_FlagIllegal, + this.Menu_Undo, + this.Menu_Redo, + this.Menu_Settings, this.Menu_About}); this.Menu_Options.Name = "Menu_Options"; this.Menu_Options.Size = new System.Drawing.Size(61, 20); @@ -330,7 +321,7 @@ public void InitializeComponent() this.CB_MainLanguage}); this.Menu_Language.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Language.Image"))); this.Menu_Language.Name = "Menu_Language"; - this.Menu_Language.Size = new System.Drawing.Size(152, 22); + this.Menu_Language.Size = new System.Drawing.Size(164, 22); this.Menu_Language.Text = "Language"; // // CB_MainLanguage @@ -340,94 +331,35 @@ public void InitializeComponent() this.CB_MainLanguage.Size = new System.Drawing.Size(121, 23); this.CB_MainLanguage.SelectedIndexChanged += new System.EventHandler(this.ChangeMainLanguage); // - // Menu_Modify - // - this.Menu_Modify.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.Menu_ModifyDex, - this.Menu_ModifyPKM, - this.Menu_ModifyUnset, - this.Menu_Undo, - this.Menu_Redo}); - this.Menu_Modify.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Modify.Image"))); - this.Menu_Modify.Name = "Menu_Modify"; - this.Menu_Modify.Size = new System.Drawing.Size(152, 22); - this.Menu_Modify.Text = "Set to SAV"; - // - // Menu_ModifyDex - // - this.Menu_ModifyDex.Checked = true; - this.Menu_ModifyDex.CheckOnClick = true; - this.Menu_ModifyDex.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_ModifyDex.Name = "Menu_ModifyDex"; - this.Menu_ModifyDex.Size = new System.Drawing.Size(189, 22); - this.Menu_ModifyDex.Text = "Modify Pokédex"; - this.Menu_ModifyDex.Click += new System.EventHandler(this.MainMenuModifyDex); - // - // Menu_ModifyPKM - // - this.Menu_ModifyPKM.Checked = true; - this.Menu_ModifyPKM.CheckOnClick = true; - this.Menu_ModifyPKM.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_ModifyPKM.Name = "Menu_ModifyPKM"; - this.Menu_ModifyPKM.Size = new System.Drawing.Size(189, 22); - this.Menu_ModifyPKM.Text = "Modify PKM Info"; - this.Menu_ModifyPKM.Click += new System.EventHandler(this.MainMenuModifyPKM); - // - // Menu_ModifyUnset - // - this.Menu_ModifyUnset.CheckOnClick = true; - this.Menu_ModifyUnset.Name = "Menu_ModifyUnset"; - this.Menu_ModifyUnset.Size = new System.Drawing.Size(189, 22); - this.Menu_ModifyUnset.Text = "Notify Unset Changes"; - this.Menu_ModifyUnset.Click += new System.EventHandler(this.MainMenuModifyUnset); - // // Menu_Undo // this.Menu_Undo.Enabled = false; + this.Menu_Undo.Image = global::PKHeX.WinForms.Properties.Resources.bak; this.Menu_Undo.Name = "Menu_Undo"; this.Menu_Undo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); this.Menu_Undo.ShowShortcutKeys = false; - this.Menu_Undo.Size = new System.Drawing.Size(189, 22); + this.Menu_Undo.Size = new System.Drawing.Size(164, 22); this.Menu_Undo.Text = "Undo Last Change"; - this.Menu_Undo.Click += new System.EventHandler(this.ClickUndo); // // Menu_Redo // this.Menu_Redo.Enabled = false; + this.Menu_Redo.Image = global::PKHeX.WinForms.Properties.Resources.redo; this.Menu_Redo.Name = "Menu_Redo"; this.Menu_Redo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); this.Menu_Redo.ShowShortcutKeys = false; - this.Menu_Redo.Size = new System.Drawing.Size(189, 22); + this.Menu_Redo.Size = new System.Drawing.Size(164, 22); this.Menu_Redo.Text = "Redo Last Change"; - this.Menu_Redo.Click += new System.EventHandler(this.ClickRedo); // - // Menu_Unicode + // Menu_Settings // - this.Menu_Unicode.Checked = true; - this.Menu_Unicode.CheckOnClick = true; - this.Menu_Unicode.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_Unicode.Name = "Menu_Unicode"; - this.Menu_Unicode.Size = new System.Drawing.Size(152, 22); - this.Menu_Unicode.Text = "Unicode"; - this.Menu_Unicode.Click += new System.EventHandler(this.MainMenuUnicode); - // - // Menu_ShinySprites - // - this.Menu_ShinySprites.Checked = true; - this.Menu_ShinySprites.CheckOnClick = true; - this.Menu_ShinySprites.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_ShinySprites.Name = "Menu_ShinySprites"; - this.Menu_ShinySprites.Size = new System.Drawing.Size(152, 22); - this.Menu_ShinySprites.Text = "Shiny Sprites"; - this.Menu_ShinySprites.Click += new System.EventHandler(this.MainMenuShinySprites); - // - // Menu_FlagIllegal - // - this.Menu_FlagIllegal.CheckOnClick = true; - this.Menu_FlagIllegal.Name = "Menu_FlagIllegal"; - this.Menu_FlagIllegal.Size = new System.Drawing.Size(152, 22); - this.Menu_FlagIllegal.Text = "Flag Legality"; - this.Menu_FlagIllegal.Click += new System.EventHandler(this.MainMenuFlagIllegal); + this.Menu_Settings.Image = global::PKHeX.WinForms.Properties.Resources.settings; + this.Menu_Settings.Name = "Menu_Settings"; + this.Menu_Settings.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); + this.Menu_Settings.ShowShortcutKeys = false; + this.Menu_Settings.Size = new System.Drawing.Size(164, 22); + this.Menu_Settings.Text = "Settings"; + this.Menu_Settings.Click += new System.EventHandler(this.MainMenuSettings); // // Menu_About // @@ -435,7 +367,7 @@ public void InitializeComponent() this.Menu_About.Name = "Menu_About"; this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); this.Menu_About.ShowShortcutKeys = false; - this.Menu_About.Size = new System.Drawing.Size(152, 22); + this.Menu_About.Size = new System.Drawing.Size(164, 22); this.Menu_About.Text = "About &PKHeX"; this.Menu_About.Click += new System.EventHandler(this.MainMenuAbout); // @@ -475,16 +407,6 @@ public void InitializeComponent() this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.L_UpdateAvailable.Visible = false; // - // Menu_ApplyMarkings - // - this.Menu_ApplyMarkings.Checked = true; - this.Menu_ApplyMarkings.CheckOnClick = true; - this.Menu_ApplyMarkings.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_ApplyMarkings.Name = "Menu_ApplyMarkings"; - this.Menu_ApplyMarkings.Size = new System.Drawing.Size(231, 22); - this.Menu_ApplyMarkings.Text = "Apply Markings on Import"; - this.Menu_ApplyMarkings.Click += new System.EventHandler(this.MainMenuMarkings); - // // C_SAV // this.C_SAV.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -563,10 +485,6 @@ public void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem Menu_Language; private System.Windows.Forms.ToolStripComboBox CB_MainLanguage; private System.Windows.Forms.ToolStripMenuItem Menu_About; - private System.Windows.Forms.ToolStripMenuItem Menu_Unicode; - private System.Windows.Forms.ToolStripMenuItem Menu_Modify; - private System.Windows.Forms.ToolStripMenuItem Menu_ModifyDex; - private System.Windows.Forms.ToolStripMenuItem Menu_ModifyPKM; private System.Windows.Forms.ToolStripMenuItem Menu_ExportSAV; private System.Windows.Forms.ToolStripMenuItem Menu_Showdown; private System.Windows.Forms.ToolStripMenuItem Menu_ShowdownExportPKM; @@ -586,10 +504,7 @@ public void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem Menu_MGDatabase; private System.Windows.Forms.ToolStripMenuItem Menu_Undo; private System.Windows.Forms.ToolStripMenuItem Menu_Redo; - private System.Windows.Forms.ToolStripMenuItem Menu_FlagIllegal; - private System.Windows.Forms.ToolStripMenuItem Menu_ModifyUnset; - private System.Windows.Forms.ToolStripMenuItem Menu_ShinySprites; - private System.Windows.Forms.ToolStripMenuItem Menu_ApplyMarkings; + private System.Windows.Forms.ToolStripMenuItem Menu_Settings; } } diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index 646460ad9..826309f8b 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -142,19 +142,6 @@ private void FormLoadAddEvents() // ToolTips for Drag&Drop new ToolTip().SetToolTip(dragout, "PKM QuickSave"); - Menu_Modify.DropDown.Closing += (sender, e) => - { - if (e.CloseReason == ToolStripDropDownCloseReason.ItemClicked) - e.Cancel = true; - }; - Menu_Options.DropDown.Closing += (sender, e) => - { - if (!Menu_Unicode.Selected) - return; - if (e.CloseReason == ToolStripDropDownCloseReason.ItemClicked) - e.Cancel = true; - }; - // Box to Tabs D&D dragout.AllowDrop = true; @@ -249,14 +236,13 @@ private void FormLoadConfig(out bool BAKprompt, out bool showChangelog, out int var Settings = Properties.Settings.Default; Settings.Upgrade(); - PKME_Tabs.Unicode = Unicode = Menu_Unicode.Checked = Settings.Unicode; + PKME_Tabs.Unicode = Unicode = Settings.Unicode; PKME_Tabs.UpdateUnicode(GenderSymbols); - Menu_ApplyMarkings.Checked = CommonEdits.ShowdownSetIVMarkings = Settings.ApplyMarkings; - SaveFile.SetUpdateDex = Menu_ModifyDex.Checked = Settings.SetUpdateDex; - SaveFile.SetUpdatePKM = C_SAV.ModifyPKM = PKME_Tabs.ModifyPKM = Menu_ModifyPKM.Checked = Settings.SetUpdatePKM; - C_SAV.FlagIllegal = Menu_FlagIllegal.Checked = Settings.FlagIllegal; - PKX.AllowShinySprite = Menu_ModifyUnset.Checked = Settings.ShinySprites; - Menu_ShinySprites.Checked = Settings.ShinySprites; + CommonEdits.ShowdownSetIVMarkings = Settings.ApplyMarkings; + SaveFile.SetUpdateDex = Settings.SetUpdateDex; + SaveFile.SetUpdatePKM = C_SAV.ModifyPKM = PKME_Tabs.ModifyPKM = Settings.SetUpdatePKM; + C_SAV.FlagIllegal = Settings.FlagIllegal; + PKX.AllowShinySprite = Settings.ShinySprites; // Select Language string l = Settings.Language; @@ -352,24 +338,23 @@ private void MainMenuMysteryDB(object sender, EventArgs e) new SAV_MysteryGiftDB(PKME_Tabs, C_SAV).Show(); } - private void MainMenuUnicode(object sender, EventArgs e) + + private void MainMenuSettings(object sender, EventArgs e) { - Settings.Default.Unicode = PKME_Tabs.Unicode = Unicode = Menu_Unicode.Checked; + new SettingsEditor(Settings.Default, nameof(Settings.Default.BAKPrompt)).ShowDialog(); + + // Update final settings + PKX.AllowShinySprite = Settings.Default.ShinySprites; + SaveFile.SetUpdateDex = Settings.Default.SetUpdateDex; + SaveFile.SetUpdatePKM = Settings.Default.SetUpdatePKM; + CommonEdits.ShowdownSetIVMarkings = Settings.Default.ApplyMarkings; + PKME_Tabs.Unicode = Unicode = Settings.Default.Unicode; + C_SAV.FlagIllegal = Settings.Default.FlagIllegal; + PKME_Tabs.UpdateUnicode(GenderSymbols); - } - private void MainMenuMarkings(object sender, EventArgs e) - { - Settings.Default.ApplyMarkings = CommonEdits.ShowdownSetIVMarkings = Menu_ApplyMarkings.Checked; - } - private void MainMenuModifyDex(object sender, EventArgs e) => Settings.Default.SetUpdateDex = SaveFile.SetUpdateDex = Menu_ModifyDex.Checked; - private void MainMenuModifyUnset(object sender, EventArgs e) => Settings.Default.ModifyUnset = Menu_ModifyUnset.Checked; - private void MainMenuModifyPKM(object sender, EventArgs e) => Settings.Default.SetUpdatePKM = SaveFile.SetUpdatePKM = Menu_ModifyPKM.Checked; - private void MainMenuFlagIllegal(object sender, EventArgs e) => Settings.Default.FlagIllegal = C_SAV.FlagIllegal = Menu_FlagIllegal.Checked; - private void MainMenuShinySprites(object sender, EventArgs e) - { - Settings.Default.ShinySprites = PKX.AllowShinySprite = Menu_ShinySprites.Checked; - C_SAV.ReloadSlots(); PKME_Tabs_UpdatePreviewSprite(sender, e); + if (C_SAV.SAV.HasBox) + C_SAV.ReloadSlots(); } private void MainMenuBoxLoad(object sender, EventArgs e) @@ -775,7 +760,7 @@ private void ResetSAVPKMEditors(SaveFile sav) C_SAV.SAV = sav; // Initialize Overall Info - Menu_LoadBoxes.Enabled = Menu_DumpBoxes.Enabled = Menu_DumpBox.Enabled = Menu_Report.Enabled = Menu_Modify.Enabled = C_SAV.SAV.HasBox; + Menu_LoadBoxes.Enabled = Menu_DumpBoxes.Enabled = Menu_DumpBox.Enabled = Menu_Report.Enabled = C_SAV.SAV.HasBox; // Initialize Subviews bool WindowTranslationRequired = false; @@ -922,7 +907,7 @@ private void ChangeMainLanguage(object sender, EventArgs e) if (CB_MainLanguage.SelectedIndex < 8) CurrentLanguage = GameInfo.Language2Char((uint)CB_MainLanguage.SelectedIndex); else if (CB_MainLanguage.SelectedIndex == 8) - CurrentLanguage = GameInfo.Language2Char((uint)9); + CurrentLanguage = GameInfo.Language2Char(9); // Set the culture (makes it easy to pass language to other forms) Settings.Default.Language = CurrentLanguage; @@ -944,6 +929,8 @@ private static void InitializeStrings() GameInfo.Strings = GameInfo.GetStrings(l); // Update Legality Strings + // WinFormsTranslator.UpdateAll("en", new[] {"ja", "fr", "it", "de", "es", "ko", "zh", "pt"}); + // WinFormsTranslator.DumpAll(); // Clipboard.SetText(string.Join(Environment.NewLine, Util.GetLocalization(typeof(LegalityCheckStrings)))); Task.Run(() => { var lang = Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName.Substring(0, 2); diff --git a/PKHeX.WinForms/MainWindow/Main.resx b/PKHeX.WinForms/MainWindow/Main.resx index 4d5d8fe0c..2361631ba 100644 --- a/PKHeX.WinForms/MainWindow/Main.resx +++ b/PKHeX.WinForms/MainWindow/Main.resx @@ -148,17 +148,6 @@ VBzpk2zH149IbsgCJ1w/pJo5vioujnga3GKFNfrH2JhBZ6kByxQ7+JyoNrRzlhZeENWGjv0qZ3iRqw3d OcsEF3iRqw39MN05poMXRIOOfpjurGhnFWfZIF2g0J3LsbO8XcBl+bMFNDnao3z/6TEdcH+SelXZhDEU N7MbRmG+g+WNbMUAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EwAACxMBAJqcGAAAAQxJREFUOE+lk0tKA0EQhgcUH7fIUpBEUAleL6+ViEKiwVWukAuE3MKQLENWXiA+ - o9/XTMs4pAeJP3xMd01VdVVPTbZFZzCEObzCGyxyWx2KauXPoCN4hA18JfiEW9iHdm4LMngKGtZwA+dw - CAf5ug/voI/VxaRBnuxmCacaEroCD4jBIYE9W7YvqoJVB4rBIYGX48KyqxR7LvPTj32m5G2XAyPhU7nw - wnbSvxPEFi7Cbgc9gAkckL9qBMb03DTAz/gC5VHdJmfhAxzxmgZ1D2ZcgQlTuoRn0LerIcoLnIAvrOQO - dD4Gx7wJA/BUfcawB7+ko5VU/UyWfg3+TEl5D542A6uRJ7CqEygoy74BMMpgsfyc5z4AAAAASUVORK5C - YII= @@ -303,17 +292,6 @@ C9xgpBSzO8b2SrELuIQ0YSarYQ7SeNqSI2gHW2VyPXzZiVhn+LbcyWyGJN9mgUOiTuEWHNkmeIB8kPIp nU1eyELH08QaTITtKI+G7cKNsPeh/MlJjq038Tlioa0TbWNe25N/LS7L8XTCHBLbJP62H1a8uaIs+wRz uYzQHrOc0AAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EwAACxMBAJqcGAAAAQxJREFUOE+V071KA0EUhuHRFMbGgIhRkFSmDYi1kBQGcifWFpJchk0aEZIyEUWw - EUkp3oGlIFaB1IKKRt9vObMsh11wP3hgOPOzM7uzoSDr+MCvWaBUWoiToy0UpoEz7GAN5/AL9FHBnrU1 - Ns0VNOgLb9bO84pva18iyRH8wP/4wQHCjRW8CTpoY2o17wJhGzMrRJrsc43smDtsIMkqsp9NT/Y5Ruz/ - xArS6O3GlyPatk8Xsf8dmpNkEw+InaIz+9wiO+YJ+whjK3g6s7atJ/vJ0SPCIZZWKKuHJCOooIv0Yu08 - umQ6v9r3SLOLU9ShLzKAnzxEFTWcoInC6J77BXRjS+UZc6Ot5/yNIfwBdF+Mwpmwi9MAAAAASUVORK5C - YII= diff --git a/PKHeX.WinForms/PKHeX.WinForms.csproj b/PKHeX.WinForms/PKHeX.WinForms.csproj index 204d9aa90..d5bf28f13 100644 --- a/PKHeX.WinForms/PKHeX.WinForms.csproj +++ b/PKHeX.WinForms/PKHeX.WinForms.csproj @@ -797,6 +797,7 @@ + diff --git a/PKHeX.WinForms/Properties/Resources.Designer.cs b/PKHeX.WinForms/Properties/Resources.Designer.cs index 2cbfbe303..5088ebe54 100644 --- a/PKHeX.WinForms/Properties/Resources.Designer.cs +++ b/PKHeX.WinForms/Properties/Resources.Designer.cs @@ -22904,15 +22904,13 @@ internal class Resources { /// Looks up a localized string similar to PKHeX - By Kaphotics ///http://projectpokemon.org/pkhex/ /// - ///17/01/28 - New Update: - /// - Legality: - /// - - Added: Crystal transfer legality. + ///18/03/19 - New Update: + /// - Legality: + /// - - Added: Fixed IVs for Static Encounters are now checked. + /// - - Fixed: Shedinja family handling. Thanks @ultima-soul, @Lusamine, @OmegaDonut, @admiral-fish & @Marty-D! + /// - - Changed: Pay Day Mewtwo is now legal (official transporter rules were updated). Thanks @Real96 & sora10pls! /// - - Changed: Another round of legality check updates. Thanks (so many different users)! - /// - Added: Shiny recolored sprites for all pkm that are shiny. Thanks @msikma (dada)! - /// - Added: All Box viewer (hold shift and double click the Box Tab). Can switch entire boxes! - /// - Added: Gen5 C-Gear Skin editing. - /// - Added: Gen5 Box Name/Wallpaper editing. - /// - Added: Gen4 Coin Case [rest of string was truncated]";. + /// - Added: Base Stats are now displayed [rest of string was truncated]";. /// internal static string changelog { get { @@ -28061,7 +28059,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to 20171205. + /// Looks up a localized string similar to 20180319. /// internal static string ProgramVersion { get { @@ -28089,6 +28087,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap redo { + get { + object obj = ResourceManager.GetObject("redo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PKHeX.WinForms/Properties/Resources.resx b/PKHeX.WinForms/Properties/Resources.resx index e6209dbe8..5d3af4175 100644 --- a/PKHeX.WinForms/Properties/Resources.resx +++ b/PKHeX.WinForms/Properties/Resources.resx @@ -9163,4 +9163,7 @@ ..\Resources\img\Shiny Pokemon Sprites\744-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Program\redo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/PKHeX.WinForms/Resources/img/Program/bak.png b/PKHeX.WinForms/Resources/img/Program/bak.png index ac2cd25aa04808feaa689b680f229d551b9d73b5..828082d291c8162b035d1fc0390aaed01581f041 100644 GIT binary patch delta 386 zcmV-|0e$}90-XbpB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XT z000XT0n*)m`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMIczh2P5=M_4oO5o zR5(wi(_cygQ5c8e0YhyUT?%1BMYugPuOtk#q${`J2BKXkdVd*SwSlxOdtaF|jN>?j z{oqmO%$e`}nPWs+exy>z5OaKDg<0Izz+N`E#R+=&j@$D5;2BjU2{#?Z?=SRmi83nj z?|Xc}KCeiMgaWcd6Nhq+H`v#iY?CgaHi}{q2XZ;vJ;@f3dr}maV?Q@`@8KZ(cG7WA z?Bl*26*txbzI)=M^6vsyNS4rvFGgPcF&;RddGg{69@#aD&OnGqeFY&(wuWu~QzW?Z`WSrfh0(vq5MR5?3OwJb;NB9T#0A z!z7bvJ`D6!*Z=jayP9dVFu)M+_`qYtnx))s@uz`Hd?Ty)zJG9vRUAg_mwXq25qfB& zjPRHa<4SIE&=^c diff --git a/PKHeX.WinForms/Resources/img/Program/redo.png b/PKHeX.WinForms/Resources/img/Program/redo.png new file mode 100644 index 0000000000000000000000000000000000000000..ac2cd25aa04808feaa689b680f229d551b9d73b5 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ za0`PlBg3pY5)2HCOr9=|Ar`%JFFSfMI|{H~XcrXDe;9N{f