From ea592e534b7181b8125a12e15da7cf5b506c06af Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 6 Mar 2015 02:08:31 +0000
Subject: [PATCH] MultiHawk - add some more movie menu and contextmenu items I
 realize I use all the time

---
 .../BizHawk.Client.MultiHawk.csproj           |   3 +
 BizHawk.Client.MultiHawk/Mainform.Designer.cs |  66 +++++++++++++++---
 BizHawk.Client.MultiHawk/Mainform.cs          |  25 ++++++-
 .../Properties/Resources.Designer.cs          |  10 +++
 .../Properties/Resources.resx                 |   3 +
 BizHawk.Client.MultiHawk/images/restart.png   | Bin 0 -> 473 bytes
 6 files changed, 94 insertions(+), 13 deletions(-)
 create mode 100644 BizHawk.Client.MultiHawk/images/restart.png

diff --git a/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj b/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj
index c88d526a65..124f2512d7 100644
--- a/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj
+++ b/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj
@@ -345,6 +345,9 @@
   <ItemGroup>
     <None Include="images\Save.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="images\restart.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BizHawk.Client.MultiHawk/Mainform.Designer.cs b/BizHawk.Client.MultiHawk/Mainform.Designer.cs
index f75be87141..d02a8cd630 100644
--- a/BizHawk.Client.MultiHawk/Mainform.Designer.cs
+++ b/BizHawk.Client.MultiHawk/Mainform.Designer.cs
@@ -54,6 +54,7 @@
 			this.RecordMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.PlayMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.StopMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.RestartMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.RecentMovieSubMenu = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
 			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
@@ -70,8 +71,11 @@
 			this.PlayRecordStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
 			this.StatusBarMessageLabel = new System.Windows.Forms.ToolStripStatusLabel();
 			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.LoadLastMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.RecordMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PlayMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadLastMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.StopMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.RestartMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.MainformMenu.SuspendLayout();
 			this.WorkspacePanel.SuspendLayout();
 			this.MainStatusBar.SuspendLayout();
@@ -180,7 +184,7 @@
 			// toolStripSeparator1
 			// 
 			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator1.Size = new System.Drawing.Size(57, 6);
 			// 
 			// toolStripSeparator5
 			// 
@@ -253,6 +257,7 @@
             this.RecordMovieMenuItem,
             this.PlayMovieMenuItem,
             this.StopMovieMenuItem,
+            this.RestartMovieMenuItem,
             this.RecentMovieSubMenu,
             this.toolStripSeparator2,
             this.ToggleReadonlyMenuItem});
@@ -285,6 +290,14 @@
 			this.StopMovieMenuItem.Text = "&Stop Movie";
 			this.StopMovieMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
 			// 
+			// RestartMovieMenuItem
+			// 
+			this.RestartMovieMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.restart;
+			this.RestartMovieMenuItem.Name = "RestartMovieMenuItem";
+			this.RestartMovieMenuItem.Size = new System.Drawing.Size(168, 22);
+			this.RestartMovieMenuItem.Text = "Restart Movie";
+			this.RestartMovieMenuItem.Click += new System.EventHandler(this.RestartMovieMenuItem_Click);
+			// 
 			// RecentMovieSubMenu
 			// 
 			this.RecentMovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -407,12 +420,31 @@
 			// contextMenuStrip1
 			// 
 			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.LoadLastMovieContextMenuItem,
-            this.RecordMovieContextMenuItem});
+            this.RecordMovieContextMenuItem,
+            this.PlayMovieContextMenuItem,
+            this.RestartMovieContextMenuItem,
+            this.StopMovieContextMenuItem,
+            this.LoadLastMovieContextMenuItem});
 			this.contextMenuStrip1.Name = "contextMenuStrip1";
-			this.contextMenuStrip1.Size = new System.Drawing.Size(161, 48);
+			this.contextMenuStrip1.Size = new System.Drawing.Size(161, 114);
 			this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
 			// 
+			// RecordMovieContextMenuItem
+			// 
+			this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.RecordHS;
+			this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem";
+			this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
+			this.RecordMovieContextMenuItem.Text = "Record Movie";
+			this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
+			// 
+			// PlayMovieContextMenuItem
+			// 
+			this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Play;
+			this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem";
+			this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
+			this.PlayMovieContextMenuItem.Text = "Play Movie";
+			this.PlayMovieContextMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click);
+			// 
 			// LoadLastMovieContextMenuItem
 			// 
 			this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Recent;
@@ -421,13 +453,21 @@
 			this.LoadLastMovieContextMenuItem.Text = "Load Last Movie";
 			this.LoadLastMovieContextMenuItem.Click += new System.EventHandler(this.LoadLastMovieMenuItem_Click);
 			// 
-			// RecordMovieContextMenuItem
+			// StopMovieContextMenuItem
 			// 
-			this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.RecordHS;
-			this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem";
-			this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.RecordMovieContextMenuItem.Text = "Record Movie";
-			this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
+			this.StopMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Stop;
+			this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem";
+			this.StopMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
+			this.StopMovieContextMenuItem.Text = "Stop Movie";
+			this.StopMovieContextMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
+			// 
+			// RestartMovieContextMenuItem
+			// 
+			this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.restart;
+			this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem";
+			this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
+			this.RestartMovieContextMenuItem.Text = "Restart Movie";
+			this.RestartMovieContextMenuItem.Click += new System.EventHandler(this.RestartMovieMenuItem_Click);
 			// 
 			// Mainform
 			// 
@@ -498,6 +538,10 @@
 		private System.Windows.Forms.ToolStripMenuItem RecentMovieSubMenu;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
 		private System.Windows.Forms.ToolStripMenuItem RecordMovieContextMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem StopMovieContextMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem PlayMovieContextMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem RestartMovieMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem RestartMovieContextMenuItem;
 	}
 }
 
diff --git a/BizHawk.Client.MultiHawk/Mainform.cs b/BizHawk.Client.MultiHawk/Mainform.cs
index a45ac89b6d..95de975ca0 100644
--- a/BizHawk.Client.MultiHawk/Mainform.cs
+++ b/BizHawk.Client.MultiHawk/Mainform.cs
@@ -85,6 +85,8 @@ namespace BizHawk.Client.MultiHawk
 
 			Closing += (o, e) =>
 			{
+				Global.MovieSession.Movie.Stop();
+
 				foreach (var ew in EmulatorWindows.ToList())
 				{
 					ew.ShutDown();
@@ -1081,7 +1083,9 @@ namespace BizHawk.Client.MultiHawk
 				RecordMovieMenuItem.Enabled =
 				EmulatorWindows.Any();
 
-			StopMovieMenuItem.Enabled = Global.MovieSession.Movie.IsActive;
+			StopMovieMenuItem.Enabled =
+				RestartMovieMenuItem.Enabled =
+				Global.MovieSession.Movie.IsActive;
 		}
 
 		private void RecordMovieMenuItem_Click(object sender, EventArgs e)
@@ -1487,7 +1491,15 @@ namespace BizHawk.Client.MultiHawk
 
 		private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)
 		{
-			LoadLastMovieContextMenuItem.Enabled = !Global.Config.RecentMovies.Empty;
+			LoadLastMovieContextMenuItem.Visible = !Global.Config.RecentMovies.Empty;
+			PlayMovieContextMenuItem.Visible =
+				RecordMovieContextMenuItem.Visible =
+				!Global.MovieSession.Movie.IsActive;
+
+			StopMovieContextMenuItem.Visible =
+				RestartMovieContextMenuItem.Visible =
+				Global.MovieSession.Movie.IsActive;
+
 		}
 
 		private void RecentMovieSubMenu_DropDownOpened(object sender, EventArgs e)
@@ -1496,5 +1508,14 @@ namespace BizHawk.Client.MultiHawk
 			RecentMovieSubMenu.DropDownItems.AddRange(
 				Global.Config.RecentMovies.RecentMenu(LoadMoviesFromRecent, autoload: true));
 		}
+
+		private void RestartMovieMenuItem_Click(object sender, EventArgs e)
+		{
+			if (Global.MovieSession.Movie.IsActive)
+			{
+				StartNewMovie(Global.MovieSession.Movie, false);
+				AddMessage("Replaying movie file in read-only mode");
+			}
+		}
 	}
 }
diff --git a/BizHawk.Client.MultiHawk/Properties/Resources.Designer.cs b/BizHawk.Client.MultiHawk/Properties/Resources.Designer.cs
index e58dd80c2c..3855218b5a 100644
--- a/BizHawk.Client.MultiHawk/Properties/Resources.Designer.cs
+++ b/BizHawk.Client.MultiHawk/Properties/Resources.Designer.cs
@@ -230,6 +230,16 @@ namespace BizHawk.Client.MultiHawk.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap restart {
+            get {
+                object obj = ResourceManager.GetObject("restart", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/BizHawk.Client.MultiHawk/Properties/Resources.resx b/BizHawk.Client.MultiHawk/Properties/Resources.resx
index 5620a1b98c..88761a4c4d 100644
--- a/BizHawk.Client.MultiHawk/Properties/Resources.resx
+++ b/BizHawk.Client.MultiHawk/Properties/Resources.resx
@@ -184,4 +184,7 @@
   <data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="restart" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\restart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/images/restart.png b/BizHawk.Client.MultiHawk/images/restart.png
new file mode 100644
index 0000000000000000000000000000000000000000..89eebbbd0415a390edf792111ecbf0e558b6f999
GIT binary patch
literal 473
zcmV;~0Ve*5P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ-Pf0{URCwCdle<a-Q4~d29+QZIBM2!Z#7YoJV<D(u
z=?|o~)GyI0f}dbvVUgNGv<pfQtAN@FHo+#Kh0e@<-?5kwd?gmCJaCJ1xGeTQk6fCj
zOcHq}jEMoo&&ko5ANo;RVT{8Xi!lc49M)Qb0yOukxnC7H=UA#Js-a*Zv^3UB%uT1v
zl=Bn|1v~-gmz~iTtg|H26HCwL@)Y&O67RzECLNJ*M2SZ#Iog6Tj!2|zua>A)0stc6
zNR-c>^e8z7V2x#KrAVz(9@Y+bD*$xvUN~sQ$ZvrBR|SUFmE!ikKdkLEpK0v(*r?AB
z6sU1Ma75B`()L_jKLHSntS118@@TEcSg;nMvX95@61{$xScV9bO;_q{lp_H_0bXN|
zkPe|!PH#e#PEpzqcH@sl0(gAr0-&`<2tg7jBuUKdnm{S_1Caaw$Mi7(wBp17fNojn
P00000NkvXXu0mjfDGIx+

literal 0
HcmV?d00001