ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

put Customize menu item in context menu

This commit is contained in:
adelikat 2014-05-07 01:03:44 +00:00
parent c7526c4207
commit f58cb3cf72
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/InputManager.cs
View File

@ -37,7 +37,7 @@ namespace BizHawk.Client.Common
} }
} }
public static void SyncControls() // Move to client.comon public static void SyncControls()
{ {
var def = Global.Emulator.ControllerDefinition; var def = Global.Emulator.ControllerDefinition;

10
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -353,6 +353,7 @@
this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator(); this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.customizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainformMenu.SuspendLayout(); this.MainformMenu.SuspendLayout();
this.MainStatusBar.SuspendLayout(); this.MainStatusBar.SuspendLayout();
this.MainFormContextMenu.SuspendLayout(); this.MainFormContextMenu.SuspendLayout();
@ -2880,6 +2881,7 @@
this.toolStripMenuItem13, this.toolStripMenuItem13,
this.toolStripMenuItem14, this.toolStripMenuItem14,
this.toolStripMenuItem15, this.toolStripMenuItem15,
this.customizeToolStripMenuItem,
this.toolStripSeparator30, this.toolStripSeparator30,
this.SavestateTypeContextSubMenu, this.SavestateTypeContextSubMenu,
this.CoreSelectionContextSubMenu, this.CoreSelectionContextSubMenu,
@ -3085,6 +3087,13 @@
this.ShowMenuContextMenuItem.Text = "Show Menu"; this.ShowMenuContextMenuItem.Text = "Show Menu";
this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click); this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click);
// //
// customizeToolStripMenuItem
//
this.customizeToolStripMenuItem.Name = "customizeToolStripMenuItem";
this.customizeToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
this.customizeToolStripMenuItem.Text = "Customize...";
this.customizeToolStripMenuItem.Click += new System.EventHandler(this.guiOptionsToolStripMenuItem_Click);
//
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@ -3449,6 +3458,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripMenuItem N64VideoPluginSettingsMenuItem; private System.Windows.Forms.ToolStripMenuItem N64VideoPluginSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem ClientOptionsMenuItem; private System.Windows.Forms.ToolStripMenuItem ClientOptionsMenuItem;
private System.Windows.Forms.ToolStripMenuItem customizeToolStripMenuItem;
} }
} }

2
BizHawk.Client.EmuHawk/config/GuiOptions.cs
View File

@ -13,8 +13,6 @@ namespace BizHawk.Client.EmuHawk
{ {
public partial class EmuHawkOptions : Form public partial class EmuHawkOptions : Form
{ {
// TODO: make sure these options are cleaned out of the mainform context menu
// TODO: put this in the context menu
public EmuHawkOptions() public EmuHawkOptions()
{ {
InitializeComponent(); InitializeComponent();