diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 29b1af4339..ad5c035acb 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -89,7 +89,7 @@ this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aVIWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AVIWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.recordAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.stopAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.screenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -101,10 +101,6 @@ this.makeAnimatedGifAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); @@ -223,6 +219,10 @@ this.debuggerToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.skipBIOSIntroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StatusSlot0 = new System.Windows.Forms.StatusStrip(); this.DumpStatus = new System.Windows.Forms.ToolStripDropDownButton(); this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel(); @@ -304,7 +304,7 @@ this.saveSlotToolStripMenuItem, this.toolStripMenuItem2, this.movieToolStripMenuItem, - this.aVIWAVToolStripMenuItem, + this.AVIWAVToolStripMenuItem, this.screenshotToolStripMenuItem, this.toolStripSeparator4, this.exitToolStripMenuItem}); @@ -317,7 +317,7 @@ // this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); // @@ -330,7 +330,7 @@ this.autoloadMostRecentToolStripMenuItem}); this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; - this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.recentROMToolStripMenuItem.Text = "Recent ROM"; this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); // @@ -363,14 +363,14 @@ // this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; - this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(140, 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(137, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); // // saveStateToolStripMenuItem // @@ -388,7 +388,7 @@ this.toolStripSeparator6, this.saveNamedStateToolStripMenuItem}); this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; - this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveStateToolStripMenuItem.Text = "Save State"; this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); // @@ -492,7 +492,7 @@ this.toolStripSeparator21, this.autoLoadLastSlotToolStripMenuItem}); this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; - this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.loadStateToolStripMenuItem.Text = "Load State"; this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); // @@ -609,7 +609,7 @@ this.saveToCurrentSlotToolStripMenuItem, this.loadCurrentSlotToolStripMenuItem}); this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; - this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveSlotToolStripMenuItem.Text = "SaveSlot"; this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); // @@ -721,7 +721,7 @@ // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); // // movieToolStripMenuItem // @@ -738,7 +738,7 @@ this.bindSavestatesToMoviesToolStripMenuItem, this.automaticallyBackupMoviesToolStripMenuItem}); this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; - this.movieToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.movieToolStripMenuItem.Text = "Movie"; this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); // @@ -852,19 +852,19 @@ // // aVIWAVToolStripMenuItem // - this.aVIWAVToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.AVIWAVToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.recordAVIToolStripMenuItem, this.stopAVIToolStripMenuItem}); - this.aVIWAVToolStripMenuItem.Name = "aVIWAVToolStripMenuItem"; - this.aVIWAVToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.aVIWAVToolStripMenuItem.Text = "AVI/WAV"; - this.aVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); + this.AVIWAVToolStripMenuItem.Name = "aVIWAVToolStripMenuItem"; + this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.AVIWAVToolStripMenuItem.Text = "AVI/WAV"; + this.AVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); // // recordAVIToolStripMenuItem // this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI; this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem"; - this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.recordAVIToolStripMenuItem.Text = "Record AVI"; this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click); // @@ -872,7 +872,7 @@ // this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem"; - this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.stopAVIToolStripMenuItem.Text = "Stop AVI"; this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click); // @@ -886,7 +886,7 @@ this.makeAnimatedGIFToolStripMenuItem, this.makeAnimatedGifAsToolStripMenuItem}); this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; - this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.screenshotToolStripMenuItem.Text = "Screenshot"; // // screenshotF12ToolStripMenuItem @@ -936,50 +936,16 @@ // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(137, 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(140, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.helpToolStripMenuItem1, - this.forumsToolStripMenuItem, - this.aboutToolStripMenuItem}); - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - 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(152, 22); - this.helpToolStripMenuItem1.Text = "&Online Help..."; - this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); - // - // forumsToolStripMenuItem - // - this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; - this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem"; - this.forumsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.forumsToolStripMenuItem.Text = "Forums..."; - this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click); - // - // aboutToolStripMenuItem - // - this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.aboutToolStripMenuItem.Text = "&About"; - this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); - // // emulationToolStripMenuItem // this.emulationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1915,6 +1881,40 @@ this.skipBIOSIntroToolStripMenuItem.Text = "Skip BIOS Intro"; this.skipBIOSIntroToolStripMenuItem.Click += new System.EventHandler(this.skipBIOSIntroToolStripMenuItem_Click); // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.helpToolStripMenuItem1, + this.forumsToolStripMenuItem, + this.aboutToolStripMenuItem}); + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + 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(146, 22); + this.helpToolStripMenuItem1.Text = "&Online Help..."; + this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); + // + // forumsToolStripMenuItem + // + this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; + this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem"; + this.forumsToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.forumsToolStripMenuItem.Text = "Forums..."; + this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click); + // + // aboutToolStripMenuItem + // + this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.aboutToolStripMenuItem.Text = "&About"; + this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); + // // StatusSlot0 // this.StatusSlot0.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2473,7 +2473,7 @@ private System.Windows.Forms.ToolStripMenuItem cmiViewComments; private System.Windows.Forms.ToolStripMenuItem displayLogWindowToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem displaySubtitlesToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem aVIWAVToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem AVIWAVToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem recordAVIToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem stopAVIToolStripMenuItem; private System.Windows.Forms.ToolStripStatusLabel AVIStatusLabel; diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index cfe090a27b..2a46fa671b 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -1239,8 +1239,10 @@ namespace BizHawk.MultiClient { if (IsNullEmulator()) { + movieToolStripMenuItem.Enabled = false; + AVIWAVToolStripMenuItem.Enabled = false; + screenshotToolStripMenuItem.Enabled = false; closeROMToolStripMenuItem.Enabled = false; - screenshotF12ToolStripMenuItem.Enabled = false; saveToCurrentSlotToolStripMenuItem.Enabled = false; loadCurrentSlotToolStripMenuItem.Enabled = false; loadNamedStateToolStripMenuItem.Enabled = false; @@ -1268,8 +1270,10 @@ namespace BizHawk.MultiClient } else { + movieToolStripMenuItem.Enabled = true; + AVIWAVToolStripMenuItem.Enabled = true; + screenshotToolStripMenuItem.Enabled = true; closeROMToolStripMenuItem.Enabled = true; - screenshotF12ToolStripMenuItem.Enabled = true; saveToCurrentSlotToolStripMenuItem.Enabled = true; loadCurrentSlotToolStripMenuItem.Enabled = true; loadNamedStateToolStripMenuItem.Enabled = true; diff --git a/BizHawk.MultiClient/PlayMovie.Designer.cs b/BizHawk.MultiClient/PlayMovie.Designer.cs index 5a0b0c55e3..752e00e7ed 100644 --- a/BizHawk.MultiClient/PlayMovie.Designer.cs +++ b/BizHawk.MultiClient/PlayMovie.Designer.cs @@ -105,6 +105,7 @@ this.DetailsView.Name = "DetailsView"; this.DetailsView.Size = new System.Drawing.Size(228, 242); this.DetailsView.TabIndex = 10; + this.toolTip1.SetToolTip(this.DetailsView, "Contains the header information for the selected movie"); this.DetailsView.UseCompatibleStateImageBehavior = false; this.DetailsView.View = System.Windows.Forms.View.Details; // diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs index 41da739e47..fcc11407a7 100644 --- a/BizHawk.MultiClient/PlayMovie.cs +++ b/BizHawk.MultiClient/PlayMovie.cs @@ -298,6 +298,7 @@ namespace BizHawk.MultiClient private void PlayMovie_Load(object sender, EventArgs e) { + IncludeSubDirectories.Checked = Global.Config.PlayMovie_IncludeSubdir; ShowStateFiles.Checked = Global.Config.PlayMovie_ShowStateFiles; MatchGameNameCheckBox.Checked = Global.Config.PlayMovie_MatchGameName; @@ -307,6 +308,7 @@ namespace BizHawk.MultiClient private void MovieView_SelectedIndexChanged(object sender, EventArgs e) { + toolTip1.SetToolTip(DetailsView, ""); DetailsView.Items.Clear(); if (MovieView.SelectedIndices.Count < 1) { @@ -331,6 +333,7 @@ namespace BizHawk.MultiClient if (kvp.Value.ToString() != Global.Game.Hash) { item.BackColor = Color.Pink; + toolTip1.SetToolTip(DetailsView, "Current SHA1: " + Global.Game.Hash); } break; case MovieHeader.MOVIEVERSION: diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs index ae7915c4db..4974b4d67e 100644 --- a/BizHawk.MultiClient/movie/InputAdapters.cs +++ b/BizHawk.MultiClient/movie/InputAdapters.cs @@ -188,11 +188,6 @@ namespace BizHawk.MultiClient ) { input.Append("."); - /* - TODO: - * Gameboy: reset goes here - * PC Engine: some kind of command key, since reset isn't used (adelikat: unimplmented command was - */ } if (ControlType == "Atari 2600 Basic Controller") {