From bb363a7a3d0b6887c5342ccbef5cc18fce4e74cd Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 12 Mar 2026 01:29:58 -0500 Subject: [PATCH] Re-flow Stat editor for alignment/showing all text Some languages have localized these labels to long strings; previously they were truncated (probably frustrating); now, they all show (wrapped text is the best I can do -- better than truncating?) --- .../Controls/PKM Editor/PKMEditor.Designer.cs | 10 +- .../PKM Editor/StatEditor.Designer.cs | 1637 ++++++++--------- .../Controls/PKM Editor/StatEditor.cs | 123 +- .../Controls/SAV Editor/SAVEditor.Designer.cs | 12 +- PKHeX.WinForms/MainWindow/Main.Designer.cs | 10 +- 5 files changed, 838 insertions(+), 954 deletions(-) diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs index 3cabd7389..597cb205d 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs @@ -2015,7 +2015,7 @@ private void InitializeComponent() MC_Move1.Name = "MC_Move1"; MC_Move1.PP = 0; MC_Move1.PPUps = 0; - MC_Move1.SelectedMove = (ushort)0; + MC_Move1.SelectedMove = 0; MC_Move1.Size = new System.Drawing.Size(246, 27); MC_Move1.TabIndex = 1; // @@ -2029,7 +2029,7 @@ private void InitializeComponent() MC_Move2.Name = "MC_Move2"; MC_Move2.PP = 0; MC_Move2.PPUps = 0; - MC_Move2.SelectedMove = (ushort)0; + MC_Move2.SelectedMove = 0; MC_Move2.Size = new System.Drawing.Size(246, 27); MC_Move2.TabIndex = 2; // @@ -2043,7 +2043,7 @@ private void InitializeComponent() MC_Move3.Name = "MC_Move3"; MC_Move3.PP = 0; MC_Move3.PPUps = 0; - MC_Move3.SelectedMove = (ushort)0; + MC_Move3.SelectedMove = 0; MC_Move3.Size = new System.Drawing.Size(246, 27); MC_Move3.TabIndex = 3; // @@ -2057,7 +2057,7 @@ private void InitializeComponent() MC_Move4.Name = "MC_Move4"; MC_Move4.PP = 0; MC_Move4.PPUps = 0; - MC_Move4.SelectedMove = (ushort)0; + MC_Move4.SelectedMove = 0; MC_Move4.Size = new System.Drawing.Size(246, 27); MC_Move4.TabIndex = 4; // @@ -3307,7 +3307,7 @@ private void InitializeComponent() // // StatusView // - StatusView.Location = new System.Drawing.Point(2, 303); + StatusView.Location = new System.Drawing.Point(2, 322); StatusView.Margin = new System.Windows.Forms.Padding(0); StatusView.Name = "StatusView"; StatusView.Size = new System.Drawing.Size(64, 64); diff --git a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.Designer.cs index 4019b11ec..ea5c4a72e 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.Designer.cs @@ -29,79 +29,63 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { FLP_Stats = new System.Windows.Forms.FlowLayoutPanel(); - FLP_StatHeader = new System.Windows.Forms.FlowLayoutPanel(); - FLP_HackedStats = new System.Windows.Forms.FlowLayoutPanel(); + TLP_StatGrid = new System.Windows.Forms.TableLayoutPanel(); CHK_HackedStats = new System.Windows.Forms.CheckBox(); - FLP_StatsHeaderRight = new System.Windows.Forms.FlowLayoutPanel(); Label_Base = new System.Windows.Forms.Label(); Label_IVs = new System.Windows.Forms.Label(); Label_EVs = new System.Windows.Forms.Label(); Label_AVs = new System.Windows.Forms.Label(); Label_GVs = new System.Windows.Forms.Label(); Label_Stats = new System.Windows.Forms.Label(); - FLP_HP = new System.Windows.Forms.FlowLayoutPanel(); - Label_HP = new System.Windows.Forms.Label(); - FLP_HPRight = new System.Windows.Forms.FlowLayoutPanel(); - TB_BaseHP = new System.Windows.Forms.MaskedTextBox(); - TB_IVHP = new System.Windows.Forms.MaskedTextBox(); - TB_EVHP = new System.Windows.Forms.MaskedTextBox(); - TB_AVHP = new System.Windows.Forms.MaskedTextBox(); - TB_GVHP = new System.Windows.Forms.MaskedTextBox(); - Stat_HP = new System.Windows.Forms.MaskedTextBox(); - FLP_Atk = new System.Windows.Forms.FlowLayoutPanel(); - Label_ATK = new System.Windows.Forms.Label(); - FLP_AtkRight = new System.Windows.Forms.FlowLayoutPanel(); - TB_BaseATK = new System.Windows.Forms.MaskedTextBox(); - TB_IVATK = new System.Windows.Forms.MaskedTextBox(); - TB_EVATK = new System.Windows.Forms.MaskedTextBox(); - TB_AVATK = new System.Windows.Forms.MaskedTextBox(); - TB_GVATK = new System.Windows.Forms.MaskedTextBox(); - Stat_ATK = new System.Windows.Forms.MaskedTextBox(); - FLP_Def = new System.Windows.Forms.FlowLayoutPanel(); - Label_DEF = new System.Windows.Forms.Label(); - FLP_DefRight = new System.Windows.Forms.FlowLayoutPanel(); - TB_BaseDEF = new System.Windows.Forms.MaskedTextBox(); - TB_IVDEF = new System.Windows.Forms.MaskedTextBox(); - TB_EVDEF = new System.Windows.Forms.MaskedTextBox(); - TB_AVDEF = new System.Windows.Forms.MaskedTextBox(); - TB_GVDEF = new System.Windows.Forms.MaskedTextBox(); - Stat_DEF = new System.Windows.Forms.MaskedTextBox(); - FLP_SpA = new System.Windows.Forms.FlowLayoutPanel(); - FLP_SpALeft = new System.Windows.Forms.FlowLayoutPanel(); - Label_SPA = new System.Windows.Forms.Label(); + FLP_SPA = new System.Windows.Forms.FlowLayoutPanel(); Label_SPC = new System.Windows.Forms.Label(); - FLP_SpARight = new System.Windows.Forms.FlowLayoutPanel(); - TB_BaseSPA = new System.Windows.Forms.MaskedTextBox(); - TB_IVSPA = new System.Windows.Forms.MaskedTextBox(); - TB_EVSPA = new System.Windows.Forms.MaskedTextBox(); - TB_AVSPA = new System.Windows.Forms.MaskedTextBox(); - TB_GVSPA = new System.Windows.Forms.MaskedTextBox(); - Stat_SPA = new System.Windows.Forms.MaskedTextBox(); - FLP_SpD = new System.Windows.Forms.FlowLayoutPanel(); + Label_SPA = new System.Windows.Forms.Label(); + Label_HP = new System.Windows.Forms.Label(); + Label_ATK = new System.Windows.Forms.Label(); + Label_DEF = new System.Windows.Forms.Label(); Label_SPD = new System.Windows.Forms.Label(); - FLP_SpDRight = new System.Windows.Forms.FlowLayoutPanel(); - TB_BaseSPD = new System.Windows.Forms.MaskedTextBox(); - TB_IVSPD = new System.Windows.Forms.MaskedTextBox(); - TB_EVSPD = new System.Windows.Forms.MaskedTextBox(); - TB_AVSPD = new System.Windows.Forms.MaskedTextBox(); - TB_GVSPD = new System.Windows.Forms.MaskedTextBox(); - Stat_SPD = new System.Windows.Forms.MaskedTextBox(); - FLP_Spe = new System.Windows.Forms.FlowLayoutPanel(); Label_SPE = new System.Windows.Forms.Label(); - FLP_SpeRight = new System.Windows.Forms.FlowLayoutPanel(); - TB_BaseSPE = new System.Windows.Forms.MaskedTextBox(); - TB_IVSPE = new System.Windows.Forms.MaskedTextBox(); - TB_EVSPE = new System.Windows.Forms.MaskedTextBox(); - TB_AVSPE = new System.Windows.Forms.MaskedTextBox(); - TB_GVSPE = new System.Windows.Forms.MaskedTextBox(); - Stat_SPE = new System.Windows.Forms.MaskedTextBox(); - FLP_StatsTotal = new System.Windows.Forms.FlowLayoutPanel(); Label_Total = new System.Windows.Forms.Label(); - FLP_StatsTotalRight = new System.Windows.Forms.FlowLayoutPanel(); + TB_BaseHP = new System.Windows.Forms.MaskedTextBox(); + TB_BaseATK = new System.Windows.Forms.MaskedTextBox(); + TB_BaseDEF = new System.Windows.Forms.MaskedTextBox(); + TB_BaseSPA = new System.Windows.Forms.MaskedTextBox(); + TB_BaseSPD = new System.Windows.Forms.MaskedTextBox(); + TB_BaseSPE = new System.Windows.Forms.MaskedTextBox(); TB_BST = new System.Windows.Forms.TextBox(); + TB_IVHP = new System.Windows.Forms.MaskedTextBox(); + TB_IVATK = new System.Windows.Forms.MaskedTextBox(); + TB_IVDEF = new System.Windows.Forms.MaskedTextBox(); + TB_IVSPA = new System.Windows.Forms.MaskedTextBox(); + TB_IVSPD = new System.Windows.Forms.MaskedTextBox(); + TB_IVSPE = new System.Windows.Forms.MaskedTextBox(); TB_IVTotal = new System.Windows.Forms.TextBox(); + TB_EVHP = new System.Windows.Forms.MaskedTextBox(); + TB_EVATK = new System.Windows.Forms.MaskedTextBox(); + TB_EVDEF = new System.Windows.Forms.MaskedTextBox(); + TB_EVSPA = new System.Windows.Forms.MaskedTextBox(); + TB_EVSPD = new System.Windows.Forms.MaskedTextBox(); + TB_EVSPE = new System.Windows.Forms.MaskedTextBox(); TB_EVTotal = new System.Windows.Forms.TextBox(); + TB_AVHP = new System.Windows.Forms.MaskedTextBox(); + TB_AVATK = new System.Windows.Forms.MaskedTextBox(); + TB_AVDEF = new System.Windows.Forms.MaskedTextBox(); + TB_AVSPA = new System.Windows.Forms.MaskedTextBox(); + TB_AVSPD = new System.Windows.Forms.MaskedTextBox(); + TB_AVSPE = new System.Windows.Forms.MaskedTextBox(); TB_AVTotal = new System.Windows.Forms.TextBox(); + TB_GVHP = new System.Windows.Forms.MaskedTextBox(); + TB_GVATK = new System.Windows.Forms.MaskedTextBox(); + TB_GVDEF = new System.Windows.Forms.MaskedTextBox(); + TB_GVSPA = new System.Windows.Forms.MaskedTextBox(); + TB_GVSPD = new System.Windows.Forms.MaskedTextBox(); + TB_GVSPE = new System.Windows.Forms.MaskedTextBox(); + Stat_HP = new System.Windows.Forms.MaskedTextBox(); + Stat_ATK = new System.Windows.Forms.MaskedTextBox(); + Stat_DEF = new System.Windows.Forms.MaskedTextBox(); + Stat_SPA = new System.Windows.Forms.MaskedTextBox(); + Stat_SPD = new System.Windows.Forms.MaskedTextBox(); + Stat_SPE = new System.Windows.Forms.MaskedTextBox(); L_Potential = new System.Windows.Forms.Label(); FLP_HPType = new System.Windows.Forms.FlowLayoutPanel(); Label_HiddenPowerPrefix = new System.Windows.Forms.Label(); @@ -133,24 +117,8 @@ private void InitializeComponent() CHK_IsAlpha = new System.Windows.Forms.CheckBox(); CHK_IsNoble = new System.Windows.Forms.CheckBox(); FLP_Stats.SuspendLayout(); - FLP_StatHeader.SuspendLayout(); - FLP_HackedStats.SuspendLayout(); - FLP_StatsHeaderRight.SuspendLayout(); - FLP_HP.SuspendLayout(); - FLP_HPRight.SuspendLayout(); - FLP_Atk.SuspendLayout(); - FLP_AtkRight.SuspendLayout(); - FLP_Def.SuspendLayout(); - FLP_DefRight.SuspendLayout(); - FLP_SpA.SuspendLayout(); - FLP_SpALeft.SuspendLayout(); - FLP_SpARight.SuspendLayout(); - FLP_SpD.SuspendLayout(); - FLP_SpDRight.SuspendLayout(); - FLP_Spe.SuspendLayout(); - FLP_SpeRight.SuspendLayout(); - FLP_StatsTotal.SuspendLayout(); - FLP_StatsTotalRight.SuspendLayout(); + TLP_StatGrid.SuspendLayout(); + FLP_SPA.SuspendLayout(); FLP_HPType.SuspendLayout(); FLP_Characteristic.SuspendLayout(); FLP_TeraType.SuspendLayout(); @@ -167,14 +135,7 @@ private void InitializeComponent() // // FLP_Stats // - FLP_Stats.Controls.Add(FLP_StatHeader); - FLP_Stats.Controls.Add(FLP_HP); - FLP_Stats.Controls.Add(FLP_Atk); - FLP_Stats.Controls.Add(FLP_Def); - FLP_Stats.Controls.Add(FLP_SpA); - FLP_Stats.Controls.Add(FLP_SpD); - FLP_Stats.Controls.Add(FLP_Spe); - FLP_Stats.Controls.Add(FLP_StatsTotal); + FLP_Stats.Controls.Add(TLP_StatGrid); FLP_Stats.Controls.Add(FLP_HPType); FLP_Stats.Controls.Add(FLP_Characteristic); FLP_Stats.Controls.Add(FLP_TeraType); @@ -183,170 +144,295 @@ private void InitializeComponent() FLP_Stats.Controls.Add(FLP_AlphaNoble); FLP_Stats.Dock = System.Windows.Forms.DockStyle.Fill; FLP_Stats.Location = new System.Drawing.Point(0, 0); + FLP_Stats.Margin = new System.Windows.Forms.Padding(0); FLP_Stats.Name = "FLP_Stats"; FLP_Stats.Size = new System.Drawing.Size(320, 452); FLP_Stats.TabIndex = 106; // - // FLP_StatHeader + // TLP_StatGrid // - FLP_StatHeader.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_StatHeader.AutoSize = true; - FLP_StatHeader.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_StatHeader.Controls.Add(FLP_HackedStats); - FLP_StatHeader.Controls.Add(FLP_StatsHeaderRight); - FLP_StatHeader.Location = new System.Drawing.Point(0, 0); - FLP_StatHeader.Margin = new System.Windows.Forms.Padding(0); - FLP_StatHeader.Name = "FLP_StatHeader"; - FLP_StatHeader.Size = new System.Drawing.Size(304, 24); - FLP_StatHeader.TabIndex = 122; - // - // FLP_HackedStats - // - FLP_HackedStats.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_HackedStats.Controls.Add(CHK_HackedStats); - FLP_HackedStats.Location = new System.Drawing.Point(0, 0); - FLP_HackedStats.Margin = new System.Windows.Forms.Padding(0); - FLP_HackedStats.Name = "FLP_HackedStats"; - FLP_HackedStats.Size = new System.Drawing.Size(72, 24); - FLP_HackedStats.TabIndex = 122; + TLP_StatGrid.AutoSize = true; + TLP_StatGrid.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + TLP_StatGrid.ColumnCount = 7; + TLP_StatGrid.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + TLP_StatGrid.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + TLP_StatGrid.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + TLP_StatGrid.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + TLP_StatGrid.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + TLP_StatGrid.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + TLP_StatGrid.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + TLP_StatGrid.Controls.Add(CHK_HackedStats, 0, 0); + TLP_StatGrid.Controls.Add(Label_Base, 1, 0); + TLP_StatGrid.Controls.Add(Label_IVs, 2, 0); + TLP_StatGrid.Controls.Add(Label_EVs, 3, 0); + TLP_StatGrid.Controls.Add(Label_AVs, 4, 0); + TLP_StatGrid.Controls.Add(Label_GVs, 5, 0); + TLP_StatGrid.Controls.Add(Label_Stats, 6, 0); + TLP_StatGrid.Controls.Add(FLP_SPA, 0, 4); + TLP_StatGrid.Controls.Add(Label_HP, 0, 1); + TLP_StatGrid.Controls.Add(Label_ATK, 0, 2); + TLP_StatGrid.Controls.Add(Label_DEF, 0, 3); + TLP_StatGrid.Controls.Add(Label_SPD, 0, 5); + TLP_StatGrid.Controls.Add(Label_SPE, 0, 6); + TLP_StatGrid.Controls.Add(Label_Total, 0, 7); + TLP_StatGrid.Controls.Add(TB_BaseHP, 1, 1); + TLP_StatGrid.Controls.Add(TB_BaseATK, 1, 2); + TLP_StatGrid.Controls.Add(TB_BaseDEF, 1, 3); + TLP_StatGrid.Controls.Add(TB_BaseSPA, 1, 4); + TLP_StatGrid.Controls.Add(TB_BaseSPD, 1, 5); + TLP_StatGrid.Controls.Add(TB_BaseSPE, 1, 6); + TLP_StatGrid.Controls.Add(TB_BST, 1, 7); + TLP_StatGrid.Controls.Add(TB_IVHP, 2, 1); + TLP_StatGrid.Controls.Add(TB_IVATK, 2, 2); + TLP_StatGrid.Controls.Add(TB_IVDEF, 2, 3); + TLP_StatGrid.Controls.Add(TB_IVSPA, 2, 4); + TLP_StatGrid.Controls.Add(TB_IVSPD, 2, 5); + TLP_StatGrid.Controls.Add(TB_IVSPE, 2, 6); + TLP_StatGrid.Controls.Add(TB_IVTotal, 2, 7); + TLP_StatGrid.Controls.Add(TB_EVHP, 3, 1); + TLP_StatGrid.Controls.Add(TB_EVATK, 3, 2); + TLP_StatGrid.Controls.Add(TB_EVDEF, 3, 3); + TLP_StatGrid.Controls.Add(TB_EVSPA, 3, 4); + TLP_StatGrid.Controls.Add(TB_EVSPD, 3, 5); + TLP_StatGrid.Controls.Add(TB_EVSPE, 3, 6); + TLP_StatGrid.Controls.Add(TB_EVTotal, 3, 7); + TLP_StatGrid.Controls.Add(TB_AVHP, 4, 1); + TLP_StatGrid.Controls.Add(TB_AVATK, 4, 2); + TLP_StatGrid.Controls.Add(TB_AVDEF, 4, 3); + TLP_StatGrid.Controls.Add(TB_AVSPA, 4, 4); + TLP_StatGrid.Controls.Add(TB_AVSPD, 4, 5); + TLP_StatGrid.Controls.Add(TB_AVSPE, 4, 6); + TLP_StatGrid.Controls.Add(TB_AVTotal, 4, 7); + TLP_StatGrid.Controls.Add(TB_GVHP, 5, 1); + TLP_StatGrid.Controls.Add(TB_GVATK, 5, 2); + TLP_StatGrid.Controls.Add(TB_GVDEF, 5, 3); + TLP_StatGrid.Controls.Add(TB_GVSPA, 5, 4); + TLP_StatGrid.Controls.Add(TB_GVSPD, 5, 5); + TLP_StatGrid.Controls.Add(TB_GVSPE, 5, 6); + TLP_StatGrid.Controls.Add(Stat_HP, 6, 1); + TLP_StatGrid.Controls.Add(Stat_ATK, 6, 2); + TLP_StatGrid.Controls.Add(Stat_DEF, 6, 3); + TLP_StatGrid.Controls.Add(Stat_SPA, 6, 4); + TLP_StatGrid.Controls.Add(Stat_SPD, 6, 5); + TLP_StatGrid.Controls.Add(Stat_SPE, 6, 6); + TLP_StatGrid.Controls.Add(L_Potential, 6, 7); + TLP_StatGrid.Location = new System.Drawing.Point(0, 0); + TLP_StatGrid.Margin = new System.Windows.Forms.Padding(0); + TLP_StatGrid.Name = "TLP_StatGrid"; + TLP_StatGrid.RowCount = 8; + TLP_StatGrid.RowStyles.Add(new System.Windows.Forms.RowStyle()); + TLP_StatGrid.RowStyles.Add(new System.Windows.Forms.RowStyle()); + TLP_StatGrid.RowStyles.Add(new System.Windows.Forms.RowStyle()); + TLP_StatGrid.RowStyles.Add(new System.Windows.Forms.RowStyle()); + TLP_StatGrid.RowStyles.Add(new System.Windows.Forms.RowStyle()); + TLP_StatGrid.RowStyles.Add(new System.Windows.Forms.RowStyle()); + TLP_StatGrid.RowStyles.Add(new System.Windows.Forms.RowStyle()); + TLP_StatGrid.RowStyles.Add(new System.Windows.Forms.RowStyle()); + TLP_StatGrid.Size = new System.Drawing.Size(308, 206); + TLP_StatGrid.TabIndex = 0; // // CHK_HackedStats // + CHK_HackedStats.Dock = System.Windows.Forms.DockStyle.Fill; CHK_HackedStats.Enabled = false; CHK_HackedStats.Location = new System.Drawing.Point(0, 0); CHK_HackedStats.Margin = new System.Windows.Forms.Padding(0); CHK_HackedStats.Name = "CHK_HackedStats"; - CHK_HackedStats.Size = new System.Drawing.Size(72, 24); + CHK_HackedStats.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); + CHK_HackedStats.Size = new System.Drawing.Size(80, 24); CHK_HackedStats.TabIndex = 0; CHK_HackedStats.Text = "Hacked"; CHK_HackedStats.UseVisualStyleBackColor = true; CHK_HackedStats.Visible = false; CHK_HackedStats.CheckedChanged += UpdateHackedStats; // - // FLP_StatsHeaderRight - // - FLP_StatsHeaderRight.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_StatsHeaderRight.AutoSize = true; - FLP_StatsHeaderRight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_StatsHeaderRight.Controls.Add(Label_Base); - FLP_StatsHeaderRight.Controls.Add(Label_IVs); - FLP_StatsHeaderRight.Controls.Add(Label_EVs); - FLP_StatsHeaderRight.Controls.Add(Label_AVs); - FLP_StatsHeaderRight.Controls.Add(Label_GVs); - FLP_StatsHeaderRight.Controls.Add(Label_Stats); - FLP_StatsHeaderRight.Location = new System.Drawing.Point(72, 0); - FLP_StatsHeaderRight.Margin = new System.Windows.Forms.Padding(0); - FLP_StatsHeaderRight.Name = "FLP_StatsHeaderRight"; - FLP_StatsHeaderRight.Size = new System.Drawing.Size(232, 24); - FLP_StatsHeaderRight.TabIndex = 123; - // // Label_Base // - Label_Base.Location = new System.Drawing.Point(0, 0); + Label_Base.Anchor = System.Windows.Forms.AnchorStyles.None; + Label_Base.AutoSize = true; + Label_Base.Location = new System.Drawing.Point(82, 3); Label_Base.Margin = new System.Windows.Forms.Padding(0); Label_Base.Name = "Label_Base"; - Label_Base.Size = new System.Drawing.Size(48, 24); + Label_Base.Size = new System.Drawing.Size(35, 17); Label_Base.TabIndex = 30; Label_Base.Text = "Base"; Label_Base.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Label_IVs // - Label_IVs.Location = new System.Drawing.Point(48, 0); + Label_IVs.Anchor = System.Windows.Forms.AnchorStyles.None; + Label_IVs.AutoSize = true; + Label_IVs.Location = new System.Drawing.Point(123, 3); Label_IVs.Margin = new System.Windows.Forms.Padding(0); Label_IVs.Name = "Label_IVs"; - Label_IVs.Size = new System.Drawing.Size(32, 24); + Label_IVs.Size = new System.Drawing.Size(25, 17); Label_IVs.TabIndex = 29; Label_IVs.Text = "IVs"; Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Label_EVs // - Label_EVs.Location = new System.Drawing.Point(80, 0); + Label_EVs.Anchor = System.Windows.Forms.AnchorStyles.None; + Label_EVs.AutoSize = true; + Label_EVs.Location = new System.Drawing.Point(157, 3); Label_EVs.Margin = new System.Windows.Forms.Padding(0); Label_EVs.Name = "Label_EVs"; - Label_EVs.Size = new System.Drawing.Size(40, 24); + Label_EVs.Size = new System.Drawing.Size(29, 17); Label_EVs.TabIndex = 27; Label_EVs.Text = "EVs"; Label_EVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Label_AVs // - Label_AVs.Location = new System.Drawing.Point(120, 0); + Label_AVs.Anchor = System.Windows.Forms.AnchorStyles.None; + Label_AVs.AutoSize = true; + Label_AVs.Location = new System.Drawing.Point(197, 3); Label_AVs.Margin = new System.Windows.Forms.Padding(0); Label_AVs.Name = "Label_AVs"; - Label_AVs.Size = new System.Drawing.Size(40, 24); + Label_AVs.Size = new System.Drawing.Size(29, 17); Label_AVs.TabIndex = 31; Label_AVs.Text = "AVs"; Label_AVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Label_GVs // - Label_GVs.Location = new System.Drawing.Point(160, 0); + Label_GVs.Anchor = System.Windows.Forms.AnchorStyles.None; + Label_GVs.AutoSize = true; + Label_GVs.Location = new System.Drawing.Point(232, 3); Label_GVs.Margin = new System.Windows.Forms.Padding(0); Label_GVs.Name = "Label_GVs"; - Label_GVs.Size = new System.Drawing.Size(32, 24); + Label_GVs.Size = new System.Drawing.Size(31, 17); Label_GVs.TabIndex = 32; Label_GVs.Text = "GVs"; Label_GVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Label_Stats // - Label_Stats.Location = new System.Drawing.Point(192, 0); + Label_Stats.Anchor = System.Windows.Forms.AnchorStyles.Left; + Label_Stats.AutoSize = true; + Label_Stats.Location = new System.Drawing.Point(264, 3); Label_Stats.Margin = new System.Windows.Forms.Padding(0); Label_Stats.Name = "Label_Stats"; - Label_Stats.Size = new System.Drawing.Size(40, 24); + Label_Stats.Padding = new System.Windows.Forms.Padding(6, 0, 0, 0); + Label_Stats.Size = new System.Drawing.Size(42, 17); Label_Stats.TabIndex = 28; Label_Stats.Text = "Stats"; - Label_Stats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + Label_Stats.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // FLP_HP + // FLP_SPA // - FLP_HP.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_HP.AutoSize = true; - FLP_HP.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_HP.Controls.Add(Label_HP); - FLP_HP.Controls.Add(FLP_HPRight); - FLP_HP.Location = new System.Drawing.Point(0, 24); - FLP_HP.Margin = new System.Windows.Forms.Padding(0); - FLP_HP.Name = "FLP_HP"; - FLP_HP.Size = new System.Drawing.Size(308, 26); - FLP_HP.TabIndex = 1; + FLP_SPA.Anchor = System.Windows.Forms.AnchorStyles.Right; + FLP_SPA.AutoSize = true; + FLP_SPA.Controls.Add(Label_SPC); + FLP_SPA.Controls.Add(Label_SPA); + FLP_SPA.Location = new System.Drawing.Point(12, 106); + FLP_SPA.Margin = new System.Windows.Forms.Padding(0); + FLP_SPA.Name = "FLP_SPA"; + FLP_SPA.Size = new System.Drawing.Size(68, 17); + FLP_SPA.TabIndex = 22; + // + // Label_SPC + // + Label_SPC.Anchor = System.Windows.Forms.AnchorStyles.Right; + Label_SPC.AutoSize = true; + Label_SPC.Location = new System.Drawing.Point(0, 0); + Label_SPC.Margin = new System.Windows.Forms.Padding(0); + Label_SPC.Name = "Label_SPC"; + Label_SPC.Size = new System.Drawing.Size(34, 17); + Label_SPC.TabIndex = 125; + Label_SPC.Text = "SpC:"; + Label_SPC.Visible = false; + Label_SPC.MouseDown += ClickStatLabel; + // + // Label_SPA + // + Label_SPA.Anchor = System.Windows.Forms.AnchorStyles.Right; + Label_SPA.AutoSize = true; + Label_SPA.Location = new System.Drawing.Point(34, 0); + Label_SPA.Margin = new System.Windows.Forms.Padding(0); + Label_SPA.Name = "Label_SPA"; + Label_SPA.Size = new System.Drawing.Size(34, 17); + Label_SPA.TabIndex = 22; + Label_SPA.Text = "SpA:"; + Label_SPA.MouseDown += ClickStatLabel; // // Label_HP // - Label_HP.Location = new System.Drawing.Point(0, 0); + Label_HP.Anchor = System.Windows.Forms.AnchorStyles.Right; + Label_HP.AutoSize = true; + Label_HP.Location = new System.Drawing.Point(53, 28); Label_HP.Margin = new System.Windows.Forms.Padding(0); Label_HP.Name = "Label_HP"; - Label_HP.Size = new System.Drawing.Size(80, 24); - Label_HP.TabIndex = 19; + Label_HP.Size = new System.Drawing.Size(27, 17); + Label_HP.TabIndex = 33; Label_HP.Text = "HP:"; - Label_HP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - Label_HP.MouseDown += ClickStatLabel; // - // FLP_HPRight + // Label_ATK // - FLP_HPRight.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_HPRight.AutoSize = true; - FLP_HPRight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_HPRight.Controls.Add(TB_BaseHP); - FLP_HPRight.Controls.Add(TB_IVHP); - FLP_HPRight.Controls.Add(TB_EVHP); - FLP_HPRight.Controls.Add(TB_AVHP); - FLP_HPRight.Controls.Add(TB_GVHP); - FLP_HPRight.Controls.Add(Stat_HP); - FLP_HPRight.Location = new System.Drawing.Point(80, 0); - FLP_HPRight.Margin = new System.Windows.Forms.Padding(0); - FLP_HPRight.Name = "FLP_HPRight"; - FLP_HPRight.Size = new System.Drawing.Size(228, 26); - FLP_HPRight.TabIndex = 1; + Label_ATK.Anchor = System.Windows.Forms.AnchorStyles.Right; + Label_ATK.AutoSize = true; + Label_ATK.Location = new System.Drawing.Point(51, 54); + Label_ATK.Margin = new System.Windows.Forms.Padding(0); + Label_ATK.Name = "Label_ATK"; + Label_ATK.Size = new System.Drawing.Size(29, 17); + Label_ATK.TabIndex = 20; + Label_ATK.Text = "Atk:"; + Label_ATK.MouseDown += ClickStatLabel; + // + // Label_DEF + // + Label_DEF.Anchor = System.Windows.Forms.AnchorStyles.Right; + Label_DEF.AutoSize = true; + Label_DEF.Location = new System.Drawing.Point(49, 80); + Label_DEF.Margin = new System.Windows.Forms.Padding(0); + Label_DEF.Name = "Label_DEF"; + Label_DEF.Size = new System.Drawing.Size(31, 17); + Label_DEF.TabIndex = 21; + Label_DEF.Text = "Def:"; + Label_DEF.MouseDown += ClickStatLabel; + // + // Label_SPD + // + Label_SPD.Anchor = System.Windows.Forms.AnchorStyles.Right; + Label_SPD.AutoSize = true; + Label_SPD.Location = new System.Drawing.Point(45, 132); + Label_SPD.Margin = new System.Windows.Forms.Padding(0); + Label_SPD.Name = "Label_SPD"; + Label_SPD.Size = new System.Drawing.Size(35, 17); + Label_SPD.TabIndex = 23; + Label_SPD.Text = "SpD:"; + Label_SPD.MouseDown += ClickStatLabel; + // + // Label_SPE + // + Label_SPE.Anchor = System.Windows.Forms.AnchorStyles.Right; + Label_SPE.AutoSize = true; + Label_SPE.Location = new System.Drawing.Point(47, 158); + Label_SPE.Margin = new System.Windows.Forms.Padding(0); + Label_SPE.Name = "Label_SPE"; + Label_SPE.Size = new System.Drawing.Size(33, 17); + Label_SPE.TabIndex = 24; + Label_SPE.Text = "Spe:"; + Label_SPE.MouseDown += ClickStatLabel; + // + // Label_Total + // + Label_Total.Anchor = System.Windows.Forms.AnchorStyles.Right; + Label_Total.AutoSize = true; + Label_Total.Location = new System.Drawing.Point(41, 184); + Label_Total.Margin = new System.Windows.Forms.Padding(0); + Label_Total.Name = "Label_Total"; + Label_Total.Size = new System.Drawing.Size(39, 17); + Label_Total.TabIndex = 25; + Label_Total.Text = "Total:"; // // TB_BaseHP // + TB_BaseHP.Anchor = System.Windows.Forms.AnchorStyles.None; TB_BaseHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; TB_BaseHP.Enabled = false; - TB_BaseHP.Location = new System.Drawing.Point(0, 0); - TB_BaseHP.Margin = new System.Windows.Forms.Padding(0, 0, 8, 1); + TB_BaseHP.Location = new System.Drawing.Point(84, 24); + TB_BaseHP.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); TB_BaseHP.Mask = "000"; TB_BaseHP.Name = "TB_BaseHP"; TB_BaseHP.PromptChar = ' '; @@ -356,119 +442,13 @@ private void InitializeComponent() TB_BaseHP.TabStop = false; TB_BaseHP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // TB_IVHP - // - TB_IVHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_IVHP.Location = new System.Drawing.Point(40, 0); - TB_IVHP.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_IVHP.Mask = "00"; - TB_IVHP.Name = "TB_IVHP"; - TB_IVHP.Size = new System.Drawing.Size(24, 25); - TB_IVHP.TabIndex = 1; - TB_IVHP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_IVHP.Click += ClickIV; - TB_IVHP.TextChanged += UpdateIVs; - // - // TB_EVHP - // - TB_EVHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_EVHP.Location = new System.Drawing.Point(72, 0); - TB_EVHP.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_EVHP.Mask = "000"; - TB_EVHP.Name = "TB_EVHP"; - TB_EVHP.Size = new System.Drawing.Size(32, 25); - TB_EVHP.TabIndex = 2; - TB_EVHP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_EVHP.Click += ClickEV; - TB_EVHP.TextChanged += UpdateEVs; - // - // TB_AVHP - // - TB_AVHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_AVHP.Location = new System.Drawing.Point(112, 0); - TB_AVHP.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_AVHP.Mask = "000"; - TB_AVHP.Name = "TB_AVHP"; - TB_AVHP.Size = new System.Drawing.Size(32, 25); - TB_AVHP.TabIndex = 3; - TB_AVHP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_AVHP.Click += ClickAV; - TB_AVHP.TextChanged += UpdateAVs; - // - // TB_GVHP - // - TB_GVHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_GVHP.Location = new System.Drawing.Point(152, 0); - TB_GVHP.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_GVHP.Mask = "000"; - TB_GVHP.Name = "TB_GVHP"; - TB_GVHP.Size = new System.Drawing.Size(28, 25); - TB_GVHP.TabIndex = 4; - TB_GVHP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_GVHP.Click += ClickGV; - TB_GVHP.TextChanged += UpdateGVs; - // - // Stat_HP - // - Stat_HP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - Stat_HP.Enabled = false; - Stat_HP.Location = new System.Drawing.Point(188, 0); - Stat_HP.Margin = new System.Windows.Forms.Padding(0); - Stat_HP.Mask = "00000"; - Stat_HP.Name = "Stat_HP"; - Stat_HP.PromptChar = ' '; - Stat_HP.Size = new System.Drawing.Size(40, 25); - Stat_HP.TabIndex = 10; - Stat_HP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - Stat_HP.TextChanged += UpdateHackedStatText; - // - // FLP_Atk - // - FLP_Atk.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_Atk.AutoSize = true; - FLP_Atk.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_Atk.Controls.Add(Label_ATK); - FLP_Atk.Controls.Add(FLP_AtkRight); - FLP_Atk.Location = new System.Drawing.Point(0, 50); - FLP_Atk.Margin = new System.Windows.Forms.Padding(0); - FLP_Atk.Name = "FLP_Atk"; - FLP_Atk.Size = new System.Drawing.Size(308, 26); - FLP_Atk.TabIndex = 2; - // - // Label_ATK - // - Label_ATK.Location = new System.Drawing.Point(0, 0); - Label_ATK.Margin = new System.Windows.Forms.Padding(0); - Label_ATK.Name = "Label_ATK"; - Label_ATK.Size = new System.Drawing.Size(80, 24); - Label_ATK.TabIndex = 20; - Label_ATK.Text = "Atk:"; - Label_ATK.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - Label_ATK.MouseDown += ClickStatLabel; - // - // FLP_AtkRight - // - FLP_AtkRight.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_AtkRight.AutoSize = true; - FLP_AtkRight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_AtkRight.Controls.Add(TB_BaseATK); - FLP_AtkRight.Controls.Add(TB_IVATK); - FLP_AtkRight.Controls.Add(TB_EVATK); - FLP_AtkRight.Controls.Add(TB_AVATK); - FLP_AtkRight.Controls.Add(TB_GVATK); - FLP_AtkRight.Controls.Add(Stat_ATK); - FLP_AtkRight.Location = new System.Drawing.Point(80, 0); - FLP_AtkRight.Margin = new System.Windows.Forms.Padding(0); - FLP_AtkRight.Name = "FLP_AtkRight"; - FLP_AtkRight.Size = new System.Drawing.Size(228, 26); - FLP_AtkRight.TabIndex = 2; - // // TB_BaseATK // + TB_BaseATK.Anchor = System.Windows.Forms.AnchorStyles.None; TB_BaseATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; TB_BaseATK.Enabled = false; - TB_BaseATK.Location = new System.Drawing.Point(0, 0); - TB_BaseATK.Margin = new System.Windows.Forms.Padding(0, 0, 8, 1); + TB_BaseATK.Location = new System.Drawing.Point(84, 50); + TB_BaseATK.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); TB_BaseATK.Mask = "000"; TB_BaseATK.Name = "TB_BaseATK"; TB_BaseATK.PromptChar = ' '; @@ -478,119 +458,13 @@ private void InitializeComponent() TB_BaseATK.TabStop = false; TB_BaseATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // TB_IVATK - // - TB_IVATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_IVATK.Location = new System.Drawing.Point(40, 0); - TB_IVATK.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_IVATK.Mask = "00"; - TB_IVATK.Name = "TB_IVATK"; - TB_IVATK.Size = new System.Drawing.Size(24, 25); - TB_IVATK.TabIndex = 1; - TB_IVATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_IVATK.Click += ClickIV; - TB_IVATK.TextChanged += UpdateIVs; - // - // TB_EVATK - // - TB_EVATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_EVATK.Location = new System.Drawing.Point(72, 0); - TB_EVATK.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_EVATK.Mask = "000"; - TB_EVATK.Name = "TB_EVATK"; - TB_EVATK.Size = new System.Drawing.Size(32, 25); - TB_EVATK.TabIndex = 2; - TB_EVATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_EVATK.Click += ClickEV; - TB_EVATK.TextChanged += UpdateEVs; - // - // TB_AVATK - // - TB_AVATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_AVATK.Location = new System.Drawing.Point(112, 0); - TB_AVATK.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_AVATK.Mask = "000"; - TB_AVATK.Name = "TB_AVATK"; - TB_AVATK.Size = new System.Drawing.Size(32, 25); - TB_AVATK.TabIndex = 3; - TB_AVATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_AVATK.Click += ClickAV; - TB_AVATK.TextChanged += UpdateAVs; - // - // TB_GVATK - // - TB_GVATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_GVATK.Location = new System.Drawing.Point(152, 0); - TB_GVATK.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_GVATK.Mask = "000"; - TB_GVATK.Name = "TB_GVATK"; - TB_GVATK.Size = new System.Drawing.Size(28, 25); - TB_GVATK.TabIndex = 4; - TB_GVATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_GVATK.Click += ClickGV; - TB_GVATK.TextChanged += UpdateGVs; - // - // Stat_ATK - // - Stat_ATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - Stat_ATK.Enabled = false; - Stat_ATK.Location = new System.Drawing.Point(188, 0); - Stat_ATK.Margin = new System.Windows.Forms.Padding(0); - Stat_ATK.Mask = "00000"; - Stat_ATK.Name = "Stat_ATK"; - Stat_ATK.PromptChar = ' '; - Stat_ATK.Size = new System.Drawing.Size(40, 25); - Stat_ATK.TabIndex = 10; - Stat_ATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - Stat_ATK.TextChanged += UpdateHackedStatText; - // - // FLP_Def - // - FLP_Def.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_Def.AutoSize = true; - FLP_Def.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_Def.Controls.Add(Label_DEF); - FLP_Def.Controls.Add(FLP_DefRight); - FLP_Def.Location = new System.Drawing.Point(0, 76); - FLP_Def.Margin = new System.Windows.Forms.Padding(0); - FLP_Def.Name = "FLP_Def"; - FLP_Def.Size = new System.Drawing.Size(308, 26); - FLP_Def.TabIndex = 3; - // - // Label_DEF - // - Label_DEF.Location = new System.Drawing.Point(0, 0); - Label_DEF.Margin = new System.Windows.Forms.Padding(0); - Label_DEF.Name = "Label_DEF"; - Label_DEF.Size = new System.Drawing.Size(80, 24); - Label_DEF.TabIndex = 21; - Label_DEF.Text = "Def:"; - Label_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - Label_DEF.MouseDown += ClickStatLabel; - // - // FLP_DefRight - // - FLP_DefRight.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_DefRight.AutoSize = true; - FLP_DefRight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_DefRight.Controls.Add(TB_BaseDEF); - FLP_DefRight.Controls.Add(TB_IVDEF); - FLP_DefRight.Controls.Add(TB_EVDEF); - FLP_DefRight.Controls.Add(TB_AVDEF); - FLP_DefRight.Controls.Add(TB_GVDEF); - FLP_DefRight.Controls.Add(Stat_DEF); - FLP_DefRight.Location = new System.Drawing.Point(80, 0); - FLP_DefRight.Margin = new System.Windows.Forms.Padding(0); - FLP_DefRight.Name = "FLP_DefRight"; - FLP_DefRight.Size = new System.Drawing.Size(228, 26); - FLP_DefRight.TabIndex = 3; - // // TB_BaseDEF // + TB_BaseDEF.Anchor = System.Windows.Forms.AnchorStyles.None; TB_BaseDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; TB_BaseDEF.Enabled = false; - TB_BaseDEF.Location = new System.Drawing.Point(0, 0); - TB_BaseDEF.Margin = new System.Windows.Forms.Padding(0, 0, 8, 1); + TB_BaseDEF.Location = new System.Drawing.Point(84, 76); + TB_BaseDEF.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); TB_BaseDEF.Mask = "000"; TB_BaseDEF.Name = "TB_BaseDEF"; TB_BaseDEF.PromptChar = ' '; @@ -600,142 +474,13 @@ private void InitializeComponent() TB_BaseDEF.TabStop = false; TB_BaseDEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // TB_IVDEF - // - TB_IVDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_IVDEF.Location = new System.Drawing.Point(40, 0); - TB_IVDEF.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_IVDEF.Mask = "00"; - TB_IVDEF.Name = "TB_IVDEF"; - TB_IVDEF.Size = new System.Drawing.Size(24, 25); - TB_IVDEF.TabIndex = 1; - TB_IVDEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_IVDEF.Click += ClickIV; - TB_IVDEF.TextChanged += UpdateIVs; - // - // TB_EVDEF - // - TB_EVDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_EVDEF.Location = new System.Drawing.Point(72, 0); - TB_EVDEF.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_EVDEF.Mask = "000"; - TB_EVDEF.Name = "TB_EVDEF"; - TB_EVDEF.Size = new System.Drawing.Size(32, 25); - TB_EVDEF.TabIndex = 2; - TB_EVDEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_EVDEF.Click += ClickEV; - TB_EVDEF.TextChanged += UpdateEVs; - // - // TB_AVDEF - // - TB_AVDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_AVDEF.Location = new System.Drawing.Point(112, 0); - TB_AVDEF.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_AVDEF.Mask = "000"; - TB_AVDEF.Name = "TB_AVDEF"; - TB_AVDEF.Size = new System.Drawing.Size(32, 25); - TB_AVDEF.TabIndex = 3; - TB_AVDEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_AVDEF.Click += ClickAV; - TB_AVDEF.TextChanged += UpdateAVs; - // - // TB_GVDEF - // - TB_GVDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_GVDEF.Location = new System.Drawing.Point(152, 0); - TB_GVDEF.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_GVDEF.Mask = "000"; - TB_GVDEF.Name = "TB_GVDEF"; - TB_GVDEF.Size = new System.Drawing.Size(28, 25); - TB_GVDEF.TabIndex = 4; - TB_GVDEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_GVDEF.Click += ClickGV; - TB_GVDEF.TextChanged += UpdateGVs; - // - // Stat_DEF - // - Stat_DEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - Stat_DEF.Enabled = false; - Stat_DEF.Location = new System.Drawing.Point(188, 0); - Stat_DEF.Margin = new System.Windows.Forms.Padding(0); - Stat_DEF.Mask = "00000"; - Stat_DEF.Name = "Stat_DEF"; - Stat_DEF.PromptChar = ' '; - Stat_DEF.Size = new System.Drawing.Size(40, 25); - Stat_DEF.TabIndex = 10; - Stat_DEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - Stat_DEF.TextChanged += UpdateHackedStatText; - // - // FLP_SpA - // - FLP_SpA.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_SpA.AutoSize = true; - FLP_SpA.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_SpA.Controls.Add(FLP_SpALeft); - FLP_SpA.Controls.Add(FLP_SpARight); - FLP_SpA.Location = new System.Drawing.Point(0, 102); - FLP_SpA.Margin = new System.Windows.Forms.Padding(0); - FLP_SpA.Name = "FLP_SpA"; - FLP_SpA.Size = new System.Drawing.Size(308, 26); - FLP_SpA.TabIndex = 4; - // - // FLP_SpALeft - // - FLP_SpALeft.Anchor = System.Windows.Forms.AnchorStyles.Right; - FLP_SpALeft.Controls.Add(Label_SPA); - FLP_SpALeft.Controls.Add(Label_SPC); - FLP_SpALeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; - FLP_SpALeft.Location = new System.Drawing.Point(0, 1); - FLP_SpALeft.Margin = new System.Windows.Forms.Padding(0); - FLP_SpALeft.Name = "FLP_SpALeft"; - FLP_SpALeft.Size = new System.Drawing.Size(80, 24); - FLP_SpALeft.TabIndex = 4; - // - // Label_SPA - // - Label_SPA.Location = new System.Drawing.Point(0, 0); - Label_SPA.Margin = new System.Windows.Forms.Padding(0); - Label_SPA.Name = "Label_SPA"; - Label_SPA.Size = new System.Drawing.Size(80, 24); - Label_SPA.TabIndex = 22; - Label_SPA.Text = "SpA:"; - Label_SPA.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - Label_SPA.MouseDown += ClickStatLabel; - // - // Label_SPC - // - Label_SPC.Location = new System.Drawing.Point(0, 24); - Label_SPC.Margin = new System.Windows.Forms.Padding(0); - Label_SPC.Name = "Label_SPC"; - Label_SPC.Size = new System.Drawing.Size(80, 24); - Label_SPC.TabIndex = 125; - Label_SPC.Text = "SpC:"; - Label_SPC.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - Label_SPC.MouseDown += ClickStatLabel; - // - // FLP_SpARight - // - FLP_SpARight.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_SpARight.AutoSize = true; - FLP_SpARight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_SpARight.Controls.Add(TB_BaseSPA); - FLP_SpARight.Controls.Add(TB_IVSPA); - FLP_SpARight.Controls.Add(TB_EVSPA); - FLP_SpARight.Controls.Add(TB_AVSPA); - FLP_SpARight.Controls.Add(TB_GVSPA); - FLP_SpARight.Controls.Add(Stat_SPA); - FLP_SpARight.Location = new System.Drawing.Point(80, 0); - FLP_SpARight.Margin = new System.Windows.Forms.Padding(0); - FLP_SpARight.Name = "FLP_SpARight"; - FLP_SpARight.Size = new System.Drawing.Size(228, 26); - FLP_SpARight.TabIndex = 4; - // // TB_BaseSPA // + TB_BaseSPA.Anchor = System.Windows.Forms.AnchorStyles.None; TB_BaseSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; TB_BaseSPA.Enabled = false; - TB_BaseSPA.Location = new System.Drawing.Point(0, 0); - TB_BaseSPA.Margin = new System.Windows.Forms.Padding(0, 0, 8, 1); + TB_BaseSPA.Location = new System.Drawing.Point(84, 102); + TB_BaseSPA.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); TB_BaseSPA.Mask = "000"; TB_BaseSPA.Name = "TB_BaseSPA"; TB_BaseSPA.PromptChar = ' '; @@ -745,119 +490,13 @@ private void InitializeComponent() TB_BaseSPA.TabStop = false; TB_BaseSPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // TB_IVSPA - // - TB_IVSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_IVSPA.Location = new System.Drawing.Point(40, 0); - TB_IVSPA.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_IVSPA.Mask = "00"; - TB_IVSPA.Name = "TB_IVSPA"; - TB_IVSPA.Size = new System.Drawing.Size(24, 25); - TB_IVSPA.TabIndex = 1; - TB_IVSPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_IVSPA.Click += ClickIV; - TB_IVSPA.TextChanged += UpdateIVs; - // - // TB_EVSPA - // - TB_EVSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_EVSPA.Location = new System.Drawing.Point(72, 0); - TB_EVSPA.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_EVSPA.Mask = "000"; - TB_EVSPA.Name = "TB_EVSPA"; - TB_EVSPA.Size = new System.Drawing.Size(32, 25); - TB_EVSPA.TabIndex = 2; - TB_EVSPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_EVSPA.Click += ClickEV; - TB_EVSPA.TextChanged += UpdateEVs; - // - // TB_AVSPA - // - TB_AVSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_AVSPA.Location = new System.Drawing.Point(112, 0); - TB_AVSPA.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_AVSPA.Mask = "000"; - TB_AVSPA.Name = "TB_AVSPA"; - TB_AVSPA.Size = new System.Drawing.Size(32, 25); - TB_AVSPA.TabIndex = 3; - TB_AVSPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_AVSPA.Click += ClickAV; - TB_AVSPA.TextChanged += UpdateAVs; - // - // TB_GVSPA - // - TB_GVSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_GVSPA.Location = new System.Drawing.Point(152, 0); - TB_GVSPA.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_GVSPA.Mask = "000"; - TB_GVSPA.Name = "TB_GVSPA"; - TB_GVSPA.Size = new System.Drawing.Size(28, 25); - TB_GVSPA.TabIndex = 4; - TB_GVSPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_GVSPA.Click += ClickGV; - TB_GVSPA.TextChanged += UpdateGVs; - // - // Stat_SPA - // - Stat_SPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - Stat_SPA.Enabled = false; - Stat_SPA.Location = new System.Drawing.Point(188, 0); - Stat_SPA.Margin = new System.Windows.Forms.Padding(0); - Stat_SPA.Mask = "00000"; - Stat_SPA.Name = "Stat_SPA"; - Stat_SPA.PromptChar = ' '; - Stat_SPA.Size = new System.Drawing.Size(40, 25); - Stat_SPA.TabIndex = 10; - Stat_SPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - Stat_SPA.TextChanged += UpdateHackedStatText; - // - // FLP_SpD - // - FLP_SpD.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_SpD.AutoSize = true; - FLP_SpD.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_SpD.Controls.Add(Label_SPD); - FLP_SpD.Controls.Add(FLP_SpDRight); - FLP_SpD.Location = new System.Drawing.Point(0, 128); - FLP_SpD.Margin = new System.Windows.Forms.Padding(0); - FLP_SpD.Name = "FLP_SpD"; - FLP_SpD.Size = new System.Drawing.Size(308, 26); - FLP_SpD.TabIndex = 5; - // - // Label_SPD - // - Label_SPD.Location = new System.Drawing.Point(0, 0); - Label_SPD.Margin = new System.Windows.Forms.Padding(0); - Label_SPD.Name = "Label_SPD"; - Label_SPD.Size = new System.Drawing.Size(80, 24); - Label_SPD.TabIndex = 23; - Label_SPD.Text = "SpD:"; - Label_SPD.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - Label_SPD.MouseDown += ClickStatLabel; - // - // FLP_SpDRight - // - FLP_SpDRight.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_SpDRight.AutoSize = true; - FLP_SpDRight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_SpDRight.Controls.Add(TB_BaseSPD); - FLP_SpDRight.Controls.Add(TB_IVSPD); - FLP_SpDRight.Controls.Add(TB_EVSPD); - FLP_SpDRight.Controls.Add(TB_AVSPD); - FLP_SpDRight.Controls.Add(TB_GVSPD); - FLP_SpDRight.Controls.Add(Stat_SPD); - FLP_SpDRight.Location = new System.Drawing.Point(80, 0); - FLP_SpDRight.Margin = new System.Windows.Forms.Padding(0); - FLP_SpDRight.Name = "FLP_SpDRight"; - FLP_SpDRight.Size = new System.Drawing.Size(228, 26); - FLP_SpDRight.TabIndex = 5; - // // TB_BaseSPD // + TB_BaseSPD.Anchor = System.Windows.Forms.AnchorStyles.None; TB_BaseSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; TB_BaseSPD.Enabled = false; - TB_BaseSPD.Location = new System.Drawing.Point(0, 0); - TB_BaseSPD.Margin = new System.Windows.Forms.Padding(0, 0, 8, 1); + TB_BaseSPD.Location = new System.Drawing.Point(84, 128); + TB_BaseSPD.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); TB_BaseSPD.Mask = "000"; TB_BaseSPD.Name = "TB_BaseSPD"; TB_BaseSPD.PromptChar = ' '; @@ -867,119 +506,13 @@ private void InitializeComponent() TB_BaseSPD.TabStop = false; TB_BaseSPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // TB_IVSPD - // - TB_IVSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_IVSPD.Location = new System.Drawing.Point(40, 0); - TB_IVSPD.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_IVSPD.Mask = "00"; - TB_IVSPD.Name = "TB_IVSPD"; - TB_IVSPD.Size = new System.Drawing.Size(24, 25); - TB_IVSPD.TabIndex = 1; - TB_IVSPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_IVSPD.Click += ClickIV; - TB_IVSPD.TextChanged += UpdateIVs; - // - // TB_EVSPD - // - TB_EVSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_EVSPD.Location = new System.Drawing.Point(72, 0); - TB_EVSPD.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_EVSPD.Mask = "000"; - TB_EVSPD.Name = "TB_EVSPD"; - TB_EVSPD.Size = new System.Drawing.Size(32, 25); - TB_EVSPD.TabIndex = 2; - TB_EVSPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_EVSPD.Click += ClickEV; - TB_EVSPD.TextChanged += UpdateEVs; - // - // TB_AVSPD - // - TB_AVSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_AVSPD.Location = new System.Drawing.Point(112, 0); - TB_AVSPD.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_AVSPD.Mask = "000"; - TB_AVSPD.Name = "TB_AVSPD"; - TB_AVSPD.Size = new System.Drawing.Size(32, 25); - TB_AVSPD.TabIndex = 3; - TB_AVSPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_AVSPD.Click += ClickAV; - TB_AVSPD.TextChanged += UpdateAVs; - // - // TB_GVSPD - // - TB_GVSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_GVSPD.Location = new System.Drawing.Point(152, 0); - TB_GVSPD.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_GVSPD.Mask = "000"; - TB_GVSPD.Name = "TB_GVSPD"; - TB_GVSPD.Size = new System.Drawing.Size(28, 25); - TB_GVSPD.TabIndex = 4; - TB_GVSPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_GVSPD.Click += ClickGV; - TB_GVSPD.TextChanged += UpdateGVs; - // - // Stat_SPD - // - Stat_SPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - Stat_SPD.Enabled = false; - Stat_SPD.Location = new System.Drawing.Point(188, 0); - Stat_SPD.Margin = new System.Windows.Forms.Padding(0); - Stat_SPD.Mask = "00000"; - Stat_SPD.Name = "Stat_SPD"; - Stat_SPD.PromptChar = ' '; - Stat_SPD.Size = new System.Drawing.Size(40, 25); - Stat_SPD.TabIndex = 10; - Stat_SPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - Stat_SPD.TextChanged += UpdateHackedStatText; - // - // FLP_Spe - // - FLP_Spe.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_Spe.AutoSize = true; - FLP_Spe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_Spe.Controls.Add(Label_SPE); - FLP_Spe.Controls.Add(FLP_SpeRight); - FLP_Spe.Location = new System.Drawing.Point(0, 154); - FLP_Spe.Margin = new System.Windows.Forms.Padding(0); - FLP_Spe.Name = "FLP_Spe"; - FLP_Spe.Size = new System.Drawing.Size(308, 26); - FLP_Spe.TabIndex = 6; - // - // Label_SPE - // - Label_SPE.Location = new System.Drawing.Point(0, 0); - Label_SPE.Margin = new System.Windows.Forms.Padding(0); - Label_SPE.Name = "Label_SPE"; - Label_SPE.Size = new System.Drawing.Size(80, 24); - Label_SPE.TabIndex = 24; - Label_SPE.Text = "Spe:"; - Label_SPE.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - Label_SPE.MouseDown += ClickStatLabel; - // - // FLP_SpeRight - // - FLP_SpeRight.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_SpeRight.AutoSize = true; - FLP_SpeRight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_SpeRight.Controls.Add(TB_BaseSPE); - FLP_SpeRight.Controls.Add(TB_IVSPE); - FLP_SpeRight.Controls.Add(TB_EVSPE); - FLP_SpeRight.Controls.Add(TB_AVSPE); - FLP_SpeRight.Controls.Add(TB_GVSPE); - FLP_SpeRight.Controls.Add(Stat_SPE); - FLP_SpeRight.Location = new System.Drawing.Point(80, 0); - FLP_SpeRight.Margin = new System.Windows.Forms.Padding(0); - FLP_SpeRight.Name = "FLP_SpeRight"; - FLP_SpeRight.Size = new System.Drawing.Size(228, 26); - FLP_SpeRight.TabIndex = 6; - // // TB_BaseSPE // + TB_BaseSPE.Anchor = System.Windows.Forms.AnchorStyles.None; TB_BaseSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; TB_BaseSPE.Enabled = false; - TB_BaseSPE.Location = new System.Drawing.Point(0, 0); - TB_BaseSPE.Margin = new System.Windows.Forms.Padding(0, 0, 8, 1); + TB_BaseSPE.Location = new System.Drawing.Point(84, 154); + TB_BaseSPE.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); TB_BaseSPE.Mask = "000"; TB_BaseSPE.Name = "TB_BaseSPE"; TB_BaseSPE.PromptChar = ' '; @@ -989,117 +522,13 @@ private void InitializeComponent() TB_BaseSPE.TabStop = false; TB_BaseSPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // TB_IVSPE - // - TB_IVSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_IVSPE.Location = new System.Drawing.Point(40, 0); - TB_IVSPE.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_IVSPE.Mask = "00"; - TB_IVSPE.Name = "TB_IVSPE"; - TB_IVSPE.Size = new System.Drawing.Size(24, 25); - TB_IVSPE.TabIndex = 1; - TB_IVSPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_IVSPE.Click += ClickIV; - TB_IVSPE.TextChanged += UpdateIVs; - // - // TB_EVSPE - // - TB_EVSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_EVSPE.Location = new System.Drawing.Point(72, 0); - TB_EVSPE.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_EVSPE.Mask = "000"; - TB_EVSPE.Name = "TB_EVSPE"; - TB_EVSPE.Size = new System.Drawing.Size(32, 25); - TB_EVSPE.TabIndex = 2; - TB_EVSPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_EVSPE.Click += ClickEV; - TB_EVSPE.TextChanged += UpdateEVs; - // - // TB_AVSPE - // - TB_AVSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_AVSPE.Location = new System.Drawing.Point(112, 0); - TB_AVSPE.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_AVSPE.Mask = "000"; - TB_AVSPE.Name = "TB_AVSPE"; - TB_AVSPE.Size = new System.Drawing.Size(32, 25); - TB_AVSPE.TabIndex = 3; - TB_AVSPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_AVSPE.Click += ClickAV; - TB_AVSPE.TextChanged += UpdateAVs; - // - // TB_GVSPE - // - TB_GVSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_GVSPE.Location = new System.Drawing.Point(152, 0); - TB_GVSPE.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); - TB_GVSPE.Mask = "000"; - TB_GVSPE.Name = "TB_GVSPE"; - TB_GVSPE.Size = new System.Drawing.Size(28, 25); - TB_GVSPE.TabIndex = 4; - TB_GVSPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - TB_GVSPE.Click += ClickGV; - TB_GVSPE.TextChanged += UpdateGVs; - // - // Stat_SPE - // - Stat_SPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - Stat_SPE.Enabled = false; - Stat_SPE.Location = new System.Drawing.Point(188, 0); - Stat_SPE.Margin = new System.Windows.Forms.Padding(0); - Stat_SPE.Mask = "00000"; - Stat_SPE.Name = "Stat_SPE"; - Stat_SPE.PromptChar = ' '; - Stat_SPE.Size = new System.Drawing.Size(40, 25); - Stat_SPE.TabIndex = 10; - Stat_SPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - Stat_SPE.TextChanged += UpdateHackedStatText; - // - // FLP_StatsTotal - // - FLP_StatsTotal.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_StatsTotal.AutoSize = true; - FLP_StatsTotal.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_StatsTotal.Controls.Add(Label_Total); - FLP_StatsTotal.Controls.Add(FLP_StatsTotalRight); - FLP_StatsTotal.Location = new System.Drawing.Point(0, 180); - FLP_StatsTotal.Margin = new System.Windows.Forms.Padding(0, 0, 0, 8); - FLP_StatsTotal.Name = "FLP_StatsTotal"; - FLP_StatsTotal.Size = new System.Drawing.Size(288, 26); - FLP_StatsTotal.TabIndex = 7; - // - // Label_Total - // - Label_Total.Location = new System.Drawing.Point(0, 0); - Label_Total.Margin = new System.Windows.Forms.Padding(0); - Label_Total.Name = "Label_Total"; - Label_Total.Size = new System.Drawing.Size(80, 24); - Label_Total.TabIndex = 25; - Label_Total.Text = "Total:"; - Label_Total.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // FLP_StatsTotalRight - // - FLP_StatsTotalRight.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - FLP_StatsTotalRight.AutoSize = true; - FLP_StatsTotalRight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - FLP_StatsTotalRight.Controls.Add(TB_BST); - FLP_StatsTotalRight.Controls.Add(TB_IVTotal); - FLP_StatsTotalRight.Controls.Add(TB_EVTotal); - FLP_StatsTotalRight.Controls.Add(TB_AVTotal); - FLP_StatsTotalRight.Controls.Add(L_Potential); - FLP_StatsTotalRight.Location = new System.Drawing.Point(80, 0); - FLP_StatsTotalRight.Margin = new System.Windows.Forms.Padding(0); - FLP_StatsTotalRight.Name = "FLP_StatsTotalRight"; - FLP_StatsTotalRight.Size = new System.Drawing.Size(208, 26); - FLP_StatsTotalRight.TabIndex = 7; - // // TB_BST // + TB_BST.Anchor = System.Windows.Forms.AnchorStyles.None; TB_BST.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; TB_BST.Enabled = false; - TB_BST.Location = new System.Drawing.Point(0, 0); - TB_BST.Margin = new System.Windows.Forms.Padding(0, 0, 8, 1); + TB_BST.Location = new System.Drawing.Point(84, 180); + TB_BST.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); TB_BST.MaxLength = 3; TB_BST.Name = "TB_BST"; TB_BST.ReadOnly = true; @@ -1108,11 +537,96 @@ private void InitializeComponent() TB_BST.TabStop = false; TB_BST.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // TB_IVHP + // + TB_IVHP.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_IVHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_IVHP.Location = new System.Drawing.Point(124, 24); + TB_IVHP.Margin = new System.Windows.Forms.Padding(0); + TB_IVHP.Mask = "00"; + TB_IVHP.Name = "TB_IVHP"; + TB_IVHP.Size = new System.Drawing.Size(24, 25); + TB_IVHP.TabIndex = 1; + TB_IVHP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_IVHP.Click += ClickIV; + TB_IVHP.TextChanged += UpdateIVs; + // + // TB_IVATK + // + TB_IVATK.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_IVATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_IVATK.Location = new System.Drawing.Point(124, 50); + TB_IVATK.Margin = new System.Windows.Forms.Padding(0); + TB_IVATK.Mask = "00"; + TB_IVATK.Name = "TB_IVATK"; + TB_IVATK.Size = new System.Drawing.Size(24, 25); + TB_IVATK.TabIndex = 1; + TB_IVATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_IVATK.Click += ClickIV; + TB_IVATK.TextChanged += UpdateIVs; + // + // TB_IVDEF + // + TB_IVDEF.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_IVDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_IVDEF.Location = new System.Drawing.Point(124, 76); + TB_IVDEF.Margin = new System.Windows.Forms.Padding(0); + TB_IVDEF.Mask = "00"; + TB_IVDEF.Name = "TB_IVDEF"; + TB_IVDEF.Size = new System.Drawing.Size(24, 25); + TB_IVDEF.TabIndex = 1; + TB_IVDEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_IVDEF.Click += ClickIV; + TB_IVDEF.TextChanged += UpdateIVs; + // + // TB_IVSPA + // + TB_IVSPA.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_IVSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_IVSPA.Location = new System.Drawing.Point(124, 102); + TB_IVSPA.Margin = new System.Windows.Forms.Padding(0); + TB_IVSPA.Mask = "00"; + TB_IVSPA.Name = "TB_IVSPA"; + TB_IVSPA.Size = new System.Drawing.Size(24, 25); + TB_IVSPA.TabIndex = 1; + TB_IVSPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_IVSPA.Click += ClickIV; + TB_IVSPA.TextChanged += UpdateIVs; + // + // TB_IVSPD + // + TB_IVSPD.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_IVSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_IVSPD.Location = new System.Drawing.Point(124, 128); + TB_IVSPD.Margin = new System.Windows.Forms.Padding(0); + TB_IVSPD.Mask = "00"; + TB_IVSPD.Name = "TB_IVSPD"; + TB_IVSPD.Size = new System.Drawing.Size(24, 25); + TB_IVSPD.TabIndex = 1; + TB_IVSPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_IVSPD.Click += ClickIV; + TB_IVSPD.TextChanged += UpdateIVs; + // + // TB_IVSPE + // + TB_IVSPE.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_IVSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_IVSPE.Location = new System.Drawing.Point(124, 154); + TB_IVSPE.Margin = new System.Windows.Forms.Padding(0); + TB_IVSPE.Mask = "00"; + TB_IVSPE.Name = "TB_IVSPE"; + TB_IVSPE.Size = new System.Drawing.Size(24, 25); + TB_IVSPE.TabIndex = 1; + TB_IVSPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_IVSPE.Click += ClickIV; + TB_IVSPE.TextChanged += UpdateIVs; + // // TB_IVTotal // + TB_IVTotal.Anchor = System.Windows.Forms.AnchorStyles.None; TB_IVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_IVTotal.Location = new System.Drawing.Point(40, 0); - TB_IVTotal.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); + TB_IVTotal.Location = new System.Drawing.Point(124, 180); + TB_IVTotal.Margin = new System.Windows.Forms.Padding(0); TB_IVTotal.MaxLength = 1; TB_IVTotal.Name = "TB_IVTotal"; TB_IVTotal.ReadOnly = true; @@ -1121,11 +635,96 @@ private void InitializeComponent() TB_IVTotal.TabStop = false; TB_IVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // TB_EVHP + // + TB_EVHP.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_EVHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_EVHP.Location = new System.Drawing.Point(156, 24); + TB_EVHP.Margin = new System.Windows.Forms.Padding(0); + TB_EVHP.Mask = "000"; + TB_EVHP.Name = "TB_EVHP"; + TB_EVHP.Size = new System.Drawing.Size(32, 25); + TB_EVHP.TabIndex = 2; + TB_EVHP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_EVHP.Click += ClickEV; + TB_EVHP.TextChanged += UpdateEVs; + // + // TB_EVATK + // + TB_EVATK.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_EVATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_EVATK.Location = new System.Drawing.Point(156, 50); + TB_EVATK.Margin = new System.Windows.Forms.Padding(0); + TB_EVATK.Mask = "000"; + TB_EVATK.Name = "TB_EVATK"; + TB_EVATK.Size = new System.Drawing.Size(32, 25); + TB_EVATK.TabIndex = 2; + TB_EVATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_EVATK.Click += ClickEV; + TB_EVATK.TextChanged += UpdateEVs; + // + // TB_EVDEF + // + TB_EVDEF.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_EVDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_EVDEF.Location = new System.Drawing.Point(156, 76); + TB_EVDEF.Margin = new System.Windows.Forms.Padding(0); + TB_EVDEF.Mask = "000"; + TB_EVDEF.Name = "TB_EVDEF"; + TB_EVDEF.Size = new System.Drawing.Size(32, 25); + TB_EVDEF.TabIndex = 2; + TB_EVDEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_EVDEF.Click += ClickEV; + TB_EVDEF.TextChanged += UpdateEVs; + // + // TB_EVSPA + // + TB_EVSPA.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_EVSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_EVSPA.Location = new System.Drawing.Point(156, 102); + TB_EVSPA.Margin = new System.Windows.Forms.Padding(0); + TB_EVSPA.Mask = "000"; + TB_EVSPA.Name = "TB_EVSPA"; + TB_EVSPA.Size = new System.Drawing.Size(32, 25); + TB_EVSPA.TabIndex = 2; + TB_EVSPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_EVSPA.Click += ClickEV; + TB_EVSPA.TextChanged += UpdateEVs; + // + // TB_EVSPD + // + TB_EVSPD.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_EVSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_EVSPD.Location = new System.Drawing.Point(156, 128); + TB_EVSPD.Margin = new System.Windows.Forms.Padding(0); + TB_EVSPD.Mask = "000"; + TB_EVSPD.Name = "TB_EVSPD"; + TB_EVSPD.Size = new System.Drawing.Size(32, 25); + TB_EVSPD.TabIndex = 2; + TB_EVSPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_EVSPD.Click += ClickEV; + TB_EVSPD.TextChanged += UpdateEVs; + // + // TB_EVSPE + // + TB_EVSPE.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_EVSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_EVSPE.Location = new System.Drawing.Point(156, 154); + TB_EVSPE.Margin = new System.Windows.Forms.Padding(0); + TB_EVSPE.Mask = "000"; + TB_EVSPE.Name = "TB_EVSPE"; + TB_EVSPE.Size = new System.Drawing.Size(32, 25); + TB_EVSPE.TabIndex = 2; + TB_EVSPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_EVSPE.Click += ClickEV; + TB_EVSPE.TextChanged += UpdateEVs; + // // TB_EVTotal // + TB_EVTotal.Anchor = System.Windows.Forms.AnchorStyles.None; TB_EVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_EVTotal.Location = new System.Drawing.Point(72, 0); - TB_EVTotal.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); + TB_EVTotal.Location = new System.Drawing.Point(156, 180); + TB_EVTotal.Margin = new System.Windows.Forms.Padding(0); TB_EVTotal.MaxLength = 4; TB_EVTotal.Name = "TB_EVTotal"; TB_EVTotal.ReadOnly = true; @@ -1134,11 +733,96 @@ private void InitializeComponent() TB_EVTotal.TabStop = false; TB_EVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // TB_AVHP + // + TB_AVHP.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_AVHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_AVHP.Location = new System.Drawing.Point(196, 24); + TB_AVHP.Margin = new System.Windows.Forms.Padding(0); + TB_AVHP.Mask = "000"; + TB_AVHP.Name = "TB_AVHP"; + TB_AVHP.Size = new System.Drawing.Size(32, 25); + TB_AVHP.TabIndex = 3; + TB_AVHP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_AVHP.Click += ClickAV; + TB_AVHP.TextChanged += UpdateAVs; + // + // TB_AVATK + // + TB_AVATK.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_AVATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_AVATK.Location = new System.Drawing.Point(196, 50); + TB_AVATK.Margin = new System.Windows.Forms.Padding(0); + TB_AVATK.Mask = "000"; + TB_AVATK.Name = "TB_AVATK"; + TB_AVATK.Size = new System.Drawing.Size(32, 25); + TB_AVATK.TabIndex = 3; + TB_AVATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_AVATK.Click += ClickAV; + TB_AVATK.TextChanged += UpdateAVs; + // + // TB_AVDEF + // + TB_AVDEF.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_AVDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_AVDEF.Location = new System.Drawing.Point(196, 76); + TB_AVDEF.Margin = new System.Windows.Forms.Padding(0); + TB_AVDEF.Mask = "000"; + TB_AVDEF.Name = "TB_AVDEF"; + TB_AVDEF.Size = new System.Drawing.Size(32, 25); + TB_AVDEF.TabIndex = 3; + TB_AVDEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_AVDEF.Click += ClickAV; + TB_AVDEF.TextChanged += UpdateAVs; + // + // TB_AVSPA + // + TB_AVSPA.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_AVSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_AVSPA.Location = new System.Drawing.Point(196, 102); + TB_AVSPA.Margin = new System.Windows.Forms.Padding(0); + TB_AVSPA.Mask = "000"; + TB_AVSPA.Name = "TB_AVSPA"; + TB_AVSPA.Size = new System.Drawing.Size(32, 25); + TB_AVSPA.TabIndex = 3; + TB_AVSPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_AVSPA.Click += ClickAV; + TB_AVSPA.TextChanged += UpdateAVs; + // + // TB_AVSPD + // + TB_AVSPD.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_AVSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_AVSPD.Location = new System.Drawing.Point(196, 128); + TB_AVSPD.Margin = new System.Windows.Forms.Padding(0); + TB_AVSPD.Mask = "000"; + TB_AVSPD.Name = "TB_AVSPD"; + TB_AVSPD.Size = new System.Drawing.Size(32, 25); + TB_AVSPD.TabIndex = 3; + TB_AVSPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_AVSPD.Click += ClickAV; + TB_AVSPD.TextChanged += UpdateAVs; + // + // TB_AVSPE + // + TB_AVSPE.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_AVSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_AVSPE.Location = new System.Drawing.Point(196, 154); + TB_AVSPE.Margin = new System.Windows.Forms.Padding(0); + TB_AVSPE.Mask = "000"; + TB_AVSPE.Name = "TB_AVSPE"; + TB_AVSPE.Size = new System.Drawing.Size(32, 25); + TB_AVSPE.TabIndex = 3; + TB_AVSPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_AVSPE.Click += ClickAV; + TB_AVSPE.TextChanged += UpdateAVs; + // // TB_AVTotal // + TB_AVTotal.Anchor = System.Windows.Forms.AnchorStyles.None; TB_AVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - TB_AVTotal.Location = new System.Drawing.Point(112, 0); - TB_AVTotal.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0); + TB_AVTotal.Location = new System.Drawing.Point(196, 180); + TB_AVTotal.Margin = new System.Windows.Forms.Padding(0); TB_AVTotal.MaxLength = 4; TB_AVTotal.Name = "TB_AVTotal"; TB_AVTotal.ReadOnly = true; @@ -1147,15 +831,191 @@ private void InitializeComponent() TB_AVTotal.TabStop = false; TB_AVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // TB_GVHP + // + TB_GVHP.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_GVHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_GVHP.Location = new System.Drawing.Point(236, 24); + TB_GVHP.Margin = new System.Windows.Forms.Padding(0); + TB_GVHP.Mask = "000"; + TB_GVHP.Name = "TB_GVHP"; + TB_GVHP.Size = new System.Drawing.Size(24, 25); + TB_GVHP.TabIndex = 4; + TB_GVHP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_GVHP.Click += ClickGV; + TB_GVHP.TextChanged += UpdateGVs; + // + // TB_GVATK + // + TB_GVATK.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_GVATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_GVATK.Location = new System.Drawing.Point(236, 50); + TB_GVATK.Margin = new System.Windows.Forms.Padding(0); + TB_GVATK.Mask = "000"; + TB_GVATK.Name = "TB_GVATK"; + TB_GVATK.Size = new System.Drawing.Size(24, 25); + TB_GVATK.TabIndex = 4; + TB_GVATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_GVATK.Click += ClickGV; + TB_GVATK.TextChanged += UpdateGVs; + // + // TB_GVDEF + // + TB_GVDEF.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_GVDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_GVDEF.Location = new System.Drawing.Point(236, 76); + TB_GVDEF.Margin = new System.Windows.Forms.Padding(0); + TB_GVDEF.Mask = "000"; + TB_GVDEF.Name = "TB_GVDEF"; + TB_GVDEF.Size = new System.Drawing.Size(24, 25); + TB_GVDEF.TabIndex = 4; + TB_GVDEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_GVDEF.Click += ClickGV; + TB_GVDEF.TextChanged += UpdateGVs; + // + // TB_GVSPA + // + TB_GVSPA.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_GVSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_GVSPA.Location = new System.Drawing.Point(236, 102); + TB_GVSPA.Margin = new System.Windows.Forms.Padding(0); + TB_GVSPA.Mask = "000"; + TB_GVSPA.Name = "TB_GVSPA"; + TB_GVSPA.Size = new System.Drawing.Size(24, 25); + TB_GVSPA.TabIndex = 4; + TB_GVSPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_GVSPA.Click += ClickGV; + TB_GVSPA.TextChanged += UpdateGVs; + // + // TB_GVSPD + // + TB_GVSPD.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_GVSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_GVSPD.Location = new System.Drawing.Point(236, 128); + TB_GVSPD.Margin = new System.Windows.Forms.Padding(0); + TB_GVSPD.Mask = "000"; + TB_GVSPD.Name = "TB_GVSPD"; + TB_GVSPD.Size = new System.Drawing.Size(24, 25); + TB_GVSPD.TabIndex = 4; + TB_GVSPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_GVSPD.Click += ClickGV; + TB_GVSPD.TextChanged += UpdateGVs; + // + // TB_GVSPE + // + TB_GVSPE.Anchor = System.Windows.Forms.AnchorStyles.None; + TB_GVSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + TB_GVSPE.Location = new System.Drawing.Point(236, 154); + TB_GVSPE.Margin = new System.Windows.Forms.Padding(0); + TB_GVSPE.Mask = "000"; + TB_GVSPE.Name = "TB_GVSPE"; + TB_GVSPE.Size = new System.Drawing.Size(24, 25); + TB_GVSPE.TabIndex = 4; + TB_GVSPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + TB_GVSPE.Click += ClickGV; + TB_GVSPE.TextChanged += UpdateGVs; + // + // Stat_HP + // + Stat_HP.Anchor = System.Windows.Forms.AnchorStyles.Left; + Stat_HP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + Stat_HP.Enabled = false; + Stat_HP.Location = new System.Drawing.Point(268, 24); + Stat_HP.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0); + Stat_HP.Mask = "00000"; + Stat_HP.Name = "Stat_HP"; + Stat_HP.PromptChar = ' '; + Stat_HP.Size = new System.Drawing.Size(40, 25); + Stat_HP.TabIndex = 10; + Stat_HP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + Stat_HP.TextChanged += UpdateHackedStatText; + // + // Stat_ATK + // + Stat_ATK.Anchor = System.Windows.Forms.AnchorStyles.Left; + Stat_ATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + Stat_ATK.Enabled = false; + Stat_ATK.Location = new System.Drawing.Point(268, 50); + Stat_ATK.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0); + Stat_ATK.Mask = "00000"; + Stat_ATK.Name = "Stat_ATK"; + Stat_ATK.PromptChar = ' '; + Stat_ATK.Size = new System.Drawing.Size(40, 25); + Stat_ATK.TabIndex = 10; + Stat_ATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + Stat_ATK.TextChanged += UpdateHackedStatText; + // + // Stat_DEF + // + Stat_DEF.Anchor = System.Windows.Forms.AnchorStyles.Left; + Stat_DEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + Stat_DEF.Enabled = false; + Stat_DEF.Location = new System.Drawing.Point(268, 76); + Stat_DEF.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0); + Stat_DEF.Mask = "00000"; + Stat_DEF.Name = "Stat_DEF"; + Stat_DEF.PromptChar = ' '; + Stat_DEF.Size = new System.Drawing.Size(40, 25); + Stat_DEF.TabIndex = 10; + Stat_DEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + Stat_DEF.TextChanged += UpdateHackedStatText; + // + // Stat_SPA + // + Stat_SPA.Anchor = System.Windows.Forms.AnchorStyles.Left; + Stat_SPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + Stat_SPA.Enabled = false; + Stat_SPA.Location = new System.Drawing.Point(268, 102); + Stat_SPA.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0); + Stat_SPA.Mask = "00000"; + Stat_SPA.Name = "Stat_SPA"; + Stat_SPA.PromptChar = ' '; + Stat_SPA.Size = new System.Drawing.Size(40, 25); + Stat_SPA.TabIndex = 10; + Stat_SPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + Stat_SPA.TextChanged += UpdateHackedStatText; + // + // Stat_SPD + // + Stat_SPD.Anchor = System.Windows.Forms.AnchorStyles.Left; + Stat_SPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + Stat_SPD.Enabled = false; + Stat_SPD.Location = new System.Drawing.Point(268, 128); + Stat_SPD.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0); + Stat_SPD.Mask = "00000"; + Stat_SPD.Name = "Stat_SPD"; + Stat_SPD.PromptChar = ' '; + Stat_SPD.Size = new System.Drawing.Size(40, 25); + Stat_SPD.TabIndex = 10; + Stat_SPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + Stat_SPD.TextChanged += UpdateHackedStatText; + // + // Stat_SPE + // + Stat_SPE.Anchor = System.Windows.Forms.AnchorStyles.Left; + Stat_SPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + Stat_SPE.Enabled = false; + Stat_SPE.Location = new System.Drawing.Point(268, 154); + Stat_SPE.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0); + Stat_SPE.Mask = "00000"; + Stat_SPE.Name = "Stat_SPE"; + Stat_SPE.PromptChar = ' '; + Stat_SPE.Size = new System.Drawing.Size(40, 25); + Stat_SPE.TabIndex = 10; + Stat_SPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + Stat_SPE.TextChanged += UpdateHackedStatText; + // // L_Potential // + L_Potential.Anchor = System.Windows.Forms.AnchorStyles.Left; + L_Potential.AutoSize = true; L_Potential.Font = new System.Drawing.Font("Courier New", 9.75F); - L_Potential.Location = new System.Drawing.Point(152, 0); + L_Potential.Location = new System.Drawing.Point(264, 185); L_Potential.Margin = new System.Windows.Forms.Padding(0); L_Potential.Name = "L_Potential"; - L_Potential.Size = new System.Drawing.Size(56, 24); + L_Potential.Size = new System.Drawing.Size(39, 16); L_Potential.TabIndex = 42; - L_Potential.Text = "12345"; + L_Potential.Text = "1234"; L_Potential.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // FLP_HPType @@ -1166,7 +1026,7 @@ private void InitializeComponent() FLP_HPType.Controls.Add(Label_HiddenPowerPrefix); FLP_HPType.Controls.Add(CB_HPType); FLP_HPType.Controls.Add(Label_HiddenPowerPower); - FLP_HPType.Location = new System.Drawing.Point(0, 214); + FLP_HPType.Location = new System.Drawing.Point(0, 206); FLP_HPType.Margin = new System.Windows.Forms.Padding(0); FLP_HPType.Name = "FLP_HPType"; FLP_HPType.Size = new System.Drawing.Size(272, 25); @@ -1212,7 +1072,7 @@ private void InitializeComponent() FLP_Characteristic.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; FLP_Characteristic.Controls.Add(Label_CharacteristicPrefix); FLP_Characteristic.Controls.Add(L_Characteristic); - FLP_Characteristic.Location = new System.Drawing.Point(0, 239); + FLP_Characteristic.Location = new System.Drawing.Point(0, 231); FLP_Characteristic.Margin = new System.Windows.Forms.Padding(0, 0, 0, 8); FLP_Characteristic.Name = "FLP_Characteristic"; FLP_Characteristic.Size = new System.Drawing.Size(280, 24); @@ -1245,7 +1105,7 @@ private void InitializeComponent() FLP_TeraType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; FLP_TeraType.Controls.Add(FLP_TeraInner); FLP_TeraType.Controls.Add(PB_TeraType); - FLP_TeraType.Location = new System.Drawing.Point(0, 271); + FLP_TeraType.Location = new System.Drawing.Point(0, 263); FLP_TeraType.Margin = new System.Windows.Forms.Padding(0); FLP_TeraType.Name = "FLP_TeraType"; FLP_TeraType.Size = new System.Drawing.Size(278, 64); @@ -1359,7 +1219,7 @@ private void InitializeComponent() // PAN_BTN.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; PAN_BTN.Controls.Add(FLP_PKMEditors); - PAN_BTN.Location = new System.Drawing.Point(0, 339); + PAN_BTN.Location = new System.Drawing.Point(0, 331); PAN_BTN.Margin = new System.Windows.Forms.Padding(0, 4, 0, 8); PAN_BTN.Name = "PAN_BTN"; PAN_BTN.Size = new System.Drawing.Size(288, 26); @@ -1427,7 +1287,7 @@ private void InitializeComponent() FLP_DynamaxLevel.Controls.Add(L_DynamaxLevel); FLP_DynamaxLevel.Controls.Add(CB_DynamaxLevel); FLP_DynamaxLevel.Controls.Add(CHK_Gigantamax); - FLP_DynamaxLevel.Location = new System.Drawing.Point(0, 373); + FLP_DynamaxLevel.Location = new System.Drawing.Point(0, 365); FLP_DynamaxLevel.Margin = new System.Windows.Forms.Padding(0); FLP_DynamaxLevel.Name = "FLP_DynamaxLevel"; FLP_DynamaxLevel.Size = new System.Drawing.Size(262, 27); @@ -1473,7 +1333,7 @@ private void InitializeComponent() FLP_AlphaNoble.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; FLP_AlphaNoble.Controls.Add(CHK_IsAlpha); FLP_AlphaNoble.Controls.Add(CHK_IsNoble); - FLP_AlphaNoble.Location = new System.Drawing.Point(80, 400); + FLP_AlphaNoble.Location = new System.Drawing.Point(80, 392); FLP_AlphaNoble.Margin = new System.Windows.Forms.Padding(80, 0, 0, 0); FLP_AlphaNoble.Name = "FLP_AlphaNoble"; FLP_AlphaNoble.Size = new System.Drawing.Size(144, 24); @@ -1508,39 +1368,10 @@ private void InitializeComponent() Size = new System.Drawing.Size(320, 452); FLP_Stats.ResumeLayout(false); FLP_Stats.PerformLayout(); - FLP_StatHeader.ResumeLayout(false); - FLP_StatHeader.PerformLayout(); - FLP_HackedStats.ResumeLayout(false); - FLP_StatsHeaderRight.ResumeLayout(false); - FLP_HP.ResumeLayout(false); - FLP_HP.PerformLayout(); - FLP_HPRight.ResumeLayout(false); - FLP_HPRight.PerformLayout(); - FLP_Atk.ResumeLayout(false); - FLP_Atk.PerformLayout(); - FLP_AtkRight.ResumeLayout(false); - FLP_AtkRight.PerformLayout(); - FLP_Def.ResumeLayout(false); - FLP_Def.PerformLayout(); - FLP_DefRight.ResumeLayout(false); - FLP_DefRight.PerformLayout(); - FLP_SpA.ResumeLayout(false); - FLP_SpA.PerformLayout(); - FLP_SpALeft.ResumeLayout(false); - FLP_SpARight.ResumeLayout(false); - FLP_SpARight.PerformLayout(); - FLP_SpD.ResumeLayout(false); - FLP_SpD.PerformLayout(); - FLP_SpDRight.ResumeLayout(false); - FLP_SpDRight.PerformLayout(); - FLP_Spe.ResumeLayout(false); - FLP_Spe.PerformLayout(); - FLP_SpeRight.ResumeLayout(false); - FLP_SpeRight.PerformLayout(); - FLP_StatsTotal.ResumeLayout(false); - FLP_StatsTotal.PerformLayout(); - FLP_StatsTotalRight.ResumeLayout(false); - FLP_StatsTotalRight.PerformLayout(); + TLP_StatGrid.ResumeLayout(false); + TLP_StatGrid.PerformLayout(); + FLP_SPA.ResumeLayout(false); + FLP_SPA.PerformLayout(); FLP_HPType.ResumeLayout(false); FLP_Characteristic.ResumeLayout(false); FLP_TeraType.ResumeLayout(false); @@ -1562,54 +1393,36 @@ private void InitializeComponent() #endregion private System.Windows.Forms.FlowLayoutPanel FLP_Stats; - private System.Windows.Forms.FlowLayoutPanel FLP_StatHeader; - private System.Windows.Forms.FlowLayoutPanel FLP_HackedStats; + private System.Windows.Forms.TableLayoutPanel TLP_StatGrid; private System.Windows.Forms.CheckBox CHK_HackedStats; - private System.Windows.Forms.FlowLayoutPanel FLP_StatsHeaderRight; private System.Windows.Forms.Label Label_IVs; private System.Windows.Forms.Label Label_EVs; private System.Windows.Forms.Label Label_Stats; - private System.Windows.Forms.FlowLayoutPanel FLP_HP; - private System.Windows.Forms.Label Label_HP; - private System.Windows.Forms.FlowLayoutPanel FLP_HPRight; private System.Windows.Forms.MaskedTextBox TB_IVHP; private System.Windows.Forms.MaskedTextBox TB_EVHP; private System.Windows.Forms.MaskedTextBox Stat_HP; - private System.Windows.Forms.FlowLayoutPanel FLP_Atk; private System.Windows.Forms.Label Label_ATK; - private System.Windows.Forms.FlowLayoutPanel FLP_AtkRight; private System.Windows.Forms.MaskedTextBox TB_IVATK; private System.Windows.Forms.MaskedTextBox TB_EVATK; private System.Windows.Forms.MaskedTextBox Stat_ATK; - private System.Windows.Forms.FlowLayoutPanel FLP_Def; private System.Windows.Forms.Label Label_DEF; - private System.Windows.Forms.FlowLayoutPanel FLP_DefRight; private System.Windows.Forms.MaskedTextBox TB_IVDEF; private System.Windows.Forms.MaskedTextBox TB_EVDEF; private System.Windows.Forms.MaskedTextBox Stat_DEF; - private System.Windows.Forms.FlowLayoutPanel FLP_SpA; - private System.Windows.Forms.FlowLayoutPanel FLP_SpALeft; private System.Windows.Forms.Label Label_SPA; private System.Windows.Forms.Label Label_SPC; - private System.Windows.Forms.FlowLayoutPanel FLP_SpARight; private System.Windows.Forms.MaskedTextBox TB_IVSPA; private System.Windows.Forms.MaskedTextBox TB_EVSPA; private System.Windows.Forms.MaskedTextBox Stat_SPA; - private System.Windows.Forms.FlowLayoutPanel FLP_SpD; private System.Windows.Forms.Label Label_SPD; - private System.Windows.Forms.FlowLayoutPanel FLP_SpDRight; private System.Windows.Forms.MaskedTextBox TB_IVSPD; private System.Windows.Forms.MaskedTextBox TB_EVSPD; private System.Windows.Forms.MaskedTextBox Stat_SPD; - private System.Windows.Forms.FlowLayoutPanel FLP_Spe; private System.Windows.Forms.Label Label_SPE; - private System.Windows.Forms.FlowLayoutPanel FLP_SpeRight; private System.Windows.Forms.MaskedTextBox TB_IVSPE; private System.Windows.Forms.MaskedTextBox TB_EVSPE; private System.Windows.Forms.MaskedTextBox Stat_SPE; - private System.Windows.Forms.FlowLayoutPanel FLP_StatsTotal; private System.Windows.Forms.Label Label_Total; - private System.Windows.Forms.FlowLayoutPanel FLP_StatsTotalRight; private System.Windows.Forms.TextBox TB_IVTotal; private System.Windows.Forms.TextBox TB_EVTotal; private System.Windows.Forms.Label L_Potential; @@ -1665,5 +1478,7 @@ private void InitializeComponent() private PKHeX.WinForms.Controls.TypePictureBox PB_TeraType2; private PKHeX.WinForms.Controls.TypePictureBox PB_TeraType1; private System.Windows.Forms.FlowLayoutPanel FLP_PKMEditors; + private System.Windows.Forms.Label Label_HP; + private System.Windows.Forms.FlowLayoutPanel FLP_SPA; } } diff --git a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs index 5eead5b2e..285d42f01 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs @@ -658,38 +658,106 @@ private void SetStatOrder(StatEditorStatOrder order) if (order == StatOrder) return; - // https://stackoverflow.com/a/30219698 - // WinForms hack to create the handles and avoid Z-order changing on visibility toggle. - // Otherwise, our stat ordering may be incorrect if we change it more than once. - foreach (Control ctrl in FLP_Stats.Controls) - _ = ctrl.Handle; - // In Generation 1, Special Defense and Special Attack are combined. // Additionally, Speed is shown before Special. - const int baseIndex = 1; if (order == StatEditorStatOrder.Gen1Special) { - FLP_SpD.Visible = Label_SPA.Visible = false; + SetStatGridRow(3, 4); // Speed + SetStatGridRow(4, 5); // Special + SetStatVisibility(5, false); + + Label_SPA.Visible = false; Label_SPC.Visible = true; - FLP_Stats.Controls.SetChildIndex(FLP_Spe, baseIndex + 3); // Speed } else if (order == StatEditorStatOrder.Current) { - FLP_SpD.Visible = Label_SPA.Visible = true; + SetStatGridRow(4, 4); // SpA + SetStatGridRow(3, 6); // Speed + SetStatVisibility(5, true); + + Label_SPA.Visible = true; Label_SPC.Visible = false; - FLP_Stats.Controls.SetChildIndex(FLP_Spe, baseIndex + 5); // Speed } else { throw new ArgumentOutOfRangeException(nameof(order), order, null); } + UpdateStatGridRowHeights(); + StatOrder = order; } + private float GetStatRowHeight() => TLP_StatGrid.RowStyles.Count > 1 ? TLP_StatGrid.RowStyles[1].Height : 0; + + private void UpdateStatGridRowHeights() + { + var height = GetStatRowHeight(); + for (int row = 1; row <= 6; row++) // Iterate over stat rows (1-based index) + TLP_StatGrid.RowStyles[row].Height = IsStatRowVisible(row) ? height : 0; + } + + private bool IsStatRowVisible(int row) + { + for (int i = 0; i < L_Stats.Length; i++) + { + Control label = (i == 4) ? FLP_SPA : L_Stats[i]; + if (label.Visible && TLP_StatGrid.GetRow(label) == row) + return true; + } + + return false; + } + + private void SetStatVisibility(int statIndex, bool visible) + { + L_Stats[statIndex].Visible = visible; + MT_Base[statIndex].Visible = visible; + MT_IVs[statIndex].Visible = visible; + MT_EVs[statIndex].Visible = visible; + MT_AVs[statIndex].Visible = visible; + MT_GVs[statIndex].Visible = visible; + MT_Stats[statIndex].Visible = visible; + } + + private void SetStatGridRow(int statIndex, int row) + { + Control stat = (statIndex == 4) ? FLP_SPA : L_Stats[statIndex]; + TLP_StatGrid.SetRow(stat, row); + + TLP_StatGrid.SetRow(MT_Base[statIndex], row); + TLP_StatGrid.SetRow(MT_IVs[statIndex], row); + TLP_StatGrid.SetRow(MT_EVs[statIndex], row); + TLP_StatGrid.SetRow(MT_AVs[statIndex], row); + TLP_StatGrid.SetRow(MT_GVs[statIndex], row); + TLP_StatGrid.SetRow(MT_Stats[statIndex], row); + } + + private void SetTotalRowVisible(bool visible) + { + var total = TLP_StatGrid.RowStyles[7]; + total.SizeType = visible ? SizeType.AutoSize : SizeType.Absolute; + total.Height = 0; // AutoSize will ignore the height, but Absolute needs it to be zero to hide properly. + } + + private static void SetColumnVisible(TableLayoutPanel panel, int index, bool visible) + { + if ((uint)index >= panel.ColumnStyles.Count) + return; + + var style = panel.ColumnStyles[index]; + // toggle individual control visibility in column + foreach (Control c in panel.Controls) + { + if (panel.GetColumn(c) == index) + c.Visible = visible; + } + style.SizeType = !visible ? SizeType.AutoSize : SizeType.Absolute; + } + public void ToggleInterface(PKM pk, byte format) { - FLP_StatsTotal.Visible = format >= 3; + SetTotalRowVisible(format >= 3); FLP_Characteristic.Visible = format >= 3; FLP_HPType.Visible = format <= 7 || pk is PB8; FLP_TeraType.Visible = FLP_TeraInner.Visible = pk is ITeraType; @@ -698,9 +766,11 @@ public void ToggleInterface(PKM pk, byte format) FLP_AlphaNoble.Visible = pk is IAlpha; CHK_IsNoble.Visible = pk is PA8; + // Update stat ordering if necessary. Gen 1 shows Speed before Special, and combines Special Attack and Special Defense into one "Special" stat. + // Later gens show Speed after Special, and have separate Special Attack and Special Defense stats. SetStatOrder(format == 1 ? StatEditorStatOrder.Gen1Special : StatEditorStatOrder.Current); - switch (format) + switch (format) // EV Mask (Gen1/2 is 16-bit as opposed to 8-bit in later gens) { case 1 or 2: TB_IVHP.Enabled = false; @@ -712,27 +782,26 @@ public void ToggleInterface(PKM pk, byte format) break; } - var showAV = pk is IAwakened; - Label_AVs.Visible = TB_AVTotal.Visible = BTN_RandomAVs.Visible = showAV; - foreach (var mtb in MT_AVs) - mtb.Visible = showAV; - Label_EVs.Visible = TB_EVTotal.Visible = BTN_RandomEVs.Visible = !showAV; - foreach (var mtb in MT_EVs) - mtb.Visible = !showAV; + // Misc stat properties: toggle columns if present for object. + var showAVs = pk is IAwakened; + var showGVs = pk is IGanbaru; + var showEVs = !showAVs || HaX; + SetColumnVisible(TLP_StatGrid, 3, showEVs); + SetColumnVisible(TLP_StatGrid, 4, showAVs); + SetColumnVisible(TLP_StatGrid, 5, showGVs); + BTN_RandomEVs.Visible = showEVs; + BTN_RandomAVs.Visible = showAVs; + // no randomizing GVs; maxing/zeroing is all that is needed. FLP_PKMEditors.PerformLayout(); + return; - var showGV = pk is IGanbaru; - Label_GVs.Visible = showGV; - foreach (var mtb in MT_GVs) - mtb.Visible = showGV; - - static void SetEVMaskSize(Size s, string Mask, MaskedTextBox[] arr) + static void SetEVMaskSize(Size s, string mask, ReadOnlySpan arr) { foreach (var ctrl in arr) { ctrl.Size = s; - ctrl.Mask = Mask; + ctrl.Mask = mask; } } } diff --git a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.Designer.cs b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.Designer.cs index 82c530ba8..b462c32f0 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.Designer.cs @@ -162,7 +162,7 @@ private void InitializeComponent() // B_PopoutBox.ContextMenuStrip = PopoutMenu; B_PopoutBox.Image = Properties.Resources.popout; - B_PopoutBox.Location = new System.Drawing.Point(3, 3); + B_PopoutBox.Location = new System.Drawing.Point(3, 15); B_PopoutBox.Margin = new System.Windows.Forms.Padding(0); B_PopoutBox.Name = "B_PopoutBox"; B_PopoutBox.Size = new System.Drawing.Size(24, 24); @@ -174,13 +174,13 @@ private void InitializeComponent() // PopoutMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { Menu_PopoutBoxSingle, Menu_PopoutBoxAll }); PopoutMenu.Name = "PopoutMenu"; - PopoutMenu.Size = new System.Drawing.Size(181, 70); + PopoutMenu.Size = new System.Drawing.Size(137, 48); // // Menu_PopoutBoxSingle // Menu_PopoutBoxSingle.Image = Properties.Resources.open; Menu_PopoutBoxSingle.Name = "Menu_PopoutBoxSingle"; - Menu_PopoutBoxSingle.Size = new System.Drawing.Size(180, 22); + Menu_PopoutBoxSingle.Size = new System.Drawing.Size(136, 22); Menu_PopoutBoxSingle.Text = "Single Box"; Menu_PopoutBoxSingle.Click += Menu_PopoutBoxSingle_Click; // @@ -188,7 +188,7 @@ private void InitializeComponent() // Menu_PopoutBoxAll.Image = Properties.Resources.database; Menu_PopoutBoxAll.Name = "Menu_PopoutBoxAll"; - Menu_PopoutBoxAll.Size = new System.Drawing.Size(180, 22); + Menu_PopoutBoxAll.Size = new System.Drawing.Size(136, 22); Menu_PopoutBoxAll.Text = "All Boxes"; Menu_PopoutBoxAll.Click += Menu_PopoutBoxAll_Click; // @@ -196,7 +196,7 @@ private void InitializeComponent() // B_SearchBox.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; B_SearchBox.Image = Properties.Resources.other; - B_SearchBox.Location = new System.Drawing.Point(414, 3); + B_SearchBox.Location = new System.Drawing.Point(414, 15); B_SearchBox.Margin = new System.Windows.Forms.Padding(0); B_SearchBox.Name = "B_SearchBox"; B_SearchBox.Size = new System.Drawing.Size(24, 24); @@ -214,7 +214,7 @@ private void InitializeComponent() Box.CurrentBox = -1; Box.Editor = null; Box.FlagIllegal = false; - Box.Location = new System.Drawing.Point(107, 7); + Box.Location = new System.Drawing.Point(107, 19); Box.M = null; Box.Name = "Box"; Box.Size = new System.Drawing.Size(251, 187); diff --git a/PKHeX.WinForms/MainWindow/Main.Designer.cs b/PKHeX.WinForms/MainWindow/Main.Designer.cs index 4954d8a68..2c90a2c13 100644 --- a/PKHeX.WinForms/MainWindow/Main.Designer.cs +++ b/PKHeX.WinForms/MainWindow/Main.Designer.cs @@ -383,7 +383,7 @@ public void InitializeComponent() // splitContainer1.Panel2.Controls.Add(C_SAV); splitContainer1.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3); - splitContainer1.Size = new System.Drawing.Size(864, 367); + splitContainer1.Size = new System.Drawing.Size(864, 383); splitContainer1.SplitterDistance = 400; splitContainer1.SplitterWidth = 1; splitContainer1.TabIndex = 105; @@ -426,7 +426,7 @@ public void InitializeComponent() PKME_Tabs.Location = new System.Drawing.Point(0, 0); PKME_Tabs.Margin = new System.Windows.Forms.Padding(0); PKME_Tabs.Name = "PKME_Tabs"; - PKME_Tabs.Size = new System.Drawing.Size(400, 367); + PKME_Tabs.Size = new System.Drawing.Size(400, 383); PKME_Tabs.TabIndex = 103; PKME_Tabs.Unicode = true; PKME_Tabs.LegalityChanged += PKME_Tabs_LegalityChanged; @@ -446,7 +446,7 @@ public void InitializeComponent() C_SAV.Menu_Redo = null; C_SAV.Menu_Undo = null; C_SAV.Name = "C_SAV"; - C_SAV.Size = new System.Drawing.Size(462, 364); + C_SAV.Size = new System.Drawing.Size(462, 380); C_SAV.TabIndex = 104; C_SAV.ViewIndex = -1; C_SAV.RequestCloneData += ClickClone; @@ -470,7 +470,7 @@ public void InitializeComponent() // splitContainer2.Panel2 // splitContainer2.Panel2.Controls.Add(splitContainer1); - splitContainer2.Size = new System.Drawing.Size(864, 393); + splitContainer2.Size = new System.Drawing.Size(864, 409); splitContainer2.SplitterDistance = 25; splitContainer2.SplitterWidth = 1; splitContainer2.TabIndex = 106; @@ -480,7 +480,7 @@ public void InitializeComponent() AllowDrop = true; AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - ClientSize = new System.Drawing.Size(864, 393); + ClientSize = new System.Drawing.Size(864, 409); Controls.Add(splitContainer2); FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; Icon = Properties.Resources.Icon;