Add Record icon for when movie is in record movie, add green check for good rom dumps, add function for checking rom dumps (currently blank and always shows good)

BizHawk.MultiClient/BizHawk.MultiClient.csproj

@@ -597,6 +597,8 @@
     <None Include="images\camera.png" />
     <None Include="images\Recent.png" />
     <None Include="images\Blank.png" />
+    <None Include="images\RecordHS.png" />
+    <None Include="images\GreenCheck.png" />
     <Content Include="logo.ico" />
     <Content Include="output\gamedb.txt" />
     <Content Include="output\gamedb_neshomebrew.txt" />

BizHawk.MultiClient/MainForm.Designer.cs

@@ -128,6 +128,7 @@
 			this.displayLagCounterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.displayInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.displayRerecordCountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.displaySubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
 			this.displayStatusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.displayLogWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -233,7 +234,6 @@
 			this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
 			this.screenshotToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
 			this.closeROMToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.displaySubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuStrip1.SuspendLayout();
 			this.StatusSlot0.SuspendLayout();
 			this.contextMenuStrip1.SuspendLayout();
@@ -255,7 +255,7 @@
 			this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
 			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
 			this.menuStrip1.Name = "menuStrip1";
-			this.menuStrip1.Size = new System.Drawing.Size(470, 40);
+			this.menuStrip1.Size = new System.Drawing.Size(470, 21);
 			this.menuStrip1.TabIndex = 0;
 			this.menuStrip1.Text = "menuStrip1";
 			this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate);
@@ -285,7 +285,7 @@
 			// 
 			this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
 			this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
-			this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.openROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
 			this.openROMToolStripMenuItem.Text = "Open ROM";
 			this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
 			// 
@@ -298,7 +298,7 @@
             this.autoloadMostRecentToolStripMenuItem});
 			this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
 			this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
-			this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
 			this.recentROMToolStripMenuItem.Text = "Recent ROM";
 			this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
 			// 
@@ -331,14 +331,14 @@
 			// 
 			this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
 			this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
-			this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
 			this.closeROMToolStripMenuItem.Text = "&Close ROM";
 			this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click);
 			// 
 			// toolStripMenuItem1
 			// 
 			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-			this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
+			this.toolStripMenuItem1.Size = new System.Drawing.Size(142, 6);
 			// 
 			// saveStateToolStripMenuItem
 			// 
@@ -356,7 +356,7 @@
             this.toolStripSeparator6,
             this.saveNamedStateToolStripMenuItem});
 			this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
-			this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
 			this.saveStateToolStripMenuItem.Text = "Save State";
 			this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened);
 			// 
@@ -458,7 +458,7 @@
             this.toolStripSeparator7,
             this.loadNamedStateToolStripMenuItem});
 			this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
-			this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
 			this.loadStateToolStripMenuItem.Text = "Load State";
 			this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened);
 			// 
@@ -563,7 +563,7 @@
             this.saveToCurrentSlotToolStripMenuItem,
             this.loadCurrentSlotToolStripMenuItem});
 			this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
-			this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
 			this.saveSlotToolStripMenuItem.Text = "SaveSlot";
 			this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened);
 			// 
@@ -673,7 +673,7 @@
 			// toolStripMenuItem2
 			// 
 			this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-			this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6);
+			this.toolStripMenuItem2.Size = new System.Drawing.Size(142, 6);
 			// 
 			// movieToolStripMenuItem
 			// 
@@ -689,7 +689,7 @@
             this.bindSavestatesToMoviesToolStripMenuItem,
             this.automaticallyBackupMoviesToolStripMenuItem});
 			this.movieToolStripMenuItem.Name = "movieToolStripMenuItem";
-			this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.movieToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
 			this.movieToolStripMenuItem.Text = "Movie";
 			this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened);
 			// 
@@ -797,7 +797,7 @@
             this.screenshotF12ToolStripMenuItem,
             this.screenshotAsToolStripMenuItem});
 			this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem";
-			this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
 			this.screenshotToolStripMenuItem.Text = "Screenshot";
 			// 
 			// screenshotF12ToolStripMenuItem
@@ -818,13 +818,13 @@
 			// toolStripSeparator4
 			// 
 			this.toolStripSeparator4.Name = "toolStripSeparator4";
-			this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator4.Size = new System.Drawing.Size(142, 6);
 			// 
 			// exitToolStripMenuItem
 			// 
 			this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
 			this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
-			this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.exitToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
 			this.exitToolStripMenuItem.Text = "Exit";
 			this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
 			// 
@@ -1028,6 +1028,13 @@
 			this.displayRerecordCountToolStripMenuItem.Text = "Display Rerecord Count";
 			this.displayRerecordCountToolStripMenuItem.Click += new System.EventHandler(this.displayRerecordCountToolStripMenuItem_Click);
 			// 
+			// displaySubtitlesToolStripMenuItem
+			// 
+			this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem";
+			this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+			this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles";
+			this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click);
+			// 
 			// toolStripMenuItem4
 			// 
 			this.toolStripMenuItem4.Name = "toolStripMenuItem4";
@@ -1069,7 +1076,7 @@
 			// 
 			this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController;
 			this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem";
-			this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.controllersToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
 			this.controllersToolStripMenuItem.Text = "&Controllers...";
 			this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click);
 			// 
@@ -1077,7 +1084,7 @@
 			// 
 			this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys;
 			this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem";
-			this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
 			this.hotkeysToolStripMenuItem.Text = "&Hotkeys...";
 			this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click);
 			// 
@@ -1085,7 +1092,7 @@
 			// 
 			this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig;
 			this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem";
-			this.messagesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.messagesToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
 			this.messagesToolStripMenuItem.Text = "&Messages...";
 			this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click);
 			// 
@@ -1093,7 +1100,7 @@
 			// 
 			this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS;
 			this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem";
-			this.pathsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.pathsToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
 			this.pathsToolStripMenuItem.Text = "Paths...";
 			this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click);
 			// 
@@ -1101,14 +1108,14 @@
 			// 
 			this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS;
 			this.soundToolStripMenuItem.Name = "soundToolStripMenuItem";
-			this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.soundToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
 			this.soundToolStripMenuItem.Text = "&Sound...";
 			this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click);
 			// 
 			// toolStripSeparator9
 			// 
 			this.toolStripSeparator9.Name = "toolStripSeparator9";
-			this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator9.Size = new System.Drawing.Size(146, 6);
 			// 
 			// gUIToolStripMenuItem
 			// 
@@ -1123,7 +1130,7 @@
             this.singleInstanceModeToolStripMenuItem,
             this.enableContextMenuToolStripMenuItem});
 			this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem";
-			this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.gUIToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
 			this.gUIToolStripMenuItem.Text = "GUI";
 			this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened);
 			// 
@@ -1214,7 +1221,7 @@
             this.miSpeed150,
             this.miSpeed200});
 			this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem";
-			this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
 			this.frameSkipToolStripMenuItem.Text = "Speed/Skip";
 			this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened);
 			// 
@@ -1357,13 +1364,13 @@
 			// toolStripSeparator10
 			// 
 			this.toolStripSeparator10.Name = "toolStripSeparator10";
-			this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator10.Size = new System.Drawing.Size(146, 6);
 			// 
 			// saveConfigToolStripMenuItem
 			// 
 			this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save;
 			this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem";
-			this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
 			this.saveConfigToolStripMenuItem.Text = "Save Config";
 			this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click);
 			// 
@@ -1371,7 +1378,7 @@
 			// 
 			this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig;
 			this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem";
-			this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
 			this.loadConfigToolStripMenuItem.Text = "Load Config";
 			// 
 			// toolsToolStripMenuItem
@@ -1628,13 +1635,13 @@
 			// 
 			// DumpError
 			// 
-			this.DumpError.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None;
+			this.DumpError.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.DumpError.Image = global::BizHawk.MultiClient.Properties.Resources.WarningHS;
+			this.DumpError.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
 			this.DumpError.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.DumpError.Name = "DumpError";
 			this.DumpError.ShowDropDownArrow = false;
-			this.DumpError.Size = new System.Drawing.Size(4, 20);
+			this.DumpError.Size = new System.Drawing.Size(20, 20);
-			this.DumpError.Text = "Bad ROM Dump in use";
+			this.DumpError.Text = "No ROM loaded";
 			// 
 			// EmuStatus
 			// 
@@ -1643,12 +1650,12 @@
 			// 
 			// PlayRecordStatus
 			// 
-			this.PlayRecordStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None;
+			this.PlayRecordStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.PlayRecordStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Play;
+			this.PlayRecordStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
 			this.PlayRecordStatus.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.PlayRecordStatus.Name = "PlayRecordStatus";
 			this.PlayRecordStatus.ShowDropDownArrow = false;
-			this.PlayRecordStatus.Size = new System.Drawing.Size(4, 20);
+			this.PlayRecordStatus.Size = new System.Drawing.Size(20, 20);
 			this.PlayRecordStatus.Text = "Movie is in play mode";
 			// 
 			// PauseStrip
@@ -1875,13 +1882,6 @@
 			this.closeROMToolStripMenuItem1.Text = "Close ROM";
 			this.closeROMToolStripMenuItem1.Click += new System.EventHandler(this.closeROMToolStripMenuItem1_Click);
 			// 
-			// displaySubtitlesToolStripMenuItem
-			// 
-			this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem";
-			this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
-			this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles";
-			this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click);
-			// 
 			// MainForm
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);

BizHawk.MultiClient/MainForm.MenuItems.cs

@@ -139,6 +139,7 @@ namespace BizHawk.MultiClient
 				UserMovie.StopMovie();
 				Global.MovieMode = false;
 				Global.RenderPanel.AddMessage(message);
+				SetMainformMovieInfo();
 			}
 		}
 

BizHawk.MultiClient/MainForm.cs

@@ -169,7 +169,6 @@ namespace BizHawk.MultiClient
 					ReadOnly = true;
 					StartNewMovie(m, false);
 					CreateNewInputLog(false);
-					UserMovie.StartPlayback();
 					Global.Config.RecentMovies.Add(cmdMovie);
 				}
 			}
@@ -182,7 +181,6 @@ namespace BizHawk.MultiClient
 					Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY);
 					ReadOnly = true;
 					StartNewMovie(m, false);
-					UserMovie.StartPlayback();
 					CreateNewInputLog(false);
 				}
 			}
@@ -653,31 +651,26 @@ namespace BizHawk.MultiClient
 			{
 				//TODO: error checking of some kind and don't play on error
 				LoadRom(CurrentlyOpenRom);
-				UserMovie = MovieConvert.ConvertFCM(filePaths[0]);
+				StartNewMovie(MovieConvert.ConvertFCM(filePaths[0]), false);
-				UserMovie.StartPlayback();
-
 			}
 			else if (Path.GetExtension(filePaths[0]).ToUpper() == ".SMV")
 			{
 				//TODO: error checking of some kind and don't play on error
 				LoadRom(CurrentlyOpenRom);
-				UserMovie = MovieConvert.ConvertSMV(filePaths[0]);
+				StartNewMovie(MovieConvert.ConvertSMV(filePaths[0]), false);
-				UserMovie.StartPlayback();
 
 			}
 			else if (Path.GetExtension(filePaths[0]).ToUpper() == ".MMV")
 			{
 				//TODO: error checking of some kind and don't play on error
 				LoadRom(CurrentlyOpenRom);
-				UserMovie = MovieConvert.ConvertMMV(filePaths[0]);
+				StartNewMovie(MovieConvert.ConvertMMV(filePaths[0]), false);
-				UserMovie.StartPlayback();
 			}
 			else if (Path.GetExtension(filePaths[0]).ToUpper() == ".VBM")
 			{
 				//TODO: error checking of some kind and don't play on error
 				LoadRom(CurrentlyOpenRom);
-				UserMovie = MovieConvert.ConvertVBM(filePaths[0]);
+				StartNewMovie(MovieConvert.ConvertVBM(filePaths[0]), false);
-				UserMovie.StartPlayback();
 			}
 			else
 				LoadRom(filePaths[0]);
@@ -928,10 +921,28 @@ namespace BizHawk.MultiClient
 				CurrentlyOpenRom = file.CanonicalFullPath;
 				HandlePlatformMenus();
 				UpdateStatusSlots();
+				UpdateDumpIcon();
 				return true;
 			}
 		}
 
+		private void UpdateDumpIcon()
+		{
+			if (Global.Game != null)
+			{
+				//TODO: check ROM dump and display warning icon
+				//DumpError.Image = BizHawk.MultiClient.Properties.Resources.WarningHS;
+				//DumpError.ToolTipText = "Warning: Bad ROM Dump";
+				DumpError.Image = BizHawk.MultiClient.Properties.Resources.GreenCheck;
+				DumpError.ToolTipText = "Verified good dump";
+			}
+			else
+			{
+				DumpError.Image = BizHawk.MultiClient.Properties.Resources.Blank;
+				DumpError.ToolTipText = "";
+			}
+		}
+
 		private void LoadSaveRam()
 		{
 			using (var reader = new BinaryReader(new FileStream(Global.Game.SaveRamPath, FileMode.Open, FileAccess.Read)))
@@ -1470,6 +1481,7 @@ namespace BizHawk.MultiClient
 					{
 						UserMovie.WriteMovie();
 						UserMovie.StartPlayback();
+						SetMainformMovieInfo();
 						Global.MovieMode = true;
 					}
 				}
@@ -1490,6 +1502,7 @@ namespace BizHawk.MultiClient
 				else
 				{
 					UserMovie.StartNewRecording();
+					SetMainformMovieInfo();
 					Global.MovieMode = false;
 					UserMovie.LoadLogFromSavestateText(reader);
 				}
@@ -1510,6 +1523,7 @@ namespace BizHawk.MultiClient
 					{
 						int x = UserMovie.CheckTimeLines(reader);
 						UserMovie.StartPlayback();
+						SetMainformMovieInfo();
 						Global.MovieMode = true;
 						//if (x >= 0)
 						//    MessageBox.Show("Savestate input log does not match the movie at frame " + (x+1).ToString() + "!", "Timeline error", MessageBoxButtons.OK); //TODO: replace with a not annoying message once savestate logic is running smoothly
@@ -1528,6 +1542,7 @@ namespace BizHawk.MultiClient
 					{
 						UserMovie.StartNewRecording();
 						Global.MovieMode = false;
+						SetMainformMovieInfo();
 						UserMovie.LoadLogFromSavestateText(reader);
 					}
 				}
@@ -2025,6 +2040,7 @@ namespace BizHawk.MultiClient
 			Text = "BizHawk";
 			HandlePlatformMenus();
 			UpdateStatusSlots();
+			UpdateDumpIcon();
 		}
 
 		private void frameSkipToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
@@ -2173,6 +2189,28 @@ namespace BizHawk.MultiClient
 			ToggleReadOnly();
 		}
 
+		public void SetMainformMovieInfo()
+		{
+			if (UserMovie.GetMovieMode() == MOVIEMODE.PLAY || UserMovie.GetMovieMode() == MOVIEMODE.FINISHED)
+			{
+				Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(UserMovie.GetFilePath());
+				PlayRecordStatus.Image = BizHawk.MultiClient.Properties.Resources.Play;
+				PlayRecordStatus.ToolTipText = "Movie is in playback mode";
+			}
+			else if (UserMovie.GetMovieMode() == MOVIEMODE.RECORD)
+			{
+				Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(UserMovie.GetFilePath());
+				PlayRecordStatus.Image = BizHawk.MultiClient.Properties.Resources.RecordHS;
+				PlayRecordStatus.ToolTipText = "Movie is in record mode";
+			}
+			else
+			{
+				Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name;
+				PlayRecordStatus.Image = BizHawk.MultiClient.Properties.Resources.Blank;
+				PlayRecordStatus.ToolTipText = "";
+			}
+		}
+
 		public void StartNewMovie(Movie m, bool record)
 		{
 
@@ -2181,13 +2219,17 @@ namespace BizHawk.MultiClient
 			LoadRom(Global.MainForm.CurrentlyOpenRom);
 			UserMovie.LoadMovie();
 			Global.Config.RecentMovies.Add(m.GetFilePath());
+
 			if (record)
 			{
 				UserMovie.StartNewRecording();
 				ReadOnly = false;
 			}
 			else
+			{
 				UserMovie.StartPlayback();
+			}
+			SetMainformMovieInfo();
 		}
 
 		public Movie GetActiveMovie()
@@ -2228,6 +2270,7 @@ namespace BizHawk.MultiClient
 			{
 				LoadRom(CurrentlyOpenRom);
 				UserMovie.StartPlayback();
+				SetMainformMovieInfo();
 			}
 		}
 

BizHawk.MultiClient/Properties/Resources.Designer.cs

@@ -228,6 +228,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap GreenCheck {
+            get {
+                object obj = ResourceManager.GetObject("GreenCheck", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap HotKeys {
             get {
                 object obj = ResourceManager.GetObject("HotKeys", resourceCulture);
@@ -367,6 +374,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap RecordHS {
+            get {
+                object obj = ResourceManager.GetObject("RecordHS", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap redo {
             get {
                 object obj = ResourceManager.GetObject("redo", resourceCulture);

BizHawk.MultiClient/Properties/Resources.resx

@@ -744,4 +744,10 @@
   <data name="Blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Blank.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="GreenCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\GreenCheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RecordHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\RecordHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>