diff --git a/PKHeX.WinForms/Controls/PKM Editor/EntityInstructionBuilder.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/EntityInstructionBuilder.Designer.cs index 4b6f9ce64..539ed706d 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/EntityInstructionBuilder.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/EntityInstructionBuilder.Designer.cs @@ -43,10 +43,10 @@ private void InitializeComponent() // L_PropValue.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; L_PropValue.AutoSize = true; - L_PropValue.Location = new System.Drawing.Point(200, 28); + L_PropValue.Location = new System.Drawing.Point(236, 30); L_PropValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_PropValue.Name = "L_PropValue"; - L_PropValue.Size = new System.Drawing.Size(80, 15); + L_PropValue.Size = new System.Drawing.Size(89, 17); L_PropValue.TabIndex = 18; L_PropValue.Text = "PropertyValue"; // @@ -56,7 +56,7 @@ private void InitializeComponent() L_PropType.Location = new System.Drawing.Point(55, 28); L_PropType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_PropType.Name = "L_PropType"; - L_PropType.Size = new System.Drawing.Size(76, 15); + L_PropType.Size = new System.Drawing.Size(85, 17); L_PropType.TabIndex = 17; L_PropType.Text = "PropertyType"; // @@ -66,11 +66,11 @@ private void InitializeComponent() CB_Require.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; CB_Require.FormattingEnabled = true; CB_Require.Items.AddRange(new object[] { "Set", "==", "!=", ">", ">=", "<", "<=" }); - CB_Require.Location = new System.Drawing.Point(203, 0); - CB_Require.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CB_Require.Location = new System.Drawing.Point(236, 0); + CB_Require.Margin = new System.Windows.Forms.Padding(4); CB_Require.Name = "CB_Require"; - CB_Require.Size = new System.Drawing.Size(135, 23); - CB_Require.TabIndex = 16; + CB_Require.Size = new System.Drawing.Size(100, 25); + CB_Require.TabIndex = 2; // // CB_Property // @@ -79,11 +79,11 @@ private void InitializeComponent() CB_Property.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; CB_Property.DropDownWidth = 200; CB_Property.FormattingEnabled = true; - CB_Property.Location = new System.Drawing.Point(58, 0); - CB_Property.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CB_Property.Location = new System.Drawing.Point(56, 0); + CB_Property.Margin = new System.Windows.Forms.Padding(4); CB_Property.Name = "CB_Property"; - CB_Property.Size = new System.Drawing.Size(137, 23); - CB_Property.TabIndex = 15; + CB_Property.Size = new System.Drawing.Size(176, 25); + CB_Property.TabIndex = 1; CB_Property.SelectedIndexChanged += CB_Property_SelectedIndexChanged; // // CB_Format @@ -91,10 +91,10 @@ private void InitializeComponent() CB_Format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; CB_Format.FormattingEnabled = true; CB_Format.Location = new System.Drawing.Point(0, 0); - CB_Format.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + CB_Format.Margin = new System.Windows.Forms.Padding(4); CB_Format.Name = "CB_Format"; - CB_Format.Size = new System.Drawing.Size(51, 23); - CB_Format.TabIndex = 14; + CB_Format.Size = new System.Drawing.Size(52, 25); + CB_Format.TabIndex = 0; CB_Format.SelectedIndexChanged += CB_Format_SelectedIndexChanged; // // EntityInstructionBuilder diff --git a/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.Designer.cs b/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.Designer.cs index bc9c66317..bc4d47c1d 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.Designer.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.Designer.cs @@ -50,7 +50,7 @@ private void InitializeComponent() RB_Boxes.Location = new System.Drawing.Point(0, 1); RB_Boxes.Margin = new System.Windows.Forms.Padding(0); RB_Boxes.Name = "RB_Boxes"; - RB_Boxes.Size = new System.Drawing.Size(48, 25); + RB_Boxes.Size = new System.Drawing.Size(52, 27); RB_Boxes.TabIndex = 0; RB_Boxes.TabStop = true; RB_Boxes.Text = "Boxes"; @@ -62,11 +62,11 @@ private void InitializeComponent() RB_Path.Anchor = System.Windows.Forms.AnchorStyles.Left; RB_Path.Appearance = System.Windows.Forms.Appearance.Button; RB_Path.AutoSize = true; - RB_Path.Location = new System.Drawing.Point(92, 1); + RB_Path.Location = new System.Drawing.Point(99, 1); RB_Path.Margin = new System.Windows.Forms.Padding(0); RB_Path.Name = "RB_Path"; - RB_Path.Size = new System.Drawing.Size(59, 25); - RB_Path.TabIndex = 1; + RB_Path.Size = new System.Drawing.Size(64, 27); + RB_Path.TabIndex = 2; RB_Path.Text = "Folder..."; RB_Path.UseVisualStyleBackColor = true; RB_Path.Click += B_Open_Click; @@ -78,10 +78,10 @@ private void InitializeComponent() FLP_RB.Controls.Add(RB_Party); FLP_RB.Controls.Add(RB_Path); FLP_RB.Controls.Add(TB_Folder); - FLP_RB.Location = new System.Drawing.Point(14, 12); - FLP_RB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + FLP_RB.Location = new System.Drawing.Point(12, 12); + FLP_RB.Margin = new System.Windows.Forms.Padding(4); FLP_RB.Name = "FLP_RB"; - FLP_RB.Size = new System.Drawing.Size(432, 28); + FLP_RB.Size = new System.Drawing.Size(460, 28); FLP_RB.TabIndex = 2; // // RB_Party @@ -89,42 +89,42 @@ private void InitializeComponent() RB_Party.Anchor = System.Windows.Forms.AnchorStyles.Left; RB_Party.Appearance = System.Windows.Forms.Appearance.Button; RB_Party.AutoSize = true; - RB_Party.Location = new System.Drawing.Point(48, 1); + RB_Party.Location = new System.Drawing.Point(52, 1); RB_Party.Margin = new System.Windows.Forms.Padding(0); RB_Party.Name = "RB_Party"; - RB_Party.Size = new System.Drawing.Size(44, 25); - RB_Party.TabIndex = 5; + RB_Party.Size = new System.Drawing.Size(47, 27); + RB_Party.TabIndex = 1; RB_Party.Text = "Party"; RB_Party.UseVisualStyleBackColor = true; // // TB_Folder // TB_Folder.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - TB_Folder.Location = new System.Drawing.Point(153, 2); + TB_Folder.Location = new System.Drawing.Point(165, 2); TB_Folder.Margin = new System.Windows.Forms.Padding(2); TB_Folder.Name = "TB_Folder"; TB_Folder.ReadOnly = true; - TB_Folder.Size = new System.Drawing.Size(251, 23); - TB_Folder.TabIndex = 4; + TB_Folder.Size = new System.Drawing.Size(292, 25); + TB_Folder.TabIndex = 3; TB_Folder.Visible = false; // // RTB_Instructions // RTB_Instructions.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - RTB_Instructions.Location = new System.Drawing.Point(14, 97); - RTB_Instructions.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + RTB_Instructions.Location = new System.Drawing.Point(12, 98); + RTB_Instructions.Margin = new System.Windows.Forms.Padding(4); RTB_Instructions.Name = "RTB_Instructions"; - RTB_Instructions.Size = new System.Drawing.Size(431, 162); + RTB_Instructions.Size = new System.Drawing.Size(459, 177); RTB_Instructions.TabIndex = 5; RTB_Instructions.Text = ""; // // B_Go // B_Go.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; - B_Go.Location = new System.Drawing.Point(379, 265); - B_Go.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + B_Go.Location = new System.Drawing.Point(405, 282); + B_Go.Margin = new System.Windows.Forms.Padding(4); B_Go.Name = "B_Go"; - B_Go.Size = new System.Drawing.Size(66, 27); + B_Go.Size = new System.Drawing.Size(66, 28); B_Go.TabIndex = 6; B_Go.Text = "Run"; B_Go.UseVisualStyleBackColor = true; @@ -133,20 +133,20 @@ private void InitializeComponent() // PB_Show // PB_Show.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - PB_Show.Location = new System.Drawing.Point(14, 267); - PB_Show.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + PB_Show.Location = new System.Drawing.Point(12, 284); + PB_Show.Margin = new System.Windows.Forms.Padding(4); PB_Show.Name = "PB_Show"; - PB_Show.Size = new System.Drawing.Size(358, 24); + PB_Show.Size = new System.Drawing.Size(382, 24); PB_Show.TabIndex = 7; // // B_Add // B_Add.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; - B_Add.Location = new System.Drawing.Point(378, 45); + B_Add.Location = new System.Drawing.Point(406, 42); B_Add.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); B_Add.Name = "B_Add"; - B_Add.Size = new System.Drawing.Size(66, 27); - B_Add.TabIndex = 11; + B_Add.Size = new System.Drawing.Size(66, 28); + B_Add.TabIndex = 4; B_Add.Text = "Add"; B_Add.UseVisualStyleBackColor = true; B_Add.Click += B_Add_Click; @@ -159,7 +159,7 @@ private void InitializeComponent() // AllowDrop = true; AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; - ClientSize = new System.Drawing.Size(460, 301); + ClientSize = new System.Drawing.Size(484, 321); Controls.Add(B_Add); Controls.Add(PB_Show); Controls.Add(B_Go); @@ -169,7 +169,7 @@ private void InitializeComponent() Icon = Properties.Resources.Icon; Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); MaximizeBox = false; - MinimumSize = new System.Drawing.Size(476, 340); + MinimumSize = new System.Drawing.Size(500, 340); Name = "BatchEditor"; StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; Text = "Batch Editor"; diff --git a/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs index fd3941f1a..963056b85 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs @@ -26,9 +26,9 @@ public BatchEditor(PKM pk, SaveFile sav) var above = FLP_RB.Location; UC_Builder = new EntityInstructionBuilder(() => pk) { - Location = new() { Y = above.Y + FLP_RB.Height + 6, X = above.X + 1 }, + Location = new() { Y = above.Y + FLP_RB.Height + 4 - 1, X = above.X + 1 }, Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right, - Width = B_Add.Location.X - above.X - 6, + Width = B_Add.Location.X - above.X - 2, }; Controls.Add(UC_Builder); SAV = sav;