diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 2e64108a68..76554d49a7 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -441,10 +441,10 @@ Component - + Form - + N64VideoPluginconfig.cs @@ -644,7 +644,7 @@ SNESOptions.cs - + N64VideoPluginconfig.cs diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index a673821c74..8b2d93a960 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -285,6 +285,7 @@ this.skipBIOSIntroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.n64ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.videoConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tempN64PluginControlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -332,7 +333,6 @@ this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.tempN64PluginControlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.StatusSlot0.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); @@ -1799,8 +1799,7 @@ this.luaConsoleToolStripMenuItem, this.cheatsToolStripMenuItem, this.toolStripSeparator29, - this.createDualGBXMLToolStripMenuItem, - this.tempN64PluginControlToolStripMenuItem}); + this.createDualGBXMLToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); this.toolsToolStripMenuItem.Text = "&Tools"; @@ -1810,20 +1809,20 @@ // this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; - this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(189, 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(206, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(186, 6); // // rAMWatchToolStripMenuItem // this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // @@ -1831,7 +1830,7 @@ // this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // @@ -1839,7 +1838,7 @@ // this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); // @@ -1847,7 +1846,7 @@ // this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // @@ -1855,7 +1854,7 @@ // this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; - this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); // @@ -1863,7 +1862,7 @@ // this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; - this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.tAStudioToolStripMenuItem.Text = "&TAStudio"; this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); // @@ -1871,20 +1870,20 @@ // this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem"; - this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.virtualPadToolStripMenuItem.Text = "Virtual Pad"; this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(206, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(186, 6); // // luaConsoleToolStripMenuItem // this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // @@ -1892,19 +1891,19 @@ // this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // // toolStripSeparator29 // this.toolStripSeparator29.Name = "toolStripSeparator29"; - this.toolStripSeparator29.Size = new System.Drawing.Size(206, 6); + this.toolStripSeparator29.Size = new System.Drawing.Size(186, 6); // // createDualGBXMLToolStripMenuItem // this.createDualGBXMLToolStripMenuItem.Name = "createDualGBXMLToolStripMenuItem"; - this.createDualGBXMLToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.createDualGBXMLToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.createDualGBXMLToolStripMenuItem.Text = "Create Dual GB XML..."; this.createDualGBXMLToolStripMenuItem.Click += new System.EventHandler(this.createDualGBXMLToolStripMenuItem_Click); // @@ -2466,7 +2465,8 @@ // n64ToolStripMenuItem // this.n64ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.videoConfigToolStripMenuItem}); + this.videoConfigToolStripMenuItem, + this.tempN64PluginControlToolStripMenuItem}); this.n64ToolStripMenuItem.Name = "n64ToolStripMenuItem"; this.n64ToolStripMenuItem.Size = new System.Drawing.Size(40, 19); this.n64ToolStripMenuItem.Text = "N64"; @@ -2474,10 +2474,17 @@ // videoConfigToolStripMenuItem // this.videoConfigToolStripMenuItem.Name = "videoConfigToolStripMenuItem"; - this.videoConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.videoConfigToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.videoConfigToolStripMenuItem.Text = "Video Settings"; this.videoConfigToolStripMenuItem.Click += new System.EventHandler(this.videoConfigToolStripMenuItem_Click); // + // tempN64PluginControlToolStripMenuItem + // + this.tempN64PluginControlToolStripMenuItem.Name = "tempN64PluginControlToolStripMenuItem"; + this.tempN64PluginControlToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.tempN64PluginControlToolStripMenuItem.Text = "Temp N64 Plugin Control"; + this.tempN64PluginControlToolStripMenuItem.Click += new System.EventHandler(this.tempN64PluginControlToolStripMenuItem_Click); + // // helpToolStripMenuItem // this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2882,13 +2889,6 @@ this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); // - // tempN64PluginControlToolStripMenuItem - // - this.tempN64PluginControlToolStripMenuItem.Name = "tempN64PluginControlToolStripMenuItem"; - this.tempN64PluginControlToolStripMenuItem.Size = new System.Drawing.Size(209, 22); - this.tempN64PluginControlToolStripMenuItem.Text = "Temp N64 Plugin Control"; - this.tempN64PluginControlToolStripMenuItem.Click += new System.EventHandler(this.tempN64PluginControlToolStripMenuItem_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 1290bf011b..eaf419a707 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -5394,7 +5394,8 @@ namespace BizHawk.MultiClient private void tempN64PluginControlToolStripMenuItem_Click(object sender, EventArgs e) { - new BizHawk.MultiClient.tools.N64VideoPluginconfig().ShowDialog(); + new BizHawk.MultiClient.N64VideoPluginconfig().ShowDialog(); } + } } diff --git a/BizHawk.MultiClient/tools/N64VideoPluginconfig.Designer.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs similarity index 97% rename from BizHawk.MultiClient/tools/N64VideoPluginconfig.Designer.cs rename to BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs index 55967126f9..ec0ff59e47 100644 --- a/BizHawk.MultiClient/tools/N64VideoPluginconfig.Designer.cs +++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient.tools +namespace BizHawk.MultiClient { partial class N64VideoPluginconfig { diff --git a/BizHawk.MultiClient/tools/N64VideoPluginconfig.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs similarity index 86% rename from BizHawk.MultiClient/tools/N64VideoPluginconfig.cs rename to BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs index c684771e26..32ff58b5fd 100644 --- a/BizHawk.MultiClient/tools/N64VideoPluginconfig.cs +++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk.MultiClient.tools +namespace BizHawk.MultiClient { public partial class N64VideoPluginconfig : Form { diff --git a/BizHawk.MultiClient/tools/N64VideoPluginconfig.resx b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx similarity index 100% rename from BizHawk.MultiClient/tools/N64VideoPluginconfig.resx rename to BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx