From 44fd5ca07ceb9fb10e6f5a74c0b4d328e5c5be7b Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 27 Jun 2016 21:16:46 -0700 Subject: [PATCH] Update database viewer with Format filter Filters reorganized into tablelayoutpanel for tight appearance. --- SAV/SAV_Database.Designer.cs | 501 +++++++++++++++++++++++------------ SAV/SAV_Database.cs | 39 +-- 2 files changed, 351 insertions(+), 189 deletions(-) diff --git a/SAV/SAV_Database.Designer.cs b/SAV/SAV_Database.Designer.cs index 5a94534f9..240a2e686 100644 --- a/SAV/SAV_Database.Designer.cs +++ b/SAV/SAV_Database.Designer.cs @@ -128,8 +128,6 @@ private void InitializeComponent() this.CB_HPType = new System.Windows.Forms.ComboBox(); this.Label_HiddenPowerPrefix = new System.Windows.Forms.Label(); this.CB_GameOrigin = new System.Windows.Forms.ComboBox(); - this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); - this.CHK_Shiny = new System.Windows.Forms.CheckBox(); this.CB_IV = new System.Windows.Forms.ComboBox(); this.B_Search = new System.Windows.Forms.Button(); this.CB_Level = new System.Windows.Forms.ComboBox(); @@ -141,12 +139,19 @@ private void InitializeComponent() this.L_Potential = new System.Windows.Forms.Label(); this.L_EVTraining = new System.Windows.Forms.Label(); this.B_Reset = new System.Windows.Forms.Button(); - this.MT_ESV = new System.Windows.Forms.MaskedTextBox(); - this.L_ESV = new System.Windows.Forms.Label(); this.L_Count = new System.Windows.Forms.Label(); this.L_Generation = new System.Windows.Forms.Label(); this.CB_Generation = new System.Windows.Forms.ComboBox(); this.L_Viewed = new System.Windows.Forms.Label(); + this.FLP_Egg = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); + this.L_ESV = new System.Windows.Forms.Label(); + this.MT_ESV = new System.Windows.Forms.MaskedTextBox(); + this.CHK_Shiny = new System.Windows.Forms.CheckBox(); + this.TLP_Filters = new System.Windows.Forms.TableLayoutPanel(); + this.FLP_Level = new System.Windows.Forms.FlowLayoutPanel(); + this.CB_Format = new System.Windows.Forms.ComboBox(); + this.L_Format = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bpkx30)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx28)).BeginInit(); @@ -216,6 +221,9 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.bpkx63)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx62)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx61)).BeginInit(); + this.FLP_Egg.SuspendLayout(); + this.TLP_Filters.SuspendLayout(); + this.FLP_Level.SuspendLayout(); this.SuspendLayout(); // // SCR_Box @@ -915,7 +923,7 @@ private void InitializeComponent() this.Menu_Exit.Name = "Menu_Exit"; this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.Menu_Exit.ShowShortcutKeys = false; - this.Menu_Exit.Size = new System.Drawing.Size(152, 22); + this.Menu_Exit.Size = new System.Drawing.Size(96, 22); this.Menu_Exit.Text = "&Close"; this.Menu_Exit.Click += new System.EventHandler(this.Menu_Exit_Click); // @@ -1156,99 +1164,108 @@ private void InitializeComponent() // // CB_Ability // - this.CB_Ability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Ability.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ability.FormattingEnabled = true; this.CB_Ability.Items.AddRange(new object[] { "Item"}); - this.CB_Ability.Location = new System.Drawing.Point(400, 89); + this.CB_Ability.Location = new System.Drawing.Point(83, 83); + this.CB_Ability.Margin = new System.Windows.Forms.Padding(0); this.CB_Ability.Name = "CB_Ability"; this.CB_Ability.Size = new System.Drawing.Size(122, 21); this.CB_Ability.TabIndex = 70; // // CB_HeldItem // - this.CB_HeldItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_HeldItem.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_HeldItem.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_HeldItem.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem.FormattingEnabled = true; - this.CB_HeldItem.Location = new System.Drawing.Point(400, 68); + this.CB_HeldItem.Location = new System.Drawing.Point(83, 62); + this.CB_HeldItem.Margin = new System.Windows.Forms.Padding(0); this.CB_HeldItem.Name = "CB_HeldItem"; this.CB_HeldItem.Size = new System.Drawing.Size(122, 21); this.CB_HeldItem.TabIndex = 69; // // CB_Nature // - this.CB_Nature.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Nature.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_Nature.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Nature.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Nature.FormattingEnabled = true; - this.CB_Nature.Location = new System.Drawing.Point(400, 47); + this.CB_Nature.Location = new System.Drawing.Point(83, 41); + this.CB_Nature.Margin = new System.Windows.Forms.Padding(0); this.CB_Nature.Name = "CB_Nature"; this.CB_Nature.Size = new System.Drawing.Size(122, 21); this.CB_Nature.TabIndex = 68; // // CB_Species // - this.CB_Species.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Species.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Species.FormattingEnabled = true; - this.CB_Species.Location = new System.Drawing.Point(400, 26); + this.CB_Species.Location = new System.Drawing.Point(83, 20); + this.CB_Species.Margin = new System.Windows.Forms.Padding(0); this.CB_Species.Name = "CB_Species"; this.CB_Species.Size = new System.Drawing.Size(122, 21); this.CB_Species.TabIndex = 67; // // CB_Move4 // - this.CB_Move4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Move4.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_Move4.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Move4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Move4.FormattingEnabled = true; - this.CB_Move4.Location = new System.Drawing.Point(400, 277); + this.CB_Move4.Location = new System.Drawing.Point(83, 251); + this.CB_Move4.Margin = new System.Windows.Forms.Padding(0); this.CB_Move4.Name = "CB_Move4"; this.CB_Move4.Size = new System.Drawing.Size(122, 21); this.CB_Move4.TabIndex = 74; // // CB_Move3 // - this.CB_Move3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Move3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_Move3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Move3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Move3.FormattingEnabled = true; - this.CB_Move3.Location = new System.Drawing.Point(400, 256); + this.CB_Move3.Location = new System.Drawing.Point(83, 230); + this.CB_Move3.Margin = new System.Windows.Forms.Padding(0); this.CB_Move3.Name = "CB_Move3"; this.CB_Move3.Size = new System.Drawing.Size(122, 21); this.CB_Move3.TabIndex = 73; // // CB_Move2 // - this.CB_Move2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Move2.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_Move2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Move2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Move2.FormattingEnabled = true; - this.CB_Move2.Location = new System.Drawing.Point(400, 235); + this.CB_Move2.Location = new System.Drawing.Point(83, 209); + this.CB_Move2.Margin = new System.Windows.Forms.Padding(0); this.CB_Move2.Name = "CB_Move2"; this.CB_Move2.Size = new System.Drawing.Size(122, 21); this.CB_Move2.TabIndex = 72; // // CB_Move1 // - this.CB_Move1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Move1.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_Move1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Move1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Move1.FormattingEnabled = true; - this.CB_Move1.Location = new System.Drawing.Point(400, 214); + this.CB_Move1.Location = new System.Drawing.Point(83, 188); + this.CB_Move1.Margin = new System.Windows.Forms.Padding(0); this.CB_Move1.Name = "CB_Move1"; this.CB_Move1.Size = new System.Drawing.Size(122, 21); this.CB_Move1.TabIndex = 71; // // TB_Level // - this.TB_Level.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.TB_Level.Anchor = System.Windows.Forms.AnchorStyles.Left; this.TB_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Level.Location = new System.Drawing.Point(400, 117); + this.TB_Level.Location = new System.Drawing.Point(0, 0); + this.TB_Level.Margin = new System.Windows.Forms.Padding(0); this.TB_Level.Mask = "000"; this.TB_Level.Name = "TB_Level"; this.TB_Level.Size = new System.Drawing.Size(22, 20); @@ -1257,57 +1274,67 @@ private void InitializeComponent() // // Label_CurLevel // - this.Label_CurLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Label_CurLevel.Location = new System.Drawing.Point(319, 116); + this.Label_CurLevel.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_CurLevel.AutoSize = true; + this.Label_CurLevel.Location = new System.Drawing.Point(44, 108); + this.Label_CurLevel.Margin = new System.Windows.Forms.Padding(3); this.Label_CurLevel.Name = "Label_CurLevel"; - this.Label_CurLevel.Size = new System.Drawing.Size(75, 17); + this.Label_CurLevel.Size = new System.Drawing.Size(36, 13); this.Label_CurLevel.TabIndex = 88; this.Label_CurLevel.Text = "Level:"; this.Label_CurLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // Label_HeldItem // - this.Label_HeldItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Label_HeldItem.Location = new System.Drawing.Point(317, 71); + this.Label_HeldItem.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_HeldItem.AutoSize = true; + this.Label_HeldItem.Location = new System.Drawing.Point(25, 66); + this.Label_HeldItem.Margin = new System.Windows.Forms.Padding(3); this.Label_HeldItem.Name = "Label_HeldItem"; - this.Label_HeldItem.Size = new System.Drawing.Size(77, 13); + this.Label_HeldItem.Size = new System.Drawing.Size(55, 13); this.Label_HeldItem.TabIndex = 93; this.Label_HeldItem.Text = "Held Item:"; this.Label_HeldItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // Label_Ability // - this.Label_Ability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Label_Ability.Location = new System.Drawing.Point(317, 92); + this.Label_Ability.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_Ability.AutoSize = true; + this.Label_Ability.Location = new System.Drawing.Point(43, 87); + this.Label_Ability.Margin = new System.Windows.Forms.Padding(3); this.Label_Ability.Name = "Label_Ability"; - this.Label_Ability.Size = new System.Drawing.Size(77, 13); + this.Label_Ability.Size = new System.Drawing.Size(37, 13); this.Label_Ability.TabIndex = 92; this.Label_Ability.Text = "Ability:"; this.Label_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // Label_Nature // - this.Label_Nature.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Label_Nature.Location = new System.Drawing.Point(317, 50); + this.Label_Nature.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_Nature.AutoSize = true; + this.Label_Nature.Location = new System.Drawing.Point(38, 45); + this.Label_Nature.Margin = new System.Windows.Forms.Padding(3); this.Label_Nature.Name = "Label_Nature"; - this.Label_Nature.Size = new System.Drawing.Size(77, 13); + this.Label_Nature.Size = new System.Drawing.Size(42, 13); this.Label_Nature.TabIndex = 91; this.Label_Nature.Text = "Nature:"; this.Label_Nature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // Label_Species // - this.Label_Species.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Label_Species.Location = new System.Drawing.Point(317, 29); + this.Label_Species.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_Species.AutoSize = true; + this.Label_Species.Location = new System.Drawing.Point(32, 24); + this.Label_Species.Margin = new System.Windows.Forms.Padding(3); this.Label_Species.Name = "Label_Species"; - this.Label_Species.Size = new System.Drawing.Size(77, 13); + this.Label_Species.Size = new System.Drawing.Size(48, 13); this.Label_Species.TabIndex = 90; this.Label_Species.Text = "Species:"; this.Label_Species.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // CB_EVTrain // - this.CB_EVTrain.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_EVTrain.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_EVTrain.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_EVTrain.DropDownWidth = 85; this.CB_EVTrain.FormattingEnabled = true; @@ -1317,78 +1344,52 @@ private void InitializeComponent() "Some (127-0)", "Half (128-507)", "Full (508+)"}); - this.CB_EVTrain.Location = new System.Drawing.Point(400, 160); + this.CB_EVTrain.Location = new System.Drawing.Point(83, 146); + this.CB_EVTrain.Margin = new System.Windows.Forms.Padding(0); this.CB_EVTrain.Name = "CB_EVTrain"; this.CB_EVTrain.Size = new System.Drawing.Size(94, 21); this.CB_EVTrain.TabIndex = 94; // // CB_HPType // - this.CB_HPType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_HPType.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_HPType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_HPType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HPType.DropDownWidth = 80; this.CB_HPType.FormattingEnabled = true; - this.CB_HPType.Location = new System.Drawing.Point(400, 188); + this.CB_HPType.Location = new System.Drawing.Point(83, 167); + this.CB_HPType.Margin = new System.Windows.Forms.Padding(0); this.CB_HPType.Name = "CB_HPType"; this.CB_HPType.Size = new System.Drawing.Size(122, 21); this.CB_HPType.TabIndex = 96; // // Label_HiddenPowerPrefix // - this.Label_HiddenPowerPrefix.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Label_HiddenPowerPrefix.Location = new System.Drawing.Point(314, 190); + this.Label_HiddenPowerPrefix.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_HiddenPowerPrefix.AutoSize = true; + this.Label_HiddenPowerPrefix.Location = new System.Drawing.Point(3, 171); + this.Label_HiddenPowerPrefix.Margin = new System.Windows.Forms.Padding(3); this.Label_HiddenPowerPrefix.Name = "Label_HiddenPowerPrefix"; - this.Label_HiddenPowerPrefix.Size = new System.Drawing.Size(80, 14); + this.Label_HiddenPowerPrefix.Size = new System.Drawing.Size(77, 13); this.Label_HiddenPowerPrefix.TabIndex = 95; this.Label_HiddenPowerPrefix.Text = "Hidden Power:"; this.Label_HiddenPowerPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // CB_GameOrigin // - this.CB_GameOrigin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_GameOrigin.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_GameOrigin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_GameOrigin.FormattingEnabled = true; - this.CB_GameOrigin.Location = new System.Drawing.Point(400, 301); + this.CB_GameOrigin.Location = new System.Drawing.Point(83, 272); + this.CB_GameOrigin.Margin = new System.Windows.Forms.Padding(0); this.CB_GameOrigin.Name = "CB_GameOrigin"; this.CB_GameOrigin.Size = new System.Drawing.Size(122, 21); this.CB_GameOrigin.TabIndex = 97; this.CB_GameOrigin.SelectedIndexChanged += new System.EventHandler(this.changeGame); // - // CHK_IsEgg - // - this.CHK_IsEgg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.CHK_IsEgg.AutoSize = true; - this.CHK_IsEgg.Checked = true; - this.CHK_IsEgg.CheckState = System.Windows.Forms.CheckState.Indeterminate; - this.CHK_IsEgg.Location = new System.Drawing.Point(400, 7); - this.CHK_IsEgg.Name = "CHK_IsEgg"; - this.CHK_IsEgg.Size = new System.Drawing.Size(45, 17); - this.CHK_IsEgg.TabIndex = 98; - this.CHK_IsEgg.Text = "Egg"; - this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_IsEgg.ThreeState = true; - this.CHK_IsEgg.UseVisualStyleBackColor = true; - this.CHK_IsEgg.CheckedChanged += new System.EventHandler(this.toggleESV); - // - // CHK_Shiny - // - this.CHK_Shiny.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.CHK_Shiny.AutoSize = true; - this.CHK_Shiny.Checked = true; - this.CHK_Shiny.CheckState = System.Windows.Forms.CheckState.Indeterminate; - this.CHK_Shiny.Location = new System.Drawing.Point(342, 7); - this.CHK_Shiny.Name = "CHK_Shiny"; - this.CHK_Shiny.Size = new System.Drawing.Size(52, 17); - this.CHK_Shiny.TabIndex = 99; - this.CHK_Shiny.Text = "Shiny"; - this.CHK_Shiny.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Shiny.ThreeState = true; - this.CHK_Shiny.UseVisualStyleBackColor = true; - // // CB_IV // - this.CB_IV.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_IV.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_IV.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_IV.DropDownWidth = 85; this.CB_IV.FormattingEnabled = true; @@ -1400,7 +1401,8 @@ private void InitializeComponent() "151-179", "180+", "== 186"}); - this.CB_IV.Location = new System.Drawing.Point(400, 138); + this.CB_IV.Location = new System.Drawing.Point(83, 125); + this.CB_IV.Margin = new System.Windows.Forms.Padding(0); this.CB_IV.Name = "CB_IV"; this.CB_IV.Size = new System.Drawing.Size(94, 21); this.CB_IV.TabIndex = 100; @@ -1408,9 +1410,9 @@ private void InitializeComponent() // B_Search // this.B_Search.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.B_Search.Location = new System.Drawing.Point(317, 347); + this.B_Search.Location = new System.Drawing.Point(317, 350); this.B_Search.Name = "B_Search"; - this.B_Search.Size = new System.Drawing.Size(206, 32); + this.B_Search.Size = new System.Drawing.Size(206, 30); this.B_Search.TabIndex = 102; this.B_Search.Text = "Search!"; this.B_Search.UseVisualStyleBackColor = true; @@ -1418,7 +1420,7 @@ private void InitializeComponent() // // CB_Level // - this.CB_Level.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Level.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_Level.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Level.DropDownWidth = 85; this.CB_Level.FormattingEnabled = true; @@ -1427,7 +1429,8 @@ private void InitializeComponent() ">=", "==", "<="}); - this.CB_Level.Location = new System.Drawing.Point(428, 116); + this.CB_Level.Location = new System.Drawing.Point(22, 0); + this.CB_Level.Margin = new System.Windows.Forms.Padding(0); this.CB_Level.Name = "CB_Level"; this.CB_Level.Size = new System.Drawing.Size(66, 21); this.CB_Level.TabIndex = 103; @@ -1435,70 +1438,84 @@ private void InitializeComponent() // // L_Version // - this.L_Version.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Version.Location = new System.Drawing.Point(318, 303); + this.L_Version.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Version.AutoSize = true; + this.L_Version.Location = new System.Drawing.Point(17, 276); + this.L_Version.Margin = new System.Windows.Forms.Padding(3); this.L_Version.Name = "L_Version"; - this.L_Version.Size = new System.Drawing.Size(80, 14); + this.L_Version.Size = new System.Drawing.Size(63, 13); this.L_Version.TabIndex = 104; this.L_Version.Text = "OT Version:"; this.L_Version.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Move1 // - this.L_Move1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Move1.Location = new System.Drawing.Point(314, 216); + this.L_Move1.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Move1.AutoSize = true; + this.L_Move1.Location = new System.Drawing.Point(34, 192); + this.L_Move1.Margin = new System.Windows.Forms.Padding(3); this.L_Move1.Name = "L_Move1"; - this.L_Move1.Size = new System.Drawing.Size(80, 14); + this.L_Move1.Size = new System.Drawing.Size(46, 13); this.L_Move1.TabIndex = 105; this.L_Move1.Text = "Move 1:"; this.L_Move1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Move2 // - this.L_Move2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Move2.Location = new System.Drawing.Point(314, 237); + this.L_Move2.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Move2.AutoSize = true; + this.L_Move2.Location = new System.Drawing.Point(34, 213); + this.L_Move2.Margin = new System.Windows.Forms.Padding(3); this.L_Move2.Name = "L_Move2"; - this.L_Move2.Size = new System.Drawing.Size(80, 14); + this.L_Move2.Size = new System.Drawing.Size(46, 13); this.L_Move2.TabIndex = 106; this.L_Move2.Text = "Move 2:"; this.L_Move2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Move3 // - this.L_Move3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Move3.Location = new System.Drawing.Point(314, 258); + this.L_Move3.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Move3.AutoSize = true; + this.L_Move3.Location = new System.Drawing.Point(34, 234); + this.L_Move3.Margin = new System.Windows.Forms.Padding(3); this.L_Move3.Name = "L_Move3"; - this.L_Move3.Size = new System.Drawing.Size(80, 14); + this.L_Move3.Size = new System.Drawing.Size(46, 13); this.L_Move3.TabIndex = 107; this.L_Move3.Text = "Move 3:"; this.L_Move3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Move4 // - this.L_Move4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Move4.Location = new System.Drawing.Point(314, 279); + this.L_Move4.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Move4.AutoSize = true; + this.L_Move4.Location = new System.Drawing.Point(34, 255); + this.L_Move4.Margin = new System.Windows.Forms.Padding(3); this.L_Move4.Name = "L_Move4"; - this.L_Move4.Size = new System.Drawing.Size(80, 14); + this.L_Move4.Size = new System.Drawing.Size(46, 13); this.L_Move4.TabIndex = 108; this.L_Move4.Text = "Move 4:"; this.L_Move4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Potential // - this.L_Potential.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Potential.Location = new System.Drawing.Point(319, 139); + this.L_Potential.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Potential.AutoSize = true; + this.L_Potential.Location = new System.Drawing.Point(16, 129); + this.L_Potential.Margin = new System.Windows.Forms.Padding(3); this.L_Potential.Name = "L_Potential"; - this.L_Potential.Size = new System.Drawing.Size(75, 17); + this.L_Potential.Size = new System.Drawing.Size(64, 13); this.L_Potential.TabIndex = 109; this.L_Potential.Text = "IV Potential:"; this.L_Potential.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_EVTraining // - this.L_EVTraining.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_EVTraining.Location = new System.Drawing.Point(319, 161); + this.L_EVTraining.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_EVTraining.AutoSize = true; + this.L_EVTraining.Location = new System.Drawing.Point(15, 150); + this.L_EVTraining.Margin = new System.Windows.Forms.Padding(3); this.L_EVTraining.Name = "L_EVTraining"; - this.L_EVTraining.Size = new System.Drawing.Size(75, 17); + this.L_EVTraining.Size = new System.Drawing.Size(65, 13); this.L_EVTraining.TabIndex = 110; this.L_EVTraining.Text = "EV Training:"; this.L_EVTraining.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1513,29 +1530,6 @@ private void InitializeComponent() this.B_Reset.UseVisualStyleBackColor = true; this.B_Reset.Click += new System.EventHandler(this.resetFilters); // - // MT_ESV - // - this.MT_ESV.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.MT_ESV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.MT_ESV.Location = new System.Drawing.Point(491, 6); - this.MT_ESV.Mask = "0000"; - this.MT_ESV.Name = "MT_ESV"; - this.MT_ESV.Size = new System.Drawing.Size(31, 20); - this.MT_ESV.TabIndex = 112; - this.MT_ESV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.MT_ESV.Visible = false; - // - // L_ESV - // - this.L_ESV.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_ESV.Location = new System.Drawing.Point(445, 7); - this.L_ESV.Name = "L_ESV"; - this.L_ESV.Size = new System.Drawing.Size(43, 17); - this.L_ESV.TabIndex = 113; - this.L_ESV.Text = "ESV:"; - this.L_ESV.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.L_ESV.Visible = false; - // // L_Count // this.L_Count.Location = new System.Drawing.Point(99, 11); @@ -1547,17 +1541,19 @@ private void InitializeComponent() // // L_Generation // - this.L_Generation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Generation.Location = new System.Drawing.Point(318, 325); + this.L_Generation.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Generation.AutoSize = true; + this.L_Generation.Location = new System.Drawing.Point(18, 297); + this.L_Generation.Margin = new System.Windows.Forms.Padding(3); this.L_Generation.Name = "L_Generation"; - this.L_Generation.Size = new System.Drawing.Size(80, 14); + this.L_Generation.Size = new System.Drawing.Size(62, 13); this.L_Generation.TabIndex = 116; this.L_Generation.Text = "Generation:"; this.L_Generation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // CB_Generation // - this.CB_Generation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Generation.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CB_Generation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Generation.FormattingEnabled = true; this.CB_Generation.Items.AddRange(new object[] { @@ -1566,7 +1562,8 @@ private void InitializeComponent() "Gen 5 (BW/B2W2)", "Gen 4 (DPPt/HGSS)", "Gen 3 (RSE/FRLG/CXD)"}); - this.CB_Generation.Location = new System.Drawing.Point(400, 323); + this.CB_Generation.Location = new System.Drawing.Point(83, 293); + this.CB_Generation.Margin = new System.Windows.Forms.Padding(0); this.CB_Generation.Name = "CB_Generation"; this.CB_Generation.Size = new System.Drawing.Size(122, 21); this.CB_Generation.TabIndex = 115; @@ -1582,50 +1579,197 @@ private void InitializeComponent() this.L_Viewed.Text = "Last Viewed: {0}"; this.L_Viewed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // FLP_Egg + // + this.FLP_Egg.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.FLP_Egg.AutoSize = true; + this.FLP_Egg.Controls.Add(this.CHK_IsEgg); + this.FLP_Egg.Controls.Add(this.L_ESV); + this.FLP_Egg.Controls.Add(this.MT_ESV); + this.FLP_Egg.Location = new System.Drawing.Point(83, 0); + this.FLP_Egg.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Egg.Name = "FLP_Egg"; + this.FLP_Egg.Size = new System.Drawing.Size(119, 20); + this.FLP_Egg.TabIndex = 120; + // + // CHK_IsEgg + // + this.CHK_IsEgg.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CHK_IsEgg.AutoSize = true; + this.CHK_IsEgg.Checked = true; + this.CHK_IsEgg.CheckState = System.Windows.Forms.CheckState.Indeterminate; + this.CHK_IsEgg.Location = new System.Drawing.Point(0, 1); + this.CHK_IsEgg.Margin = new System.Windows.Forms.Padding(0); + this.CHK_IsEgg.Name = "CHK_IsEgg"; + this.CHK_IsEgg.Size = new System.Drawing.Size(45, 17); + this.CHK_IsEgg.TabIndex = 98; + this.CHK_IsEgg.Text = "Egg"; + this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_IsEgg.ThreeState = true; + this.CHK_IsEgg.UseVisualStyleBackColor = true; + this.CHK_IsEgg.CheckedChanged += new System.EventHandler(this.toggleESV); + // + // L_ESV + // + this.L_ESV.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.L_ESV.Location = new System.Drawing.Point(45, 1); + this.L_ESV.Margin = new System.Windows.Forms.Padding(0); + this.L_ESV.Name = "L_ESV"; + this.L_ESV.Size = new System.Drawing.Size(43, 17); + this.L_ESV.TabIndex = 113; + this.L_ESV.Text = "ESV:"; + this.L_ESV.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.L_ESV.Visible = false; + // + // MT_ESV + // + this.MT_ESV.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.MT_ESV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.MT_ESV.Location = new System.Drawing.Point(88, 0); + this.MT_ESV.Margin = new System.Windows.Forms.Padding(0); + this.MT_ESV.Mask = "0000"; + this.MT_ESV.Name = "MT_ESV"; + this.MT_ESV.Size = new System.Drawing.Size(31, 20); + this.MT_ESV.TabIndex = 112; + this.MT_ESV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.MT_ESV.Visible = false; + // + // CHK_Shiny + // + this.CHK_Shiny.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.CHK_Shiny.AutoSize = true; + this.CHK_Shiny.Checked = true; + this.CHK_Shiny.CheckState = System.Windows.Forms.CheckState.Indeterminate; + this.CHK_Shiny.Location = new System.Drawing.Point(31, 1); + this.CHK_Shiny.Margin = new System.Windows.Forms.Padding(0); + this.CHK_Shiny.Name = "CHK_Shiny"; + this.CHK_Shiny.Size = new System.Drawing.Size(52, 17); + this.CHK_Shiny.TabIndex = 99; + this.CHK_Shiny.Text = "Shiny"; + this.CHK_Shiny.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Shiny.ThreeState = true; + this.CHK_Shiny.UseVisualStyleBackColor = true; + // + // TLP_Filters + // + this.TLP_Filters.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.TLP_Filters.AutoScroll = true; + this.TLP_Filters.AutoScrollMargin = new System.Drawing.Size(3, 3); + this.TLP_Filters.AutoSize = true; + this.TLP_Filters.ColumnCount = 2; + this.TLP_Filters.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Filters.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Filters.Controls.Add(this.L_Format, 0, 15); + this.TLP_Filters.Controls.Add(this.FLP_Egg, 1, 0); + this.TLP_Filters.Controls.Add(this.CHK_Shiny, 0, 0); + this.TLP_Filters.Controls.Add(this.Label_Species, 0, 1); + this.TLP_Filters.Controls.Add(this.CB_Species, 1, 1); + this.TLP_Filters.Controls.Add(this.Label_Nature, 0, 2); + this.TLP_Filters.Controls.Add(this.CB_Nature, 1, 2); + this.TLP_Filters.Controls.Add(this.Label_HeldItem, 0, 3); + this.TLP_Filters.Controls.Add(this.CB_HeldItem, 1, 3); + this.TLP_Filters.Controls.Add(this.Label_Ability, 0, 4); + this.TLP_Filters.Controls.Add(this.CB_Ability, 1, 4); + this.TLP_Filters.Controls.Add(this.FLP_Level, 1, 5); + this.TLP_Filters.Controls.Add(this.Label_CurLevel, 0, 5); + this.TLP_Filters.Controls.Add(this.L_Potential, 0, 6); + this.TLP_Filters.Controls.Add(this.CB_IV, 1, 6); + this.TLP_Filters.Controls.Add(this.L_EVTraining, 0, 7); + this.TLP_Filters.Controls.Add(this.CB_EVTrain, 1, 7); + this.TLP_Filters.Controls.Add(this.Label_HiddenPowerPrefix, 0, 8); + this.TLP_Filters.Controls.Add(this.CB_HPType, 1, 8); + this.TLP_Filters.Controls.Add(this.L_Move1, 0, 9); + this.TLP_Filters.Controls.Add(this.CB_Move1, 1, 9); + this.TLP_Filters.Controls.Add(this.L_Move2, 0, 10); + this.TLP_Filters.Controls.Add(this.CB_Move2, 1, 10); + this.TLP_Filters.Controls.Add(this.L_Move3, 0, 11); + this.TLP_Filters.Controls.Add(this.CB_Move3, 1, 11); + this.TLP_Filters.Controls.Add(this.L_Move4, 0, 12); + this.TLP_Filters.Controls.Add(this.CB_Move4, 1, 12); + this.TLP_Filters.Controls.Add(this.L_Version, 0, 13); + this.TLP_Filters.Controls.Add(this.CB_GameOrigin, 1, 13); + this.TLP_Filters.Controls.Add(this.L_Generation, 0, 14); + this.TLP_Filters.Controls.Add(this.CB_Generation, 1, 14); + this.TLP_Filters.Controls.Add(this.CB_Format, 1, 15); + this.TLP_Filters.Location = new System.Drawing.Point(304, 11); + this.TLP_Filters.Name = "TLP_Filters"; + this.TLP_Filters.RowCount = 17; + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.Size = new System.Drawing.Size(228, 354); + this.TLP_Filters.TabIndex = 118; + // + // FLP_Level + // + this.FLP_Level.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.FLP_Level.AutoSize = true; + this.FLP_Level.Controls.Add(this.TB_Level); + this.FLP_Level.Controls.Add(this.CB_Level); + this.FLP_Level.Location = new System.Drawing.Point(83, 104); + this.FLP_Level.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Level.Name = "FLP_Level"; + this.FLP_Level.Size = new System.Drawing.Size(88, 21); + this.FLP_Level.TabIndex = 119; + // + // CB_Format + // + this.CB_Format.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_Format.FormattingEnabled = true; + this.CB_Format.Items.AddRange(new object[] { + "Any", + ">=pk6", + ">=pk5", + ">=pk4", + ">=pk3"}); + this.CB_Format.Location = new System.Drawing.Point(83, 314); + this.CB_Format.Margin = new System.Windows.Forms.Padding(0); + this.CB_Format.Name = "CB_Format"; + this.CB_Format.Size = new System.Drawing.Size(122, 21); + this.CB_Format.TabIndex = 121; + // + // L_Format + // + this.L_Format.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Format.AutoSize = true; + this.L_Format.Location = new System.Drawing.Point(38, 318); + this.L_Format.Margin = new System.Windows.Forms.Padding(3); + this.L_Format.Name = "L_Format"; + this.L_Format.Size = new System.Drawing.Size(42, 13); + this.L_Format.TabIndex = 122; + this.L_Format.Text = "Format:"; + this.L_Format.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // SAV_Database // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(544, 396); - this.Controls.Add(this.L_Viewed); - this.Controls.Add(this.L_Generation); - this.Controls.Add(this.CB_Generation); - this.Controls.Add(this.L_Count); - this.Controls.Add(this.L_ESV); - this.Controls.Add(this.MT_ESV); - this.Controls.Add(this.B_Reset); - this.Controls.Add(this.L_EVTraining); - this.Controls.Add(this.L_Potential); - this.Controls.Add(this.L_Move4); - this.Controls.Add(this.L_Move3); - this.Controls.Add(this.L_Move2); - this.Controls.Add(this.L_Move1); - this.Controls.Add(this.L_Version); - this.Controls.Add(this.CB_Level); this.Controls.Add(this.B_Search); - this.Controls.Add(this.CB_IV); - this.Controls.Add(this.CHK_IsEgg); - this.Controls.Add(this.CHK_Shiny); - this.Controls.Add(this.CB_GameOrigin); - this.Controls.Add(this.CB_HPType); - this.Controls.Add(this.Label_HiddenPowerPrefix); - this.Controls.Add(this.CB_EVTrain); - this.Controls.Add(this.Label_HeldItem); - this.Controls.Add(this.Label_Ability); - this.Controls.Add(this.Label_Nature); - this.Controls.Add(this.Label_Species); - this.Controls.Add(this.TB_Level); - this.Controls.Add(this.Label_CurLevel); - this.Controls.Add(this.CB_Move4); - this.Controls.Add(this.CB_Move3); - this.Controls.Add(this.CB_Move2); - this.Controls.Add(this.CB_Move1); - this.Controls.Add(this.CB_Ability); - this.Controls.Add(this.CB_HeldItem); - this.Controls.Add(this.CB_Nature); - this.Controls.Add(this.CB_Species); + this.Controls.Add(this.TLP_Filters); + this.Controls.Add(this.L_Viewed); + this.Controls.Add(this.L_Count); + this.Controls.Add(this.B_Reset); this.Controls.Add(this.P_Results); this.Controls.Add(this.menuStrip1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(800, 435); @@ -1704,6 +1848,12 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.bpkx63)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx62)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx61)).EndInit(); + this.FLP_Egg.ResumeLayout(false); + this.FLP_Egg.PerformLayout(); + this.TLP_Filters.ResumeLayout(false); + this.TLP_Filters.PerformLayout(); + this.FLP_Level.ResumeLayout(false); + this.FLP_Level.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1797,8 +1947,6 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox CB_HPType; private System.Windows.Forms.Label Label_HiddenPowerPrefix; private System.Windows.Forms.ComboBox CB_GameOrigin; - public System.Windows.Forms.CheckBox CHK_IsEgg; - public System.Windows.Forms.CheckBox CHK_Shiny; private System.Windows.Forms.ComboBox CB_IV; private System.Windows.Forms.Button B_Search; private System.Windows.Forms.ComboBox CB_Level; @@ -1810,8 +1958,6 @@ private void InitializeComponent() private System.Windows.Forms.Label L_Potential; private System.Windows.Forms.Label L_EVTraining; private System.Windows.Forms.Button B_Reset; - private System.Windows.Forms.MaskedTextBox MT_ESV; - private System.Windows.Forms.Label L_ESV; private System.Windows.Forms.Label L_Count; private System.Windows.Forms.Panel PAN_Box; private System.Windows.Forms.PictureBox bpkx66; @@ -1829,5 +1975,14 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem Menu_SearchDatabase; private System.Windows.Forms.ToolStripMenuItem Menu_SearchLegal; private System.Windows.Forms.ToolStripMenuItem Menu_SearchIllegal; + private System.Windows.Forms.TableLayoutPanel TLP_Filters; + public System.Windows.Forms.CheckBox CHK_Shiny; + private System.Windows.Forms.MaskedTextBox MT_ESV; + private System.Windows.Forms.Label L_ESV; + public System.Windows.Forms.CheckBox CHK_IsEgg; + private System.Windows.Forms.FlowLayoutPanel FLP_Egg; + private System.Windows.Forms.FlowLayoutPanel FLP_Level; + private System.Windows.Forms.ComboBox CB_Format; + private System.Windows.Forms.Label L_Format; } } \ No newline at end of file diff --git a/SAV/SAV_Database.cs b/SAV/SAV_Database.cs index 2199b6903..1742bb195 100644 --- a/SAV/SAV_Database.cs +++ b/SAV/SAV_Database.cs @@ -15,6 +15,7 @@ public SAV_Database(Main f1) { m_parent = f1; InitializeComponent(); + CB_Format.SelectedIndex = MAXFORMAT - Main.SAV.Generation + 1; PKXBOXES = new[] { bpkx1, bpkx2, bpkx3, bpkx4, bpkx5, bpkx6, @@ -104,6 +105,7 @@ public SAV_Database(Main f1) if (e.CloseReason == ToolStripDropDownCloseReason.ItemClicked) e.Cancel = true; }; + B_Search.PerformClick(); CenterToParent(); } private readonly Main m_parent; @@ -118,6 +120,7 @@ public SAV_Database(Main f1) private const int RES_MIN = 6; private readonly string Counter; private readonly string Viewed; + private const int MAXFORMAT = 6; // Important Events private void clickView(object sender, EventArgs e) @@ -422,6 +425,26 @@ private void B_Search_Click(object sender, EventArgs e) // Populate Search Query Result IEnumerable res = RawDB; + int format = MAXFORMAT + 1 - CB_Format.SelectedIndex; + res = res.Where(pk => pk.Format <= format); + + switch (CB_Generation.SelectedIndex) + { + case 0: break; // Do nothing + case 1: // Gen 6 + res = res.Where(pk => pk.Gen6); + break; + case 2: // Gen 5 + res = res.Where(pk => pk.Gen5); + break; + case 3: // Gen 4 + res = res.Where(pk => pk.Gen4); + break; + case 4: // Gen 3 + res = res.Where(pk => pk.Gen3); + break; + } + // Primary Searchables int species = Util.getIndex(CB_Species); int ability = Util.getIndex(CB_Ability); @@ -509,22 +532,6 @@ private void B_Search_Click(object sender, EventArgs e) res = res.Where(pk => pk.EVs.Sum() >= 508); break; } - switch (CB_Generation.SelectedIndex) - { - case 0: break; // Do nothing - case 1: // Gen 6 - res = res.Where(pk => pk.Gen6); - break; - case 2: // Gen 5 - res = res.Where(pk => pk.Gen5); - break; - case 3: // Gen 4 - res = res.Where(pk => pk.Gen4); - break; - case 4: // Gen 3 - res = res.Where(pk => pk.Gen3); - break; - } // Filter for Selected Source if (!Menu_SearchBoxes.Checked)