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

Lua Console - autoload session

This commit is contained in:
andres.delikat 2012-03-19 16:49:47 +00:00
parent 33383b533b
commit da634a45f1
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.MultiClient/Config.cs
View File

@ -213,7 +213,7 @@ namespace BizHawk.MultiClient
// Lua Console // Lua Console
public RecentFiles RecentLua = new RecentFiles(8); public RecentFiles RecentLua = new RecentFiles(8);
public RecentFiles RecentLuaSession = new RecentFiles(8); public RecentFiles RecentLuaSession = new RecentFiles(8);
public bool AutoLoadLua = false; public bool AutoLoadLuaSession = false;
public bool AutoLoadLuaConsole = false; public bool AutoLoadLuaConsole = false;
public bool LuaConsoleSaveWindowPosition = true; public bool LuaConsoleSaveWindowPosition = true;
public int LuaConsoleWndx = -1; //Negative numbers will be ignored even with save window position set public int LuaConsoleWndx = -1; //Negative numbers will be ignored even with save window position set
@ -221,6 +221,7 @@ namespace BizHawk.MultiClient
public int LuaConsoleWidth = -1; public int LuaConsoleWidth = -1;
public int LuaConsoleHeight = -1; public int LuaConsoleHeight = -1;
public bool DisableLuaScriptsOnLoad = false; public bool DisableLuaScriptsOnLoad = false;
// RamWatch Settings // RamWatch Settings
public bool AutoLoadRamWatch = false; public bool AutoLoadRamWatch = false;

28
BizHawk.MultiClient/tools/LuaConsole.Designer.cs generated
View File

@ -69,6 +69,7 @@
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoloadConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoloadConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.disableScriptsOnLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -78,6 +79,7 @@
this.clearToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.clearToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.NumberOfScripts = new System.Windows.Forms.Label(); this.NumberOfScripts = new System.Windows.Forms.Label();
this.autoloadSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new ToolStripEx(); this.toolStrip1 = new ToolStripEx();
this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
this.copyToolStripButton = new System.Windows.Forms.ToolStripButton(); this.copyToolStripButton = new System.Windows.Forms.ToolStripButton();
@ -90,7 +92,6 @@
this.LuaListView = new BizHawk.VirtualListView(); this.LuaListView = new BizHawk.VirtualListView();
this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.disableScriptsOnLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.contextMenuStrip2.SuspendLayout(); this.contextMenuStrip2.SuspendLayout();
@ -108,7 +109,7 @@
this.toolStripSeparator4, this.toolStripSeparator4,
this.stopAllScriptsToolStripMenuItem}); this.stopAllScriptsToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(175, 142); this.contextMenuStrip1.Size = new System.Drawing.Size(175, 120);
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
// //
// toggleScriptToolStripMenuItem // toggleScriptToolStripMenuItem
@ -411,6 +412,7 @@
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.saveWindowPositionToolStripMenuItem, this.saveWindowPositionToolStripMenuItem,
this.autoloadConsoleToolStripMenuItem, this.autoloadConsoleToolStripMenuItem,
this.autoloadSessionToolStripMenuItem,
this.disableScriptsOnLoadToolStripMenuItem, this.disableScriptsOnLoadToolStripMenuItem,
this.toolStripSeparator5, this.toolStripSeparator5,
this.restoreWindowSizeToolStripMenuItem}); this.restoreWindowSizeToolStripMenuItem});
@ -433,6 +435,13 @@
this.autoloadConsoleToolStripMenuItem.Text = "Autoload Console"; this.autoloadConsoleToolStripMenuItem.Text = "Autoload Console";
this.autoloadConsoleToolStripMenuItem.Click += new System.EventHandler(this.autoloadConsoleToolStripMenuItem_Click); this.autoloadConsoleToolStripMenuItem.Click += new System.EventHandler(this.autoloadConsoleToolStripMenuItem_Click);
// //
// disableScriptsOnLoadToolStripMenuItem
//
this.disableScriptsOnLoadToolStripMenuItem.Name = "disableScriptsOnLoadToolStripMenuItem";
this.disableScriptsOnLoadToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.disableScriptsOnLoadToolStripMenuItem.Text = "Disable Scripts on Load";
this.disableScriptsOnLoadToolStripMenuItem.Click += new System.EventHandler(this.disableScriptsOnLoadToolStripMenuItem_Click);
//
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
@ -504,6 +513,13 @@
this.NumberOfScripts.TabIndex = 4; this.NumberOfScripts.TabIndex = 4;
this.NumberOfScripts.Text = " 0 Scripts "; this.NumberOfScripts.Text = " 0 Scripts ";
// //
// autoloadSessionToolStripMenuItem
//
this.autoloadSessionToolStripMenuItem.Name = "autoloadSessionToolStripMenuItem";
this.autoloadSessionToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.autoloadSessionToolStripMenuItem.Text = "Autoload Session";
this.autoloadSessionToolStripMenuItem.Click += new System.EventHandler(this.autoloadSessionToolStripMenuItem_Click);
//
// toolStrip1 // toolStrip1
// //
this.toolStrip1.ClickThrough = true; this.toolStrip1.ClickThrough = true;
@ -630,13 +646,6 @@
this.PathName.Text = "Path"; this.PathName.Text = "Path";
this.PathName.Width = 195; this.PathName.Width = 195;
// //
// disableScriptsOnLoadToolStripMenuItem
//
this.disableScriptsOnLoadToolStripMenuItem.Name = "disableScriptsOnLoadToolStripMenuItem";
this.disableScriptsOnLoadToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.disableScriptsOnLoadToolStripMenuItem.Text = "Disable Scripts on Load";
this.disableScriptsOnLoadToolStripMenuItem.Click += new System.EventHandler(this.disableScriptsOnLoadToolStripMenuItem_Click);
//
// LuaConsole // LuaConsole
// //
this.AllowDrop = true; this.AllowDrop = true;
@ -731,5 +740,6 @@
private System.Windows.Forms.ContextMenuStrip contextMenuStrip2; private System.Windows.Forms.ContextMenuStrip contextMenuStrip2;
private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem disableScriptsOnLoadToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem disableScriptsOnLoadToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem autoloadSessionToolStripMenuItem;
} }
} }

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

@ -78,6 +78,8 @@ namespace BizHawk.MultiClient
private void LuaConsole_Load(object sender, EventArgs e) private void LuaConsole_Load(object sender, EventArgs e)
{ {
LoadConfigSettings(); LoadConfigSettings();
if (Global.Config.AutoLoadLuaSession)
LoadSessionFromRecent(Global.Config.RecentLuaSession.GetRecentFileByPosition(0));
} }
private void StopScript(int x) private void StopScript(int x)
@ -199,6 +201,7 @@ namespace BizHawk.MultiClient
{ {
saveWindowPositionToolStripMenuItem.Checked = Global.Config.LuaConsoleSaveWindowPosition; saveWindowPositionToolStripMenuItem.Checked = Global.Config.LuaConsoleSaveWindowPosition;
autoloadConsoleToolStripMenuItem.Checked = Global.Config.AutoLoadLuaConsole; autoloadConsoleToolStripMenuItem.Checked = Global.Config.AutoLoadLuaConsole;
autoloadSessionToolStripMenuItem.Checked = Global.Config.AutoLoadLuaSession;
disableScriptsOnLoadToolStripMenuItem.Checked = Global.Config.DisableLuaScriptsOnLoad; disableScriptsOnLoadToolStripMenuItem.Checked = Global.Config.DisableLuaScriptsOnLoad;
} }
@ -1005,5 +1008,10 @@ namespace BizHawk.MultiClient
{ {
Global.Config.DisableLuaScriptsOnLoad ^= true; Global.Config.DisableLuaScriptsOnLoad ^= true;
} }
private void autoloadSessionToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.AutoLoadLuaSession ^= true;
}
} }
} }