From 5d44836c923c8639442a705bd18bbaaae8829921 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 3 Mar 2012 20:14:20 +0000 Subject: [PATCH] File -> MOvie -> Import movies menu item --- .../BizHawk.MultiClient.csproj | 1 + BizHawk.MultiClient/MainForm.Designer.cs | 367 +++++++++--------- BizHawk.MultiClient/MainForm.cs | 37 ++ .../Properties/Resources.Designer.cs | 9 +- BizHawk.MultiClient/Properties/Resources.resx | 3 + BizHawk.MultiClient/images/Import.png | Bin 0 -> 733 bytes 6 files changed, 238 insertions(+), 179 deletions(-) create mode 100644 BizHawk.MultiClient/images/Import.png diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 687112c9f1..c9ebda022f 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -671,6 +671,7 @@ + diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index e35955ddab..936122d263 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -96,6 +96,7 @@ this.playMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.stopMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.playFromBeginningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -277,7 +278,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, 21); + this.menuStrip1.Size = new System.Drawing.Size(470, 42); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); @@ -300,7 +301,7 @@ this.toolStripSeparator4, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 17); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 19); this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); // @@ -308,7 +309,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); // @@ -321,32 +322,32 @@ 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); // // noneToolStripMenuItem // this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.noneToolStripMenuItem.Size = new System.Drawing.Size(192, 22); this.noneToolStripMenuItem.Text = "None"; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(188, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6); // // clearToolStripMenuItem // this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.clearToolStripMenuItem.Size = new System.Drawing.Size(192, 22); this.clearToolStripMenuItem.Text = "&Clear"; this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); // // autoloadMostRecentToolStripMenuItem // this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem"; - this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(192, 22); this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent"; this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click); // @@ -354,14 +355,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 // @@ -379,89 +380,89 @@ 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); // // savestate1toolStripMenuItem // this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; - this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate1toolStripMenuItem.Text = "1"; this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); // // savestate2toolStripMenuItem // this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; - this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate2toolStripMenuItem.Text = "2"; this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); // // savestate3toolStripMenuItem // this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; - this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate3toolStripMenuItem.Text = "3"; this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); // // savestate4toolStripMenuItem // this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; - this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate4toolStripMenuItem.Text = "4"; this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); // // savestate5toolStripMenuItem // this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; - this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate5toolStripMenuItem.Text = "5"; this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); // // savestate6toolStripMenuItem // this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; - this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate6toolStripMenuItem.Text = "6"; this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); // // savestate7toolStripMenuItem // this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; - this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate7toolStripMenuItem.Text = "7"; this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); // // savestate8toolStripMenuItem // this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; - this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate8toolStripMenuItem.Text = "8"; this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); // // savestate9toolStripMenuItem // this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; - this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate9toolStripMenuItem.Text = "9"; this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); // // savestate0toolStripMenuItem // this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; - this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.savestate0toolStripMenuItem.Text = "0"; this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(183, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); // // saveNamedStateToolStripMenuItem // this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; - this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.saveNamedStateToolStripMenuItem.Text = "Save Named State..."; this.saveNamedStateToolStripMenuItem.Click += new System.EventHandler(this.saveNamedStateToolStripMenuItem_Click); // @@ -483,101 +484,101 @@ this.toolStripSeparator21, this.autoLoadLastSlotToolStripMenuItem}); 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); // // loadstate1toolStripMenuItem // this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; - this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate1toolStripMenuItem.Text = "1"; this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); // // loadstate2toolStripMenuItem // this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; - this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate2toolStripMenuItem.Text = "2"; this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); // // loadstate3toolStripMenuItem // this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; - this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate3toolStripMenuItem.Text = "3"; this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); // // loadstate4toolStripMenuItem // this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; - this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate4toolStripMenuItem.Text = "4"; this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); // // loadstate5toolStripMenuItem // this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; - this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate5toolStripMenuItem.Text = "5"; this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); // // loadstate6toolStripMenuItem // this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; - this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate6toolStripMenuItem.Text = "6"; this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); // // loadstate7toolStripMenuItem // this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; - this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate7toolStripMenuItem.Text = "7"; this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); // // loadstate8toolStripMenuItem // this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; - this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate8toolStripMenuItem.Text = "8"; this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); // // loadstate9toolStripMenuItem // this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; - this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate9toolStripMenuItem.Text = "9"; this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); // // loadstate0toolStripMenuItem // this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; - this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadstate0toolStripMenuItem.Text = "0"; this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(182, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); // // loadNamedStateToolStripMenuItem // this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; - this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.loadNamedStateToolStripMenuItem.Text = "Load Named State..."; this.loadNamedStateToolStripMenuItem.Click += new System.EventHandler(this.loadNamedStateToolStripMenuItem_Click); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(182, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6); // // autoLoadLastSlotToolStripMenuItem // this.autoLoadLastSlotToolStripMenuItem.Name = "autoLoadLastSlotToolStripMenuItem"; - this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.autoLoadLastSlotToolStripMenuItem.Text = "AutoLoad last Slot"; this.autoLoadLastSlotToolStripMenuItem.Click += new System.EventHandler(this.autoLoadLastSlotToolStripMenuItem_Click); // @@ -600,77 +601,77 @@ 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); // // selectSlot10ToolStripMenuItem // this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem"; - this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0"; this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click); // // selectSlot1ToolStripMenuItem // this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem"; - this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1"; this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click); // // selectSlot2ToolStripMenuItem // this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem"; - this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2"; this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click); // // selectSlot3ToolStripMenuItem // this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem"; - this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3"; this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click); // // selectSlot4ToolStripMenuItem // this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem"; - this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4"; this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click); // // selectSlot5ToolStripMenuItem // this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem"; - this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5"; this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click); // // selectSlot6ToolStripMenuItem // this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem"; - this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6"; this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click); // // selectSlot7ToolStripMenuItem // this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem"; - this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7"; this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click); // // selectSlot8ToolStripMenuItem // this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem"; - this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8"; this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click); // // selectSlot9ToolStripMenuItem // this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem"; - this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9"; this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click); // @@ -678,7 +679,7 @@ // this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem"; - this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.previousSlotToolStripMenuItem.Text = "Previous Slot"; this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click); // @@ -686,33 +687,33 @@ // this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight; this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem"; - this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.nextSlotToolStripMenuItem.Text = "Next Slot"; this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6); // // saveToCurrentSlotToolStripMenuItem // this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem"; - this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot"; this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click); // // loadCurrentSlotToolStripMenuItem // this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem"; - this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot"; this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(142, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); // // movieToolStripMenuItem // @@ -724,11 +725,12 @@ this.playMovieToolStripMenuItem, this.stopMovieToolStripMenuItem, this.playFromBeginningToolStripMenuItem, + this.importMovieToolStripMenuItem, this.toolStripSeparator14, 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); // @@ -736,14 +738,14 @@ // this.readonlyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; this.readonlyToolStripMenuItem.Name = "readonlyToolStripMenuItem"; - this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.readonlyToolStripMenuItem.Text = "Read-only"; this.readonlyToolStripMenuItem.Click += new System.EventHandler(this.readonlyToolStripMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(219, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6); // // recentToolStripMenuItem // @@ -754,38 +756,38 @@ this.autoloadMostRecentToolStripMenuItem1}); this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.recentToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.recentToolStripMenuItem.Text = "Recent"; this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); // // noneToolStripMenuItem1 // this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1"; - this.noneToolStripMenuItem1.Size = new System.Drawing.Size(191, 22); + this.noneToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); this.noneToolStripMenuItem1.Text = "None"; // // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(188, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(189, 6); // // clearToolStripMenuItem1 // this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; - this.clearToolStripMenuItem1.Size = new System.Drawing.Size(191, 22); + this.clearToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); this.clearToolStripMenuItem1.Text = "Clear"; // // autoloadMostRecentToolStripMenuItem1 // this.autoloadMostRecentToolStripMenuItem1.Name = "autoloadMostRecentToolStripMenuItem1"; - this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(191, 22); + this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); this.autoloadMostRecentToolStripMenuItem1.Text = "&Autoload Most Recent"; // // recordMovieToolStripMenuItem // this.recordMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem"; - this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.recordMovieToolStripMenuItem.Text = "&Record Movie..."; this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click); // @@ -793,7 +795,7 @@ // this.playMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem"; - this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.playMovieToolStripMenuItem.Text = "&Play Movie..."; this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click); // @@ -801,7 +803,7 @@ // this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; - this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.stopMovieToolStripMenuItem.Text = "Stop Movie"; this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click); // @@ -809,26 +811,34 @@ // this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; - this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click); // + // importMovieToolStripMenuItem + // + this.importMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import; + this.importMovieToolStripMenuItem.Name = "importMovieToolStripMenuItem"; + this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.importMovieToolStripMenuItem.Text = "Import Movies..."; + this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click); + // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(219, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6); // // bindSavestatesToMoviesToolStripMenuItem // this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem"; - this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies"; this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click); // // automaticallyBackupMoviesToolStripMenuItem // this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem"; - this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies"; this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click); // @@ -838,7 +848,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); // @@ -846,7 +856,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(132, 22); this.recordAVIToolStripMenuItem.Text = "Record AVI"; this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click); // @@ -854,7 +864,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(132, 22); this.stopAVIToolStripMenuItem.Text = "Stop AVI"; this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click); // @@ -864,34 +874,34 @@ 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 // this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; - this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); // // screenshotAsToolStripMenuItem // this.screenshotAsToolStripMenuItem.Name = "screenshotAsToolStripMenuItem"; - this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.screenshotAsToolStripMenuItem.Text = "Screenshot As..."; this.screenshotAsToolStripMenuItem.Click += new System.EventHandler(this.screenshotAsToolStripMenuItem_Click); // // 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); // @@ -906,7 +916,7 @@ this.sega8bitToolStripMenuItem, this.pCEngineToolStripMenuItem}); this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; - this.emulationToolStripMenuItem.Size = new System.Drawing.Size(65, 17); + this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19); this.emulationToolStripMenuItem.Text = "&Emulation"; this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); // @@ -914,33 +924,33 @@ // this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; - this.pauseToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.pauseToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.pauseToolStripMenuItem.Text = "&Pause"; this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(136, 6); // // powerToolStripMenuItem // this.powerToolStripMenuItem.Name = "powerToolStripMenuItem"; - this.powerToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.powerToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.powerToolStripMenuItem.Text = "Power Cycle"; this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); // // resetToolStripMenuItem // this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.resetToolStripMenuItem.Text = "&Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(141, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(136, 6); // // sega8bitToolStripMenuItem // @@ -950,34 +960,34 @@ this.forceStereoSeparationToolStripMenuItem, this.smsSpriteLimitToolStripMenuItem}); this.sega8bitToolStripMenuItem.Name = "sega8bitToolStripMenuItem"; - this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.sega8bitToolStripMenuItem.Text = "Sega 8-bit"; // // enableFMChipToolStripMenuItem // this.enableFMChipToolStripMenuItem.Name = "enableFMChipToolStripMenuItem"; - this.enableFMChipToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.enableFMChipToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.enableFMChipToolStripMenuItem.Text = "Enable FM Chip"; this.enableFMChipToolStripMenuItem.Click += new System.EventHandler(this.enableFMChipToolStripMenuItem_Click); // // overclockWhenKnownSafeToolStripMenuItem // this.overclockWhenKnownSafeToolStripMenuItem.Name = "overclockWhenKnownSafeToolStripMenuItem"; - this.overclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.overclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.overclockWhenKnownSafeToolStripMenuItem.Text = "Overclock when Known Safe"; this.overclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.overclockWhenKnownSafeToolStripMenuItem_Click); // // forceStereoSeparationToolStripMenuItem // this.forceStereoSeparationToolStripMenuItem.Name = "forceStereoSeparationToolStripMenuItem"; - this.forceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.forceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.forceStereoSeparationToolStripMenuItem.Text = "Force Stereo Separation"; this.forceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.forceStereoSeparationToolStripMenuItem_Click); // // smsSpriteLimitToolStripMenuItem // this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem"; - this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.smsSpriteLimitToolStripMenuItem.Text = "Sprite Limit"; this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click); // @@ -988,27 +998,27 @@ this.pceAlwaysEqualizeVolumesToolStripMenuItem, this.pceArcadeCardRewindEnableHackToolStripMenuItem}); this.pCEngineToolStripMenuItem.Name = "pCEngineToolStripMenuItem"; - this.pCEngineToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.pCEngineToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.pCEngineToolStripMenuItem.Text = "PC Engine"; // // pceAlwaysPerformSpriteLimitToolStripMenuItem // this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Name = "pceAlwaysPerformSpriteLimitToolStripMenuItem"; - this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(251, 22); + this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(259, 22); this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Text = "Always Perform Sprite Limit"; this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.pceAlwaysPerformSpriteLimitToolStripMenuItem_Click); // // pceAlwaysEqualizeVolumesToolStripMenuItem // this.pceAlwaysEqualizeVolumesToolStripMenuItem.Name = "pceAlwaysEqualizeVolumesToolStripMenuItem"; - this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(251, 22); + this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(259, 22); this.pceAlwaysEqualizeVolumesToolStripMenuItem.Text = "Always Equalize Volumes (PCE-CD)"; this.pceAlwaysEqualizeVolumesToolStripMenuItem.Click += new System.EventHandler(this.pceAlwayEqualizeVolumesLimitToolStripMenuItem_Click); // // pceArcadeCardRewindEnableHackToolStripMenuItem // this.pceArcadeCardRewindEnableHackToolStripMenuItem.Name = "pceArcadeCardRewindEnableHackToolStripMenuItem"; - this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(251, 22); + this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(259, 22); this.pceArcadeCardRewindEnableHackToolStripMenuItem.Text = "Arcade Card Rewind-Enable Hack"; this.pceArcadeCardRewindEnableHackToolStripMenuItem.Click += new System.EventHandler(this.pceArcadeCardRewindEnableHackToolStripMenuItem_Click); // @@ -1028,7 +1038,7 @@ this.displayStatusBarToolStripMenuItem, this.displayLogWindowToolStripMenuItem}); this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 17); + this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 19); this.viewToolStripMenuItem.Text = "&View"; this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened); // @@ -1048,42 +1058,42 @@ // x1MenuItem // this.x1MenuItem.Name = "x1MenuItem"; - this.x1MenuItem.Size = new System.Drawing.Size(105, 22); + this.x1MenuItem.Size = new System.Drawing.Size(96, 22); this.x1MenuItem.Text = "&1x"; this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x2MenuItem // this.x2MenuItem.Name = "x2MenuItem"; - this.x2MenuItem.Size = new System.Drawing.Size(105, 22); + this.x2MenuItem.Size = new System.Drawing.Size(96, 22); this.x2MenuItem.Text = "&2x"; this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x3MenuItem // this.x3MenuItem.Name = "x3MenuItem"; - this.x3MenuItem.Size = new System.Drawing.Size(105, 22); + this.x3MenuItem.Size = new System.Drawing.Size(96, 22); this.x3MenuItem.Text = "&3x"; this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x4MenuItem // this.x4MenuItem.Name = "x4MenuItem"; - this.x4MenuItem.Size = new System.Drawing.Size(105, 22); + this.x4MenuItem.Size = new System.Drawing.Size(96, 22); this.x4MenuItem.Text = "&4x"; this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x5MenuItem // this.x5MenuItem.Name = "x5MenuItem"; - this.x5MenuItem.Size = new System.Drawing.Size(105, 22); + this.x5MenuItem.Size = new System.Drawing.Size(96, 22); this.x5MenuItem.Text = "&5x"; this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // mzMenuItem // this.mzMenuItem.Name = "mzMenuItem"; - this.mzMenuItem.Size = new System.Drawing.Size(105, 22); + this.mzMenuItem.Size = new System.Drawing.Size(96, 22); this.mzMenuItem.Text = "&Max"; this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // @@ -1177,14 +1187,14 @@ this.saveConfigToolStripMenuItem, this.loadConfigToolStripMenuItem}); this.configToolStripMenuItem.Name = "configToolStripMenuItem"; - this.configToolStripMenuItem.Size = new System.Drawing.Size(50, 17); + this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 19); this.configToolStripMenuItem.Text = "&Config"; // // controllersToolStripMenuItem // 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(141, 22); this.controllersToolStripMenuItem.Text = "&Controllers..."; this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); // @@ -1192,7 +1202,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(141, 22); this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); // @@ -1200,7 +1210,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(141, 22); this.messagesToolStripMenuItem.Text = "&Messages..."; this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); // @@ -1208,7 +1218,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(141, 22); this.pathsToolStripMenuItem.Text = "Paths..."; this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); // @@ -1216,7 +1226,7 @@ // 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(141, 22); this.soundToolStripMenuItem.Text = "&Sound..."; this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); // @@ -1224,14 +1234,14 @@ // this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem"; - this.autofireToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.autofireToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.autofireToolStripMenuItem.Text = "&Autofire..."; this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(138, 6); // // gUIToolStripMenuItem // @@ -1254,120 +1264,120 @@ this.toolStripSeparator23, this.logWindowAsConsoleToolStripMenuItem}); this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; - this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.gUIToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.gUIToolStripMenuItem.Text = "GUI"; this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); // // pauseWhenMenuActivatedToolStripMenuItem // this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem"; - this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated"; this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click); // // startPausedToolStripMenuItem // this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem"; - this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.startPausedToolStripMenuItem.Text = "Start paused"; this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(243, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(239, 6); // // saveWindowPositionToolStripMenuItem // this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); // // forceGDIPPresentationToolStripMenuItem // this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem"; - this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.forceGDIPPresentationToolStripMenuItem.Text = "Use GDI+ Display Method"; this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click); // // showMenuInFullScreenToolStripMenuItem // this.showMenuInFullScreenToolStripMenuItem.Name = "showMenuInFullScreenToolStripMenuItem"; - this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.showMenuInFullScreenToolStripMenuItem.Text = "Show Menu in Full Screen"; this.showMenuInFullScreenToolStripMenuItem.Click += new System.EventHandler(this.showMenuInFullScreenToolStripMenuItem_Click); // // runInBackgroundToolStripMenuItem // this.runInBackgroundToolStripMenuItem.Name = "runInBackgroundToolStripMenuItem"; - this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.runInBackgroundToolStripMenuItem.Text = "Run in Background"; this.runInBackgroundToolStripMenuItem.Click += new System.EventHandler(this.runInBackgroundToolStripMenuItem_Click); // // acceptBackgroundInputToolStripMenuItem // this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem"; - this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input"; this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click); // // singleInstanceModeToolStripMenuItem // this.singleInstanceModeToolStripMenuItem.Name = "singleInstanceModeToolStripMenuItem"; - this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.singleInstanceModeToolStripMenuItem.Text = "Single Instance Mode"; this.singleInstanceModeToolStripMenuItem.Click += new System.EventHandler(this.singleInstanceModeToolStripMenuItem_Click); // // toolStripSeparator24 // this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(243, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(239, 6); // // enableRewindToolStripMenuItem // this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem"; - this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.enableRewindToolStripMenuItem.Text = "&Enable Rewind"; this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click); // // enableContextMenuToolStripMenuItem // this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem"; - this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu"; this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click); // // backupSavestatesToolStripMenuItem // this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem"; - this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates"; this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click); // // autoSavestatesToolStripMenuItem // this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem"; - this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates"; this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click); // // saveScreenshotWithSavestatesToolStripMenuItem // this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem"; - this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates"; this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(243, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(239, 6); // // logWindowAsConsoleToolStripMenuItem // this.logWindowAsConsoleToolStripMenuItem.Name = "logWindowAsConsoleToolStripMenuItem"; - this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.logWindowAsConsoleToolStripMenuItem.Text = "Log Window as Console"; this.logWindowAsConsoleToolStripMenuItem.Click += new System.EventHandler(this.logWindowAsConsoleToolStripMenuItem_Click); // @@ -1395,156 +1405,156 @@ this.miSpeed150, this.miSpeed200}); this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; - this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); // // miLimitFramerate // this.miLimitFramerate.Name = "miLimitFramerate"; - this.miLimitFramerate.Size = new System.Drawing.Size(192, 22); + this.miLimitFramerate.Size = new System.Drawing.Size(202, 22); this.miLimitFramerate.Text = "Limit Framerate"; this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click); // // miDisplayVsync // this.miDisplayVsync.Name = "miDisplayVsync"; - this.miDisplayVsync.Size = new System.Drawing.Size(192, 22); + this.miDisplayVsync.Size = new System.Drawing.Size(202, 22); this.miDisplayVsync.Text = "Display VSync"; this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(189, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); // // miAutoMinimizeSkipping // this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping"; - this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(192, 22); + this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(202, 22); this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping"; this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click); // // miFrameskip0 // this.miFrameskip0.Name = "miFrameskip0"; - this.miFrameskip0.Size = new System.Drawing.Size(192, 22); + this.miFrameskip0.Size = new System.Drawing.Size(202, 22); this.miFrameskip0.Text = "0 (never skip)"; this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click); // // miFrameskip1 // this.miFrameskip1.Name = "miFrameskip1"; - this.miFrameskip1.Size = new System.Drawing.Size(192, 22); + this.miFrameskip1.Size = new System.Drawing.Size(202, 22); this.miFrameskip1.Text = "1"; this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click); // // miFrameskip2 // this.miFrameskip2.Name = "miFrameskip2"; - this.miFrameskip2.Size = new System.Drawing.Size(192, 22); + this.miFrameskip2.Size = new System.Drawing.Size(202, 22); this.miFrameskip2.Text = "2"; this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click); // // miFrameskip3 // this.miFrameskip3.Name = "miFrameskip3"; - this.miFrameskip3.Size = new System.Drawing.Size(192, 22); + this.miFrameskip3.Size = new System.Drawing.Size(202, 22); this.miFrameskip3.Text = "3"; this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click); // // miFrameskip4 // this.miFrameskip4.Name = "miFrameskip4"; - this.miFrameskip4.Size = new System.Drawing.Size(192, 22); + this.miFrameskip4.Size = new System.Drawing.Size(202, 22); this.miFrameskip4.Text = "4"; this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click); // // miFrameskip5 // this.miFrameskip5.Name = "miFrameskip5"; - this.miFrameskip5.Size = new System.Drawing.Size(192, 22); + this.miFrameskip5.Size = new System.Drawing.Size(202, 22); this.miFrameskip5.Text = "5"; this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click); // // miFrameskip6 // this.miFrameskip6.Name = "miFrameskip6"; - this.miFrameskip6.Size = new System.Drawing.Size(192, 22); + this.miFrameskip6.Size = new System.Drawing.Size(202, 22); this.miFrameskip6.Text = "6"; this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click); // // miFrameskip7 // this.miFrameskip7.Name = "miFrameskip7"; - this.miFrameskip7.Size = new System.Drawing.Size(192, 22); + this.miFrameskip7.Size = new System.Drawing.Size(202, 22); this.miFrameskip7.Text = "7"; this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click); // // miFrameskip8 // this.miFrameskip8.Name = "miFrameskip8"; - this.miFrameskip8.Size = new System.Drawing.Size(192, 22); + this.miFrameskip8.Size = new System.Drawing.Size(202, 22); this.miFrameskip8.Text = "8"; this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click); // // miFrameskip9 // this.miFrameskip9.Name = "miFrameskip9"; - this.miFrameskip9.Size = new System.Drawing.Size(192, 22); + this.miFrameskip9.Size = new System.Drawing.Size(202, 22); this.miFrameskip9.Text = "9"; this.miFrameskip9.Click += new System.EventHandler(this.miFrameskip9_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(189, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); // // miSpeed50 // this.miSpeed50.Name = "miSpeed50"; - this.miSpeed50.Size = new System.Drawing.Size(192, 22); + this.miSpeed50.Size = new System.Drawing.Size(202, 22); this.miSpeed50.Text = "Speed 50%"; this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click); // // miSpeed75 // this.miSpeed75.Name = "miSpeed75"; - this.miSpeed75.Size = new System.Drawing.Size(192, 22); + this.miSpeed75.Size = new System.Drawing.Size(202, 22); this.miSpeed75.Text = "Speed 75%"; this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click); // // miSpeed100 // this.miSpeed100.Name = "miSpeed100"; - this.miSpeed100.Size = new System.Drawing.Size(192, 22); + this.miSpeed100.Size = new System.Drawing.Size(202, 22); this.miSpeed100.Text = "Speed 100%"; this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click); // // miSpeed150 // this.miSpeed150.Name = "miSpeed150"; - this.miSpeed150.Size = new System.Drawing.Size(192, 22); + this.miSpeed150.Size = new System.Drawing.Size(202, 22); this.miSpeed150.Text = "Speed 150%"; this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click); // // miSpeed200 // this.miSpeed200.Name = "miSpeed200"; - this.miSpeed200.Size = new System.Drawing.Size(192, 22); + this.miSpeed200.Size = new System.Drawing.Size(202, 22); this.miSpeed200.Text = "Speed 200%"; this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(138, 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(141, 22); this.saveConfigToolStripMenuItem.Text = "Save Config"; this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); // @@ -1552,7 +1562,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(141, 22); this.loadConfigToolStripMenuItem.Text = "Load Config"; // // toolsToolStripMenuItem @@ -1569,7 +1579,7 @@ this.luaConsoleToolStripMenuItem, this.cheatsToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 17); + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); this.toolsToolStripMenuItem.Text = "&Tools"; this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened); // @@ -1577,20 +1587,20 @@ // this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; - this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.toolBoxToolStripMenuItem.Text = "&Tool Box"; this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(136, 6); // // rAMWatchToolStripMenuItem // this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // @@ -1598,7 +1608,7 @@ // this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // @@ -1606,7 +1616,7 @@ // this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); // @@ -1614,7 +1624,7 @@ // this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // @@ -1622,20 +1632,20 @@ // this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; - this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.tAStudioToolStripMenuItem.Text = "&TAStudio"; this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(136, 6); // // luaConsoleToolStripMenuItem // this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // @@ -1643,7 +1653,7 @@ // this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // @@ -1657,47 +1667,47 @@ this.toolStripSeparator17, this.graphicsSettingsToolStripMenuItem}); this.NESToolStripMenuItem.Name = "NESToolStripMenuItem"; - this.NESToolStripMenuItem.Size = new System.Drawing.Size(38, 17); + this.NESToolStripMenuItem.Size = new System.Drawing.Size(40, 19); this.NESToolStripMenuItem.Text = "&NES"; // // debuggerToolStripMenuItem // this.debuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem"; - this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(228, 22); + this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.debuggerToolStripMenuItem.Text = "&Debugger"; this.debuggerToolStripMenuItem.Click += new System.EventHandler(this.debuggerToolStripMenuItem_Click); // // pPUViewerToolStripMenuItem // this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem"; - this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(228, 22); + this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer"; this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click); // // nametableViewerToolStripMenuItem // this.nametableViewerToolStripMenuItem.Name = "nametableViewerToolStripMenuItem"; - this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(228, 22); + this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.nametableViewerToolStripMenuItem.Text = "&Nametable Viewer"; this.nametableViewerToolStripMenuItem.Click += new System.EventHandler(this.nametableViewerToolStripMenuItem_Click); // // gameGenieCodesToolStripMenuItem // this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem"; - this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(228, 22); + this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(225, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6); // // graphicsSettingsToolStripMenuItem // this.graphicsSettingsToolStripMenuItem.Name = "graphicsSettingsToolStripMenuItem"; - this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(228, 22); + this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.graphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; this.graphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.graphicsSettingsToolStripMenuItem_Click); // @@ -1708,7 +1718,7 @@ this.toolStripSeparator13, this.autoloadVirtualKeyboardToolStripMenuItem}); this.tI83ToolStripMenuItem.Name = "tI83ToolStripMenuItem"; - this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 17); + this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 19); this.tI83ToolStripMenuItem.Text = "TI83"; this.tI83ToolStripMenuItem.DropDownOpened += new System.EventHandler(this.tI83ToolStripMenuItem_DropDownOpened); // @@ -1716,21 +1726,21 @@ // this.keypadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem"; - this.keypadToolStripMenuItem.Size = new System.Drawing.Size(167, 22); + this.keypadToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.keypadToolStripMenuItem.Text = "Keypad"; this.keypadToolStripMenuItem.Click += new System.EventHandler(this.keypadToolStripMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(164, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6); // // autoloadVirtualKeyboardToolStripMenuItem // this.autoloadVirtualKeyboardToolStripMenuItem.Checked = true; this.autoloadVirtualKeyboardToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.autoloadVirtualKeyboardToolStripMenuItem.Name = "autoloadVirtualKeyboardToolStripMenuItem"; - this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(167, 22); + this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.autoloadVirtualKeyboardToolStripMenuItem.Text = "Autoload Keypad"; this.autoloadVirtualKeyboardToolStripMenuItem.Click += new System.EventHandler(this.autoloadVirtualKeyboardToolStripMenuItem_Click); // @@ -1739,14 +1749,14 @@ this.gBToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.debuggerToolStripMenuItem1}); this.gBToolStripMenuItem.Name = "gBToolStripMenuItem"; - this.gBToolStripMenuItem.Size = new System.Drawing.Size(32, 17); + this.gBToolStripMenuItem.Size = new System.Drawing.Size(34, 19); this.gBToolStripMenuItem.Text = "GB"; // // debuggerToolStripMenuItem1 // this.debuggerToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; this.debuggerToolStripMenuItem1.Name = "debuggerToolStripMenuItem1"; - this.debuggerToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.debuggerToolStripMenuItem1.Size = new System.Drawing.Size(126, 22); this.debuggerToolStripMenuItem1.Text = "Debugger"; this.debuggerToolStripMenuItem1.Click += new System.EventHandler(this.debuggerToolStripMenuItem1_Click); // @@ -1756,14 +1766,14 @@ this.helpToolStripMenuItem1, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 17); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 19); this.helpToolStripMenuItem.Text = "&Help"; // // helpToolStripMenuItem1 // this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(151, 22); + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22); this.helpToolStripMenuItem1.Text = "&Online Help..."; this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); // @@ -1771,7 +1781,7 @@ // this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -1863,7 +1873,7 @@ // this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control; this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(56, 17); + this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17); this.toolStripStatusLabel1.Text = "Save slots"; // // StatusSlot1 @@ -2354,6 +2364,7 @@ private System.Windows.Forms.ToolStripMenuItem showMenuInFullScreenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showMenuToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem autoSavestatesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem importMovieToolStripMenuItem; } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 48a909942a..dda75976f0 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -2477,5 +2477,42 @@ namespace BizHawk.MultiClient RamPoke r = new RamPoke(); r.Show(); } + + private void importMovieToolStripMenuItem_Click(object sender, EventArgs e) + { + var ofd = new OpenFileDialog(); + ofd.InitialDirectory = PathManager.GetRomsPath(Global.Emulator.SystemId); + ofd.Multiselect = true; + ofd.Filter = FormatFilter( + "Movie Files", "*.fm2;*.mc2;*.mmv;*.fmv;", + "FCEUX", "*.fm2", + "PCEjin", "*.mc2", + "Dega", "*mmv", + "Famtasia", "*fmv", + "All Files", "*.*"); + + ofd.RestoreDirectory = false; + + Global.Sound.StopSound(); + var result = ofd.ShowDialog(); + Global.Sound.StartSound(); + if (result != DialogResult.OK) + return; + + foreach (string fn in ofd.FileNames) + { + var file = new FileInfo(fn); + + string errorMsg = ""; + string warningMsg = ""; + Movie m = MovieImport.ImportFile(fn, out errorMsg, out warningMsg); + if (errorMsg.Length > 0) + MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error); + if (warningMsg.Length > 0) + Global.RenderPanel.AddMessage(warningMsg); + else + Global.RenderPanel.AddMessage(Path.GetFileName(fn) + " imported as .tas"); + } + } } } \ No newline at end of file diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index 335491c82f..c60b8abc47 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.239 +// Runtime Version:4.0.30319.261 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -326,6 +326,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Import { + get { + object obj = ResourceManager.GetObject("Import", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap InsertSeparator { get { object obj = ResourceManager.GetObject("InsertSeparator", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index f136d47ccd..8be34adeb0 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -810,4 +810,7 @@ ..\images\console32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\Import.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.MultiClient/images/Import.png b/BizHawk.MultiClient/images/Import.png new file mode 100644 index 0000000000000000000000000000000000000000..b642ebee49f7234737039776ca36bd8b5607c5ae GIT binary patch literal 733 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#P2Jx;TbdobH`;K3h0Zpl$xoO}h=ROmGw6 z3CXUncNPPmfXnk zy`59`U7CNY%TmLA2FqtwRy{q%S4R;P&7 zSAW$iE6rPVE;3s^wDeiWEU}51p?jls#NMk2aW0S0`Nr6{%E)WoYa?sx*?vodz8lT- ziP4%Wcl~wg+2@}FLiFXVZ#pW}jWxePYR~ss?tIkgJkA1kar~+QE@~TXz55JpG95?W?Z7 z3I_&(&+4mH%1ZGK!VX*#zgd69Dqdjx*7(^$_{AR)%how@lbnQ4`n mI=Ao`nrtyL-E3rX0jksS2dn4@r-pc-P6kg`KbLh*2~7ZI@h#N= literal 0 HcmV?d00001