Move ball browser form to separate file

PKHeX.WinForms/Controls/PKM Editor/BallBrowser.Designer.cs

@@ -0,0 +1,64 @@
+namespace PKHeX.WinForms
+{
+    partial class BallBrowser
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.flp = new System.Windows.Forms.FlowLayoutPanel();
+            this.SuspendLayout();
+            // 
+            // flp
+            // 
+            this.flp.AutoSize = true;
+            this.flp.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.flp.Location = new System.Drawing.Point(0, 0);
+            this.flp.Name = "flp";
+            this.flp.Size = new System.Drawing.Size(127, 88);
+            this.flp.TabIndex = 0;
+            // 
+            // BallBrowser
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoSize = true;
+            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.ClientSize = new System.Drawing.Size(127, 88);
+            this.Controls.Add(this.flp);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.Name = "BallBrowser";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "BallBrowser";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.FlowLayoutPanel flp;
+    }
+}

PKHeX.WinForms/Controls/PKM Editor/BallBrowser.cs

@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+
+using PKHeX.Core;
+using PKHeX.WinForms.Properties;
+
+namespace PKHeX.WinForms
+{
+    public partial class BallBrowser : Form
+    {
+        public BallBrowser() => InitializeComponent();
+
+        public int BallChoice { get; private set; } = -1;
+
+        public void LoadBalls(Ball[] poss, ICollection<Ball> legal, IReadOnlyList<ComboItem> names)
+        {
+            for (int i = 0; i < poss.Length; i++)
+            {
+                var pb = GetBallView(poss[i], legal, names);
+                flp.Controls.Add(pb);
+                const int width = 5; // balls wide
+                if (i % width == width - 1)
+                    flp.SetFlowBreak(pb, true);
+            }
+        }
+
+        private PictureBox GetBallView(Ball b, ICollection<Ball> legal, IReadOnlyList<ComboItem> names)
+        {
+            var img = SpriteUtil.GetBallSprite((int) b);
+            var pb = new PictureBox
+            {
+                Size = img.Size,
+                Image = img,
+                BackgroundImage = legal.Contains(b) ? Resources.slotSet : Resources.slotDel,
+                BackgroundImageLayout = ImageLayout.Tile
+            };
+            pb.MouseEnter += (_, __) => Text = names.First(z => z.Value == (int) b).Text;
+            pb.Click += (_, __) => SelectBall(b);
+            return pb;
+        }
+
+        private void SelectBall(Ball b)
+        {
+            BallChoice = (int)b;
+            Close();
+        }
+    }
+}

PKHeX.WinForms/Controls/PKM Editor/BallBrowser.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs

@@ -239,7 +239,7 @@ private void LoadFieldsFromPKM(PKM pk, bool focus = true, bool skipConversionChe
             pkm = pk.Clone();
 
             try { GetFieldsfromPKM(); }
-            finally { }
+            catch { }
 
             Stats.UpdateIVs(null, EventArgs.Empty);
             UpdatePKRSInfected(null, EventArgs.Empty);
@@ -607,43 +607,13 @@ private void ClickBall(object sender, EventArgs e)
                 .TakeWhile(z => (int) z <= pkm.MaxBallID).ToArray();
             var names = GameInfo.BallDataSource;
 
-            var frm = new Form
+            using (var frm = new BallBrowser())
             {
-                FormBorderStyle = FormBorderStyle.FixedToolWindow,
-                StartPosition = FormStartPosition.CenterParent,
-                AutoSize = true,
-                AutoSizeMode = AutoSizeMode.GrowAndShrink,
-                MaximizeBox = false,
-                MinimizeBox = false,
-            };
-            var flp = new FlowLayoutPanel {AutoSize = true, Dock = DockStyle.Fill};
-
-            for (int i = 0; i < poss.Length; i++)
-            {
-                var b = poss[i];
-                var img = SpriteUtil.GetBallSprite((int) b);
-                bool valid = legal.Contains(b);
-                var pb = new PictureBox
-                {
-                    Size = img.Size,
-                    Image = img,
-                    BackgroundImage = valid ? Resources.slotSet : Resources.slotDel,
-                    BackgroundImageLayout = ImageLayout.Tile
-                };
-                pb.MouseEnter += (_, __) => frm.Text = names.First(z => z.Value == (int)b).Text;
-                pb.Click += (_, __) =>
-                {
-                    CB_Ball.SelectedValue = (int)b;
-                    frm.Close();
-                };
-                flp.Controls.Add(pb);
-                const int width = 5;
-                if (i % width == width - 1)
-                    flp.SetFlowBreak(pb, true);
+                frm.LoadBalls(poss, legal, names);
+                frm.ShowDialog();
+                if (frm.BallChoice >= 0)
+                    CB_Ball.SelectedValue = frm.BallChoice;
             }
-            frm.Controls.Add(flp);
-            frm.ShowDialog();
-            frm.Dispose();
         }
 
         private void ClickShinyLeaf(object sender, EventArgs e) => ShinyLeaf.CheckAll(ModifierKeys != Keys.Control);

PKHeX.WinForms/PKHeX.WinForms.csproj

@@ -147,6 +147,12 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Controls\PKM Editor\BallBrowser.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\PKM Editor\BallBrowser.Designer.cs">
+      <DependentUpon>BallBrowser.cs</DependentUpon>
+    </Compile>
     <Compile Include="Controls\PKM Editor\DrawConfig.cs" />
     <Compile Include="Controls\PKM Editor\IMainEditor.cs" />
     <Compile Include="Controls\PKM Editor\CatchRate.cs">
@@ -640,6 +646,9 @@
     <Compile Include="Util\SpriteBuilder.cs" />
     <Compile Include="Util\WinFormsTranslator.cs" />
     <Compile Include="Util\WinFormsUtil.cs" />
+    <EmbeddedResource Include="Controls\PKM Editor\BallBrowser.resx">
+      <DependentUpon>BallBrowser.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Controls\PKM Editor\CatchRate.resx">
       <DependentUpon>CatchRate.cs</DependentUpon>
     </EmbeddedResource>