status strip - pause icon implemented, movie icon put in but hidden and unimplmeented. Dump Error warning icon put in and disabled, needs to be implemented

BizHawk.MultiClient/BizHawk.MultiClient.csproj

@@ -537,6 +537,7 @@
     <None Include="images\ForwardMore.png" />
     <None Include="images\BlueDown.png" />
     <None Include="images\BlueUp.png" />
+    <None Include="images\WarningHS.png" />
     <Content Include="output\gamedb.txt" />
     <Content Include="output\gamedb_neshomebrew.txt" />
     <None Include="images\Refresh.bmp" />

BizHawk.MultiClient/MainForm.Designer.cs

@@ -199,6 +199,9 @@
 			this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
 			this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel();
+			this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton();
+			this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton();
+			this.DumpError = new System.Windows.Forms.ToolStripDropDownButton();
 			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.openRomToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
 			this.loadLastROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -1532,7 +1535,10 @@
 			// statusStrip1
 			// 
 			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.EmuStatus});
+            this.DumpError,
+            this.EmuStatus,
+            this.PlayRecordStatus,
+            this.PauseStrip});
 			this.statusStrip1.Location = new System.Drawing.Point(0, 386);
 			this.statusStrip1.Name = "statusStrip1";
 			this.statusStrip1.Size = new System.Drawing.Size(470, 22);
@@ -1545,6 +1551,38 @@
 			this.EmuStatus.Name = "EmuStatus";
 			this.EmuStatus.Size = new System.Drawing.Size(0, 17);
 			// 
+			// PlayRecordStatus
+			// 
+			this.PlayRecordStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None;
+			this.PlayRecordStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Play;
+			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.Text = "Movie is in play mode";
+			// 
+			// PauseStrip
+			// 
+			this.PauseStrip.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+			this.PauseStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None;
+			this.PauseStrip.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
+			this.PauseStrip.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.PauseStrip.Name = "PauseStrip";
+			this.PauseStrip.ShowDropDownArrow = false;
+			this.PauseStrip.Size = new System.Drawing.Size(4, 20);
+			this.PauseStrip.Text = "toolStripDropDownButton1";
+			this.PauseStrip.ToolTipText = "Emulator is paused";
+			// 
+			// DumpError
+			// 
+			this.DumpError.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None;
+			this.DumpError.Image = global::BizHawk.MultiClient.Properties.Resources.WarningHS;
+			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.Text = "Bad ROM Dump in use";
+			// 
 			// contextMenuStrip1
 			// 
 			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1563,7 +1601,7 @@
             this.screenshotToolStripMenuItem1,
             this.closeROMToolStripMenuItem1});
 			this.contextMenuStrip1.Name = "contextMenuStrip1";
-			this.contextMenuStrip1.Size = new System.Drawing.Size(179, 286);
+			this.contextMenuStrip1.Size = new System.Drawing.Size(179, 264);
 			this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
 			this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing);
 			// 
@@ -1874,6 +1912,9 @@
 		private System.Windows.Forms.ToolStripMenuItem makeMovieBackupToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem automaticallyBackupMoviesToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem stopMovieToolStripMenuItem1;
+		private System.Windows.Forms.ToolStripDropDownButton PauseStrip;
+		private System.Windows.Forms.ToolStripDropDownButton PlayRecordStatus;
+		private System.Windows.Forms.ToolStripDropDownButton DumpError;
     }
 }
 

BizHawk.MultiClient/MainForm.cs

@@ -322,16 +322,23 @@ namespace BizHawk.MultiClient
 		private void PauseEmulator()
 		{
 			EmulatorPaused = true;
+			PauseStrip.DisplayStyle = ToolStripItemDisplayStyle.Image;
 		}
 
 		private void UnpauseEmulator()
 		{
 			EmulatorPaused = false;
+			PauseStrip.DisplayStyle = ToolStripItemDisplayStyle.None;
 		}
 
 		public void TogglePause()
 		{
 			EmulatorPaused ^= true;
+			if (EmulatorPaused)
+				PauseStrip.DisplayStyle = ToolStripItemDisplayStyle.Image;
+			else
+				PauseStrip.DisplayStyle = ToolStripItemDisplayStyle.None;
+
 		}
 
 		private void LoadRomFromRecent(string rom)

BizHawk.MultiClient/Properties/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3620
+//     Runtime Version:2.0.50727.3623
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -332,6 +332,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap WarningHS {
+            get {
+                object obj = ResourceManager.GetObject("WarningHS", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap whiteTriDown {
             get {
                 object obj = ResourceManager.GetObject("whiteTriDown", resourceCulture);

BizHawk.MultiClient/Properties/Resources.resx

@@ -672,4 +672,7 @@
   <data name="BlueUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\BlueUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="WarningHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\WarningHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

BizHawk.MultiClient/movie/Movie.cs

@@ -11,20 +11,20 @@ namespace BizHawk.MultiClient
 	{
 		private MovieHeader Header = new MovieHeader();
 		private MovieLog Log = new MovieLog();
-        
+
 		private bool IsText = true;
 		private string Filename;
 		public bool MakeBackup = true; //Flag for making backup before altering movie
 
 		private MOVIEMODE MovieMode = new MOVIEMODE();
 
-        public MultitrackRecording MultiTrack = new MultitrackRecording();
+		public MultitrackRecording MultiTrack = new MultitrackRecording();
 		public int Frames = 0;
 		public int lastLog;
 		public int rerecordCount;
 
 		//TODO:
-		//Author field, needs to be passed in by a record or play dialog
+		//Author field, needs to be passed in play dialog
 
 		public Movie(string filename, MOVIEMODE m)
 		{
@@ -54,10 +54,10 @@ namespace BizHawk.MultiClient
 		{
 			return Header.GetHeaderLine(MovieHeader.GAMENAME);
 		}
-        public int GetLength()
+		public int GetLength()
-        {
+		{
-            return Log.Length();
+			return Log.Length();
-        }
+		}
 
 		public void StopMovie()
 		{
@@ -90,27 +90,27 @@ namespace BizHawk.MultiClient
 
 		public void GetMnemonic()
 		{
-            if (MultiTrack.isActive)
+			if (MultiTrack.isActive)
-            {
+			{
-                if (MovieMode == MOVIEMODE.RECORD)
+				if (MovieMode == MOVIEMODE.RECORD)
-                {
+				{
-             
+
-                    if (Global.Emulator.Frame < Log.Length())                                                                
+					if (Global.Emulator.Frame < Log.Length())
-                        Log.ReplaceFrameAt(Global.ActiveController.GetControllersAsMnemonic(),Global.Emulator.Frame);
+						Log.ReplaceFrameAt(Global.ActiveController.GetControllersAsMnemonic(), Global.Emulator.Frame);
-                    else
+					else
-                        Log.AddFrame(Global.ActiveController.GetControllersAsMnemonic());
+						Log.AddFrame(Global.ActiveController.GetControllersAsMnemonic());
-                }
+				}
-            }
+			}
-            else
+			else
-                if (MovieMode == MOVIEMODE.RECORD)
+				if (MovieMode == MOVIEMODE.RECORD)
-                {
+				{
-             
+
-                    if (Global.Emulator.Frame < Log.Length())
+					if (Global.Emulator.Frame < Log.Length())
-                    {
+					{
-                        Log.Truncate(Global.Emulator.Frame);
+						Log.Truncate(Global.Emulator.Frame);
-                    }
+					}
-                    Log.AddFrame(Global.ActiveController.GetControllersAsMnemonic());
+					Log.AddFrame(Global.ActiveController.GetControllersAsMnemonic());
-                }
+				}
 		}
 
 		public string GetInputFrame(int frame)
@@ -364,42 +364,42 @@ namespace BizHawk.MultiClient
 		public void LoadLogFromSavestateText(TextReader reader)
 		{
 			//We are in record mode so replace the movie log with the one from the savestate
-            if (!MultiTrack.isActive)
+			if (!MultiTrack.isActive)
-            {
+			{
 				if (Global.Config.EnableBackupMovies && MakeBackup && Log.Length() > 0)
 				{
 					WriteBackup();
 					MakeBackup = false;
 				}
 				Log.Clear();
-                while (true)
+				while (true)
-                {
+				{
-                    string line = reader.ReadLine();
+					string line = reader.ReadLine();
-                    if (line == null) break;
+					if (line == null) break;
-                    if (line.Trim() == "") continue;
+					if (line.Trim() == "") continue;
-                    if (line == "[Input]") continue;
+					if (line == "[Input]") continue;
-                    if (line == "[/Input]") break;
+					if (line == "[/Input]") break;
-                    if (line[0] == '|')
+					if (line[0] == '|')
-                        Log.AddFrame(line);
+						Log.AddFrame(line);
-                }
+				}
-            }
+			}
-            else
+			else
-            {
+			{
-                int i = 0;
+				int i = 0;
-                while (true)
+				while (true)
-                {
+				{
-                    string line = reader.ReadLine();
+					string line = reader.ReadLine();
-                    if (line == null) break;
+					if (line == null) break;
-                    if (line.Trim() == "") continue;
+					if (line.Trim() == "") continue;
-                    if (line == "[Input]") continue;
+					if (line == "[Input]") continue;
-                    if (line == "[/Input]") break;
+					if (line == "[/Input]") break;
-                    if (line[0] == '|')
+					if (line[0] == '|')
-                    {
+					{
-                        Log.ReplaceFrameAt(line, i);
+						Log.ReplaceFrameAt(line, i);
-                        i++;
+						i++;
-                    }
+					}
-                }
+				}
-            }
+			}
 			//TODO: we can truncate the movie down to the current frame now (in case the savestate has a larger input log)
 			//However, VBA will load it all, then truncate on the next frame, do we want that?
 			IncrementRerecordCount();