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

Lua Console - hook up autoload, fix hotkey and toolbox to open lua console (not the old lua window dialog). Add TAStudio to the toolbox dialog.

This commit is contained in:
andres.delikat 2012-01-10 01:30:17 +00:00
parent e73dee15b9
commit ee440f140f
4 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -47,10 +47,7 @@ namespace BizHawk.MultiClient
private void luaConsoleToolStripMenuItem_Click(object sender, EventArgs e) private void luaConsoleToolStripMenuItem_Click(object sender, EventArgs e)
{ {
//var window = new BizHawk.MultiClient.tools.LuaWindow(); OpenLuaConsole();
//window.Show();
LuaConsole l = new LuaConsole();
l.Show();
} }
private void miLimitFramerate_Click(object sender, EventArgs e) private void miLimitFramerate_Click(object sender, EventArgs e)

11
BizHawk.MultiClient/MainForm.cs
View File

@ -220,6 +220,8 @@ namespace BizHawk.MultiClient
LoadGameGenieEC(); LoadGameGenieEC();
if (Global.Config.AutoloadTAStudio) if (Global.Config.AutoloadTAStudio)
LoadTAStudio(); LoadTAStudio();
if (Global.Config.AutoLoadLuaConsole)
OpenLuaConsole();
if (Global.Config.MainWndx >= 0 && Global.Config.MainWndy >= 0 && Global.Config.SaveWindowPosition) if (Global.Config.MainWndx >= 0 && Global.Config.MainWndy >= 0 && Global.Config.SaveWindowPosition)
this.Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy); this.Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy);
@ -1437,8 +1439,7 @@ namespace BizHawk.MultiClient
case "Hex Editor": LoadHexEditor(); break; case "Hex Editor": LoadHexEditor(); break;
case "Lua Console": case "Lua Console":
{ {
var window = new BizHawk.MultiClient.tools.LuaWindow(); OpenLuaConsole();
window.Show();
break; break;
} }
case "Cheats": LoadCheatsWindow(); break; case "Cheats": LoadCheatsWindow(); break;
@ -2456,5 +2457,11 @@ namespace BizHawk.MultiClient
{ {
MainMenuStrip.Visible ^= true; MainMenuStrip.Visible ^= true;
} }
public void OpenLuaConsole()
{
LuaConsole l = new LuaConsole();
l.Show();
}
} }
} }

16
BizHawk.MultiClient/tools/ToolBox.Designer.cs generated
View File

@ -41,6 +41,7 @@
this.NESNameTable = new System.Windows.Forms.ToolStripButton(); this.NESNameTable = new System.Windows.Forms.ToolStripButton();
this.NESGameGenie = new System.Windows.Forms.ToolStripButton(); this.NESGameGenie = new System.Windows.Forms.ToolStripButton();
this.KeypadTool = new System.Windows.Forms.ToolStripButton(); this.KeypadTool = new System.Windows.Forms.ToolStripButton();
this.TAStudioButton = new System.Windows.Forms.ToolStripButton();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -55,6 +56,7 @@
this.toolStripButton4, this.toolStripButton4,
this.HexEditor, this.HexEditor,
this.toolStripButton5, this.toolStripButton5,
this.TAStudioButton,
this.NESDebugger, this.NESDebugger,
this.NESPPU, this.NESPPU,
this.NESNameTable, this.NESNameTable,
@ -63,7 +65,7 @@
this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table; this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table;
this.toolStrip1.Location = new System.Drawing.Point(9, 11); this.toolStrip1.Location = new System.Drawing.Point(9, 11);
this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(86, 253); this.toolStrip1.Size = new System.Drawing.Size(86, 295);
this.toolStrip1.TabIndex = 0; this.toolStrip1.TabIndex = 0;
this.toolStrip1.TabStop = true; this.toolStrip1.TabStop = true;
// //
@ -166,11 +168,20 @@
this.KeypadTool.Text = "Keypad"; this.KeypadTool.Text = "Keypad";
this.KeypadTool.Click += new System.EventHandler(this.KeyPadTool_Click); this.KeypadTool.Click += new System.EventHandler(this.KeyPadTool_Click);
// //
// TAStudioButton
//
this.TAStudioButton.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
this.TAStudioButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.TAStudioButton.Name = "TAStudioButton";
this.TAStudioButton.Size = new System.Drawing.Size(70, 20);
this.TAStudioButton.Text = "TAStudio";
this.TAStudioButton.Click += new System.EventHandler(this.TAStudioButton_Click);
//
// ToolBox // ToolBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(122, 274); this.ClientSize = new System.Drawing.Size(122, 311);
this.Controls.Add(this.toolStrip1); this.Controls.Add(this.toolStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(130, 64); this.MinimumSize = new System.Drawing.Size(130, 64);
@ -198,6 +209,7 @@
private System.Windows.Forms.ToolStripButton NESGameGenie; private System.Windows.Forms.ToolStripButton NESGameGenie;
private System.Windows.Forms.ToolStripButton NESNameTable; private System.Windows.Forms.ToolStripButton NESNameTable;
private System.Windows.Forms.ToolStripButton KeypadTool; private System.Windows.Forms.ToolStripButton KeypadTool;
private System.Windows.Forms.ToolStripButton TAStudioButton;
} }
} }

8
BizHawk.MultiClient/tools/ToolBox.cs
View File

@ -75,8 +75,7 @@ namespace BizHawk.MultiClient
private void toolStripButton5_Click(object sender, EventArgs e) private void toolStripButton5_Click(object sender, EventArgs e)
{ {
var window = new BizHawk.MultiClient.tools.LuaWindow(); Global.MainForm.OpenLuaConsole();
window.Show();
} }
private void NESPPU_Click(object sender, EventArgs e) private void NESPPU_Click(object sender, EventArgs e)
@ -105,5 +104,10 @@ namespace BizHawk.MultiClient
return; return;
Global.MainForm.LoadTI83KeyPad(); Global.MainForm.LoadTI83KeyPad();
} }
private void TAStudioButton_Click(object sender, EventArgs e)
{
Global.MainForm.LoadTAStudio();
}
} }
} }