From 50727e79eddcd9b51d7952dee2a74566f62671eb Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sun, 19 Jun 2011 20:13:54 +0000
Subject: [PATCH] Add Stop Movie to context menu

---
 BizHawk.MultiClient/MainForm.Designer.cs  | 12 ++++++++++-
 BizHawk.MultiClient/MainForm.MenuItems.cs | 26 +++++++++++++++--------
 BizHawk.MultiClient/MainForm.cs           |  1 -
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index 18a7dd3148..7084313a06 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -205,6 +205,7 @@
 			this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
 			this.recordMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
 			this.playMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+			this.stopMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
 			this.loadLastMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.makeMovieBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
@@ -1552,6 +1553,7 @@
             this.toolStripSeparator18,
             this.recordMovieToolStripMenuItem1,
             this.playMovieToolStripMenuItem1,
+            this.stopMovieToolStripMenuItem1,
             this.loadLastMovieToolStripMenuItem,
             this.makeMovieBackupToolStripMenuItem,
             this.toolStripSeparator19,
@@ -1561,7 +1563,7 @@
             this.screenshotToolStripMenuItem1,
             this.closeROMToolStripMenuItem1});
 			this.contextMenuStrip1.Name = "contextMenuStrip1";
-			this.contextMenuStrip1.Size = new System.Drawing.Size(179, 264);
+			this.contextMenuStrip1.Size = new System.Drawing.Size(179, 286);
 			this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
 			this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing);
 			// 
@@ -1598,6 +1600,13 @@
 			this.playMovieToolStripMenuItem1.Text = "Play Movie";
 			this.playMovieToolStripMenuItem1.Click += new System.EventHandler(this.playMovieToolStripMenuItem1_Click);
 			// 
+			// stopMovieToolStripMenuItem1
+			// 
+			this.stopMovieToolStripMenuItem1.Name = "stopMovieToolStripMenuItem1";
+			this.stopMovieToolStripMenuItem1.Size = new System.Drawing.Size(178, 22);
+			this.stopMovieToolStripMenuItem1.Text = "Stop Movie";
+			this.stopMovieToolStripMenuItem1.Click += new System.EventHandler(this.stopMovieToolStripMenuItem1_Click);
+			// 
 			// loadLastMovieToolStripMenuItem
 			// 
 			this.loadLastMovieToolStripMenuItem.Name = "loadLastMovieToolStripMenuItem";
@@ -1864,6 +1873,7 @@
 		private System.Windows.Forms.ToolStripMenuItem closeROMToolStripMenuItem1;
 		private System.Windows.Forms.ToolStripMenuItem makeMovieBackupToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem automaticallyBackupMoviesToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem stopMovieToolStripMenuItem1;
     }
 }
 
diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index cbdb652908..dbe77c7944 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -792,6 +792,7 @@ namespace BizHawk.MultiClient
 				contextMenuStrip1.Items[10].Visible = false;
 				contextMenuStrip1.Items[11].Visible = false;
 				contextMenuStrip1.Items[12].Visible = false;
+				contextMenuStrip1.Items[13].Visible = false;
 			}
 			else
 			{
@@ -803,30 +804,32 @@ namespace BizHawk.MultiClient
 				{
 					contextMenuStrip1.Items[3].Visible = true;
 					contextMenuStrip1.Items[4].Visible = true;
-					contextMenuStrip1.Items[5].Visible = true;
-					contextMenuStrip1.Items[6].Visible = false;
-					contextMenuStrip1.Items[7].Visible = true;
+					contextMenuStrip1.Items[5].Visible = false;
+					contextMenuStrip1.Items[6].Visible = true;
+					contextMenuStrip1.Items[7].Visible = false;
+					contextMenuStrip1.Items[8].Visible = true;
 				}
 				else
 				{
 					contextMenuStrip1.Items[3].Visible = false;
 					contextMenuStrip1.Items[4].Visible = false;
-					contextMenuStrip1.Items[5].Visible = false;
-					contextMenuStrip1.Items[6].Visible = true;
+					contextMenuStrip1.Items[5].Visible = true;
+					contextMenuStrip1.Items[6].Visible = false;
 					contextMenuStrip1.Items[7].Visible = true;
+					contextMenuStrip1.Items[8].Visible = true;
 				}
 
-				contextMenuStrip1.Items[8].Visible = true;
 				contextMenuStrip1.Items[9].Visible = true;
-
 				contextMenuStrip1.Items[10].Visible = true;
+
 				contextMenuStrip1.Items[11].Visible = true;
 				contextMenuStrip1.Items[12].Visible = true;
+				contextMenuStrip1.Items[13].Visible = true;
 			}
 			
 			//TODO:
-			contextMenuStrip1.Items[7].Enabled = false;
-			contextMenuStrip1.Items[8].Enabled = false;
+			contextMenuStrip1.Items[9].Enabled = false;
+			contextMenuStrip1.Items[10].Enabled = false;
 		}
 
 
@@ -847,5 +850,10 @@ namespace BizHawk.MultiClient
 		{
 			Global.Config.EnableBackupMovies ^= true;
 		}
+
+		private void stopMovieToolStripMenuItem1_Click(object sender, EventArgs e)
+		{
+			StopUserMovie();
+		}
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 9cd1434ca1..f45a13c20b 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2239,6 +2239,5 @@ namespace BizHawk.MultiClient
 			Global.Sound.ChangeVolume(Global.Config.SoundVolume);
 			Global.RenderPanel.AddMessage("Volume " + Global.Config.SoundVolume.ToString());
 		}
-
 	}
 }
\ No newline at end of file