Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

3 files changed, 103 insertions, 52 deletions

diff --git a/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs b/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs
index d6795df..67f596a 100644
--- a/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs
+++ b/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs
@@ -1,33 +1,33 @@
-namespace TimeHACK.Engine.Template
-{
-    partial class Win9XBSOD
-    {
-        /// <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()
-        {
+namespace TimeHACK.Engine.Template

+{

+    partial class Win9XBSOD

+    {

+        /// <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.label1 = new System.Windows.Forms.Label();

             this.textBox1 = new System.Windows.Forms.TextBox();

             this.textBox2 = new System.Windows.Forms.TextBox();

@@ -38,23 +38,25 @@
             // 

             // label1

             // 

+            this.label1.Anchor = System.Windows.Forms.AnchorStyles.None;

             this.label1.AutoSize = true;

             this.label1.BackColor = System.Drawing.Color.Silver;

-            this.label1.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.label1.ForeColor = System.Drawing.Color.Blue;

-            this.label1.Location = new System.Drawing.Point(444, 0);

+            this.label1.Location = new System.Drawing.Point(549, 185);

             this.label1.Name = "label1";

-            this.label1.Size = new System.Drawing.Size(147, 28);

+            this.label1.Size = new System.Drawing.Size(138, 31);

             this.label1.TabIndex = 0;

             this.label1.Text = " Windows ";

             // 

             // textBox1

             // 

+            this.textBox1.Anchor = System.Windows.Forms.AnchorStyles.None;

             this.textBox1.BackColor = System.Drawing.Color.Blue;

             this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;

-            this.textBox1.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.textBox1.ForeColor = System.Drawing.Color.White;

-            this.textBox1.Location = new System.Drawing.Point(0, 54);

+            this.textBox1.Location = new System.Drawing.Point(186, 272);

             this.textBox1.Multiline = true;

             this.textBox1.Name = "textBox1";

             this.textBox1.ReadOnly = true;

@@ -66,11 +68,12 @@
             // 

             // textBox2

             // 

+            this.textBox2.Anchor = System.Windows.Forms.AnchorStyles.None;

             this.textBox2.BackColor = System.Drawing.Color.Blue;

             this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None;

-            this.textBox2.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.textBox2.ForeColor = System.Drawing.Color.White;

-            this.textBox2.Location = new System.Drawing.Point(0, 141);

+            this.textBox2.Location = new System.Drawing.Point(205, 377);

             this.textBox2.Multiline = true;

             this.textBox2.Name = "textBox2";

             this.textBox2.ReadOnly = true;

@@ -82,11 +85,12 @@
             // 

             // textBox3

             // 

+            this.textBox3.Anchor = System.Windows.Forms.AnchorStyles.None;

             this.textBox3.BackColor = System.Drawing.Color.Blue;

             this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None;

-            this.textBox3.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.textBox3.ForeColor = System.Drawing.Color.White;

-            this.textBox3.Location = new System.Drawing.Point(332, 248);

+            this.textBox3.Location = new System.Drawing.Point(439, 506);

             this.textBox3.Multiline = true;

             this.textBox3.Name = "textBox3";

             this.textBox3.ReadOnly = true;

@@ -101,9 +105,10 @@
             this.panel1.Controls.Add(this.textBox3);

             this.panel1.Controls.Add(this.textBox1);

             this.panel1.Controls.Add(this.textBox2);

-            this.panel1.Location = new System.Drawing.Point(this.Width - 475, this.Height - 141);

+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.panel1.Location = new System.Drawing.Point(0, 0);

             this.panel1.Name = "panel1";

-            this.panel1.Size = new System.Drawing.Size(950, 282);

+            this.panel1.Size = new System.Drawing.Size(1280, 720);

             this.panel1.TabIndex = 3;

             // 

             // Win9XBSOD

@@ -115,21 +120,22 @@
             this.Controls.Add(this.panel1);

             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;

             this.Name = "Win9XBSOD";

-            this.Tag = "gnoreFormOnTaskbar";

+            this.Tag = "ignoreFormOnTaskbar";

             this.Text = "Win9XBSOD";

+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Win9XBSOD_FormClosed);

             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Win9XBSOD_KeyDown);

             this.panel1.ResumeLayout(false);

             this.panel1.PerformLayout();

             this.ResumeLayout(false);

 

-        }
-
-        #endregion
-
-        internal System.Windows.Forms.Label label1;
-        internal System.Windows.Forms.TextBox textBox1;
-        internal System.Windows.Forms.TextBox textBox2;
-        internal System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.Panel panel1;
-    }
+        }

+

+        #endregion

+

+        internal System.Windows.Forms.Label label1;

+        internal System.Windows.Forms.TextBox textBox1;

+        internal System.Windows.Forms.TextBox textBox2;

+        internal System.Windows.Forms.TextBox textBox3;

+        private System.Windows.Forms.Panel panel1;

+    }

 }
\ No newline at end of file
diff --git a/TimeHACK.Engine/Template/Win9XBSOD.cs b/TimeHACK.Engine/Template/Win9XBSOD.cs
index 519315e..acf5e07 100644
--- a/TimeHACK.Engine/Template/Win9XBSOD.cs
+++ b/TimeHACK.Engine/Template/Win9XBSOD.cs
@@ -29,5 +29,10 @@ namespace TimeHACK.Engine.Template
                 this.Close();
             }
         }
+
+        private void Win9XBSOD_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            
+        }
     }
 }
diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs
index 615d0f4..f5737aa 100644
--- a/TimeHACK.Engine/Template/WinClassic.cs
+++ b/TimeHACK.Engine/Template/WinClassic.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
@@ -74,5 +75,44 @@ namespace TimeHACK.Engine.Template
             }
             
         }
+
+        // The rest of this code will automatically style the buttons on the form!
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            base.OnControlAdded(e);
+
+            if (e.Control.GetType() == typeof(Button))
+            {
+                e.Control.MouseEnter += button_MouseEnter;
+                e.Control.MouseLeave += button_MouseLeave;
+
+                ((Button)e.Control).FlatStyle = FlatStyle.Popup;
+            }
+        }
+
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            base.OnControlRemoved(e);
+
+            if (e.Control.GetType() == typeof(Button))
+            {
+                e.Control.MouseEnter -= button_MouseEnter;
+                e.Control.MouseLeave -= button_MouseLeave;
+            }
+        }
+
+        private void button_MouseEnter(object sender, EventArgs e)
+        {
+            var c = (Button)sender;
+            c.UseVisualStyleBackColor = false;
+            c.BackColor = Color.GhostWhite;
+        }
+
+        private void button_MouseLeave(object sender, EventArgs e)
+        {
+            var c = (Button)sender;
+            c.UseVisualStyleBackColor = true;
+        }
     }
 }