diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 4dd16e843b..2b633ae9e3 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -149,7 +149,6 @@ public RecentFiles RecentMovies = new RecentFiles(8); // Client Hotkey Bindings - //TODO: These should be allowed to be "", not every hotkey should have to be mapped somewhere public string HardResetBinding = "LeftShift+Tab"; //TODO: This needs to be Ctrl+R but how? public string FastForwardBinding = "J1 B6, Tab"; public string RewindBinding = "J1 B5, LeftShift+R, RightShift+R"; @@ -190,8 +189,8 @@ public string LoadSlot8 = "F8"; public string LoadSlot9 = "F9"; public string ToolBox = "T"; - public string SaveNamedState = "Save Named State"; - public string LoadNamedState = "Load Named State"; + public string SaveNamedState = ""; + public string LoadNamedState = ""; // SMS / GameGear Settings diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index ef979fb8b3..1fb19d14b5 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -151,12 +151,14 @@ this.saveConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolBoxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.rAMWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.rAMSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.rAMPokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -182,7 +184,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, 23); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate); @@ -490,6 +492,7 @@ this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.saveSlotToolStripMenuItem.Text = "SaveSlot"; + this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); // // selectSlot10ToolStripMenuItem // @@ -1126,61 +1129,76 @@ // toolsToolStripMenuItem // this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolBoxToolStripMenuItem, + this.toolStripSeparator12, this.rAMWatchToolStripMenuItem, this.rAMSearchToolStripMenuItem, this.rAMPokeToolStripMenuItem, this.hexEditorToolStripMenuItem, - this.luaConsoleToolStripMenuItem, this.toolStripSeparator11, + this.luaConsoleToolStripMenuItem, this.cheatsToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 17); this.toolsToolStripMenuItem.Text = "&Tools"; + this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened); + // + // toolBoxToolStripMenuItem + // + this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(152, 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(149, 6); // // rAMWatchToolStripMenuItem // this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // // rAMSearchToolStripMenuItem // this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // // rAMPokeToolStripMenuItem // this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); // // hexEditorToolStripMenuItem // this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // - // luaConsoleToolStripMenuItem - // - this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.luaConsoleToolStripMenuItem.Text = "Lua Console"; - this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); - // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6); + // + // luaConsoleToolStripMenuItem + // + this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.luaConsoleToolStripMenuItem.Text = "Lua Console"; + this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // // cheatsToolStripMenuItem // this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // @@ -1407,6 +1425,8 @@ private System.Windows.Forms.ToolStripMenuItem forceGDIPPresentationToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem debuggerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem nametableViewerToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolBoxToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; } } diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index a7935db0f0..0fb5ab97b3 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -456,7 +456,7 @@ namespace BizHawk.MultiClient savestate8toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot8; savestate9toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot9; savestate0toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot0; - + saveNamedStateToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveNamedState; } private void loadStateToolStripMenuItem_DropDownOpened(object sender, EventArgs e) @@ -471,6 +471,7 @@ namespace BizHawk.MultiClient loadstate8toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot7; loadstate9toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot8; loadstate0toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot9; + loadNamedStateToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadNamedState; } private void nametableViewerToolStripMenuItem_Click(object sender, EventArgs e) @@ -521,5 +522,34 @@ namespace BizHawk.MultiClient reader.Close(); Global.RenderPanel.AddMessage(ofd.FileName + " loaded"); } + + private void toolBoxToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadToolBox(); + } + + private void toolsToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + toolBoxToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.ToolBox; + if (!ToolBox1.IsHandleCreated || ToolBox1.IsDisposed) + toolBoxToolStripMenuItem.Enabled = true; + else + toolBoxToolStripMenuItem.Enabled = false; + } + + private void saveSlotToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + selectSlot10ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot0; + selectSlot1ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot1; + selectSlot2ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot2; + selectSlot3ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot3; + selectSlot4ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot4; + selectSlot5ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot5; + selectSlot6ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot6; + selectSlot7ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot7; + selectSlot8ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot8; + selectSlot9ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot9; + + } } } \ No newline at end of file