rip out VS menu items, we don't support that stuff anymore

This commit is contained in:
adelikat 2013-12-20 22:55:50 +00:00
parent f8038d3812
commit 9c7dac0aa3
2 changed files with 2 additions and 61 deletions

View File

@ -225,9 +225,6 @@
this.NESSoundChannelsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.FDSControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.FdsEjectDiskMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.VSControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.VSCoin1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.VSCoin2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PCESubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.PCEBGViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
@ -1965,8 +1962,7 @@
this.toolStripSeparator17,
this.NESGraphicSettingsMenuItem,
this.NESSoundChannelsMenuItem,
this.FDSControlsMenuItem,
this.VSControlsMenuItem});
this.FDSControlsMenuItem});
this.NESSubMenu.Name = "NESSubMenu";
this.NESSubMenu.Size = new System.Drawing.Size(40, 19);
this.NESSubMenu.Text = "&NES";
@ -2032,33 +2028,10 @@
// FdsEjectDiskMenuItem
//
this.FdsEjectDiskMenuItem.Name = "FdsEjectDiskMenuItem";
this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(152, 22);
this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(124, 22);
this.FdsEjectDiskMenuItem.Text = "&Eject Disk";
this.FdsEjectDiskMenuItem.Click += new System.EventHandler(this.FdsEjectDiskMenuItem_Click);
//
// VSControlsMenuItem
//
this.VSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.VSCoin1MenuItem,
this.VSCoin2MenuItem});
this.VSControlsMenuItem.Name = "VSControlsMenuItem";
this.VSControlsMenuItem.Size = new System.Drawing.Size(233, 22);
this.VSControlsMenuItem.Text = "VS Controls";
//
// VSCoin1MenuItem
//
this.VSCoin1MenuItem.Name = "VSCoin1MenuItem";
this.VSCoin1MenuItem.Size = new System.Drawing.Size(152, 22);
this.VSCoin1MenuItem.Text = "VS Coin &1";
this.VSCoin1MenuItem.Click += new System.EventHandler(this.VSCoin1MenuItem_Click);
//
// VSCoin2MenuItem
//
this.VSCoin2MenuItem.Name = "VSCoin2MenuItem";
this.VSCoin2MenuItem.Size = new System.Drawing.Size(152, 22);
this.VSCoin2MenuItem.Text = "VS Coin &2";
this.VSCoin2MenuItem.Click += new System.EventHandler(this.VSCoin2MenuItem_Click);
//
// PCESubMenu
//
this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -3462,9 +3435,6 @@
private System.Windows.Forms.ToolStripMenuItem Scanlines75MenuItem;
private System.Windows.Forms.ToolStripMenuItem ScanlinesCustomMenuItem;
private System.Windows.Forms.ToolStripMenuItem FdsEjectDiskMenuItem;
private System.Windows.Forms.ToolStripMenuItem VSControlsMenuItem;
private System.Windows.Forms.ToolStripMenuItem VSCoin1MenuItem;
private System.Windows.Forms.ToolStripMenuItem VSCoin2MenuItem;
}
}

View File

@ -1162,17 +1162,12 @@ namespace BizHawk.Client.EmuHawk
private void NESSubMenu_DropDownOpened(object sender, EventArgs e)
{
FDSControlsMenuItem.Enabled = Global.Emulator.BoardName == "FDS";
VSControlsMenuItem.Enabled = Global.Emulator.BoardName == "VS";
}
private void FdsControlsMenuItem_DropDownOpened(object sender, EventArgs e)
{
FdsEjectDiskMenuItem.Enabled = Global.Emulator.BoardName == "FDS";
VSCoin1MenuItem.Enabled =
VSCoin2MenuItem.Enabled =
Global.Emulator.BoardName == "VS";
for (int i = 1; i < FDSControlsMenuItem.DropDownItems.Count; i++)
{
FDSControlsMenuItem.DropDownItems.Remove(FDSControlsMenuItem.DropDownItems[i]);
@ -1228,30 +1223,6 @@ namespace BizHawk.Client.EmuHawk
}
}
private void VSCoin1MenuItem_Click(object sender, EventArgs e)
{
//if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("FDS Eject"))
//{
// if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
// {
// Global.ClickyVirtualPadController.Click(button);
// GlobalWin.OSD.AddMessage(msg);
// }
//}
}
private void VSCoin2MenuItem_Click(object sender, EventArgs e)
{
//if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("FDS Eject"))
//{
// if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
// {
// Global.ClickyVirtualPadController.Click(button);
// GlobalWin.OSD.AddMessage(msg);
// }
//}
}
#endregion
#region PCE