From e81deff512cc7af07eff32152cae2a3441a4a44b Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 5 Oct 2019 14:29:15 -0700 Subject: [PATCH] Use pokegrid for encounter db browser Add icons for the database contextmenu items --- .../Subforms/SAV_Database.Designer.cs | 21 +- .../Subforms/SAV_Encounters.Designer.cs | 1120 +---------------- PKHeX.WinForms/Subforms/SAV_Encounters.cs | 22 +- PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs | 6 +- 4 files changed, 51 insertions(+), 1118 deletions(-) diff --git a/PKHeX.WinForms/Subforms/SAV_Database.Designer.cs b/PKHeX.WinForms/Subforms/SAV_Database.Designer.cs index 204844119..0dcd95203 100644 --- a/PKHeX.WinForms/Subforms/SAV_Database.Designer.cs +++ b/PKHeX.WinForms/Subforms/SAV_Database.Designer.cs @@ -47,6 +47,7 @@ private void InitializeComponent() this.Menu_Import = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_DeleteClones = new System.Windows.Forms.ToolStripMenuItem(); this.P_Results = new System.Windows.Forms.Panel(); + this.pokeGrid1 = new PKHeX.WinForms.Controls.PokeGrid(); this.CB_Ability = new System.Windows.Forms.ComboBox(); this.CB_HeldItem = new System.Windows.Forms.ComboBox(); this.CB_Nature = new System.Windows.Forms.ComboBox(); @@ -96,7 +97,6 @@ private void InitializeComponent() this.mnuView = new System.Windows.Forms.ToolStripMenuItem(); this.mnuDelete = new System.Windows.Forms.ToolStripMenuItem(); this.hover = new System.Windows.Forms.ToolTip(this.components); - this.pokeGrid1 = new PKHeX.WinForms.Controls.PokeGrid(); this.menuStrip1.SuspendLayout(); this.P_Results.SuspendLayout(); this.FLP_Egg.SuspendLayout(); @@ -277,6 +277,15 @@ private void InitializeComponent() this.P_Results.Size = new System.Drawing.Size(285, 352); this.P_Results.TabIndex = 66; // + // pokeGrid1 + // + this.pokeGrid1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pokeGrid1.Location = new System.Drawing.Point(2, 2); + this.pokeGrid1.Margin = new System.Windows.Forms.Padding(0); + this.pokeGrid1.Name = "pokeGrid1"; + this.pokeGrid1.Size = new System.Drawing.Size(251, 346); + this.pokeGrid1.TabIndex = 2; + // // CB_Ability // this.CB_Ability.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -928,25 +937,19 @@ private void InitializeComponent() // // mnuView // + this.mnuView.Image = global::PKHeX.WinForms.Properties.Resources.other; this.mnuView.Name = "mnuView"; this.mnuView.Size = new System.Drawing.Size(107, 22); this.mnuView.Text = "View"; // // mnuDelete // + this.mnuDelete.Image = global::PKHeX.WinForms.Properties.Resources.nocheck; this.mnuDelete.Name = "mnuDelete"; this.mnuDelete.Size = new System.Drawing.Size(107, 22); this.mnuDelete.Text = "Delete"; this.mnuDelete.Click += new System.EventHandler(this.ClickDelete); // - // pokeGrid1 - // - this.pokeGrid1.Location = new System.Drawing.Point(2, 2); - this.pokeGrid1.Margin = new System.Windows.Forms.Padding(0); - this.pokeGrid1.Name = "pokeGrid1"; - this.pokeGrid1.Size = new System.Drawing.Size(251, 346); - this.pokeGrid1.TabIndex = 2; - // // SAV_Database // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/PKHeX.WinForms/Subforms/SAV_Encounters.Designer.cs b/PKHeX.WinForms/Subforms/SAV_Encounters.Designer.cs index 94b67e1bc..b453f7a1e 100644 --- a/PKHeX.WinForms/Subforms/SAV_Encounters.Designer.cs +++ b/PKHeX.WinForms/Subforms/SAV_Encounters.Designer.cs @@ -29,66 +29,6 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.SCR_Box = new System.Windows.Forms.VScrollBar(); - this.bpkx30 = new System.Windows.Forms.PictureBox(); - this.bpkx29 = new System.Windows.Forms.PictureBox(); - this.bpkx28 = new System.Windows.Forms.PictureBox(); - this.bpkx27 = new System.Windows.Forms.PictureBox(); - this.bpkx26 = new System.Windows.Forms.PictureBox(); - this.bpkx25 = new System.Windows.Forms.PictureBox(); - this.bpkx24 = new System.Windows.Forms.PictureBox(); - this.bpkx23 = new System.Windows.Forms.PictureBox(); - this.bpkx22 = new System.Windows.Forms.PictureBox(); - this.bpkx21 = new System.Windows.Forms.PictureBox(); - this.bpkx20 = new System.Windows.Forms.PictureBox(); - this.bpkx19 = new System.Windows.Forms.PictureBox(); - this.bpkx18 = new System.Windows.Forms.PictureBox(); - this.bpkx17 = new System.Windows.Forms.PictureBox(); - this.bpkx16 = new System.Windows.Forms.PictureBox(); - this.bpkx15 = new System.Windows.Forms.PictureBox(); - this.bpkx14 = new System.Windows.Forms.PictureBox(); - this.bpkx13 = new System.Windows.Forms.PictureBox(); - this.bpkx12 = new System.Windows.Forms.PictureBox(); - this.bpkx11 = new System.Windows.Forms.PictureBox(); - this.bpkx10 = new System.Windows.Forms.PictureBox(); - this.bpkx9 = new System.Windows.Forms.PictureBox(); - this.bpkx8 = new System.Windows.Forms.PictureBox(); - this.bpkx7 = new System.Windows.Forms.PictureBox(); - this.bpkx6 = new System.Windows.Forms.PictureBox(); - this.bpkx5 = new System.Windows.Forms.PictureBox(); - this.bpkx4 = new System.Windows.Forms.PictureBox(); - this.bpkx3 = new System.Windows.Forms.PictureBox(); - this.bpkx2 = new System.Windows.Forms.PictureBox(); - this.bpkx1 = new System.Windows.Forms.PictureBox(); - this.bpkx60 = new System.Windows.Forms.PictureBox(); - this.bpkx59 = new System.Windows.Forms.PictureBox(); - this.bpkx58 = new System.Windows.Forms.PictureBox(); - this.bpkx57 = new System.Windows.Forms.PictureBox(); - this.bpkx56 = new System.Windows.Forms.PictureBox(); - this.bpkx55 = new System.Windows.Forms.PictureBox(); - this.bpkx54 = new System.Windows.Forms.PictureBox(); - this.bpkx53 = new System.Windows.Forms.PictureBox(); - this.bpkx52 = new System.Windows.Forms.PictureBox(); - this.bpkx51 = new System.Windows.Forms.PictureBox(); - this.bpkx50 = new System.Windows.Forms.PictureBox(); - this.bpkx49 = new System.Windows.Forms.PictureBox(); - this.bpkx48 = new System.Windows.Forms.PictureBox(); - this.bpkx47 = new System.Windows.Forms.PictureBox(); - this.bpkx46 = new System.Windows.Forms.PictureBox(); - this.bpkx45 = new System.Windows.Forms.PictureBox(); - this.bpkx44 = new System.Windows.Forms.PictureBox(); - this.bpkx43 = new System.Windows.Forms.PictureBox(); - this.bpkx42 = new System.Windows.Forms.PictureBox(); - this.bpkx41 = new System.Windows.Forms.PictureBox(); - this.bpkx40 = new System.Windows.Forms.PictureBox(); - this.bpkx39 = new System.Windows.Forms.PictureBox(); - this.bpkx38 = new System.Windows.Forms.PictureBox(); - this.bpkx37 = new System.Windows.Forms.PictureBox(); - this.bpkx36 = new System.Windows.Forms.PictureBox(); - this.bpkx35 = new System.Windows.Forms.PictureBox(); - this.bpkx34 = new System.Windows.Forms.PictureBox(); - this.bpkx33 = new System.Windows.Forms.PictureBox(); - this.bpkx32 = new System.Windows.Forms.PictureBox(); - this.bpkx31 = new System.Windows.Forms.PictureBox(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.Menu_Close = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Exit = new System.Windows.Forms.ToolStripMenuItem(); @@ -96,13 +36,6 @@ private void InitializeComponent() this.Menu_SearchSettings = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_SearchAdvanced = new System.Windows.Forms.ToolStripMenuItem(); this.P_Results = new System.Windows.Forms.Panel(); - this.PAN_Box = new System.Windows.Forms.Panel(); - this.bpkx66 = new System.Windows.Forms.PictureBox(); - this.bpkx65 = new System.Windows.Forms.PictureBox(); - this.bpkx64 = new System.Windows.Forms.PictureBox(); - this.bpkx63 = new System.Windows.Forms.PictureBox(); - this.bpkx62 = new System.Windows.Forms.PictureBox(); - this.bpkx61 = new System.Windows.Forms.PictureBox(); this.CB_Species = new System.Windows.Forms.ComboBox(); this.CB_Move4 = new System.Windows.Forms.ComboBox(); this.CB_Move3 = new System.Windows.Forms.ComboBox(); @@ -121,78 +54,12 @@ private void InitializeComponent() this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); this.TLP_Filters = new System.Windows.Forms.TableLayoutPanel(); this.FLP_Level = new System.Windows.Forms.FlowLayoutPanel(); - this.RTB_Instructions = new System.Windows.Forms.RichTextBox(); - this.L_Version = new System.Windows.Forms.Label(); this.CB_GameOrigin = new System.Windows.Forms.ComboBox(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx30)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx29)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx28)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx27)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx26)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx25)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx24)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx23)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx22)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx21)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx20)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx19)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx18)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx60)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx59)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx58)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx57)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx56)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx55)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx54)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx53)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx52)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx51)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx50)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx49)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx48)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx47)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx46)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx45)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx44)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx43)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx42)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx41)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx40)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx39)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx38)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx37)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx36)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx35)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx34)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx33)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx32)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx31)).BeginInit(); + this.L_Version = new System.Windows.Forms.Label(); + this.RTB_Instructions = new System.Windows.Forms.RichTextBox(); + this.pokeGrid1 = new PKHeX.WinForms.Controls.PokeGrid(); this.menuStrip1.SuspendLayout(); this.P_Results.SuspendLayout(); - this.PAN_Box.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx66)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx65)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx64)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx63)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx62)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx61)).BeginInit(); this.TLP_Filters.SuspendLayout(); this.SuspendLayout(); // @@ -207,666 +74,6 @@ private void InitializeComponent() this.SCR_Box.TabIndex = 1; this.SCR_Box.Scroll += new System.Windows.Forms.ScrollEventHandler(this.UpdateScroll); // - // bpkx30 - // - this.bpkx30.BackColor = System.Drawing.Color.Transparent; - this.bpkx30.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx30.Location = new System.Drawing.Point(207, 126); - this.bpkx30.Name = "bpkx30"; - this.bpkx30.Size = new System.Drawing.Size(42, 32); - this.bpkx30.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx30.TabIndex = 59; - this.bpkx30.TabStop = false; - // - // bpkx29 - // - this.bpkx29.BackColor = System.Drawing.Color.Transparent; - this.bpkx29.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx29.Location = new System.Drawing.Point(166, 126); - this.bpkx29.Name = "bpkx29"; - this.bpkx29.Size = new System.Drawing.Size(42, 32); - this.bpkx29.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx29.TabIndex = 58; - this.bpkx29.TabStop = false; - // - // bpkx28 - // - this.bpkx28.BackColor = System.Drawing.Color.Transparent; - this.bpkx28.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx28.Location = new System.Drawing.Point(125, 126); - this.bpkx28.Name = "bpkx28"; - this.bpkx28.Size = new System.Drawing.Size(42, 32); - this.bpkx28.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx28.TabIndex = 57; - this.bpkx28.TabStop = false; - // - // bpkx27 - // - this.bpkx27.BackColor = System.Drawing.Color.Transparent; - this.bpkx27.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx27.Location = new System.Drawing.Point(84, 126); - this.bpkx27.Name = "bpkx27"; - this.bpkx27.Size = new System.Drawing.Size(42, 32); - this.bpkx27.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx27.TabIndex = 56; - this.bpkx27.TabStop = false; - // - // bpkx26 - // - this.bpkx26.BackColor = System.Drawing.Color.Transparent; - this.bpkx26.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx26.Location = new System.Drawing.Point(43, 126); - this.bpkx26.Name = "bpkx26"; - this.bpkx26.Size = new System.Drawing.Size(42, 32); - this.bpkx26.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx26.TabIndex = 55; - this.bpkx26.TabStop = false; - // - // bpkx25 - // - this.bpkx25.BackColor = System.Drawing.Color.Transparent; - this.bpkx25.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx25.Location = new System.Drawing.Point(2, 126); - this.bpkx25.Name = "bpkx25"; - this.bpkx25.Size = new System.Drawing.Size(42, 32); - this.bpkx25.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx25.TabIndex = 54; - this.bpkx25.TabStop = false; - // - // bpkx24 - // - this.bpkx24.BackColor = System.Drawing.Color.Transparent; - this.bpkx24.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx24.Location = new System.Drawing.Point(207, 95); - this.bpkx24.Name = "bpkx24"; - this.bpkx24.Size = new System.Drawing.Size(42, 32); - this.bpkx24.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx24.TabIndex = 53; - this.bpkx24.TabStop = false; - // - // bpkx23 - // - this.bpkx23.BackColor = System.Drawing.Color.Transparent; - this.bpkx23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx23.Location = new System.Drawing.Point(166, 95); - this.bpkx23.Name = "bpkx23"; - this.bpkx23.Size = new System.Drawing.Size(42, 32); - this.bpkx23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx23.TabIndex = 52; - this.bpkx23.TabStop = false; - // - // bpkx22 - // - this.bpkx22.BackColor = System.Drawing.Color.Transparent; - this.bpkx22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx22.Location = new System.Drawing.Point(125, 95); - this.bpkx22.Name = "bpkx22"; - this.bpkx22.Size = new System.Drawing.Size(42, 32); - this.bpkx22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx22.TabIndex = 51; - this.bpkx22.TabStop = false; - // - // bpkx21 - // - this.bpkx21.BackColor = System.Drawing.Color.Transparent; - this.bpkx21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx21.Location = new System.Drawing.Point(84, 95); - this.bpkx21.Name = "bpkx21"; - this.bpkx21.Size = new System.Drawing.Size(42, 32); - this.bpkx21.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx21.TabIndex = 50; - this.bpkx21.TabStop = false; - // - // bpkx20 - // - this.bpkx20.BackColor = System.Drawing.Color.Transparent; - this.bpkx20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx20.Location = new System.Drawing.Point(43, 95); - this.bpkx20.Name = "bpkx20"; - this.bpkx20.Size = new System.Drawing.Size(42, 32); - this.bpkx20.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx20.TabIndex = 49; - this.bpkx20.TabStop = false; - // - // bpkx19 - // - this.bpkx19.BackColor = System.Drawing.Color.Transparent; - this.bpkx19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx19.Location = new System.Drawing.Point(2, 95); - this.bpkx19.Name = "bpkx19"; - this.bpkx19.Size = new System.Drawing.Size(42, 32); - this.bpkx19.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx19.TabIndex = 48; - this.bpkx19.TabStop = false; - // - // bpkx18 - // - this.bpkx18.BackColor = System.Drawing.Color.Transparent; - this.bpkx18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx18.Location = new System.Drawing.Point(207, 64); - this.bpkx18.Name = "bpkx18"; - this.bpkx18.Size = new System.Drawing.Size(42, 32); - this.bpkx18.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx18.TabIndex = 47; - this.bpkx18.TabStop = false; - // - // bpkx17 - // - this.bpkx17.BackColor = System.Drawing.Color.Transparent; - this.bpkx17.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx17.Location = new System.Drawing.Point(166, 64); - this.bpkx17.Name = "bpkx17"; - this.bpkx17.Size = new System.Drawing.Size(42, 32); - this.bpkx17.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx17.TabIndex = 46; - this.bpkx17.TabStop = false; - // - // bpkx16 - // - this.bpkx16.BackColor = System.Drawing.Color.Transparent; - this.bpkx16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx16.Location = new System.Drawing.Point(125, 64); - this.bpkx16.Name = "bpkx16"; - this.bpkx16.Size = new System.Drawing.Size(42, 32); - this.bpkx16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx16.TabIndex = 45; - this.bpkx16.TabStop = false; - // - // bpkx15 - // - this.bpkx15.BackColor = System.Drawing.Color.Transparent; - this.bpkx15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx15.Location = new System.Drawing.Point(84, 64); - this.bpkx15.Name = "bpkx15"; - this.bpkx15.Size = new System.Drawing.Size(42, 32); - this.bpkx15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx15.TabIndex = 44; - this.bpkx15.TabStop = false; - // - // bpkx14 - // - this.bpkx14.BackColor = System.Drawing.Color.Transparent; - this.bpkx14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx14.Location = new System.Drawing.Point(43, 64); - this.bpkx14.Name = "bpkx14"; - this.bpkx14.Size = new System.Drawing.Size(42, 32); - this.bpkx14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx14.TabIndex = 43; - this.bpkx14.TabStop = false; - // - // bpkx13 - // - this.bpkx13.BackColor = System.Drawing.Color.Transparent; - this.bpkx13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx13.Location = new System.Drawing.Point(2, 64); - this.bpkx13.Name = "bpkx13"; - this.bpkx13.Size = new System.Drawing.Size(42, 32); - this.bpkx13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx13.TabIndex = 42; - this.bpkx13.TabStop = false; - // - // bpkx12 - // - this.bpkx12.BackColor = System.Drawing.Color.Transparent; - this.bpkx12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx12.Location = new System.Drawing.Point(207, 33); - this.bpkx12.Name = "bpkx12"; - this.bpkx12.Size = new System.Drawing.Size(42, 32); - this.bpkx12.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx12.TabIndex = 41; - this.bpkx12.TabStop = false; - // - // bpkx11 - // - this.bpkx11.BackColor = System.Drawing.Color.Transparent; - this.bpkx11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx11.Location = new System.Drawing.Point(166, 33); - this.bpkx11.Name = "bpkx11"; - this.bpkx11.Size = new System.Drawing.Size(42, 32); - this.bpkx11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx11.TabIndex = 40; - this.bpkx11.TabStop = false; - // - // bpkx10 - // - this.bpkx10.BackColor = System.Drawing.Color.Transparent; - this.bpkx10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx10.Location = new System.Drawing.Point(125, 33); - this.bpkx10.Name = "bpkx10"; - this.bpkx10.Size = new System.Drawing.Size(42, 32); - this.bpkx10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx10.TabIndex = 39; - this.bpkx10.TabStop = false; - // - // bpkx9 - // - this.bpkx9.BackColor = System.Drawing.Color.Transparent; - this.bpkx9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx9.Location = new System.Drawing.Point(84, 33); - this.bpkx9.Name = "bpkx9"; - this.bpkx9.Size = new System.Drawing.Size(42, 32); - this.bpkx9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx9.TabIndex = 38; - this.bpkx9.TabStop = false; - // - // bpkx8 - // - this.bpkx8.BackColor = System.Drawing.Color.Transparent; - this.bpkx8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx8.Location = new System.Drawing.Point(43, 33); - this.bpkx8.Name = "bpkx8"; - this.bpkx8.Size = new System.Drawing.Size(42, 32); - this.bpkx8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx8.TabIndex = 37; - this.bpkx8.TabStop = false; - // - // bpkx7 - // - this.bpkx7.BackColor = System.Drawing.Color.Transparent; - this.bpkx7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx7.Location = new System.Drawing.Point(2, 33); - this.bpkx7.Name = "bpkx7"; - this.bpkx7.Size = new System.Drawing.Size(42, 32); - this.bpkx7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx7.TabIndex = 36; - this.bpkx7.TabStop = false; - // - // bpkx6 - // - this.bpkx6.BackColor = System.Drawing.Color.Transparent; - this.bpkx6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx6.Location = new System.Drawing.Point(207, 2); - this.bpkx6.Name = "bpkx6"; - this.bpkx6.Size = new System.Drawing.Size(42, 32); - this.bpkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx6.TabIndex = 35; - this.bpkx6.TabStop = false; - // - // bpkx5 - // - this.bpkx5.BackColor = System.Drawing.Color.Transparent; - this.bpkx5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx5.Location = new System.Drawing.Point(166, 2); - this.bpkx5.Name = "bpkx5"; - this.bpkx5.Size = new System.Drawing.Size(42, 32); - this.bpkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx5.TabIndex = 34; - this.bpkx5.TabStop = false; - // - // bpkx4 - // - this.bpkx4.BackColor = System.Drawing.Color.Transparent; - this.bpkx4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx4.Location = new System.Drawing.Point(125, 2); - this.bpkx4.Name = "bpkx4"; - this.bpkx4.Size = new System.Drawing.Size(42, 32); - this.bpkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx4.TabIndex = 33; - this.bpkx4.TabStop = false; - // - // bpkx3 - // - this.bpkx3.BackColor = System.Drawing.Color.Transparent; - this.bpkx3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx3.Location = new System.Drawing.Point(84, 2); - this.bpkx3.Name = "bpkx3"; - this.bpkx3.Size = new System.Drawing.Size(42, 32); - this.bpkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx3.TabIndex = 32; - this.bpkx3.TabStop = false; - // - // bpkx2 - // - this.bpkx2.BackColor = System.Drawing.Color.Transparent; - this.bpkx2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx2.Location = new System.Drawing.Point(43, 2); - this.bpkx2.Name = "bpkx2"; - this.bpkx2.Size = new System.Drawing.Size(42, 32); - this.bpkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx2.TabIndex = 31; - this.bpkx2.TabStop = false; - // - // bpkx1 - // - this.bpkx1.BackColor = System.Drawing.Color.Transparent; - this.bpkx1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx1.Location = new System.Drawing.Point(2, 2); - this.bpkx1.Name = "bpkx1"; - this.bpkx1.Size = new System.Drawing.Size(42, 32); - this.bpkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx1.TabIndex = 30; - this.bpkx1.TabStop = false; - // - // bpkx60 - // - this.bpkx60.BackColor = System.Drawing.Color.Transparent; - this.bpkx60.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx60.Location = new System.Drawing.Point(207, 281); - this.bpkx60.Name = "bpkx60"; - this.bpkx60.Size = new System.Drawing.Size(42, 32); - this.bpkx60.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx60.TabIndex = 59; - this.bpkx60.TabStop = false; - // - // bpkx59 - // - this.bpkx59.BackColor = System.Drawing.Color.Transparent; - this.bpkx59.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx59.Location = new System.Drawing.Point(166, 281); - this.bpkx59.Name = "bpkx59"; - this.bpkx59.Size = new System.Drawing.Size(42, 32); - this.bpkx59.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx59.TabIndex = 58; - this.bpkx59.TabStop = false; - // - // bpkx58 - // - this.bpkx58.BackColor = System.Drawing.Color.Transparent; - this.bpkx58.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx58.Location = new System.Drawing.Point(125, 281); - this.bpkx58.Name = "bpkx58"; - this.bpkx58.Size = new System.Drawing.Size(42, 32); - this.bpkx58.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx58.TabIndex = 57; - this.bpkx58.TabStop = false; - // - // bpkx57 - // - this.bpkx57.BackColor = System.Drawing.Color.Transparent; - this.bpkx57.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx57.Location = new System.Drawing.Point(84, 281); - this.bpkx57.Name = "bpkx57"; - this.bpkx57.Size = new System.Drawing.Size(42, 32); - this.bpkx57.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx57.TabIndex = 56; - this.bpkx57.TabStop = false; - // - // bpkx56 - // - this.bpkx56.BackColor = System.Drawing.Color.Transparent; - this.bpkx56.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx56.Location = new System.Drawing.Point(43, 281); - this.bpkx56.Name = "bpkx56"; - this.bpkx56.Size = new System.Drawing.Size(42, 32); - this.bpkx56.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx56.TabIndex = 55; - this.bpkx56.TabStop = false; - // - // bpkx55 - // - this.bpkx55.BackColor = System.Drawing.Color.Transparent; - this.bpkx55.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx55.Location = new System.Drawing.Point(2, 281); - this.bpkx55.Name = "bpkx55"; - this.bpkx55.Size = new System.Drawing.Size(42, 32); - this.bpkx55.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx55.TabIndex = 54; - this.bpkx55.TabStop = false; - // - // bpkx54 - // - this.bpkx54.BackColor = System.Drawing.Color.Transparent; - this.bpkx54.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx54.Location = new System.Drawing.Point(207, 250); - this.bpkx54.Name = "bpkx54"; - this.bpkx54.Size = new System.Drawing.Size(42, 32); - this.bpkx54.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx54.TabIndex = 53; - this.bpkx54.TabStop = false; - // - // bpkx53 - // - this.bpkx53.BackColor = System.Drawing.Color.Transparent; - this.bpkx53.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx53.Location = new System.Drawing.Point(166, 250); - this.bpkx53.Name = "bpkx53"; - this.bpkx53.Size = new System.Drawing.Size(42, 32); - this.bpkx53.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx53.TabIndex = 52; - this.bpkx53.TabStop = false; - // - // bpkx52 - // - this.bpkx52.BackColor = System.Drawing.Color.Transparent; - this.bpkx52.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx52.Location = new System.Drawing.Point(125, 250); - this.bpkx52.Name = "bpkx52"; - this.bpkx52.Size = new System.Drawing.Size(42, 32); - this.bpkx52.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx52.TabIndex = 51; - this.bpkx52.TabStop = false; - // - // bpkx51 - // - this.bpkx51.BackColor = System.Drawing.Color.Transparent; - this.bpkx51.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx51.Location = new System.Drawing.Point(84, 250); - this.bpkx51.Name = "bpkx51"; - this.bpkx51.Size = new System.Drawing.Size(42, 32); - this.bpkx51.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx51.TabIndex = 50; - this.bpkx51.TabStop = false; - // - // bpkx50 - // - this.bpkx50.BackColor = System.Drawing.Color.Transparent; - this.bpkx50.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx50.Location = new System.Drawing.Point(43, 250); - this.bpkx50.Name = "bpkx50"; - this.bpkx50.Size = new System.Drawing.Size(42, 32); - this.bpkx50.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx50.TabIndex = 49; - this.bpkx50.TabStop = false; - // - // bpkx49 - // - this.bpkx49.BackColor = System.Drawing.Color.Transparent; - this.bpkx49.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx49.Location = new System.Drawing.Point(2, 250); - this.bpkx49.Name = "bpkx49"; - this.bpkx49.Size = new System.Drawing.Size(42, 32); - this.bpkx49.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx49.TabIndex = 48; - this.bpkx49.TabStop = false; - // - // bpkx48 - // - this.bpkx48.BackColor = System.Drawing.Color.Transparent; - this.bpkx48.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx48.Location = new System.Drawing.Point(207, 219); - this.bpkx48.Name = "bpkx48"; - this.bpkx48.Size = new System.Drawing.Size(42, 32); - this.bpkx48.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx48.TabIndex = 47; - this.bpkx48.TabStop = false; - // - // bpkx47 - // - this.bpkx47.BackColor = System.Drawing.Color.Transparent; - this.bpkx47.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx47.Location = new System.Drawing.Point(166, 219); - this.bpkx47.Name = "bpkx47"; - this.bpkx47.Size = new System.Drawing.Size(42, 32); - this.bpkx47.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx47.TabIndex = 46; - this.bpkx47.TabStop = false; - // - // bpkx46 - // - this.bpkx46.BackColor = System.Drawing.Color.Transparent; - this.bpkx46.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx46.Location = new System.Drawing.Point(125, 219); - this.bpkx46.Name = "bpkx46"; - this.bpkx46.Size = new System.Drawing.Size(42, 32); - this.bpkx46.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx46.TabIndex = 45; - this.bpkx46.TabStop = false; - // - // bpkx45 - // - this.bpkx45.BackColor = System.Drawing.Color.Transparent; - this.bpkx45.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx45.Location = new System.Drawing.Point(84, 219); - this.bpkx45.Name = "bpkx45"; - this.bpkx45.Size = new System.Drawing.Size(42, 32); - this.bpkx45.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx45.TabIndex = 44; - this.bpkx45.TabStop = false; - // - // bpkx44 - // - this.bpkx44.BackColor = System.Drawing.Color.Transparent; - this.bpkx44.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx44.Location = new System.Drawing.Point(43, 219); - this.bpkx44.Name = "bpkx44"; - this.bpkx44.Size = new System.Drawing.Size(42, 32); - this.bpkx44.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx44.TabIndex = 43; - this.bpkx44.TabStop = false; - // - // bpkx43 - // - this.bpkx43.BackColor = System.Drawing.Color.Transparent; - this.bpkx43.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx43.Location = new System.Drawing.Point(2, 219); - this.bpkx43.Name = "bpkx43"; - this.bpkx43.Size = new System.Drawing.Size(42, 32); - this.bpkx43.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx43.TabIndex = 42; - this.bpkx43.TabStop = false; - // - // bpkx42 - // - this.bpkx42.BackColor = System.Drawing.Color.Transparent; - this.bpkx42.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx42.Location = new System.Drawing.Point(207, 188); - this.bpkx42.Name = "bpkx42"; - this.bpkx42.Size = new System.Drawing.Size(42, 32); - this.bpkx42.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx42.TabIndex = 41; - this.bpkx42.TabStop = false; - // - // bpkx41 - // - this.bpkx41.BackColor = System.Drawing.Color.Transparent; - this.bpkx41.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx41.Location = new System.Drawing.Point(166, 188); - this.bpkx41.Name = "bpkx41"; - this.bpkx41.Size = new System.Drawing.Size(42, 32); - this.bpkx41.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx41.TabIndex = 40; - this.bpkx41.TabStop = false; - // - // bpkx40 - // - this.bpkx40.BackColor = System.Drawing.Color.Transparent; - this.bpkx40.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx40.Location = new System.Drawing.Point(125, 188); - this.bpkx40.Name = "bpkx40"; - this.bpkx40.Size = new System.Drawing.Size(42, 32); - this.bpkx40.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx40.TabIndex = 39; - this.bpkx40.TabStop = false; - // - // bpkx39 - // - this.bpkx39.BackColor = System.Drawing.Color.Transparent; - this.bpkx39.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx39.Location = new System.Drawing.Point(84, 188); - this.bpkx39.Name = "bpkx39"; - this.bpkx39.Size = new System.Drawing.Size(42, 32); - this.bpkx39.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx39.TabIndex = 38; - this.bpkx39.TabStop = false; - // - // bpkx38 - // - this.bpkx38.BackColor = System.Drawing.Color.Transparent; - this.bpkx38.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx38.Location = new System.Drawing.Point(43, 188); - this.bpkx38.Name = "bpkx38"; - this.bpkx38.Size = new System.Drawing.Size(42, 32); - this.bpkx38.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx38.TabIndex = 37; - this.bpkx38.TabStop = false; - // - // bpkx37 - // - this.bpkx37.BackColor = System.Drawing.Color.Transparent; - this.bpkx37.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx37.Location = new System.Drawing.Point(2, 188); - this.bpkx37.Name = "bpkx37"; - this.bpkx37.Size = new System.Drawing.Size(42, 32); - this.bpkx37.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx37.TabIndex = 36; - this.bpkx37.TabStop = false; - // - // bpkx36 - // - this.bpkx36.BackColor = System.Drawing.Color.Transparent; - this.bpkx36.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx36.Location = new System.Drawing.Point(207, 157); - this.bpkx36.Name = "bpkx36"; - this.bpkx36.Size = new System.Drawing.Size(42, 32); - this.bpkx36.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx36.TabIndex = 35; - this.bpkx36.TabStop = false; - // - // bpkx35 - // - this.bpkx35.BackColor = System.Drawing.Color.Transparent; - this.bpkx35.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx35.Location = new System.Drawing.Point(166, 157); - this.bpkx35.Name = "bpkx35"; - this.bpkx35.Size = new System.Drawing.Size(42, 32); - this.bpkx35.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx35.TabIndex = 34; - this.bpkx35.TabStop = false; - // - // bpkx34 - // - this.bpkx34.BackColor = System.Drawing.Color.Transparent; - this.bpkx34.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx34.Location = new System.Drawing.Point(125, 157); - this.bpkx34.Name = "bpkx34"; - this.bpkx34.Size = new System.Drawing.Size(42, 32); - this.bpkx34.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx34.TabIndex = 33; - this.bpkx34.TabStop = false; - // - // bpkx33 - // - this.bpkx33.BackColor = System.Drawing.Color.Transparent; - this.bpkx33.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx33.Location = new System.Drawing.Point(84, 157); - this.bpkx33.Name = "bpkx33"; - this.bpkx33.Size = new System.Drawing.Size(42, 32); - this.bpkx33.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx33.TabIndex = 32; - this.bpkx33.TabStop = false; - // - // bpkx32 - // - this.bpkx32.BackColor = System.Drawing.Color.Transparent; - this.bpkx32.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx32.Location = new System.Drawing.Point(43, 157); - this.bpkx32.Name = "bpkx32"; - this.bpkx32.Size = new System.Drawing.Size(42, 32); - this.bpkx32.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx32.TabIndex = 31; - this.bpkx32.TabStop = false; - // - // bpkx31 - // - this.bpkx31.BackColor = System.Drawing.Color.Transparent; - this.bpkx31.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx31.Location = new System.Drawing.Point(2, 157); - this.bpkx31.Name = "bpkx31"; - this.bpkx31.Size = new System.Drawing.Size(42, 32); - this.bpkx31.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx31.TabIndex = 30; - this.bpkx31.TabStop = false; - // // menuStrip1 // this.menuStrip1.BackColor = System.Drawing.Color.Transparent; @@ -928,154 +135,13 @@ private void InitializeComponent() // this.P_Results.BackColor = System.Drawing.SystemColors.ButtonHighlight; this.P_Results.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.P_Results.Controls.Add(this.PAN_Box); + this.P_Results.Controls.Add(this.pokeGrid1); this.P_Results.Controls.Add(this.SCR_Box); this.P_Results.Location = new System.Drawing.Point(12, 32); this.P_Results.Name = "P_Results"; this.P_Results.Size = new System.Drawing.Size(285, 352); this.P_Results.TabIndex = 66; // - // PAN_Box - // - this.PAN_Box.BackgroundImage = global::PKHeX.WinForms.Properties.Resources.box_wp_clean; - this.PAN_Box.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.PAN_Box.Controls.Add(this.bpkx66); - this.PAN_Box.Controls.Add(this.bpkx65); - this.PAN_Box.Controls.Add(this.bpkx64); - this.PAN_Box.Controls.Add(this.bpkx63); - this.PAN_Box.Controls.Add(this.bpkx62); - this.PAN_Box.Controls.Add(this.bpkx61); - this.PAN_Box.Controls.Add(this.bpkx30); - this.PAN_Box.Controls.Add(this.bpkx1); - this.PAN_Box.Controls.Add(this.bpkx60); - this.PAN_Box.Controls.Add(this.bpkx31); - this.PAN_Box.Controls.Add(this.bpkx29); - this.PAN_Box.Controls.Add(this.bpkx32); - this.PAN_Box.Controls.Add(this.bpkx33); - this.PAN_Box.Controls.Add(this.bpkx28); - this.PAN_Box.Controls.Add(this.bpkx34); - this.PAN_Box.Controls.Add(this.bpkx59); - this.PAN_Box.Controls.Add(this.bpkx35); - this.PAN_Box.Controls.Add(this.bpkx27); - this.PAN_Box.Controls.Add(this.bpkx36); - this.PAN_Box.Controls.Add(this.bpkx37); - this.PAN_Box.Controls.Add(this.bpkx26); - this.PAN_Box.Controls.Add(this.bpkx38); - this.PAN_Box.Controls.Add(this.bpkx58); - this.PAN_Box.Controls.Add(this.bpkx39); - this.PAN_Box.Controls.Add(this.bpkx25); - this.PAN_Box.Controls.Add(this.bpkx40); - this.PAN_Box.Controls.Add(this.bpkx41); - this.PAN_Box.Controls.Add(this.bpkx24); - this.PAN_Box.Controls.Add(this.bpkx42); - this.PAN_Box.Controls.Add(this.bpkx57); - this.PAN_Box.Controls.Add(this.bpkx43); - this.PAN_Box.Controls.Add(this.bpkx23); - this.PAN_Box.Controls.Add(this.bpkx44); - this.PAN_Box.Controls.Add(this.bpkx22); - this.PAN_Box.Controls.Add(this.bpkx45); - this.PAN_Box.Controls.Add(this.bpkx46); - this.PAN_Box.Controls.Add(this.bpkx21); - this.PAN_Box.Controls.Add(this.bpkx2); - this.PAN_Box.Controls.Add(this.bpkx56); - this.PAN_Box.Controls.Add(this.bpkx47); - this.PAN_Box.Controls.Add(this.bpkx20); - this.PAN_Box.Controls.Add(this.bpkx3); - this.PAN_Box.Controls.Add(this.bpkx4); - this.PAN_Box.Controls.Add(this.bpkx19); - this.PAN_Box.Controls.Add(this.bpkx48); - this.PAN_Box.Controls.Add(this.bpkx55); - this.PAN_Box.Controls.Add(this.bpkx5); - this.PAN_Box.Controls.Add(this.bpkx18); - this.PAN_Box.Controls.Add(this.bpkx6); - this.PAN_Box.Controls.Add(this.bpkx49); - this.PAN_Box.Controls.Add(this.bpkx17); - this.PAN_Box.Controls.Add(this.bpkx7); - this.PAN_Box.Controls.Add(this.bpkx54); - this.PAN_Box.Controls.Add(this.bpkx8); - this.PAN_Box.Controls.Add(this.bpkx16); - this.PAN_Box.Controls.Add(this.bpkx50); - this.PAN_Box.Controls.Add(this.bpkx9); - this.PAN_Box.Controls.Add(this.bpkx15); - this.PAN_Box.Controls.Add(this.bpkx10); - this.PAN_Box.Controls.Add(this.bpkx53); - this.PAN_Box.Controls.Add(this.bpkx51); - this.PAN_Box.Controls.Add(this.bpkx14); - this.PAN_Box.Controls.Add(this.bpkx11); - this.PAN_Box.Controls.Add(this.bpkx12); - this.PAN_Box.Controls.Add(this.bpkx13); - this.PAN_Box.Controls.Add(this.bpkx52); - this.PAN_Box.Location = new System.Drawing.Point(3, 3); - this.PAN_Box.Name = "PAN_Box"; - this.PAN_Box.Size = new System.Drawing.Size(251, 346); - this.PAN_Box.TabIndex = 63; - // - // bpkx66 - // - this.bpkx66.BackColor = System.Drawing.Color.Transparent; - this.bpkx66.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx66.Location = new System.Drawing.Point(207, 312); - this.bpkx66.Name = "bpkx66"; - this.bpkx66.Size = new System.Drawing.Size(42, 32); - this.bpkx66.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx66.TabIndex = 65; - this.bpkx66.TabStop = false; - // - // bpkx65 - // - this.bpkx65.BackColor = System.Drawing.Color.Transparent; - this.bpkx65.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx65.Location = new System.Drawing.Point(166, 312); - this.bpkx65.Name = "bpkx65"; - this.bpkx65.Size = new System.Drawing.Size(42, 32); - this.bpkx65.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx65.TabIndex = 64; - this.bpkx65.TabStop = false; - // - // bpkx64 - // - this.bpkx64.BackColor = System.Drawing.Color.Transparent; - this.bpkx64.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx64.Location = new System.Drawing.Point(125, 312); - this.bpkx64.Name = "bpkx64"; - this.bpkx64.Size = new System.Drawing.Size(42, 32); - this.bpkx64.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx64.TabIndex = 63; - this.bpkx64.TabStop = false; - // - // bpkx63 - // - this.bpkx63.BackColor = System.Drawing.Color.Transparent; - this.bpkx63.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx63.Location = new System.Drawing.Point(84, 312); - this.bpkx63.Name = "bpkx63"; - this.bpkx63.Size = new System.Drawing.Size(42, 32); - this.bpkx63.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx63.TabIndex = 62; - this.bpkx63.TabStop = false; - // - // bpkx62 - // - this.bpkx62.BackColor = System.Drawing.Color.Transparent; - this.bpkx62.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx62.Location = new System.Drawing.Point(43, 312); - this.bpkx62.Name = "bpkx62"; - this.bpkx62.Size = new System.Drawing.Size(42, 32); - this.bpkx62.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx62.TabIndex = 61; - this.bpkx62.TabStop = false; - // - // bpkx61 - // - this.bpkx61.BackColor = System.Drawing.Color.Transparent; - this.bpkx61.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx61.Location = new System.Drawing.Point(2, 312); - this.bpkx61.Name = "bpkx61"; - this.bpkx61.Size = new System.Drawing.Size(42, 32); - this.bpkx61.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.bpkx61.TabIndex = 60; - this.bpkx61.TabStop = false; - // // CB_Species // this.CB_Species.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -1321,15 +387,16 @@ private void InitializeComponent() this.FLP_Level.Size = new System.Drawing.Size(0, 0); this.FLP_Level.TabIndex = 119; // - // RTB_Instructions + // CB_GameOrigin // - this.RTB_Instructions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.RTB_Instructions.Location = new System.Drawing.Point(63, 32); - this.RTB_Instructions.Name = "RTB_Instructions"; - this.RTB_Instructions.Size = new System.Drawing.Size(235, 352); - this.RTB_Instructions.TabIndex = 119; - this.RTB_Instructions.Text = ""; + 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(69, 122); + 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 = 121; // // L_Version // @@ -1343,16 +410,24 @@ private void InitializeComponent() this.L_Version.Text = "OT Version:"; this.L_Version.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // CB_GameOrigin + // RTB_Instructions // - 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(69, 122); - 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 = 121; + this.RTB_Instructions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.RTB_Instructions.Location = new System.Drawing.Point(63, 32); + this.RTB_Instructions.Name = "RTB_Instructions"; + this.RTB_Instructions.Size = new System.Drawing.Size(235, 352); + this.RTB_Instructions.TabIndex = 119; + this.RTB_Instructions.Text = ""; + // + // pokeGrid1 + // + this.pokeGrid1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pokeGrid1.Location = new System.Drawing.Point(2, 2); + this.pokeGrid1.Margin = new System.Windows.Forms.Padding(0); + this.pokeGrid1.Name = "pokeGrid1"; + this.pokeGrid1.Size = new System.Drawing.Size(251, 346); + this.pokeGrid1.TabIndex = 2; // // SAV_Encounters // @@ -1376,76 +451,9 @@ private void InitializeComponent() this.Name = "SAV_Encounters"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Database"; - ((System.ComponentModel.ISupportInitialize)(this.bpkx30)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx29)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx28)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx27)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx26)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx25)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx24)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx23)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx22)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx21)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx20)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx19)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx18)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx60)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx59)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx58)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx57)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx56)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx55)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx54)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx53)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx52)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx51)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx50)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx49)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx48)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx47)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx46)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx45)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx44)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx43)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx42)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx41)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx40)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx39)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx38)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx37)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx36)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx35)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx34)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx33)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx32)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx31)).EndInit(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); this.P_Results.ResumeLayout(false); - this.PAN_Box.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.bpkx66)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx65)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx64)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx63)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx62)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bpkx61)).EndInit(); this.TLP_Filters.ResumeLayout(false); this.TLP_Filters.PerformLayout(); this.ResumeLayout(false); @@ -1456,66 +464,6 @@ private void InitializeComponent() #endregion private System.Windows.Forms.VScrollBar SCR_Box; - private System.Windows.Forms.PictureBox bpkx30; - private System.Windows.Forms.PictureBox bpkx29; - private System.Windows.Forms.PictureBox bpkx28; - private System.Windows.Forms.PictureBox bpkx27; - private System.Windows.Forms.PictureBox bpkx26; - private System.Windows.Forms.PictureBox bpkx25; - private System.Windows.Forms.PictureBox bpkx24; - private System.Windows.Forms.PictureBox bpkx23; - private System.Windows.Forms.PictureBox bpkx22; - private System.Windows.Forms.PictureBox bpkx21; - private System.Windows.Forms.PictureBox bpkx20; - private System.Windows.Forms.PictureBox bpkx19; - private System.Windows.Forms.PictureBox bpkx18; - private System.Windows.Forms.PictureBox bpkx17; - private System.Windows.Forms.PictureBox bpkx16; - private System.Windows.Forms.PictureBox bpkx15; - private System.Windows.Forms.PictureBox bpkx14; - private System.Windows.Forms.PictureBox bpkx13; - private System.Windows.Forms.PictureBox bpkx12; - private System.Windows.Forms.PictureBox bpkx11; - private System.Windows.Forms.PictureBox bpkx10; - private System.Windows.Forms.PictureBox bpkx9; - private System.Windows.Forms.PictureBox bpkx8; - private System.Windows.Forms.PictureBox bpkx7; - private System.Windows.Forms.PictureBox bpkx6; - private System.Windows.Forms.PictureBox bpkx5; - private System.Windows.Forms.PictureBox bpkx4; - private System.Windows.Forms.PictureBox bpkx3; - private System.Windows.Forms.PictureBox bpkx2; - private System.Windows.Forms.PictureBox bpkx1; - private System.Windows.Forms.PictureBox bpkx60; - private System.Windows.Forms.PictureBox bpkx59; - private System.Windows.Forms.PictureBox bpkx58; - private System.Windows.Forms.PictureBox bpkx57; - private System.Windows.Forms.PictureBox bpkx56; - private System.Windows.Forms.PictureBox bpkx55; - private System.Windows.Forms.PictureBox bpkx54; - private System.Windows.Forms.PictureBox bpkx53; - private System.Windows.Forms.PictureBox bpkx52; - private System.Windows.Forms.PictureBox bpkx51; - private System.Windows.Forms.PictureBox bpkx50; - private System.Windows.Forms.PictureBox bpkx49; - private System.Windows.Forms.PictureBox bpkx48; - private System.Windows.Forms.PictureBox bpkx47; - private System.Windows.Forms.PictureBox bpkx46; - private System.Windows.Forms.PictureBox bpkx45; - private System.Windows.Forms.PictureBox bpkx44; - private System.Windows.Forms.PictureBox bpkx43; - private System.Windows.Forms.PictureBox bpkx42; - private System.Windows.Forms.PictureBox bpkx41; - private System.Windows.Forms.PictureBox bpkx40; - private System.Windows.Forms.PictureBox bpkx39; - private System.Windows.Forms.PictureBox bpkx38; - private System.Windows.Forms.PictureBox bpkx37; - private System.Windows.Forms.PictureBox bpkx36; - private System.Windows.Forms.PictureBox bpkx35; - private System.Windows.Forms.PictureBox bpkx34; - private System.Windows.Forms.PictureBox bpkx33; - private System.Windows.Forms.PictureBox bpkx32; - private System.Windows.Forms.PictureBox bpkx31; private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem Menu_Close; private System.Windows.Forms.ToolStripMenuItem Menu_Exit; @@ -1534,13 +482,6 @@ private void InitializeComponent() private System.Windows.Forms.Label L_Move4; private System.Windows.Forms.Button B_Reset; private System.Windows.Forms.Label L_Count; - private System.Windows.Forms.Panel PAN_Box; - private System.Windows.Forms.PictureBox bpkx66; - private System.Windows.Forms.PictureBox bpkx65; - private System.Windows.Forms.PictureBox bpkx64; - private System.Windows.Forms.PictureBox bpkx63; - private System.Windows.Forms.PictureBox bpkx62; - private System.Windows.Forms.PictureBox bpkx61; private System.Windows.Forms.Label L_Viewed; private System.Windows.Forms.ToolStripMenuItem Menu_SearchSettings; private System.Windows.Forms.TableLayoutPanel TLP_Filters; @@ -1551,5 +492,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem Menu_SearchAdvanced; private System.Windows.Forms.ComboBox CB_GameOrigin; private System.Windows.Forms.Label L_Version; + private Controls.PokeGrid pokeGrid1; } } \ No newline at end of file diff --git a/PKHeX.WinForms/Subforms/SAV_Encounters.cs b/PKHeX.WinForms/Subforms/SAV_Encounters.cs index 96da7da71..a39f438cb 100644 --- a/PKHeX.WinForms/Subforms/SAV_Encounters.cs +++ b/PKHeX.WinForms/Subforms/SAV_Encounters.cs @@ -23,28 +23,16 @@ public SAV_Encounters(PKMEditor f1) { InitializeComponent(); - ToolStripMenuItem mnuView = new ToolStripMenuItem {Name = "mnuView", Text = "View"}; + ToolStripMenuItem mnuView = new ToolStripMenuItem {Name = "mnuView", Text = "View", Image = Resources.other }; ContextMenuStrip mnu = new ContextMenuStrip(); mnu.Items.AddRange(new ToolStripItem[] { mnuView }); PKME_Tabs = f1; - PKXBOXES = new[] - { - bpkx1, bpkx2, bpkx3, bpkx4, bpkx5, bpkx6, - bpkx7, bpkx8, bpkx9, bpkx10,bpkx11,bpkx12, - bpkx13,bpkx14,bpkx15,bpkx16,bpkx17,bpkx18, - bpkx19,bpkx20,bpkx21,bpkx22,bpkx23,bpkx24, - bpkx25,bpkx26,bpkx27,bpkx28,bpkx29,bpkx30, - - bpkx31,bpkx32,bpkx33,bpkx34,bpkx35,bpkx36, - bpkx37,bpkx38,bpkx39,bpkx40,bpkx41,bpkx42, - bpkx43,bpkx44,bpkx45,bpkx46,bpkx47,bpkx48, - bpkx49,bpkx50,bpkx51,bpkx52,bpkx53,bpkx54, - bpkx55,bpkx56,bpkx57,bpkx58,bpkx59,bpkx60, - bpkx61,bpkx62,bpkx63,bpkx64,bpkx65,bpkx66, - }; + pokeGrid1.InitializeGrid(6, 11); + pokeGrid1.SetBackground(Resources.box_wp_clean); + PKXBOXES = pokeGrid1.Entries.ToArray(); // Enable Scrolling when hovered over foreach (var slot in PKXBOXES) @@ -334,7 +322,7 @@ private void Menu_SearchAdvanced_Click(object sender, EventArgs e) protected override void OnMouseWheel(MouseEventArgs e) { - if (!PAN_Box.RectangleToScreen(PAN_Box.ClientRectangle).Contains(MousePosition)) + if (!pokeGrid1.RectangleToScreen(pokeGrid1.ClientRectangle).Contains(MousePosition)) return; int oldval = SCR_Box.Value; int newval = oldval + (e.Delta < 0 ? 1 : -1); diff --git a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs index 671fe99a2..311faeb80 100644 --- a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs +++ b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs @@ -24,9 +24,9 @@ public SAV_MysteryGiftDB(PKMEditor tabs, SAVEditor sav) { InitializeComponent(); - ToolStripMenuItem mnuView = new ToolStripMenuItem { Name = "mnuView", Text = "View" }; - ToolStripMenuItem mnuSaveMG = new ToolStripMenuItem { Name = "mnuSaveMG", Text = "Save Gift" }; - ToolStripMenuItem mnuSavePK = new ToolStripMenuItem { Name = "mnuSavePK", Text = "Save PKM" }; + ToolStripMenuItem mnuView = new ToolStripMenuItem { Name = "mnuView", Text = "View", Image = Resources.other }; + ToolStripMenuItem mnuSaveMG = new ToolStripMenuItem { Name = "mnuSaveMG", Text = "Save Gift", Image = Resources.gift }; + ToolStripMenuItem mnuSavePK = new ToolStripMenuItem { Name = "mnuSavePK", Text = "Save PKM", Image = Resources.savePKM }; WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage); ContextMenuStrip mnu = new ContextMenuStrip();