From da634a45f1e387debcc2008da921ded576a736a6 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Mon, 19 Mar 2012 16:49:47 +0000 Subject: [PATCH] Lua Console - autoload session --- BizHawk.MultiClient/Config.cs | 3 +- .../tools/LuaConsole.Designer.cs | 28 +++++++++++++------ BizHawk.MultiClient/tools/LuaConsole.cs | 8 ++++++ 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 8d63191dc2..3af85b71bb 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -213,7 +213,7 @@ namespace BizHawk.MultiClient // Lua Console public RecentFiles RecentLua = new RecentFiles(8); public RecentFiles RecentLuaSession = new RecentFiles(8); - public bool AutoLoadLua = false; + public bool AutoLoadLuaSession = false; public bool AutoLoadLuaConsole = false; public bool LuaConsoleSaveWindowPosition = true; 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 LuaConsoleHeight = -1; public bool DisableLuaScriptsOnLoad = false; + // RamWatch Settings public bool AutoLoadRamWatch = false; diff --git a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs index c50a9aebc4..a42ea3e410 100644 --- a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs +++ b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs @@ -69,6 +69,7 @@ this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveWindowPositionToolStripMenuItem = 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.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -78,6 +79,7 @@ this.clearToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.NumberOfScripts = new System.Windows.Forms.Label(); + this.autoloadSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new ToolStripEx(); this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); this.copyToolStripButton = new System.Windows.Forms.ToolStripButton(); @@ -90,7 +92,6 @@ this.LuaListView = new BizHawk.VirtualListView(); this.Script = ((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.menuStrip1.SuspendLayout(); this.contextMenuStrip2.SuspendLayout(); @@ -108,7 +109,7 @@ this.toolStripSeparator4, this.stopAllScriptsToolStripMenuItem}); 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); // // toggleScriptToolStripMenuItem @@ -411,6 +412,7 @@ this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveWindowPositionToolStripMenuItem, this.autoloadConsoleToolStripMenuItem, + this.autoloadSessionToolStripMenuItem, this.disableScriptsOnLoadToolStripMenuItem, this.toolStripSeparator5, this.restoreWindowSizeToolStripMenuItem}); @@ -433,6 +435,13 @@ this.autoloadConsoleToolStripMenuItem.Text = "Autoload Console"; 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 // this.toolStripSeparator5.Name = "toolStripSeparator5"; @@ -504,6 +513,13 @@ this.NumberOfScripts.TabIndex = 4; 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 // this.toolStrip1.ClickThrough = true; @@ -630,13 +646,6 @@ this.PathName.Text = "Path"; 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 // this.AllowDrop = true; @@ -731,5 +740,6 @@ private System.Windows.Forms.ContextMenuStrip contextMenuStrip2; private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem disableScriptsOnLoadToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem autoloadSessionToolStripMenuItem; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/LuaConsole.cs b/BizHawk.MultiClient/tools/LuaConsole.cs index a012943720..f8ef38eb7a 100644 --- a/BizHawk.MultiClient/tools/LuaConsole.cs +++ b/BizHawk.MultiClient/tools/LuaConsole.cs @@ -78,6 +78,8 @@ namespace BizHawk.MultiClient private void LuaConsole_Load(object sender, EventArgs e) { LoadConfigSettings(); + if (Global.Config.AutoLoadLuaSession) + LoadSessionFromRecent(Global.Config.RecentLuaSession.GetRecentFileByPosition(0)); } private void StopScript(int x) @@ -199,6 +201,7 @@ namespace BizHawk.MultiClient { saveWindowPositionToolStripMenuItem.Checked = Global.Config.LuaConsoleSaveWindowPosition; autoloadConsoleToolStripMenuItem.Checked = Global.Config.AutoLoadLuaConsole; + autoloadSessionToolStripMenuItem.Checked = Global.Config.AutoLoadLuaSession; disableScriptsOnLoadToolStripMenuItem.Checked = Global.Config.DisableLuaScriptsOnLoad; } @@ -1005,5 +1008,10 @@ namespace BizHawk.MultiClient { Global.Config.DisableLuaScriptsOnLoad ^= true; } + + private void autoloadSessionToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.AutoLoadLuaSession ^= true; + } } }