RefactoredSweeper base, next is winning/losing and codepoints

1 files changed, 75 insertions, 205 deletions

diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs
index 8782260..8090b96 100644
--- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs
+++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs
@@ -52,90 +52,76 @@ namespace ShiftOS.WinForms.Applications
         /// </summary>
         private void InitializeComponent()
         {
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.easyPanel = new System.Windows.Forms.TableLayoutPanel();
-            this.buttonE = new System.Windows.Forms.Button();
-            this.buttonM = new System.Windows.Forms.Button();
-            this.buttonH = new System.Windows.Forms.Button();
+            this.panelGameStatus = new System.Windows.Forms.PictureBox();
+            this.gamePanel = new System.Windows.Forms.TableLayoutPanel();
+            this.buttonEasy = new System.Windows.Forms.Button();
+            this.buttonMedium = new System.Windows.Forms.Button();
+            this.buttonHard = new System.Windows.Forms.Button();
             this.lblmines = new System.Windows.Forms.Label();
             this.lbltime = new System.Windows.Forms.Label();
             this.lblinfo = new System.Windows.Forms.Label();
             this.lblinfo2 = new System.Windows.Forms.Label();
-            this.flagButton = new System.Windows.Forms.PictureBox();
-            this.mediumPanel = new System.Windows.Forms.TableLayoutPanel();
-            this.hardPanel = new System.Windows.Forms.TableLayoutPanel();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.flagButton)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelGameStatus)).BeginInit();
             this.SuspendLayout();
             // 
-            // pictureBox1
-            // 
-            this.pictureBox1.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace;
-            this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.pictureBox1.Image = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace;
-            this.pictureBox1.Location = new System.Drawing.Point(264, 3);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(32, 32);
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            // 
-            // easyPanel
-            // 
-            this.easyPanel.ColumnCount = 9;
-            this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
-            this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
-            this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
-            this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
-            this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
-            this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
-            this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
-            this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
-            this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
-            this.easyPanel.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize;
-            this.easyPanel.Location = new System.Drawing.Point(4, 40);
-            this.easyPanel.Name = "easyPanel";
-            this.easyPanel.RowCount = 9;
-            this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F));
-            this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F));
-            this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F));
-            this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F));
-            this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F));
-            this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F));
-            this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F));
-            this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11025F));
-            this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11025F));
-            this.easyPanel.Size = new System.Drawing.Size(553, 308);
-            this.easyPanel.TabIndex = 1;
-            // 
-            // buttonE
-            // 
-            this.buttonE.Location = new System.Drawing.Point(4, 354);
-            this.buttonE.Name = "buttonE";
-            this.buttonE.Size = new System.Drawing.Size(75, 23);
-            this.buttonE.TabIndex = 2;
-            this.buttonE.Text = "Easy";
-            this.buttonE.UseVisualStyleBackColor = true;
-            this.buttonE.Click += new System.EventHandler(this.buttonE_Click);
-            // 
-            // buttonM
-            // 
-            this.buttonM.Location = new System.Drawing.Point(244, 354);
-            this.buttonM.Name = "buttonM";
-            this.buttonM.Size = new System.Drawing.Size(75, 23);
-            this.buttonM.TabIndex = 3;
-            this.buttonM.Text = "Medium";
-            this.buttonM.UseVisualStyleBackColor = true;
-            this.buttonM.Click += new System.EventHandler(this.buttonM_Click);
-            // 
-            // buttonH
-            // 
-            this.buttonH.Location = new System.Drawing.Point(482, 354);
-            this.buttonH.Name = "buttonH";
-            this.buttonH.Size = new System.Drawing.Size(75, 23);
-            this.buttonH.TabIndex = 4;
-            this.buttonH.Text = "Hard";
-            this.buttonH.UseVisualStyleBackColor = true;
-            this.buttonH.Click += new System.EventHandler(this.buttonH_Click);
+            // panelGameStatus
+            // 
+            this.panelGameStatus.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace;
+            this.panelGameStatus.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+            this.panelGameStatus.Image = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace;
+            this.panelGameStatus.Location = new System.Drawing.Point(264, 3);
+            this.panelGameStatus.Name = "panelGameStatus";
+            this.panelGameStatus.Size = new System.Drawing.Size(32, 32);
+            this.panelGameStatus.TabIndex = 0;
+            this.panelGameStatus.TabStop = false;
+            this.panelGameStatus.Click += new System.EventHandler(this.panelGameStatus_Click);
+            // 
+            // gamePanel
+            // 
+            this.gamePanel.AutoScroll = true;
+            this.gamePanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.gamePanel.ColumnCount = 1;
+            this.gamePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.gamePanel.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize;
+            this.gamePanel.Location = new System.Drawing.Point(4, 40);
+            this.gamePanel.MaximumSize = new System.Drawing.Size(553, 308);
+            this.gamePanel.MinimumSize = new System.Drawing.Size(553, 308);
+            this.gamePanel.Name = "gamePanel";
+            this.gamePanel.RowCount = 1;
+            this.gamePanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.gamePanel.Size = new System.Drawing.Size(553, 308);
+            this.gamePanel.TabIndex = 1;
+            this.gamePanel.Paint += new System.Windows.Forms.PaintEventHandler(this.gamePanel_Paint);
+            // 
+            // buttonEasy
+            // 
+            this.buttonEasy.Location = new System.Drawing.Point(4, 354);
+            this.buttonEasy.Name = "buttonEasy";
+            this.buttonEasy.Size = new System.Drawing.Size(75, 23);
+            this.buttonEasy.TabIndex = 2;
+            this.buttonEasy.Text = "Easy";
+            this.buttonEasy.UseVisualStyleBackColor = true;
+            this.buttonEasy.Click += new System.EventHandler(this.buttonEasy_Click);
+            // 
+            // buttonMedium
+            // 
+            this.buttonMedium.Location = new System.Drawing.Point(244, 354);
+            this.buttonMedium.Name = "buttonMedium";
+            this.buttonMedium.Size = new System.Drawing.Size(75, 23);
+            this.buttonMedium.TabIndex = 3;
+            this.buttonMedium.Text = "Medium";
+            this.buttonMedium.UseVisualStyleBackColor = true;
+            this.buttonMedium.Click += new System.EventHandler(this.buttonMedium_Click);
+            // 
+            // buttonHard
+            // 
+            this.buttonHard.Location = new System.Drawing.Point(482, 354);
+            this.buttonHard.Name = "buttonHard";
+            this.buttonHard.Size = new System.Drawing.Size(75, 23);
+            this.buttonHard.TabIndex = 4;
+            this.buttonHard.Text = "Hard";
+            this.buttonHard.UseVisualStyleBackColor = true;
+            this.buttonHard.Click += new System.EventHandler(this.buttonHard_Click);
             // 
             // lblmines
             // 
@@ -173,135 +159,22 @@ namespace ShiftOS.WinForms.Applications
             this.lblinfo2.TabIndex = 8;
             this.lblinfo2.Text = "Click the button on the right to toggle flag mode.";
             // 
-            // flagButton
-            // 
-            this.flagButton.Image = global::ShiftOS.WinForms.Properties.Resources.SweeperTileBlock;
-            this.flagButton.Location = new System.Drawing.Point(537, 14);
-            this.flagButton.Name = "flagButton";
-            this.flagButton.Size = new System.Drawing.Size(20, 20);
-            this.flagButton.TabIndex = 9;
-            this.flagButton.TabStop = false;
-            this.flagButton.Click += new System.EventHandler(this.flagButton_Click);
-            // 
-            // mediumPanel
-            // 
-            this.mediumPanel.ColumnCount = 16;
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249042F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize;
-            this.mediumPanel.Location = new System.Drawing.Point(4, 41);
-            this.mediumPanel.Name = "mediumPanel";
-            this.mediumPanel.RowCount = 16;
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249183F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.248558F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.248558F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.Size = new System.Drawing.Size(553, 307);
-            this.mediumPanel.TabIndex = 2;
-            // 
-            // hardPanel
-            // 
-            this.hardPanel.ColumnCount = 30;
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.448275F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.hardPanel.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize;
-            this.hardPanel.Location = new System.Drawing.Point(4, 40);
-            this.hardPanel.Name = "hardPanel";
-            this.hardPanel.RowCount = 16;
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249183F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.248558F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.248558F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.Size = new System.Drawing.Size(553, 308);
-            this.hardPanel.TabIndex = 3;
-            // 
             // ShiftSweeper
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.hardPanel);
-            this.Controls.Add(this.mediumPanel);
-            this.Controls.Add(this.flagButton);
             this.Controls.Add(this.lblinfo2);
             this.Controls.Add(this.lblinfo);
             this.Controls.Add(this.lbltime);
             this.Controls.Add(this.lblmines);
-            this.Controls.Add(this.buttonH);
-            this.Controls.Add(this.buttonM);
-            this.Controls.Add(this.buttonE);
-            this.Controls.Add(this.easyPanel);
-            this.Controls.Add(this.pictureBox1);
+            this.Controls.Add(this.buttonHard);
+            this.Controls.Add(this.buttonMedium);
+            this.Controls.Add(this.buttonEasy);
+            this.Controls.Add(this.gamePanel);
+            this.Controls.Add(this.panelGameStatus);
             this.Name = "ShiftSweeper";
             this.Size = new System.Drawing.Size(596, 426);
-            this.Load += new System.EventHandler(this.ShiftSweeper_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.flagButton)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelGameStatus)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -309,17 +182,14 @@ namespace ShiftOS.WinForms.Applications
 
         #endregion
 
-        private System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.TableLayoutPanel easyPanel;
-        private System.Windows.Forms.Button buttonE;
-        private System.Windows.Forms.Button buttonM;
-        private System.Windows.Forms.Button buttonH;
+        private System.Windows.Forms.PictureBox panelGameStatus;
+        private System.Windows.Forms.TableLayoutPanel gamePanel;
+        private System.Windows.Forms.Button buttonEasy;
+        private System.Windows.Forms.Button buttonMedium;
+        private System.Windows.Forms.Button buttonHard;
         private System.Windows.Forms.Label lblmines;
         private System.Windows.Forms.Label lbltime;
         private System.Windows.Forms.Label lblinfo;
         private System.Windows.Forms.Label lblinfo2;
-        private System.Windows.Forms.PictureBox flagButton;
-        private System.Windows.Forms.TableLayoutPanel mediumPanel;
-        private System.Windows.Forms.TableLayoutPanel hardPanel;
     }
 }