diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index c94eb8919f..b64745edbe 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -614,6 +614,8 @@
+
+
diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index 185cedbbfb..dd48c328bc 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -209,6 +209,7 @@
this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton();
this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton();
+ this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.StatusSlot1 = new System.Windows.Forms.ToolStripStatusLabel();
this.StatusSlot2 = new System.Windows.Forms.ToolStripStatusLabel();
@@ -220,7 +221,6 @@
this.StatusSlot8 = new System.Windows.Forms.ToolStripStatusLabel();
this.StatusSlot9 = new System.Windows.Forms.ToolStripStatusLabel();
this.StatusSlot10 = new System.Windows.Forms.ToolStripStatusLabel();
- this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.openRomToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.loadLastROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -290,7 +290,7 @@
//
this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
- this.openROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.openROMToolStripMenuItem.Text = "Open ROM";
this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
//
@@ -303,7 +303,7 @@
this.autoloadMostRecentToolStripMenuItem});
this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
- this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.recentROMToolStripMenuItem.Text = "Recent ROM";
this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
//
@@ -336,14 +336,14 @@
//
this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
- this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 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(142, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
//
// saveStateToolStripMenuItem
//
@@ -361,7 +361,7 @@
this.toolStripSeparator6,
this.saveNamedStateToolStripMenuItem});
this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
- this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.saveStateToolStripMenuItem.Text = "Save State";
this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened);
//
@@ -463,7 +463,7 @@
this.toolStripSeparator7,
this.loadNamedStateToolStripMenuItem});
this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
- this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.loadStateToolStripMenuItem.Text = "Load State";
this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened);
//
@@ -568,7 +568,7 @@
this.saveToCurrentSlotToolStripMenuItem,
this.loadCurrentSlotToolStripMenuItem});
this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
- this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.saveSlotToolStripMenuItem.Text = "SaveSlot";
this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened);
//
@@ -644,6 +644,7 @@
//
// previousSlotToolStripMenuItem
//
+ this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft;
this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem";
this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
this.previousSlotToolStripMenuItem.Text = "Previous Slot";
@@ -651,6 +652,7 @@
//
// nextSlotToolStripMenuItem
//
+ this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight;
this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem";
this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
this.nextSlotToolStripMenuItem.Text = "Next Slot";
@@ -678,7 +680,7 @@
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
- this.toolStripMenuItem2.Size = new System.Drawing.Size(142, 6);
+ this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6);
//
// movieToolStripMenuItem
//
@@ -694,7 +696,7 @@
this.bindSavestatesToMoviesToolStripMenuItem,
this.automaticallyBackupMoviesToolStripMenuItem});
this.movieToolStripMenuItem.Name = "movieToolStripMenuItem";
- this.movieToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.movieToolStripMenuItem.Text = "Movie";
this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened);
//
@@ -804,7 +806,7 @@
this.recordAVIToolStripMenuItem,
this.stopAVIToolStripMenuItem});
this.aVIWAVToolStripMenuItem.Name = "aVIWAVToolStripMenuItem";
- this.aVIWAVToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.aVIWAVToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.aVIWAVToolStripMenuItem.Text = "AVI/WAV";
this.aVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened);
//
@@ -812,7 +814,7 @@
//
this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI;
this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem";
- this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+ this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.recordAVIToolStripMenuItem.Text = "Record AVI";
this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click);
//
@@ -820,7 +822,7 @@
//
this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem";
- this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+ this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.stopAVIToolStripMenuItem.Text = "Stop AVI";
this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click);
//
@@ -830,7 +832,7 @@
this.screenshotF12ToolStripMenuItem,
this.screenshotAsToolStripMenuItem});
this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem";
- this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.screenshotToolStripMenuItem.Text = "Screenshot";
//
// screenshotF12ToolStripMenuItem
@@ -851,13 +853,13 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(142, 6);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(149, 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(145, 22);
+ this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
@@ -1707,6 +1709,14 @@
this.PauseStrip.ToolTipText = "Emulator is paused";
this.PauseStrip.Click += new System.EventHandler(this.PauseStrip_Click);
//
+ // AVIStatusLabel
+ //
+ this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+ this.AVIStatusLabel.Name = "AVIStatusLabel";
+ this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17);
+ this.AVIStatusLabel.Text = "AVI Capture";
+ //
// toolStripStatusLabel1
//
this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control;
@@ -1784,14 +1794,6 @@
this.StatusSlot10.Text = "0";
this.StatusSlot10.Click += new System.EventHandler(this.StatusSlot10_Click);
//
- // AVIStatusLabel
- //
- this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
- this.AVIStatusLabel.Name = "AVIStatusLabel";
- this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17);
- this.AVIStatusLabel.Text = "AVI Capture";
- //
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1904,6 +1906,7 @@
//
// undoSavestateToolStripMenuItem
//
+ this.undoSavestateToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo;
this.undoSavestateToolStripMenuItem.Name = "undoSavestateToolStripMenuItem";
this.undoSavestateToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
this.undoSavestateToolStripMenuItem.Text = "Undo Savestate";
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index 8d32c25c63..f64a901ada 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -305,6 +305,20 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ internal static System.Drawing.Bitmap MoveLeft {
+ get {
+ object obj = ResourceManager.GetObject("MoveLeft", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap MoveRight {
+ get {
+ object obj = ResourceManager.GetObject("MoveRight", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap MoveUp {
get {
object obj = ResourceManager.GetObject("MoveUp", resourceCulture);
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx
index 7f88ffcfc6..123c43249d 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -768,4 +768,10 @@
..\images\AVI.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\images\MoveLeft.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\images\MoveRight.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/BizHawk.MultiClient/images/MoveLeft.png b/BizHawk.MultiClient/images/MoveLeft.png
new file mode 100644
index 0000000000..12cffc078c
Binary files /dev/null and b/BizHawk.MultiClient/images/MoveLeft.png differ
diff --git a/BizHawk.MultiClient/images/MoveRight.png b/BizHawk.MultiClient/images/MoveRight.png
new file mode 100644
index 0000000000..9aa8b1f208
Binary files /dev/null and b/BizHawk.MultiClient/images/MoveRight.png differ