Misc GUI tweaks

database Reset filters now auto-sizes, tabs are now taller
box popup now shows the switch-view button as an actual button rather than a flat image
This commit is contained in:
Kurt 2026-02-21 19:41:05 -06:00
parent 11c4fe446e
commit 395bc1b1e9
7 changed files with 63 additions and 52 deletions

View File

@ -60,7 +60,7 @@ private void InitializeComponent()
TLP_Main.RowCount = 2;
TLP_Main.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
TLP_Main.RowStyles.Add(new System.Windows.Forms.RowStyle());
TLP_Main.Size = new System.Drawing.Size(320, 502);
TLP_Main.Size = new System.Drawing.Size(322, 510);
TLP_Main.TabIndex = 0;
//
// TC_SearchSettings
@ -68,21 +68,22 @@ private void InitializeComponent()
TC_SearchSettings.Controls.Add(Tab_General);
TC_SearchSettings.Controls.Add(Tab_Advanced);
TC_SearchSettings.Dock = System.Windows.Forms.DockStyle.Fill;
TC_SearchSettings.ItemSize = new System.Drawing.Size(57, 32);
TC_SearchSettings.Location = new System.Drawing.Point(0, 0);
TC_SearchSettings.Margin = new System.Windows.Forms.Padding(0);
TC_SearchSettings.Name = "TC_SearchSettings";
TC_SearchSettings.Padding = new System.Drawing.Point(0, 0);
TC_SearchSettings.SelectedIndex = 0;
TC_SearchSettings.Size = new System.Drawing.Size(320, 474);
TC_SearchSettings.Size = new System.Drawing.Size(322, 482);
TC_SearchSettings.TabIndex = 2;
//
// Tab_General
//
Tab_General.Controls.Add(UC_EntitySearch);
Tab_General.Location = new System.Drawing.Point(4, 26);
Tab_General.Location = new System.Drawing.Point(4, 36);
Tab_General.Margin = new System.Windows.Forms.Padding(0);
Tab_General.Name = "Tab_General";
Tab_General.Size = new System.Drawing.Size(312, 444);
Tab_General.Size = new System.Drawing.Size(314, 442);
Tab_General.TabIndex = 0;
Tab_General.Text = "General";
Tab_General.UseVisualStyleBackColor = true;
@ -95,17 +96,17 @@ private void InitializeComponent()
UC_EntitySearch.Location = new System.Drawing.Point(0, 0);
UC_EntitySearch.Margin = new System.Windows.Forms.Padding(0);
UC_EntitySearch.Name = "UC_EntitySearch";
UC_EntitySearch.Size = new System.Drawing.Size(312, 444);
UC_EntitySearch.Size = new System.Drawing.Size(314, 442);
UC_EntitySearch.TabIndex = 0;
//
// Tab_Advanced
//
Tab_Advanced.Controls.Add(B_Add);
Tab_Advanced.Controls.Add(RTB_Instructions);
Tab_Advanced.Location = new System.Drawing.Point(4, 26);
Tab_Advanced.Location = new System.Drawing.Point(4, 36);
Tab_Advanced.Margin = new System.Windows.Forms.Padding(0);
Tab_Advanced.Name = "Tab_Advanced";
Tab_Advanced.Size = new System.Drawing.Size(192, 70);
Tab_Advanced.Size = new System.Drawing.Size(314, 442);
Tab_Advanced.TabIndex = 1;
Tab_Advanced.Text = "Advanced";
Tab_Advanced.UseVisualStyleBackColor = true;
@ -113,7 +114,7 @@ private void InitializeComponent()
// B_Add
//
B_Add.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
B_Add.Location = new System.Drawing.Point(128, 0);
B_Add.Location = new System.Drawing.Point(250, 0);
B_Add.Margin = new System.Windows.Forms.Padding(0);
B_Add.Name = "B_Add";
B_Add.Size = new System.Drawing.Size(66, 27);
@ -128,7 +129,7 @@ private void InitializeComponent()
RTB_Instructions.Location = new System.Drawing.Point(0, 55);
RTB_Instructions.Margin = new System.Windows.Forms.Padding(0);
RTB_Instructions.Name = "RTB_Instructions";
RTB_Instructions.Size = new System.Drawing.Size(192, 15);
RTB_Instructions.Size = new System.Drawing.Size(314, 387);
RTB_Instructions.TabIndex = 0;
RTB_Instructions.Text = "";
//
@ -142,18 +143,18 @@ private void InitializeComponent()
TLP_SearchNavigate.Controls.Add(B_Previous, 0, 0);
TLP_SearchNavigate.Controls.Add(B_Search, 1, 0);
TLP_SearchNavigate.Dock = System.Windows.Forms.DockStyle.Fill;
TLP_SearchNavigate.Location = new System.Drawing.Point(0, 474);
TLP_SearchNavigate.Location = new System.Drawing.Point(0, 482);
TLP_SearchNavigate.Margin = new System.Windows.Forms.Padding(0);
TLP_SearchNavigate.Name = "TLP_SearchNavigate";
TLP_SearchNavigate.RowCount = 1;
TLP_SearchNavigate.RowStyles.Add(new System.Windows.Forms.RowStyle());
TLP_SearchNavigate.Size = new System.Drawing.Size(320, 28);
TLP_SearchNavigate.Size = new System.Drawing.Size(322, 28);
TLP_SearchNavigate.TabIndex = 3;
//
// B_Next
//
B_Next.Dock = System.Windows.Forms.DockStyle.Fill;
B_Next.Location = new System.Drawing.Point(232, 0);
B_Next.Location = new System.Drawing.Point(234, 0);
B_Next.Margin = new System.Windows.Forms.Padding(0);
B_Next.Name = "B_Next";
B_Next.Size = new System.Drawing.Size(88, 30);
@ -179,11 +180,12 @@ private void InitializeComponent()
// B_Search
//
B_Search.AutoSize = true;
B_Search.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
B_Search.Dock = System.Windows.Forms.DockStyle.Fill;
B_Search.Location = new System.Drawing.Point(88, 0);
B_Search.Margin = new System.Windows.Forms.Padding(0);
B_Search.Name = "B_Search";
B_Search.Size = new System.Drawing.Size(144, 30);
B_Search.Size = new System.Drawing.Size(146, 30);
B_Search.TabIndex = 4;
B_Search.Text = "Search!";
B_Search.UseVisualStyleBackColor = true;
@ -192,10 +194,12 @@ private void InitializeComponent()
// B_Reset
//
B_Reset.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
B_Reset.Location = new System.Drawing.Point(214, 0);
B_Reset.AutoSize = true;
B_Reset.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
B_Reset.Location = new System.Drawing.Point(233, 0);
B_Reset.Margin = new System.Windows.Forms.Padding(0);
B_Reset.Name = "B_Reset";
B_Reset.Size = new System.Drawing.Size(104, 27);
B_Reset.Size = new System.Drawing.Size(88, 27);
B_Reset.TabIndex = 0;
B_Reset.Text = "Reset Filters";
B_Reset.UseVisualStyleBackColor = true;
@ -204,7 +208,7 @@ private void InitializeComponent()
// EntitySearchSetup
//
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
ClientSize = new System.Drawing.Size(320, 502);
ClientSize = new System.Drawing.Size(322, 510);
Controls.Add(B_Reset);
Controls.Add(TLP_Main);
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
@ -223,6 +227,7 @@ private void InitializeComponent()
TLP_SearchNavigate.ResumeLayout(false);
TLP_SearchNavigate.PerformLayout();
ResumeLayout(false);
PerformLayout();
}
#endregion

View File

@ -111,10 +111,7 @@ private void B_Search_Click(object? sender, EventArgs e)
private void B_Reset_Click(object? sender, EventArgs e)
{
UC_EntitySearch.ResetFilters();
RTB_Instructions.Clear();
SearchFilter = null;
ResetRequested?.Invoke(this, EventArgs.Empty);
ForceReset();
System.Media.SystemSounds.Asterisk.Play();
}

View File

@ -239,12 +239,13 @@ private void InitializeComponent()
//
// UC_EntitySearch
//
UC_EntitySearch.AutoSize = true;
UC_EntitySearch.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
UC_EntitySearch.Dock = System.Windows.Forms.DockStyle.Fill;
UC_EntitySearch.Location = new System.Drawing.Point(4, 3);
UC_EntitySearch.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
UC_EntitySearch.Name = "UC_EntitySearch";
UC_EntitySearch.Size = new System.Drawing.Size(314, 449);
UC_EntitySearch.Size = new System.Drawing.Size(314, 448);
UC_EntitySearch.TabIndex = 118;
//
// B_Search
@ -262,6 +263,8 @@ private void InitializeComponent()
// B_Reset
//
B_Reset.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
B_Reset.AutoSize = true;
B_Reset.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
B_Reset.Location = new System.Drawing.Point(604, 0);
B_Reset.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
B_Reset.Name = "B_Reset";
@ -321,22 +324,23 @@ private void InitializeComponent()
TC_SearchSettings.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
TC_SearchSettings.Controls.Add(Tab_General);
TC_SearchSettings.Controls.Add(Tab_Advanced);
TC_SearchSettings.Location = new System.Drawing.Point(355, 9);
TC_SearchSettings.ItemSize = new System.Drawing.Size(57, 32);
TC_SearchSettings.Location = new System.Drawing.Point(355, 0);
TC_SearchSettings.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
TC_SearchSettings.Name = "TC_SearchSettings";
TC_SearchSettings.Padding = new System.Drawing.Point(0, 0);
TC_SearchSettings.SelectedIndex = 0;
TC_SearchSettings.Size = new System.Drawing.Size(330, 485);
TC_SearchSettings.Size = new System.Drawing.Size(330, 494);
TC_SearchSettings.TabIndex = 120;
//
// Tab_General
//
Tab_General.Controls.Add(UC_EntitySearch);
Tab_General.Location = new System.Drawing.Point(4, 26);
Tab_General.Location = new System.Drawing.Point(4, 36);
Tab_General.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
Tab_General.Name = "Tab_General";
Tab_General.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
Tab_General.Size = new System.Drawing.Size(322, 455);
Tab_General.Size = new System.Drawing.Size(322, 454);
Tab_General.TabIndex = 0;
Tab_General.Text = "General";
Tab_General.UseVisualStyleBackColor = true;
@ -400,6 +404,7 @@ private void InitializeComponent()
mnu.ResumeLayout(false);
TC_SearchSettings.ResumeLayout(false);
Tab_General.ResumeLayout(false);
Tab_General.PerformLayout();
Tab_Advanced.ResumeLayout(false);
ResumeLayout(false);
PerformLayout();

View File

@ -161,6 +161,8 @@ private void InitializeComponent()
// B_Reset
//
B_Reset.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
B_Reset.AutoSize = true;
B_Reset.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
B_Reset.Location = new System.Drawing.Point(604, 0);
B_Reset.Margin = new System.Windows.Forms.Padding(0);
B_Reset.Name = "B_Reset";
@ -222,21 +224,22 @@ private void InitializeComponent()
TC_SearchOptions.Controls.Add(Tab_General);
TC_SearchOptions.Controls.Add(Tab_Advanced);
TC_SearchOptions.Controls.Add(Tab_Criteria);
TC_SearchOptions.Location = new System.Drawing.Point(355, 9);
TC_SearchOptions.ItemSize = new System.Drawing.Size(57, 32);
TC_SearchOptions.Location = new System.Drawing.Point(355, 0);
TC_SearchOptions.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
TC_SearchOptions.Name = "TC_SearchOptions";
TC_SearchOptions.Padding = new System.Drawing.Point(0, 0);
TC_SearchOptions.SelectedIndex = 0;
TC_SearchOptions.Size = new System.Drawing.Size(330, 403);
TC_SearchOptions.Size = new System.Drawing.Size(330, 412);
TC_SearchOptions.TabIndex = 120;
//
// Tab_General
//
Tab_General.Controls.Add(TLP_Filters);
Tab_General.Location = new System.Drawing.Point(4, 26);
Tab_General.Location = new System.Drawing.Point(4, 36);
Tab_General.Margin = new System.Windows.Forms.Padding(0);
Tab_General.Name = "Tab_General";
Tab_General.Size = new System.Drawing.Size(322, 373);
Tab_General.Size = new System.Drawing.Size(322, 372);
Tab_General.TabIndex = 0;
Tab_General.Text = "General";
Tab_General.UseVisualStyleBackColor = true;
@ -290,7 +293,7 @@ private void InitializeComponent()
TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle());
TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle());
TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
TLP_Filters.Size = new System.Drawing.Size(322, 373);
TLP_Filters.Size = new System.Drawing.Size(322, 372);
TLP_Filters.TabIndex = 120;
//
// Label_Species
@ -453,7 +456,7 @@ private void InitializeComponent()
TypeFilters.Location = new System.Drawing.Point(96, 182);
TypeFilters.Margin = new System.Windows.Forms.Padding(0);
TypeFilters.Name = "TypeFilters";
TypeFilters.Size = new System.Drawing.Size(226, 191);
TypeFilters.Size = new System.Drawing.Size(226, 190);
TypeFilters.TabIndex = 123;
//
// CHK_IsEgg

View File

@ -333,6 +333,8 @@ private void InitializeComponent()
// B_Reset
//
B_Reset.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
B_Reset.AutoSize = true;
B_Reset.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
B_Reset.Location = new System.Drawing.Point(604, 0);
B_Reset.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
B_Reset.Name = "B_Reset";
@ -443,7 +445,7 @@ private void InitializeComponent()
TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle());
TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle());
TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle());
TLP_Filters.Size = new System.Drawing.Size(322, 373);
TLP_Filters.Size = new System.Drawing.Size(322, 372);
TLP_Filters.TabIndex = 118;
//
// FLP_Format
@ -541,20 +543,21 @@ private void InitializeComponent()
TC_SearchSettings.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
TC_SearchSettings.Controls.Add(Tab_General);
TC_SearchSettings.Controls.Add(Tab_Advanced);
TC_SearchSettings.Location = new System.Drawing.Point(355, 9);
TC_SearchSettings.ItemSize = new System.Drawing.Size(57, 32);
TC_SearchSettings.Location = new System.Drawing.Point(355, 0);
TC_SearchSettings.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
TC_SearchSettings.Name = "TC_SearchSettings";
TC_SearchSettings.SelectedIndex = 0;
TC_SearchSettings.Size = new System.Drawing.Size(330, 403);
TC_SearchSettings.Size = new System.Drawing.Size(330, 412);
TC_SearchSettings.TabIndex = 120;
//
// Tab_General
//
Tab_General.Controls.Add(TLP_Filters);
Tab_General.Location = new System.Drawing.Point(4, 26);
Tab_General.Location = new System.Drawing.Point(4, 36);
Tab_General.Margin = new System.Windows.Forms.Padding(0);
Tab_General.Name = "Tab_General";
Tab_General.Size = new System.Drawing.Size(322, 373);
Tab_General.Size = new System.Drawing.Size(322, 372);
Tab_General.TabIndex = 0;
Tab_General.Text = "General";
Tab_General.UseVisualStyleBackColor = true;
@ -563,10 +566,10 @@ private void InitializeComponent()
//
Tab_Advanced.Controls.Add(B_Add);
Tab_Advanced.Controls.Add(RTB_Instructions);
Tab_Advanced.Location = new System.Drawing.Point(4, 26);
Tab_Advanced.Location = new System.Drawing.Point(4, 36);
Tab_Advanced.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
Tab_Advanced.Name = "Tab_Advanced";
Tab_Advanced.Size = new System.Drawing.Size(322, 373);
Tab_Advanced.Size = new System.Drawing.Size(322, 372);
Tab_Advanced.TabIndex = 1;
Tab_Advanced.Text = "Advanced";
Tab_Advanced.UseVisualStyleBackColor = true;
@ -589,7 +592,7 @@ private void InitializeComponent()
RTB_Instructions.Location = new System.Drawing.Point(0, 55);
RTB_Instructions.Margin = new System.Windows.Forms.Padding(0);
RTB_Instructions.Name = "RTB_Instructions";
RTB_Instructions.Size = new System.Drawing.Size(322, 318);
RTB_Instructions.Size = new System.Drawing.Size(322, 317);
RTB_Instructions.TabIndex = 120;
RTB_Instructions.Text = "";
//

View File

@ -28,20 +28,19 @@ protected override void Dispose(bool disposing)
/// </summary>
private void InitializeComponent()
{
PB_BoxSwap = new System.Windows.Forms.PictureBox();
B_BoxSwap = new System.Windows.Forms.Button();
Box = new PKHeX.WinForms.Controls.BoxEditor();
((System.ComponentModel.ISupportInitialize)(PB_BoxSwap)).BeginInit();
SuspendLayout();
//
// PB_BoxSwap
//
PB_BoxSwap.Image = global::PKHeX.WinForms.Properties.Resources.swapBox;
PB_BoxSwap.Location = new System.Drawing.Point(0, 0);
PB_BoxSwap.Name = "PB_BoxSwap";
PB_BoxSwap.Size = new System.Drawing.Size(24, 24);
PB_BoxSwap.TabIndex = 67;
PB_BoxSwap.TabStop = false;
PB_BoxSwap.Click += new System.EventHandler(PB_BoxSwap_Click);
B_BoxSwap.Image = global::PKHeX.WinForms.Properties.Resources.swapBox;
B_BoxSwap.Location = new System.Drawing.Point(0, 0);
B_BoxSwap.Name = "B_BoxSwap";
B_BoxSwap.Size = new System.Drawing.Size(24, 24);
B_BoxSwap.TabIndex = 67;
B_BoxSwap.TabStop = false;
B_BoxSwap.Click += new System.EventHandler(PB_BoxSwap_Click);
//
// Box
//
@ -64,7 +63,7 @@ private void InitializeComponent()
AllowDrop = true;
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
ClientSize = new System.Drawing.Size(249, 183);
Controls.Add(PB_BoxSwap);
Controls.Add(B_BoxSwap);
Controls.Add(Box);
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
Icon = global::PKHeX.WinForms.Properties.Resources.Icon;
@ -74,13 +73,12 @@ private void InitializeComponent()
StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
Text = "Box Viewer";
FormClosing += new System.Windows.Forms.FormClosingEventHandler(SAV_BoxViewer_FormClosing);
((System.ComponentModel.ISupportInitialize)(PB_BoxSwap)).EndInit();
ResumeLayout(false);
}
#endregion
private System.Windows.Forms.PictureBox PB_BoxSwap;
private System.Windows.Forms.Button B_BoxSwap;
public Controls.BoxEditor Box;
}
}

View File

@ -26,7 +26,7 @@ public SAV_BoxViewer(SAVEditor p, SlotChangeManager m, int box)
{
WinFormsTranslator.ReformatDark(Box.B_BoxLeft);
WinFormsTranslator.ReformatDark(Box.B_BoxRight);
WinFormsTranslator.ReformatDark(PB_BoxSwap);
WinFormsTranslator.ReformatDark(B_BoxSwap);
WinFormsTranslator.ReformatDark(Box.CB_BoxSelect);
}