From 019b5ae2ce23b14e9517e7ca4cccf3bfc55c1e7f Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Mon, 31 Jul 2017 12:12:06 -0400 Subject: [PATCH] A7800Hawk: Filter Menu --- BizHawk.Client.EmuHawk/MainForm.Designer.cs | 26 ++++++++++++++------- BizHawk.Client.EmuHawk/MainForm.Events.cs | 8 ++++++- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index be04630c83..6e491f5a49 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -301,7 +301,8 @@ this.AtariSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.A7800SubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.A7800ControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.GBSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.A7800FilterSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.GBSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.GBcoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LoadGBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator(); @@ -2736,7 +2737,8 @@ // A7800SubMenu // this.A7800SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.A7800ControllerSettingsMenuItem}); + this.A7800ControllerSettingsMenuItem, + this.A7800FilterSettingsMenuItem}); this.A7800SubMenu.Name = "A7800SubMenu"; this.A7800SubMenu.Size = new System.Drawing.Size(51, 19); this.A7800SubMenu.Text = "&A7800"; @@ -2746,12 +2748,19 @@ // this.A7800ControllerSettingsMenuItem.Name = "A7800ControllerSettingsMenuItem"; this.A7800ControllerSettingsMenuItem.Size = new System.Drawing.Size(125, 22); - this.A7800ControllerSettingsMenuItem.Text = "Settings..."; - this.A7800ControllerSettingsMenuItem.Click += new System.EventHandler(this.A7800SettingsToolStripMenuItem_Click); - // - // GBSubMenu - // - this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.A7800ControllerSettingsMenuItem.Text = "Controller Settings"; + this.A7800ControllerSettingsMenuItem.Click += new System.EventHandler(this.A7800ControllerSettingsToolStripMenuItem_Click); + // + // A7800FilterSettingsMenuItem + // + this.A7800FilterSettingsMenuItem.Name = "A7800FilterSettingsMenuItem"; + this.A7800FilterSettingsMenuItem.Size = new System.Drawing.Size(125, 22); + this.A7800FilterSettingsMenuItem.Text = "Filter Settings"; + this.A7800FilterSettingsMenuItem.Click += new System.EventHandler(this.A7800FilterSettingsToolStripMenuItem_Click); + // + // GBSubMenu + // + this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.GBcoreSettingsToolStripMenuItem, this.LoadGBInSGBMenuItem, this.toolStripSeparator28, @@ -4208,6 +4217,7 @@ private System.Windows.Forms.ToolStripMenuItem GenesisSettingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem AtariSettingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem A7800ControllerSettingsMenuItem; + private System.Windows.Forms.ToolStripMenuItem A7800FilterSettingsMenuItem; private System.Windows.Forms.ToolStripMenuItem MovieSettingsMenuItem; private System.Windows.Forms.ToolStripMenuItem CoresSubMenu; private System.Windows.Forms.ToolStripMenuItem GBInSGBMenuItem; diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 663e4fd85d..b247428b60 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1984,13 +1984,19 @@ namespace BizHawk.Client.EmuHawk private void A7800SubMenu_DropDownOpened(object sender, EventArgs e) { A7800ControllerSettingsMenuItem.Enabled = !Global.MovieSession.Movie.IsActive; + A7800FilterSettingsMenuItem.Enabled = !Global.MovieSession.Movie.IsActive; } - private void A7800SettingsToolStripMenuItem_Click(object sender, EventArgs e) + private void A7800ControllerSettingsToolStripMenuItem_Click(object sender, EventArgs e) { new A7800ControllerSettings().ShowDialog(); } + private void A7800FilterSettingsToolStripMenuItem_Click(object sender, EventArgs e) + { + new A7800FilterSettings().ShowDialog(); + } + #endregion #region GB