From 40cea0c858f654626c050b3d2122e47f9bc75baa Mon Sep 17 00:00:00 2001 From: Jonathan Herbert Date: Mon, 4 Mar 2024 01:35:11 -0400 Subject: [PATCH] Add A Few Time Editors For LGPE, SwSh and SV (#4201) - In SAV_Trainer7GG, add Adventure Begin and Last Saved - In SAV_Trainer8, re-enable Last Saved - In SAV_Trainer9, add Last Saved --- PKHeX.WinForms/Resources/text/lang_de.txt | 3 + PKHeX.WinForms/Resources/text/lang_en.txt | 3 + PKHeX.WinForms/Resources/text/lang_es.txt | 5 +- PKHeX.WinForms/Resources/text/lang_fr.txt | 3 + PKHeX.WinForms/Resources/text/lang_it.txt | 5 +- PKHeX.WinForms/Resources/text/lang_ja.txt | 17 +- PKHeX.WinForms/Resources/text/lang_ko.txt | 13 +- PKHeX.WinForms/Resources/text/lang_zh.txt | 3 + PKHeX.WinForms/Resources/text/lang_zh2.txt | 3 + .../Gen7/SAV_Trainer7GG.Designer.cs | 386 +++++++++++------- .../Save Editors/Gen7/SAV_Trainer7GG.cs | 10 + .../Gen8/SAV_Trainer8.Designer.cs | 8 +- .../Save Editors/Gen8/SAV_Trainer8.cs | 19 +- .../Gen8/SAV_Trainer8a.Designer.cs | 14 +- .../Gen9/SAV_Trainer9.Designer.cs | 60 ++- .../Save Editors/Gen9/SAV_Trainer9.cs | 2 + 16 files changed, 361 insertions(+), 193 deletions(-) diff --git a/PKHeX.WinForms/Resources/text/lang_de.txt b/PKHeX.WinForms/Resources/text/lang_de.txt index 2b9ee3bdf..2baa4bd6b 100644 --- a/PKHeX.WinForms/Resources/text/lang_de.txt +++ b/PKHeX.WinForms/Resources/text/lang_de.txt @@ -1670,11 +1670,13 @@ SAV_Trainer7GG.L_GoSlot=Slot: SAV_Trainer7GG.L_GoSlotSummary=Zusammenfassung SAV_Trainer7GG.L_Hours=Std: SAV_Trainer7GG.L_Language=Sprache: +SAV_Trainer7GG.L_LastSaved=Zuletzt gespeichert: SAV_Trainer7GG.L_Minutes=Min: SAV_Trainer7GG.L_Money=$: SAV_Trainer7GG.L_R=Rotation: SAV_Trainer7GG.L_RivalName=Rivalen Name: SAV_Trainer7GG.L_Seconds=Sek: +SAV_Trainer7GG.L_Started=Spiel gestartet: SAV_Trainer7GG.L_SX=X Scale: SAV_Trainer7GG.L_SY=Y Scale: SAV_Trainer7GG.L_SZ=Z Scale: @@ -1817,6 +1819,7 @@ SAV_Trainer9.L_BBQSolo=Solo Quests: SAV_Trainer9.L_BP=BP: SAV_Trainer9.L_Hours=Std: SAV_Trainer9.L_Language=Sprache: +SAV_Trainer9.L_LastSaved=Zuletzt gespeichert: SAV_Trainer9.L_LP=LP: SAV_Trainer9.L_Minutes=Min: SAV_Trainer9.L_Money=$: diff --git a/PKHeX.WinForms/Resources/text/lang_en.txt b/PKHeX.WinForms/Resources/text/lang_en.txt index c591edf97..70ad66c08 100644 --- a/PKHeX.WinForms/Resources/text/lang_en.txt +++ b/PKHeX.WinForms/Resources/text/lang_en.txt @@ -1666,11 +1666,13 @@ SAV_Trainer7GG.L_GoSlot=Slot: SAV_Trainer7GG.L_GoSlotSummary=Summary SAV_Trainer7GG.L_Hours=Hrs: SAV_Trainer7GG.L_Language=Language: +SAV_Trainer7GG.L_LastSaved=Last Saved: SAV_Trainer7GG.L_Minutes=Min: SAV_Trainer7GG.L_Money=$: SAV_Trainer7GG.L_R=Rotation: SAV_Trainer7GG.L_RivalName=Rival Name: SAV_Trainer7GG.L_Seconds=Sec: +SAV_Trainer7GG.L_Started=Game Started: SAV_Trainer7GG.L_SX=X Scale: SAV_Trainer7GG.L_SY=Y Scale: SAV_Trainer7GG.L_SZ=Z Scale: @@ -1813,6 +1815,7 @@ SAV_Trainer9.L_BBQSolo=Solo Quests: SAV_Trainer9.L_BP=BP: SAV_Trainer9.L_Hours=Hrs: SAV_Trainer9.L_Language=Language: +SAV_Trainer9.L_LastSaved=Last Saved: SAV_Trainer9.L_LP=LP: SAV_Trainer9.L_Minutes=Min: SAV_Trainer9.L_Money=$: diff --git a/PKHeX.WinForms/Resources/text/lang_es.txt b/PKHeX.WinForms/Resources/text/lang_es.txt index 2ce1595b8..3a885380c 100644 --- a/PKHeX.WinForms/Resources/text/lang_es.txt +++ b/PKHeX.WinForms/Resources/text/lang_es.txt @@ -1666,11 +1666,13 @@ SAV_Trainer7GG.L_GoSlot=Casilla: SAV_Trainer7GG.L_GoSlotSummary=Detalles SAV_Trainer7GG.L_Hours=Hrs.: SAV_Trainer7GG.L_Language=Idioma: +SAV_Trainer7GG.L_LastSaved=Último guardado: SAV_Trainer7GG.L_Minutes=Min.: SAV_Trainer7GG.L_Money=$: SAV_Trainer7GG.L_R=Rotation: SAV_Trainer7GG.L_RivalName=Nombre del Rival: SAV_Trainer7GG.L_Seconds=Seg.: +SAV_Trainer7GG.L_Started=Inicio partida: SAV_Trainer7GG.L_SX=X Scale: SAV_Trainer7GG.L_SY=Y Scale: SAV_Trainer7GG.L_SZ=Z Scale: @@ -1813,12 +1815,13 @@ SAV_Trainer9.L_BBQSolo=Solo Quests: SAV_Trainer9.L_BP=BP: SAV_Trainer9.L_Hours=Hrs.: SAV_Trainer9.L_Language=Idioma: +SAV_Trainer9.L_LastSaved=Último guardado: SAV_Trainer9.L_LP=PL: SAV_Trainer9.L_Minutes=Min.: SAV_Trainer9.L_Money=$: SAV_Trainer9.L_R=Rotation: SAV_Trainer9.L_Seconds=Seg.: -SAV_Trainer9.L_Started=Game Started: +SAV_Trainer9.L_Started=Inicio partida: SAV_Trainer9.L_ThrowStyle=Throw Styles: SAV_Trainer9.L_TrainerName=Nombre del Entrenador: SAV_Trainer9.L_X=Coord. X: diff --git a/PKHeX.WinForms/Resources/text/lang_fr.txt b/PKHeX.WinForms/Resources/text/lang_fr.txt index 0d4957801..cf95f902c 100644 --- a/PKHeX.WinForms/Resources/text/lang_fr.txt +++ b/PKHeX.WinForms/Resources/text/lang_fr.txt @@ -1666,11 +1666,13 @@ SAV_Trainer7GG.L_GoSlot=Slot: SAV_Trainer7GG.L_GoSlotSummary=Summary SAV_Trainer7GG.L_Hours=Hrs. SAV_Trainer7GG.L_Language=Langue : +SAV_Trainer7GG.L_LastSaved=Dernière sauvegarde : SAV_Trainer7GG.L_Minutes=Min. SAV_Trainer7GG.L_Money=$ SAV_Trainer7GG.L_R=Rotation: SAV_Trainer7GG.L_RivalName=Nom du Rival : SAV_Trainer7GG.L_Seconds=Sec. +SAV_Trainer7GG.L_Started=Début du jeu : SAV_Trainer7GG.L_SX=X Échelle : SAV_Trainer7GG.L_SY=Y Échelle : SAV_Trainer7GG.L_SZ=Z Échelle : @@ -1813,6 +1815,7 @@ SAV_Trainer9.L_BBQSolo=Solo Quests: SAV_Trainer9.L_BP=BP: SAV_Trainer9.L_Hours=Heures : SAV_Trainer9.L_Language=Langue : +SAV_Trainer9.L_LastSaved=Dernière sauvegarde : SAV_Trainer9.L_LP=LP : SAV_Trainer9.L_Minutes=Min : SAV_Trainer9.L_Money=$ : diff --git a/PKHeX.WinForms/Resources/text/lang_it.txt b/PKHeX.WinForms/Resources/text/lang_it.txt index 49b6748da..402e156e3 100644 --- a/PKHeX.WinForms/Resources/text/lang_it.txt +++ b/PKHeX.WinForms/Resources/text/lang_it.txt @@ -1666,11 +1666,13 @@ SAV_Trainer7GG.L_GoSlot=Slot: SAV_Trainer7GG.L_GoSlotSummary=Sommario SAV_Trainer7GG.L_Hours=Ore: SAV_Trainer7GG.L_Language=Lingua: +SAV_Trainer7GG.L_LastSaved=Last Saved: SAV_Trainer7GG.L_Minutes=Min: SAV_Trainer7GG.L_Money=$: SAV_Trainer7GG.L_R=Rotation: SAV_Trainer7GG.L_RivalName=Nome Rivale SAV_Trainer7GG.L_Seconds=Sec: +SAV_Trainer7GG.L_Started=Gioco iniziato: SAV_Trainer7GG.L_SX=X Scale: SAV_Trainer7GG.L_SY=Y Scale: SAV_Trainer7GG.L_SZ=Z Scale: @@ -1813,12 +1815,13 @@ SAV_Trainer9.L_BBQSolo=Solo Quests: SAV_Trainer9.L_BP=BP: SAV_Trainer9.L_Hours=Ore: SAV_Trainer9.L_Language=Lingua: +SAV_Trainer9.L_LastSaved=Ultimo salvataggio: SAV_Trainer9.L_LP=CL: SAV_Trainer9.L_Minutes=Min: SAV_Trainer9.L_Money=$: SAV_Trainer9.L_R=Rotation: SAV_Trainer9.L_Seconds=Sec: -SAV_Trainer9.L_Started=Game Started: +SAV_Trainer9.L_Started=Gioco iniziato: SAV_Trainer9.L_ThrowStyle=Throw Style: SAV_Trainer9.L_TrainerName=Nome Allenatore: SAV_Trainer9.L_X=Coordinata X: diff --git a/PKHeX.WinForms/Resources/text/lang_ja.txt b/PKHeX.WinForms/Resources/text/lang_ja.txt index 8a6e2f319..39c0ce5e9 100644 --- a/PKHeX.WinForms/Resources/text/lang_ja.txt +++ b/PKHeX.WinForms/Resources/text/lang_ja.txt @@ -1666,11 +1666,13 @@ SAV_Trainer7GG.L_GoSlot=Slot: SAV_Trainer7GG.L_GoSlotSummary=Summary SAV_Trainer7GG.L_Hours=Hrs: SAV_Trainer7GG.L_Language=言語: +SAV_Trainer7GG.L_LastSaved=最終セーブ SAV_Trainer7GG.L_Minutes=Min: SAV_Trainer7GG.L_Money=$: SAV_Trainer7GG.L_R=Rotation: SAV_Trainer7GG.L_RivalName=Rival Name: SAV_Trainer7GG.L_Seconds=Sec: +SAV_Trainer7GG.L_Started=ゲーム開始日 SAV_Trainer7GG.L_SX=X Scale: SAV_Trainer7GG.L_SY=Y Scale: SAV_Trainer7GG.L_SZ=Z Scale: @@ -1702,7 +1704,7 @@ SAV_Trainer8.L_Doubles=Doubles: SAV_Trainer8.L_Fame=HoF Entered: SAV_Trainer8.L_Hours=Hrs: SAV_Trainer8.L_Language=言語: -SAV_Trainer8.L_LastSaved=Last Saved: +SAV_Trainer8.L_LastSaved=最終セーブ SAV_Trainer8.L_Minutes=Min: SAV_Trainer8.L_Money=$: SAV_Trainer8.L_Offset=(offset) @@ -1712,7 +1714,7 @@ SAV_Trainer8.L_Seconds=Sec: SAV_Trainer8.L_ShowTitleScreen=Shown on Title Screen: SAV_Trainer8.L_ShowTrainerCard=Shown on Trainer Card: SAV_Trainer8.L_Singles=Singles: -SAV_Trainer8.L_Started=Game Started: +SAV_Trainer8.L_Started=ゲーム開始日 SAV_Trainer8.L_SX=X Scale: SAV_Trainer8.L_SY=Y Scale: SAV_Trainer8.L_SZ=Z Scale: @@ -1741,7 +1743,7 @@ SAV_Trainer8a.L_CurrentMap=Current Map: SAV_Trainer8a.L_GalaxyRank=Galaxy Rank: SAV_Trainer8a.L_Hours=Hrs: SAV_Trainer8a.L_Language=言語: -SAV_Trainer8a.L_LastSaved=Last Saved: +SAV_Trainer8a.L_LastSaved=最終セーブ SAV_Trainer8a.L_MeritCurrent=Current Merit Points: SAV_Trainer8a.L_MeritEarned=Earned Merit Points: SAV_Trainer8a.L_Minutes=Min: @@ -1749,7 +1751,7 @@ SAV_Trainer8a.L_Money=$: SAV_Trainer8a.L_R=Rotation: SAV_Trainer8a.L_SatchelUpgrades=Satchel Upgrades: SAV_Trainer8a.L_Seconds=Sec: -SAV_Trainer8a.L_Started=Game Started: +SAV_Trainer8a.L_Started=ゲーム開始日 SAV_Trainer8a.L_TrainerName=Trainer Name: SAV_Trainer8a.L_X=X Coordinate: SAV_Trainer8a.L_Y=Y Coordinate: @@ -1778,14 +1780,14 @@ SAV_Trainer8b.L_Fame=HoF Entered: SAV_Trainer8b.L_Height=身長: SAV_Trainer8b.L_Hours=Hrs: SAV_Trainer8b.L_Language=言語: -SAV_Trainer8b.L_LastSaved=Last Saved: +SAV_Trainer8b.L_LastSaved=最終セーブ SAV_Trainer8b.L_Minutes=Min: SAV_Trainer8b.L_Money=$: SAV_Trainer8b.L_Offset=(offset) SAV_Trainer8b.L_RivalName=Rival Name: SAV_Trainer8b.L_Rotation=Rotation: SAV_Trainer8b.L_Seconds=Sec: -SAV_Trainer8b.L_Started=Game Started: +SAV_Trainer8b.L_Started=ゲーム開始日 SAV_Trainer8b.L_TrainerName=Trainer Name: SAV_Trainer8b.L_Value=Value SAV_Trainer8b.L_X=X Coordinate: @@ -1813,12 +1815,13 @@ SAV_Trainer9.L_BBQSolo=Solo Quests: SAV_Trainer9.L_BP=BP: SAV_Trainer9.L_Hours=Hrs: SAV_Trainer9.L_Language=言語: +SAV_Trainer9.L_LastSaved=最終セーブ SAV_Trainer9.L_LP=LP: SAV_Trainer9.L_Minutes=Min: SAV_Trainer9.L_Money=$: SAV_Trainer9.L_R=Rotation: SAV_Trainer9.L_Seconds=Sec: -SAV_Trainer9.L_Started=Game Started: +SAV_Trainer9.L_Started=ゲーム開始日 SAV_Trainer9.L_ThrowStyle=Throw Style: SAV_Trainer9.L_TrainerName=Trainer Name: SAV_Trainer9.L_X=X Coordinate: diff --git a/PKHeX.WinForms/Resources/text/lang_ko.txt b/PKHeX.WinForms/Resources/text/lang_ko.txt index dacb01edf..f46454301 100644 --- a/PKHeX.WinForms/Resources/text/lang_ko.txt +++ b/PKHeX.WinForms/Resources/text/lang_ko.txt @@ -1666,11 +1666,13 @@ SAV_Trainer7GG.L_GoSlot=슬롯: SAV_Trainer7GG.L_GoSlotSummary=요약 SAV_Trainer7GG.L_Hours=시간: SAV_Trainer7GG.L_Language=언어: +SAV_Trainer7GG.L_LastSaved=최근 저장: SAV_Trainer7GG.L_Minutes=분: SAV_Trainer7GG.L_Money=$: SAV_Trainer7GG.L_R=Rotation: SAV_Trainer7GG.L_RivalName=라이벌 이름: SAV_Trainer7GG.L_Seconds=초: +SAV_Trainer7GG.L_Started=게임 시작: SAV_Trainer7GG.L_SX=X Scale: SAV_Trainer7GG.L_SY=Y Scale: SAV_Trainer7GG.L_SZ=Z Scale: @@ -1741,7 +1743,7 @@ SAV_Trainer8a.L_CurrentMap=Current Map: SAV_Trainer8a.L_GalaxyRank=Galaxy Rank: SAV_Trainer8a.L_Hours=Hrs: SAV_Trainer8a.L_Language=Language: -SAV_Trainer8a.L_LastSaved=Last Saved: +SAV_Trainer8a.L_LastSaved=최근 저장: SAV_Trainer8a.L_MeritCurrent=Current Merit Points: SAV_Trainer8a.L_MeritEarned=Earned Merit Points: SAV_Trainer8a.L_Minutes=Min: @@ -1749,7 +1751,7 @@ SAV_Trainer8a.L_Money=$: SAV_Trainer8a.L_R=Rotation: SAV_Trainer8a.L_SatchelUpgrades=Satchel Upgrades: SAV_Trainer8a.L_Seconds=Sec: -SAV_Trainer8a.L_Started=Game Started: +SAV_Trainer8a.L_Started=게임 시작: SAV_Trainer8a.L_TrainerName=Trainer Name: SAV_Trainer8a.L_X=X Coordinate: SAV_Trainer8a.L_Y=Y Coordinate: @@ -1778,14 +1780,14 @@ SAV_Trainer8b.L_Fame=HoF Entered: SAV_Trainer8b.L_Height=Height: SAV_Trainer8b.L_Hours=Hrs: SAV_Trainer8b.L_Language=Language: -SAV_Trainer8b.L_LastSaved=Last Saved: +SAV_Trainer8b.L_LastSaved=최근 저장: SAV_Trainer8b.L_Minutes=Min: SAV_Trainer8b.L_Money=$: SAV_Trainer8b.L_Offset=(offset) SAV_Trainer8b.L_RivalName=Rival Name: SAV_Trainer8b.L_Rotation=Rotation: SAV_Trainer8b.L_Seconds=Sec: -SAV_Trainer8b.L_Started=Game Started: +SAV_Trainer8b.L_Started=게임 시작: SAV_Trainer8b.L_TrainerName=Trainer Name: SAV_Trainer8b.L_Value=Value SAV_Trainer8b.L_X=X Coordinate: @@ -1813,12 +1815,13 @@ SAV_Trainer9.L_BBQSolo=Solo Quests: SAV_Trainer9.L_BP=BP: SAV_Trainer9.L_Hours=Hrs: SAV_Trainer9.L_Language=Language: +SAV_Trainer9.L_LastSaved=최근 저장: SAV_Trainer9.L_LP=LP: SAV_Trainer9.L_Minutes=Min: SAV_Trainer9.L_Money=$: SAV_Trainer9.L_R=Rotation: SAV_Trainer9.L_Seconds=Sec: -SAV_Trainer9.L_Started=Game Started: +SAV_Trainer9.L_Started=게임 시작: SAV_Trainer9.L_ThrowStyle=Throw Style: SAV_Trainer9.L_TrainerName=Trainer Name: SAV_Trainer9.L_X=X Coordinate: diff --git a/PKHeX.WinForms/Resources/text/lang_zh.txt b/PKHeX.WinForms/Resources/text/lang_zh.txt index f5ccebf4f..d1cdb7642 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh.txt @@ -1668,11 +1668,13 @@ SAV_Trainer7GG.L_GoSlot=槽: SAV_Trainer7GG.L_GoSlotSummary=摘要 SAV_Trainer7GG.L_Hours=时: SAV_Trainer7GG.L_Language=语言: +SAV_Trainer7GG.L_LastSaved=最后存档: SAV_Trainer7GG.L_Minutes=分: SAV_Trainer7GG.L_Money=$: SAV_Trainer7GG.L_R=Rotation: SAV_Trainer7GG.L_RivalName=对手名称: SAV_Trainer7GG.L_Seconds=秒: +SAV_Trainer7GG.L_Started=游戏开始: SAV_Trainer7GG.L_SX=X Scale: SAV_Trainer7GG.L_SY=Y Scale: SAV_Trainer7GG.L_SZ=Z Scale: @@ -1815,6 +1817,7 @@ SAV_Trainer9.L_BBQSolo=单人任务: SAV_Trainer9.L_BP=BP: SAV_Trainer9.L_Hours=时: SAV_Trainer9.L_Language=语言: +SAV_Trainer9.L_LastSaved=最后存档: SAV_Trainer9.L_LP=LP: SAV_Trainer9.L_Minutes=分: SAV_Trainer9.L_Money=$: diff --git a/PKHeX.WinForms/Resources/text/lang_zh2.txt b/PKHeX.WinForms/Resources/text/lang_zh2.txt index 05aafed36..d2cafaf6e 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh2.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh2.txt @@ -1666,11 +1666,13 @@ SAV_Trainer7GG.L_GoSlot=槽: SAV_Trainer7GG.L_GoSlotSummary=摘要 SAV_Trainer7GG.L_Hours=時: SAV_Trainer7GG.L_Language=語言: +SAV_Trainer7GG.L_LastSaved=最後儲存資料: SAV_Trainer7GG.L_Minutes=分: SAV_Trainer7GG.L_Money=$: SAV_Trainer7GG.L_R=Rotation: SAV_Trainer7GG.L_RivalName=對手名稱: SAV_Trainer7GG.L_Seconds=秒: +SAV_Trainer7GG.L_Started=遊戲已進行: SAV_Trainer7GG.L_SX=X Scale: SAV_Trainer7GG.L_SY=Y Scale: SAV_Trainer7GG.L_SZ=Z Scale: @@ -1813,6 +1815,7 @@ SAV_Trainer9.L_BBQSolo=Solo Quests: SAV_Trainer9.L_BP=BP: SAV_Trainer9.L_Hours=小時: SAV_Trainer9.L_Language=語言: +SAV_Trainer9.L_LastSaved=最後儲存資料: SAV_Trainer9.L_LP=LP: SAV_Trainer9.L_Minutes=分鐘: SAV_Trainer9.L_Money=$: diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.Designer.cs index f674ad1cf..91cd12df6 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.Designer.cs @@ -63,17 +63,6 @@ namespace PKHeX.WinForms L_RivalName = new System.Windows.Forms.Label(); trainerID1 = new Controls.TrainerID(); GB_Adventure = new System.Windows.Forms.GroupBox(); - Tab_Complex = new System.Windows.Forms.TabPage(); - B_DeleteAll = new System.Windows.Forms.Button(); - B_DeleteGo = new System.Windows.Forms.Button(); - B_ImportGoFiles = new System.Windows.Forms.Button(); - B_ExportGoFiles = new System.Windows.Forms.Button(); - L_GoSlotSummary = new System.Windows.Forms.Label(); - B_Import = new System.Windows.Forms.Button(); - B_Export = new System.Windows.Forms.Button(); - L_GoSlot = new System.Windows.Forms.Label(); - NUD_GoIndex = new System.Windows.Forms.NumericUpDown(); - B_ExportGoSummary = new System.Windows.Forms.Button(); Tab_BadgeMap = new System.Windows.Forms.TabPage(); GB_Map = new System.Windows.Forms.GroupBox(); NUD_SZ = new System.Windows.Forms.NumericUpDown(); @@ -92,11 +81,26 @@ namespace PKHeX.WinForms L_CurrentMap = new System.Windows.Forms.Label(); L_Z = new System.Windows.Forms.Label(); L_X = new System.Windows.Forms.Label(); + Tab_Complex = new System.Windows.Forms.TabPage(); + B_DeleteAll = new System.Windows.Forms.Button(); + B_DeleteGo = new System.Windows.Forms.Button(); + B_ImportGoFiles = new System.Windows.Forms.Button(); + B_ExportGoFiles = new System.Windows.Forms.Button(); + L_GoSlotSummary = new System.Windows.Forms.Label(); + B_Import = new System.Windows.Forms.Button(); + B_Export = new System.Windows.Forms.Button(); + L_GoSlot = new System.Windows.Forms.Label(); + NUD_GoIndex = new System.Windows.Forms.NumericUpDown(); + B_ExportGoSummary = new System.Windows.Forms.Button(); + L_Started = new System.Windows.Forms.Label(); + CAL_AdventureBeginDate = new System.Windows.Forms.DateTimePicker(); + CAL_LastSavedDate = new System.Windows.Forms.DateTimePicker(); + L_LastSaved = new System.Windows.Forms.Label(); + CAL_AdventureBeginTime = new System.Windows.Forms.DateTimePicker(); + CAL_LastSavedTime = new System.Windows.Forms.DateTimePicker(); TC_Editor.SuspendLayout(); Tab_Overview.SuspendLayout(); GB_Adventure.SuspendLayout(); - Tab_Complex.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)NUD_GoIndex).BeginInit(); Tab_BadgeMap.SuspendLayout(); GB_Map.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)NUD_SZ).BeginInit(); @@ -107,6 +111,8 @@ namespace PKHeX.WinForms ((System.ComponentModel.ISupportInitialize)NUD_M).BeginInit(); ((System.ComponentModel.ISupportInitialize)NUD_Y).BeginInit(); ((System.ComponentModel.ISupportInitialize)NUD_X).BeginInit(); + Tab_Complex.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)NUD_GoIndex).BeginInit(); SuspendLayout(); // // B_Cancel @@ -133,7 +139,7 @@ namespace PKHeX.WinForms // // TB_OTName // - TB_OTName.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + TB_OTName.Font = new System.Drawing.Font("Courier New", 8.25F); TB_OTName.Location = new System.Drawing.Point(115, 8); TB_OTName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); TB_OTName.MaxLength = 12; @@ -420,7 +426,7 @@ namespace PKHeX.WinForms // // TB_RivalName // - TB_RivalName.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + TB_RivalName.Font = new System.Drawing.Font("Courier New", 8.25F); TB_RivalName.Location = new System.Drawing.Point(338, 7); TB_RivalName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); TB_RivalName.MaxLength = 12; @@ -451,10 +457,16 @@ namespace PKHeX.WinForms // // GB_Adventure // + GB_Adventure.Controls.Add(L_Started); + GB_Adventure.Controls.Add(CAL_AdventureBeginDate); GB_Adventure.Controls.Add(MT_Seconds); + GB_Adventure.Controls.Add(CAL_LastSavedDate); GB_Adventure.Controls.Add(MT_Hours); + GB_Adventure.Controls.Add(L_LastSaved); GB_Adventure.Controls.Add(L_Seconds); + GB_Adventure.Controls.Add(CAL_AdventureBeginTime); GB_Adventure.Controls.Add(L_Hours); + GB_Adventure.Controls.Add(CAL_LastSavedTime); GB_Adventure.Controls.Add(MT_Minutes); GB_Adventure.Controls.Add(L_Minutes); GB_Adventure.Location = new System.Drawing.Point(4, 150); @@ -466,137 +478,6 @@ namespace PKHeX.WinForms GB_Adventure.TabStop = false; GB_Adventure.Text = "Adventure Info"; // - // Tab_Complex - // - Tab_Complex.AllowDrop = true; - Tab_Complex.Controls.Add(B_DeleteAll); - Tab_Complex.Controls.Add(B_DeleteGo); - Tab_Complex.Controls.Add(B_ImportGoFiles); - Tab_Complex.Controls.Add(B_ExportGoFiles); - Tab_Complex.Controls.Add(L_GoSlotSummary); - Tab_Complex.Controls.Add(B_Import); - Tab_Complex.Controls.Add(B_Export); - Tab_Complex.Controls.Add(L_GoSlot); - Tab_Complex.Controls.Add(NUD_GoIndex); - Tab_Complex.Controls.Add(B_ExportGoSummary); - Tab_Complex.Location = new System.Drawing.Point(4, 24); - Tab_Complex.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - Tab_Complex.Name = "Tab_Complex"; - Tab_Complex.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - Tab_Complex.Size = new System.Drawing.Size(452, 337); - Tab_Complex.TabIndex = 4; - Tab_Complex.Text = "GO Complex"; - Tab_Complex.UseVisualStyleBackColor = true; - Tab_Complex.DragDrop += Main_DragDrop; - Tab_Complex.DragEnter += Main_DragEnter; - // - // B_DeleteAll - // - B_DeleteAll.Location = new System.Drawing.Point(354, 160); - B_DeleteAll.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - B_DeleteAll.Name = "B_DeleteAll"; - B_DeleteAll.Size = new System.Drawing.Size(88, 27); - B_DeleteAll.TabIndex = 9; - B_DeleteAll.Text = "Delete All"; - B_DeleteAll.UseVisualStyleBackColor = true; - B_DeleteAll.Click += B_DeleteAll_Click; - // - // B_DeleteGo - // - B_DeleteGo.Location = new System.Drawing.Point(259, 160); - B_DeleteGo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - B_DeleteGo.Name = "B_DeleteGo"; - B_DeleteGo.Size = new System.Drawing.Size(88, 27); - B_DeleteGo.TabIndex = 8; - B_DeleteGo.Text = "Delete"; - B_DeleteGo.UseVisualStyleBackColor = true; - B_DeleteGo.Click += B_DeleteGo_Click; - // - // B_ImportGoFiles - // - B_ImportGoFiles.Location = new System.Drawing.Point(142, 255); - B_ImportGoFiles.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - B_ImportGoFiles.Name = "B_ImportGoFiles"; - B_ImportGoFiles.Size = new System.Drawing.Size(128, 73); - B_ImportGoFiles.TabIndex = 7; - B_ImportGoFiles.Text = "Import from Folder (start at current slot)"; - B_ImportGoFiles.UseVisualStyleBackColor = true; - B_ImportGoFiles.Click += B_ImportGoFiles_Click; - // - // B_ExportGoFiles - // - B_ExportGoFiles.Location = new System.Drawing.Point(7, 255); - B_ExportGoFiles.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - B_ExportGoFiles.Name = "B_ExportGoFiles"; - B_ExportGoFiles.Size = new System.Drawing.Size(128, 73); - B_ExportGoFiles.TabIndex = 6; - B_ExportGoFiles.Text = "Export all to Folder"; - B_ExportGoFiles.UseVisualStyleBackColor = true; - B_ExportGoFiles.Click += B_ExportGoFiles_Click; - // - // L_GoSlotSummary - // - L_GoSlotSummary.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - L_GoSlotSummary.Location = new System.Drawing.Point(31, 67); - L_GoSlotSummary.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - L_GoSlotSummary.Name = "L_GoSlotSummary"; - L_GoSlotSummary.Size = new System.Drawing.Size(220, 120); - L_GoSlotSummary.TabIndex = 5; - L_GoSlotSummary.Text = "Summary"; - // - // B_Import - // - B_Import.Location = new System.Drawing.Point(259, 100); - B_Import.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - B_Import.Name = "B_Import"; - B_Import.Size = new System.Drawing.Size(88, 27); - B_Import.TabIndex = 4; - B_Import.Text = "Import"; - B_Import.UseVisualStyleBackColor = true; - B_Import.Click += B_Import_Click; - // - // B_Export - // - B_Export.Location = new System.Drawing.Point(259, 67); - B_Export.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - B_Export.Name = "B_Export"; - B_Export.Size = new System.Drawing.Size(88, 27); - B_Export.TabIndex = 3; - B_Export.Text = "Export"; - B_Export.UseVisualStyleBackColor = true; - B_Export.Click += B_Export_Click; - // - // L_GoSlot - // - L_GoSlot.Location = new System.Drawing.Point(6, 40); - L_GoSlot.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - L_GoSlot.Name = "L_GoSlot"; - L_GoSlot.Size = new System.Drawing.Size(99, 23); - L_GoSlot.TabIndex = 2; - L_GoSlot.Text = "Slot:"; - L_GoSlot.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // NUD_GoIndex - // - NUD_GoIndex.Location = new System.Drawing.Point(112, 40); - NUD_GoIndex.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - NUD_GoIndex.Maximum = new decimal(new int[] { 999, 0, 0, 0 }); - NUD_GoIndex.Name = "NUD_GoIndex"; - NUD_GoIndex.Size = new System.Drawing.Size(140, 23); - NUD_GoIndex.TabIndex = 1; - NUD_GoIndex.ValueChanged += NUD_GoIndex_ValueChanged; - // - // B_ExportGoSummary - // - B_ExportGoSummary.Location = new System.Drawing.Point(278, 255); - B_ExportGoSummary.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - B_ExportGoSummary.Name = "B_ExportGoSummary"; - B_ExportGoSummary.Size = new System.Drawing.Size(153, 73); - B_ExportGoSummary.TabIndex = 0; - B_ExportGoSummary.Text = "Dump Text Summary of Go Park Entities"; - B_ExportGoSummary.UseVisualStyleBackColor = true; - B_ExportGoSummary.Click += B_ExportGoSummary_Click; - // // Tab_BadgeMap // Tab_BadgeMap.Controls.Add(GB_Map); @@ -815,6 +696,209 @@ namespace PKHeX.WinForms L_X.Text = "X Coordinate:"; L_X.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // Tab_Complex + // + Tab_Complex.AllowDrop = true; + Tab_Complex.Controls.Add(B_DeleteAll); + Tab_Complex.Controls.Add(B_DeleteGo); + Tab_Complex.Controls.Add(B_ImportGoFiles); + Tab_Complex.Controls.Add(B_ExportGoFiles); + Tab_Complex.Controls.Add(L_GoSlotSummary); + Tab_Complex.Controls.Add(B_Import); + Tab_Complex.Controls.Add(B_Export); + Tab_Complex.Controls.Add(L_GoSlot); + Tab_Complex.Controls.Add(NUD_GoIndex); + Tab_Complex.Controls.Add(B_ExportGoSummary); + Tab_Complex.Location = new System.Drawing.Point(4, 24); + Tab_Complex.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + Tab_Complex.Name = "Tab_Complex"; + Tab_Complex.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + Tab_Complex.Size = new System.Drawing.Size(452, 337); + Tab_Complex.TabIndex = 4; + Tab_Complex.Text = "GO Complex"; + Tab_Complex.UseVisualStyleBackColor = true; + Tab_Complex.DragDrop += Main_DragDrop; + Tab_Complex.DragEnter += Main_DragEnter; + // + // B_DeleteAll + // + B_DeleteAll.Location = new System.Drawing.Point(354, 160); + B_DeleteAll.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_DeleteAll.Name = "B_DeleteAll"; + B_DeleteAll.Size = new System.Drawing.Size(88, 27); + B_DeleteAll.TabIndex = 9; + B_DeleteAll.Text = "Delete All"; + B_DeleteAll.UseVisualStyleBackColor = true; + B_DeleteAll.Click += B_DeleteAll_Click; + // + // B_DeleteGo + // + B_DeleteGo.Location = new System.Drawing.Point(259, 160); + B_DeleteGo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_DeleteGo.Name = "B_DeleteGo"; + B_DeleteGo.Size = new System.Drawing.Size(88, 27); + B_DeleteGo.TabIndex = 8; + B_DeleteGo.Text = "Delete"; + B_DeleteGo.UseVisualStyleBackColor = true; + B_DeleteGo.Click += B_DeleteGo_Click; + // + // B_ImportGoFiles + // + B_ImportGoFiles.Location = new System.Drawing.Point(142, 255); + B_ImportGoFiles.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_ImportGoFiles.Name = "B_ImportGoFiles"; + B_ImportGoFiles.Size = new System.Drawing.Size(128, 73); + B_ImportGoFiles.TabIndex = 7; + B_ImportGoFiles.Text = "Import from Folder (start at current slot)"; + B_ImportGoFiles.UseVisualStyleBackColor = true; + B_ImportGoFiles.Click += B_ImportGoFiles_Click; + // + // B_ExportGoFiles + // + B_ExportGoFiles.Location = new System.Drawing.Point(7, 255); + B_ExportGoFiles.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_ExportGoFiles.Name = "B_ExportGoFiles"; + B_ExportGoFiles.Size = new System.Drawing.Size(128, 73); + B_ExportGoFiles.TabIndex = 6; + B_ExportGoFiles.Text = "Export all to Folder"; + B_ExportGoFiles.UseVisualStyleBackColor = true; + B_ExportGoFiles.Click += B_ExportGoFiles_Click; + // + // L_GoSlotSummary + // + L_GoSlotSummary.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + L_GoSlotSummary.Location = new System.Drawing.Point(31, 67); + L_GoSlotSummary.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_GoSlotSummary.Name = "L_GoSlotSummary"; + L_GoSlotSummary.Size = new System.Drawing.Size(220, 120); + L_GoSlotSummary.TabIndex = 5; + L_GoSlotSummary.Text = "Summary"; + // + // B_Import + // + B_Import.Location = new System.Drawing.Point(259, 100); + B_Import.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_Import.Name = "B_Import"; + B_Import.Size = new System.Drawing.Size(88, 27); + B_Import.TabIndex = 4; + B_Import.Text = "Import"; + B_Import.UseVisualStyleBackColor = true; + B_Import.Click += B_Import_Click; + // + // B_Export + // + B_Export.Location = new System.Drawing.Point(259, 67); + B_Export.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_Export.Name = "B_Export"; + B_Export.Size = new System.Drawing.Size(88, 27); + B_Export.TabIndex = 3; + B_Export.Text = "Export"; + B_Export.UseVisualStyleBackColor = true; + B_Export.Click += B_Export_Click; + // + // L_GoSlot + // + L_GoSlot.Location = new System.Drawing.Point(6, 40); + L_GoSlot.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_GoSlot.Name = "L_GoSlot"; + L_GoSlot.Size = new System.Drawing.Size(99, 23); + L_GoSlot.TabIndex = 2; + L_GoSlot.Text = "Slot:"; + L_GoSlot.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // NUD_GoIndex + // + NUD_GoIndex.Location = new System.Drawing.Point(112, 40); + NUD_GoIndex.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + NUD_GoIndex.Maximum = new decimal(new int[] { 999, 0, 0, 0 }); + NUD_GoIndex.Name = "NUD_GoIndex"; + NUD_GoIndex.Size = new System.Drawing.Size(140, 23); + NUD_GoIndex.TabIndex = 1; + NUD_GoIndex.ValueChanged += NUD_GoIndex_ValueChanged; + // + // B_ExportGoSummary + // + B_ExportGoSummary.Location = new System.Drawing.Point(278, 255); + B_ExportGoSummary.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_ExportGoSummary.Name = "B_ExportGoSummary"; + B_ExportGoSummary.Size = new System.Drawing.Size(153, 73); + B_ExportGoSummary.TabIndex = 0; + B_ExportGoSummary.Text = "Dump Text Summary of Go Park Entities"; + B_ExportGoSummary.UseVisualStyleBackColor = true; + B_ExportGoSummary.Click += B_ExportGoSummary_Click; + // + // L_Started + // + L_Started.Location = new System.Drawing.Point(8, 48); + L_Started.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_Started.Name = "L_Started"; + L_Started.Size = new System.Drawing.Size(93, 23); + L_Started.TabIndex = 59; + L_Started.Text = "Game Started:"; + L_Started.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CAL_AdventureBeginDate + // + CAL_AdventureBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; + CAL_AdventureBeginDate.Location = new System.Drawing.Point(108, 48); + CAL_AdventureBeginDate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CAL_AdventureBeginDate.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); + CAL_AdventureBeginDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + CAL_AdventureBeginDate.Name = "CAL_AdventureBeginDate"; + CAL_AdventureBeginDate.Size = new System.Drawing.Size(115, 23); + CAL_AdventureBeginDate.TabIndex = 58; + CAL_AdventureBeginDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + // + // CAL_LastSavedDate + // + CAL_LastSavedDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; + CAL_LastSavedDate.Location = new System.Drawing.Point(108, 98); + CAL_LastSavedDate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CAL_LastSavedDate.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); + CAL_LastSavedDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + CAL_LastSavedDate.Name = "CAL_LastSavedDate"; + CAL_LastSavedDate.Size = new System.Drawing.Size(115, 23); + CAL_LastSavedDate.TabIndex = 55; + CAL_LastSavedDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + // + // L_LastSaved + // + L_LastSaved.Location = new System.Drawing.Point(8, 98); + L_LastSaved.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_LastSaved.Name = "L_LastSaved"; + L_LastSaved.Size = new System.Drawing.Size(93, 23); + L_LastSaved.TabIndex = 56; + L_LastSaved.Text = "Last Saved:"; + L_LastSaved.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CAL_AdventureBeginTime + // + CAL_AdventureBeginTime.CustomFormat = "HH:mm:ss"; + CAL_AdventureBeginTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + CAL_AdventureBeginTime.Location = new System.Drawing.Point(138, 70); + CAL_AdventureBeginTime.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CAL_AdventureBeginTime.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); + CAL_AdventureBeginTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + CAL_AdventureBeginTime.Name = "CAL_AdventureBeginTime"; + CAL_AdventureBeginTime.ShowUpDown = true; + CAL_AdventureBeginTime.Size = new System.Drawing.Size(84, 23); + CAL_AdventureBeginTime.TabIndex = 57; + CAL_AdventureBeginTime.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + // + // CAL_LastSavedTime + // + CAL_LastSavedTime.CustomFormat = "HH:mm"; + CAL_LastSavedTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + CAL_LastSavedTime.Location = new System.Drawing.Point(138, 120); + CAL_LastSavedTime.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CAL_LastSavedTime.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); + CAL_LastSavedTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + CAL_LastSavedTime.Name = "CAL_LastSavedTime"; + CAL_LastSavedTime.ShowUpDown = true; + CAL_LastSavedTime.Size = new System.Drawing.Size(84, 23); + CAL_LastSavedTime.TabIndex = 60; + CAL_LastSavedTime.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + // // SAV_Trainer7GG // AllowDrop = true; @@ -838,8 +922,6 @@ namespace PKHeX.WinForms Tab_Overview.PerformLayout(); GB_Adventure.ResumeLayout(false); GB_Adventure.PerformLayout(); - Tab_Complex.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)NUD_GoIndex).EndInit(); Tab_BadgeMap.ResumeLayout(false); GB_Map.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)NUD_SZ).EndInit(); @@ -850,6 +932,8 @@ namespace PKHeX.WinForms ((System.ComponentModel.ISupportInitialize)NUD_M).EndInit(); ((System.ComponentModel.ISupportInitialize)NUD_Y).EndInit(); ((System.ComponentModel.ISupportInitialize)NUD_X).EndInit(); + Tab_Complex.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)NUD_GoIndex).EndInit(); ResumeLayout(false); } @@ -919,5 +1003,11 @@ namespace PKHeX.WinForms private System.Windows.Forms.Label L_CurrentMap; private System.Windows.Forms.Label L_Z; private System.Windows.Forms.Label L_X; + private System.Windows.Forms.Label L_Started; + private System.Windows.Forms.DateTimePicker CAL_AdventureBeginDate; + private System.Windows.Forms.DateTimePicker CAL_LastSavedDate; + private System.Windows.Forms.Label L_LastSaved; + private System.Windows.Forms.DateTimePicker CAL_AdventureBeginTime; + private System.Windows.Forms.DateTimePicker CAL_LastSavedTime; } } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs index f67619383..a21948511 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs @@ -93,6 +93,12 @@ public partial class SAV_Trainer7GG : Form MT_Hours.Text = SAV.PlayedHours.ToString(); MT_Minutes.Text = SAV.PlayedMinutes.ToString(); MT_Seconds.Text = SAV.PlayedSeconds.ToString(); + + CAL_AdventureBeginDate.Value = CAL_AdventureBeginTime.Value = SAV.PlayerGeoLocation.AdventureBegin.Timestamp; + if (SAV.Played.LastSavedDate is { } d) + CAL_LastSavedDate.Value = CAL_LastSavedTime.Value = d; + else + CAL_LastSavedDate.Enabled = CAL_LastSavedTime.Enabled = false; } private void Save() @@ -132,6 +138,10 @@ public partial class SAV_Trainer7GG : Form SAV.PlayedHours = ushort.Parse(MT_Hours.Text); SAV.PlayedMinutes = ushort.Parse(MT_Minutes.Text) % 60; SAV.PlayedSeconds = ushort.Parse(MT_Seconds.Text) % 60; + + SAV.PlayerGeoLocation.AdventureBegin.Timestamp = CAL_AdventureBeginDate.Value.Date.AddSeconds(CAL_AdventureBeginTime.Value.TimeOfDay.TotalSeconds); + if (CAL_LastSavedDate.Enabled) + SAV.Played.LastSavedDate = CAL_LastSavedDate.Value.Date.AddSeconds(CAL_LastSavedTime.Value.TimeOfDay.TotalSeconds); } private void ClickString(object sender, MouseEventArgs e) diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs index adbcd355e..bd0dabf55 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs @@ -203,7 +203,7 @@ namespace PKHeX.WinForms // // TB_OTName // - TB_OTName.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + TB_OTName.Font = new System.Drawing.Font("Courier New", 8.25F); TB_OTName.Location = new System.Drawing.Point(115, 8); TB_OTName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); TB_OTName.MaxLength = 12; @@ -808,7 +808,7 @@ namespace PKHeX.WinForms // // TB_TrainerCardNumber // - TB_TrainerCardNumber.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + TB_TrainerCardNumber.Font = new System.Drawing.Font("Courier New", 8.25F); TB_TrainerCardNumber.Location = new System.Drawing.Point(386, 38); TB_TrainerCardNumber.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); TB_TrainerCardNumber.MaxLength = 12; @@ -830,7 +830,7 @@ namespace PKHeX.WinForms // // TB_TrainerCardName // - TB_TrainerCardName.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + TB_TrainerCardName.Font = new System.Drawing.Font("Courier New", 8.25F); TB_TrainerCardName.Location = new System.Drawing.Point(386, 8); TB_TrainerCardName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); TB_TrainerCardName.MaxLength = 12; @@ -1001,7 +1001,7 @@ namespace PKHeX.WinForms // // CAL_LastSavedTime // - CAL_LastSavedTime.CustomFormat = "HH:mm:ss"; + CAL_LastSavedTime.CustomFormat = "HH:mm"; CAL_LastSavedTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; CAL_LastSavedTime.Location = new System.Drawing.Point(134, 149); CAL_LastSavedTime.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs index 2cb73f8b3..ffe544087 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs @@ -88,15 +88,10 @@ public partial class SAV_Trainer8 : Form MT_Minutes.Text = SAV.PlayedMinutes.ToString(); MT_Seconds.Text = SAV.PlayedSeconds.ToString(); - //if (SAV.Played.LastSavedDate.HasValue) - //{ - // CAL_LastSavedDate.Value = SAV.Played.LastSavedDate.Value; - // CAL_LastSavedTime.Value = SAV.Played.LastSavedDate.Value; - //} - //else - //{ - L_LastSaved.Visible = CAL_LastSavedDate.Visible = CAL_LastSavedTime.Visible = false; - //} + if (SAV.Played.LastSavedDate.HasValue) + CAL_LastSavedDate.Value = CAL_LastSavedTime.Value = SAV.Played.LastSavedDate.Value; + else + L_LastSaved.Visible = CAL_LastSavedDate.Visible = CAL_LastSavedTime.Visible = false; CAL_AdventureStartTime.Visible = false; CAL_AdventureStartDate.Value = new DateTime(SAV.TrainerCard.StartedYear, SAV.TrainerCard.StartedMonth, SAV.TrainerCard.StartedDay); @@ -181,9 +176,9 @@ public partial class SAV_Trainer8 : Form SAV.TrainerCard.StartedDay = (byte)CAL_AdventureStartDate.Value.Day; //SAV.SecondsToFame = (uint)DateUtil.GetSecondsFrom2000(CAL_HoFDate.Value, CAL_HoFTime.Value); - // - //if (SAV.Played.LastSavedDate.HasValue) - // SAV.Played.LastSavedDate = new DateTime(CAL_LastSavedDate.Value.Year, CAL_LastSavedDate.Value.Month, CAL_LastSavedDate.Value.Day, CAL_LastSavedTime.Value.Hour, CAL_LastSavedTime.Value.Minute, 0); + + if (SAV.Played.LastSavedDate.HasValue) + SAV.Played.LastSavedDate = CAL_LastSavedDate.Value.Date.AddMinutes(CAL_LastSavedTime.Value.TimeOfDay.TotalMinutes); } private void ClickOT(object sender, MouseEventArgs e) diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.Designer.cs index 66e78a2e0..4ba969811 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.Designer.cs @@ -161,7 +161,7 @@ namespace PKHeX.WinForms // // TB_OTName // - TB_OTName.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + TB_OTName.Font = new System.Drawing.Font("Courier New", 8.25F); TB_OTName.Location = new System.Drawing.Point(115, 8); TB_OTName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); TB_OTName.MaxLength = 12; @@ -274,7 +274,7 @@ namespace PKHeX.WinForms // // L_LastSaved // - L_LastSaved.Location = new System.Drawing.Point(4, 127); + L_LastSaved.Location = new System.Drawing.Point(4, 95); L_LastSaved.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_LastSaved.Name = "L_LastSaved"; L_LastSaved.Size = new System.Drawing.Size(93, 23); @@ -285,7 +285,7 @@ namespace PKHeX.WinForms // CAL_LastSavedDate // CAL_LastSavedDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - CAL_LastSavedDate.Location = new System.Drawing.Point(104, 127); + CAL_LastSavedDate.Location = new System.Drawing.Point(104, 95); CAL_LastSavedDate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CAL_LastSavedDate.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); CAL_LastSavedDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); @@ -801,7 +801,7 @@ namespace PKHeX.WinForms // // L_Started // - L_Started.Location = new System.Drawing.Point(4, 40); + L_Started.Location = new System.Drawing.Point(4, 45); L_Started.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_Started.Name = "L_Started"; L_Started.Size = new System.Drawing.Size(93, 23); @@ -812,7 +812,7 @@ namespace PKHeX.WinForms // CAL_AdventureStartDate // CAL_AdventureStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - CAL_AdventureStartDate.Location = new System.Drawing.Point(104, 40); + CAL_AdventureStartDate.Location = new System.Drawing.Point(104, 45); CAL_AdventureStartDate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CAL_AdventureStartDate.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); CAL_AdventureStartDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); @@ -825,7 +825,7 @@ namespace PKHeX.WinForms // CAL_AdventureStartTime.CustomFormat = "HH:mm:ss"; CAL_AdventureStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - CAL_AdventureStartTime.Location = new System.Drawing.Point(134, 62); + CAL_AdventureStartTime.Location = new System.Drawing.Point(134, 67); CAL_AdventureStartTime.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CAL_AdventureStartTime.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); CAL_AdventureStartTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); @@ -839,7 +839,7 @@ namespace PKHeX.WinForms // CAL_LastSavedTime.CustomFormat = "HH:mm"; CAL_LastSavedTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - CAL_LastSavedTime.Location = new System.Drawing.Point(134, 149); + CAL_LastSavedTime.Location = new System.Drawing.Point(134, 117); CAL_LastSavedTime.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CAL_LastSavedTime.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); CAL_LastSavedTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.Designer.cs index 3bdf98152..037bb84a4 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.Designer.cs @@ -91,7 +91,10 @@ namespace PKHeX.WinForms L_SinglesC = new System.Windows.Forms.Label(); TC_Editor = new System.Windows.Forms.TabControl(); Tab_Overview = new System.Windows.Forms.TabPage(); + CAL_LastSavedDate = new System.Windows.Forms.DateTimePicker(); + L_LastSaved = new System.Windows.Forms.Label(); trainerID1 = new Controls.TrainerID(); + CAL_LastSavedTime = new System.Windows.Forms.DateTimePicker(); L_Started = new System.Windows.Forms.Label(); CAL_AdventureStartDate = new System.Windows.Forms.DateTimePicker(); MT_LP = new System.Windows.Forms.MaskedTextBox(); @@ -151,7 +154,7 @@ namespace PKHeX.WinForms // B_Cancel // B_Cancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; - B_Cancel.Location = new System.Drawing.Point(281, 274); + B_Cancel.Location = new System.Drawing.Point(281, 312); B_Cancel.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); B_Cancel.Name = "B_Cancel"; B_Cancel.Size = new System.Drawing.Size(100, 32); @@ -163,7 +166,7 @@ namespace PKHeX.WinForms // B_Save // B_Save.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; - B_Save.Location = new System.Drawing.Point(391, 274); + B_Save.Location = new System.Drawing.Point(391, 312); B_Save.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); B_Save.Name = "B_Save"; B_Save.Size = new System.Drawing.Size(100, 32); @@ -649,12 +652,15 @@ namespace PKHeX.WinForms TC_Editor.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); TC_Editor.Name = "TC_Editor"; TC_Editor.SelectedIndex = 0; - TC_Editor.Size = new System.Drawing.Size(496, 269); + TC_Editor.Size = new System.Drawing.Size(496, 307); TC_Editor.TabIndex = 54; // // Tab_Overview // + Tab_Overview.Controls.Add(CAL_LastSavedDate); + Tab_Overview.Controls.Add(L_LastSaved); Tab_Overview.Controls.Add(trainerID1); + Tab_Overview.Controls.Add(CAL_LastSavedTime); Tab_Overview.Controls.Add(L_Started); Tab_Overview.Controls.Add(CAL_AdventureStartDate); Tab_Overview.Controls.Add(MT_LP); @@ -679,11 +685,32 @@ namespace PKHeX.WinForms Tab_Overview.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); Tab_Overview.Name = "Tab_Overview"; Tab_Overview.Padding = new System.Windows.Forms.Padding(5, 4, 5, 4); - Tab_Overview.Size = new System.Drawing.Size(488, 241); + Tab_Overview.Size = new System.Drawing.Size(488, 279); Tab_Overview.TabIndex = 0; Tab_Overview.Text = "Overview"; Tab_Overview.UseVisualStyleBackColor = true; // + // CAL_LastSavedDate + // + CAL_LastSavedDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; + CAL_LastSavedDate.Location = new System.Drawing.Point(170, 232); + CAL_LastSavedDate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CAL_LastSavedDate.MaxDate = new System.DateTime(4095, 12, 31, 0, 0, 0, 0); + CAL_LastSavedDate.Name = "CAL_LastSavedDate"; + CAL_LastSavedDate.Size = new System.Drawing.Size(120, 23); + CAL_LastSavedDate.TabIndex = 55; + CAL_LastSavedDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + // + // L_LastSaved + // + L_LastSaved.Location = new System.Drawing.Point(75, 232); + L_LastSaved.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + L_LastSaved.Name = "L_LastSaved"; + L_LastSaved.Size = new System.Drawing.Size(93, 23); + L_LastSaved.TabIndex = 56; + L_LastSaved.Text = "Last Saved:"; + L_LastSaved.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // trainerID1 // trainerID1.Location = new System.Drawing.Point(130, 40); @@ -692,6 +719,20 @@ namespace PKHeX.WinForms trainerID1.Size = new System.Drawing.Size(246, 23); trainerID1.TabIndex = 66; // + // CAL_LastSavedTime + // + CAL_LastSavedTime.CustomFormat = "HH:mm:ss"; + CAL_LastSavedTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + CAL_LastSavedTime.Location = new System.Drawing.Point(205, 254); + CAL_LastSavedTime.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CAL_LastSavedTime.MaxDate = new System.DateTime(2060, 12, 31, 0, 0, 0, 0); + CAL_LastSavedTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + CAL_LastSavedTime.Name = "CAL_LastSavedTime"; + CAL_LastSavedTime.ShowUpDown = true; + CAL_LastSavedTime.Size = new System.Drawing.Size(84, 23); + CAL_LastSavedTime.TabIndex = 57; + CAL_LastSavedTime.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + // // L_Started // L_Started.Location = new System.Drawing.Point(46, 206); @@ -756,7 +797,7 @@ namespace PKHeX.WinForms Tab_MiscValues.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); Tab_MiscValues.Name = "Tab_MiscValues"; Tab_MiscValues.Padding = new System.Windows.Forms.Padding(5, 4, 5, 4); - Tab_MiscValues.Size = new System.Drawing.Size(488, 241); + Tab_MiscValues.Size = new System.Drawing.Size(488, 279); Tab_MiscValues.TabIndex = 4; Tab_MiscValues.Text = "Misc"; Tab_MiscValues.UseVisualStyleBackColor = true; @@ -937,7 +978,7 @@ namespace PKHeX.WinForms Tab_Images.Controls.Add(P_CurrPhoto); Tab_Images.Location = new System.Drawing.Point(4, 24); Tab_Images.Name = "Tab_Images"; - Tab_Images.Size = new System.Drawing.Size(488, 241); + Tab_Images.Size = new System.Drawing.Size(488, 279); Tab_Images.TabIndex = 5; Tab_Images.Text = "Images"; Tab_Images.UseVisualStyleBackColor = true; @@ -989,7 +1030,7 @@ namespace PKHeX.WinForms Tab_Blueberry.Location = new System.Drawing.Point(4, 24); Tab_Blueberry.Name = "Tab_Blueberry"; Tab_Blueberry.Padding = new System.Windows.Forms.Padding(3); - Tab_Blueberry.Size = new System.Drawing.Size(488, 241); + Tab_Blueberry.Size = new System.Drawing.Size(488, 279); Tab_Blueberry.TabIndex = 6; Tab_Blueberry.Text = "Blueberry"; Tab_Blueberry.UseVisualStyleBackColor = true; @@ -1128,7 +1169,7 @@ namespace PKHeX.WinForms // SAV_Trainer9 // AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; - ClientSize = new System.Drawing.Size(496, 315); + ClientSize = new System.Drawing.Size(496, 353); Controls.Add(TC_Editor); Controls.Add(B_Save); Controls.Add(B_Cancel); @@ -1266,5 +1307,8 @@ namespace PKHeX.WinForms private System.Windows.Forms.ComboBox CB_ThrowStyle; private System.Windows.Forms.Label L_ThrowStyle; private System.Windows.Forms.GroupBox GB_BBQ; + private System.Windows.Forms.DateTimePicker CAL_LastSavedDate; + private System.Windows.Forms.Label L_LastSaved; + private System.Windows.Forms.DateTimePicker CAL_LastSavedTime; } } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.cs index 1481e888c..0ce6e39c4 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.cs @@ -122,6 +122,7 @@ public partial class SAV_Trainer9 : Form MT_Seconds.Text = SAV.PlayedSeconds.ToString(); CAL_AdventureStartDate.Value = SAV.EnrollmentDate.Timestamp; + CAL_LastSavedDate.Value = CAL_LastSavedTime.Value = SAV.LastSaved.Timestamp; } private void Save() @@ -166,6 +167,7 @@ public partial class SAV_Trainer9 : Form SAV.PlayedSeconds = ushort.Parse(MT_Seconds.Text) % 60; SAV.EnrollmentDate.Timestamp = CAL_AdventureStartDate.Value; + SAV.LastSaved.Timestamp = CAL_LastSavedDate.Value.Date.AddSeconds(CAL_LastSavedTime.Value.TimeOfDay.TotalSeconds); if (SAV.Blocks.TryGetBlock(KBlueberryPoints, out var block)) block.SetValue(Util.ToUInt32(MT_BP.Text));