Merge pull request #142 from jtsshieh/master

Made some changes to Minesweeper

10 files changed, 53 insertions, 51 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/Square.cs b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/Square.cs
index f7a9e99..2029995 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/Square.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/Square.cs
@@ -37,6 +37,9 @@ namespace TimeHACK.OS.Win95.Win95Apps.MineSweeper
             _button.Click += new EventHandler(Click);
             _button.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender,args,2);
             _button.MouseDown += new MouseEventHandler(DismantleClick);
+            _button.FlatStyle = FlatStyle.Flat;
+            _button.FlatAppearance.BorderSize = 1;
+            _button.BackgroundImageLayout = ImageLayout.Stretch;
 
             _game.Panel.Controls.Add(Button);
         }
@@ -69,13 +72,13 @@ namespace TimeHACK.OS.Win95.Win95Apps.MineSweeper
                 if (Dismantled)
                 {
                     _dismantled = false;
-                    Button.BackColor = SystemColors.Control;
+                    Button.BackgroundImage = null;
                     Button.Text = "?";
                 }
                 else
                 {
                     _dismantled = true;
-                    Button.BackgroundImage = Properties.Resources.minsweeper_flag;
+                    Button.BackgroundImage = Properties.Resources.WinClassicMinesweeperFlag;
                 }
                 OnDismantle();
             }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs
index bca6b99..e1e0d32 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs
@@ -256,7 +256,7 @@
             // 
             // button1
             // 
-            this.button1.BackgroundImage = global::TimeHACK.Properties.Resources.minsweeper_smile;
+            this.button1.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicMinesweeperSmile;
             this.button1.Location = new System.Drawing.Point(108, 32);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(25, 25);
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
index 6b6e297..657659b 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
@@ -29,32 +29,30 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             labelBombs.Text = (_game.Mines - _game.DismantledMines).ToString();
         }
+        public void calculateFormSize(int x, int y)
+        {
+            panel1.Size = new Size(x * 25, y * 25);
+            this.ParentForm.Size = new Size(x * 25 + 45, y * 25 + 100);
+            labelTime.Location = new Point(x * 25 - 38, button1.Location.Y);
+            button1.PerformClick();
+        }
         private void begginnerToolStripMenuItem_Click(object sender, EventArgs e)
         {
             level = "easy";
-            panel1.Size = new Size(200, 200);
-            this.ParentForm.Size = new Size(240, 275);
             button1.Location = new Point(108, 32);
-            labelTime.Location = new Point(162, 34);
-            button1.PerformClick();
+            calculateFormSize(8, 8);
         }
         private void intermediateToolStripMenuItem_Click(object sender, EventArgs e)
         {
             level = "medium";
-            panel1.Size = new Size(400,400);
-            this.ParentForm.Size = new Size(440, 480);
             button1.Location = new Point(208, 32);
-            labelTime.Location = new Point(362, 34);
-            button1.PerformClick();
+            calculateFormSize(16, 16);
         }
         private void expertToolStripMenuItem_Click(object sender, EventArgs e)
         {
             level = "hard";
-            panel1.Size = new Size(740, 400);
-            this.ParentForm.Size = new Size(776, 480);
             button1.Location = new Point(381, 32);
-            labelTime.Location = new Point(702, 34);
-            button1.PerformClick();
+            calculateFormSize(30, 16);
         }
         private void button1_Click(object sender, EventArgs e)
         {
@@ -87,7 +85,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         private void WinClassicMinesweeper_Load(object sender, EventArgs e)
         {
-            button1.PerformClick();
+            begginnerToolStripMenuItem.PerformClick();
         }
     }
 }
diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs
index dcc281a..74a012e 100644
--- a/TimeHACK.Main/Properties/Resources.Designer.cs
+++ b/TimeHACK.Main/Properties/Resources.Designer.cs
@@ -366,36 +366,6 @@ namespace TimeHACK.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap minsweeper_flag {
-            get {
-                object obj = ResourceManager.GetObject("minsweeper_flag", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap minsweeper_sad {
-            get {
-                object obj = ResourceManager.GetObject("minsweeper_sad", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap minsweeper_smile {
-            get {
-                object obj = ResourceManager.GetObject("minsweeper_smile", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
         /// </summary>
         internal static System.IO.UnmanagedMemoryStream modem_dial {
@@ -1254,6 +1224,36 @@ namespace TimeHACK.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        internal static System.Drawing.Bitmap WinClassicMinesweeperFlag {
+            get {
+                object obj = ResourceManager.GetObject("WinClassicMinesweeperFlag", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap WinClassicMinesweeperSad {
+            get {
+                object obj = ResourceManager.GetObject("WinClassicMinesweeperSad", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap WinClassicMinesweeperSmile {
+            get {
+                object obj = ResourceManager.GetObject("WinClassicMinesweeperSmile", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap WinClassicMSN {
             get {
                 object obj = ResourceManager.GetObject("WinClassicMSN", resourceCulture);
diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx
index 1a0ac46..f6182d6 100644
--- a/TimeHACK.Main/Properties/Resources.resx
+++ b/TimeHACK.Main/Properties/Resources.resx
@@ -148,7 +148,7 @@
   <data name="WinClassicNew" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WinClassic\WinClassicNew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="minsweeper_smile" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="WinClassicMinesweeperSmile" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minsweeper smile.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="WinClassicAddressBookDeleteIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -276,7 +276,7 @@
   <data name="termCopy" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\termCopy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="minsweeper_flag" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="WinClassicMinesweeperFlag" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minsweeper flag.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="AIMmessagereceived" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -321,7 +321,7 @@
   <data name="WinClassicIE4" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\winclassic\winclassicie4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="minsweeper_sad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="WinClassicMinesweeperSad" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minsweeper sad.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="std_story" xml:space="preserve">
diff --git a/TimeHACK.Main/Resources/minesweepeprlogo.PNG b/TimeHACK.Main/Resources/minesweepeprlogo.PNG
new file mode 100644
index 0000000..cd5477d
--- /dev/null
+++ b/TimeHACK.Main/Resources/minesweepeprlogo.PNG
diff --git a/TimeHACK.Main/Resources/minsweeper flag.PNG b/TimeHACK.Main/Resources/minsweeper flag.PNG
index 9cd89ce..bb79134 100644
--- a/TimeHACK.Main/Resources/minsweeper flag.PNG
+++ b/TimeHACK.Main/Resources/minsweeper flag.PNG
diff --git a/TimeHACK.Main/Resources/minsweeper sad.PNG b/TimeHACK.Main/Resources/minsweeper sad.PNG
index 47e026e..b0e02da 100644
--- a/TimeHACK.Main/Resources/minsweeper sad.PNG
+++ b/TimeHACK.Main/Resources/minsweeper sad.PNG
diff --git a/TimeHACK.Main/Resources/minsweeper smile.PNG b/TimeHACK.Main/Resources/minsweeper smile.PNG
index e044ad6..b6d90c3 100644
--- a/TimeHACK.Main/Resources/minsweeper smile.PNG
+++ b/TimeHACK.Main/Resources/minsweeper smile.PNG
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index d2d9b31..9d063c1 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -521,10 +521,11 @@
     <None Include="Resources\ie4_hsplitter.png" />
     <None Include="Resources\ie4_forward.png" />
     <None Include="Resources\ie4_back.png" />
-    <None Include="Resources\minsweeper smile.PNG" />
+    <None Include="Resources\minsweeper logo.jpg" />
     <None Include="Resources\minsweeper flag.PNG" />
     <None Include="Resources\minsweeper sad.PNG" />
-    <None Include="Resources\minsweeper logo.jpg" />
+    <None Include="Resources\minsweeper smile.PNG" />
+    <None Include="Resources\minesweepeprlogo.PNG" />
     <Content Include="Resources\modem_dial.wav" />
     <None Include="Resources\MS-DOS-logo-1.png" />
     <None Include="Resources\msdosprompt.png" />