diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 94fb8549b8..c9b78a9c47 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1997,7 +1997,6 @@ namespace BizHawk.MultiClient { Global.StickyXORAdapter.ClearStickies(); Global.AutofireStickyXORAdapter.ClearStickies(); - TAStudio1.ClearVirtualPadHolds(); VirtualPadForm1.ClearVirtualPadHolds(); Global.OSD.AddMessage("Autohold keys cleared"); } diff --git a/BizHawk.MultiClient/tools/TAStudio.Designer.cs b/BizHawk.MultiClient/tools/TAStudio.Designer.cs index 31fdb76e15..c7562291c3 100644 --- a/BizHawk.MultiClient/tools/TAStudio.Designer.cs +++ b/BizHawk.MultiClient/tools/TAStudio.Designer.cs @@ -80,9 +80,11 @@ this.toolStripItem_SelectAll = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.truncateMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.ControllerBox = new System.Windows.Forms.GroupBox(); - this.ControllersContext = new System.Windows.Forms.ContextMenuStrip(this.components); - this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.ClipboardDisplay = new System.Windows.Forms.Label(); + this.SelectionDisplay = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); this.toolStrip1 = new ToolStripEx(); this.RewindToBeginning = new System.Windows.Forms.ToolStripButton(); this.RewindButton = new System.Windows.Forms.ToolStripButton(); @@ -96,16 +98,10 @@ this.TASView = new BizHawk.VirtualListView(); this.Frame = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Log = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.ClipboardDisplay = new System.Windows.Forms.Label(); - this.SelectionDisplay = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); this.menuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); - this.ControllersContext.SuspendLayout(); - this.toolStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // menuStrip1 @@ -116,7 +112,7 @@ this.settingsToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(686, 24); + this.menuStrip1.Size = new System.Drawing.Size(460, 24); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -344,7 +340,6 @@ this.clearVirtualPadsToolStripMenuItem.Name = "clearVirtualPadsToolStripMenuItem"; this.clearVirtualPadsToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.clearVirtualPadsToolStripMenuItem.Text = "Clear controller &holds"; - this.clearVirtualPadsToolStripMenuItem.Click += new System.EventHandler(this.clearVirtualPadsToolStripMenuItem_Click); // // settingsToolStripMenuItem // @@ -484,30 +479,55 @@ this.truncateMovieToolStripMenuItem1.Text = "&Truncate Movie"; this.truncateMovieToolStripMenuItem1.Click += new System.EventHandler(this.truncateMovieToolStripMenuItem1_Click); // - // ControllerBox + // groupBox1 // - this.ControllerBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.ControllerBox.ContextMenuStrip = this.ControllersContext; - this.ControllerBox.Location = new System.Drawing.Point(300, 144); - this.ControllerBox.Name = "ControllerBox"; - this.ControllerBox.Size = new System.Drawing.Size(367, 207); - this.ControllerBox.TabIndex = 4; - this.ControllerBox.TabStop = false; - this.ControllerBox.Text = "Controllers"; + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Controls.Add(this.ClipboardDisplay); + this.groupBox1.Controls.Add(this.SelectionDisplay); + this.groupBox1.Controls.Add(this.label2); + this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Location = new System.Drawing.Point(302, 55); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(146, 83); + this.groupBox1.TabIndex = 5; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Slicer"; // - // ControllersContext + // ClipboardDisplay // - this.ControllersContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.clearToolStripMenuItem1}); - this.ControllersContext.Name = "ControllersContext"; - this.ControllersContext.Size = new System.Drawing.Size(136, 26); + this.ClipboardDisplay.AutoSize = true; + this.ClipboardDisplay.Location = new System.Drawing.Point(68, 36); + this.ClipboardDisplay.Name = "ClipboardDisplay"; + this.ClipboardDisplay.Size = new System.Drawing.Size(31, 13); + this.ClipboardDisplay.TabIndex = 3; + this.ClipboardDisplay.Text = "none"; // - // clearToolStripMenuItem1 + // SelectionDisplay // - this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; - this.clearToolStripMenuItem1.Size = new System.Drawing.Size(135, 22); - this.clearToolStripMenuItem1.Text = "&Clear Holds"; - this.clearToolStripMenuItem1.Click += new System.EventHandler(this.clearToolStripMenuItem1_Click); + this.SelectionDisplay.AutoSize = true; + this.SelectionDisplay.Location = new System.Drawing.Point(68, 19); + this.SelectionDisplay.Name = "SelectionDisplay"; + this.SelectionDisplay.Size = new System.Drawing.Size(31, 13); + this.SelectionDisplay.TabIndex = 2; + this.SelectionDisplay.Text = "none"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(8, 36); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(54, 13); + this.label2.TabIndex = 1; + this.label2.Text = "Clipboard:"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(8, 19); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(54, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Selection:"; // // toolStrip1 // @@ -657,67 +677,16 @@ this.Log.Text = "Log"; this.Log.Width = 201; // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox1.Controls.Add(this.ClipboardDisplay); - this.groupBox1.Controls.Add(this.SelectionDisplay); - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Location = new System.Drawing.Point(300, 55); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(367, 83); - this.groupBox1.TabIndex = 5; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Slicer"; - // - // ClipboardDisplay - // - this.ClipboardDisplay.AutoSize = true; - this.ClipboardDisplay.Location = new System.Drawing.Point(68, 36); - this.ClipboardDisplay.Name = "ClipboardDisplay"; - this.ClipboardDisplay.Size = new System.Drawing.Size(31, 13); - this.ClipboardDisplay.TabIndex = 3; - this.ClipboardDisplay.Text = "none"; - // - // SelectionDisplay - // - this.SelectionDisplay.AutoSize = true; - this.SelectionDisplay.Location = new System.Drawing.Point(68, 19); - this.SelectionDisplay.Name = "SelectionDisplay"; - this.SelectionDisplay.Size = new System.Drawing.Size(31, 13); - this.SelectionDisplay.TabIndex = 2; - this.SelectionDisplay.Text = "none"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(8, 36); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(54, 13); - this.label2.TabIndex = 1; - this.label2.Text = "Clipboard:"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(8, 19); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(54, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Selection:"; - // // TAStudio // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(686, 519); - this.Controls.Add(this.groupBox1); + this.ClientSize = new System.Drawing.Size(460, 519); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.menuStrip1); + this.Controls.Add(this.groupBox1); this.Controls.Add(this.ReadOnlyCheckBox); this.Controls.Add(this.TASView); - this.Controls.Add(this.ControllerBox); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; this.MinimumSize = new System.Drawing.Size(437, 148); @@ -727,11 +696,10 @@ this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); this.contextMenuStrip1.ResumeLayout(false); - this.ControllersContext.ResumeLayout(false); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -773,15 +741,12 @@ private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem ContextMenu_Insert; private System.Windows.Forms.ToolStripMenuItem toolStripItem_SelectAll; - private System.Windows.Forms.GroupBox ControllerBox; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.ToolStripButton StopButton; private System.Windows.Forms.ToolStripMenuItem updatePadsOnMovePlaybackToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; private System.Windows.Forms.ToolStripMenuItem clearVirtualPadsToolStripMenuItem; - private System.Windows.Forms.ContextMenuStrip ControllersContext; - private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem1; private System.Windows.Forms.ToolStripButton FastForward; private System.Windows.Forms.ToolStripButton TurboFastForward; private System.Windows.Forms.ToolStripMenuItem ContextMenu_Delete; diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs index d93072e32a..04ecbd2adc 100644 --- a/BizHawk.MultiClient/tools/TAStudio.cs +++ b/BizHawk.MultiClient/tools/TAStudio.cs @@ -34,7 +34,6 @@ namespace BizHawk.MultiClient int stopOnFrame = 0; public bool Engaged; //When engaged the Client will listen to TAStudio for input - List Pads = new List(); //Movie header object - to have the main project header data //List MacroFiles - list of .macro files (simply log files) @@ -75,55 +74,6 @@ namespace BizHawk.MultiClient if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsFinished) { - string str = Global.MovieSession.Movie.GetInput(Global.Emulator.Frame); - if (Global.Config.TASUpdatePads == true && str != "") - { - switch (Global.Emulator.SystemId) - { - case "NES": - Pads[0].SetButtons(str.Substring(3, 8)); - Pads[1].SetButtons(str.Substring(12, 8)); - Pads[2].SetButtons(str[1].ToString()); - break; - case "A26": - Pads[0].SetButtons(str.Substring(4, 5)); - Pads[1].SetButtons(str.Substring(10, 5)); - Pads[2].SetButtons(str.Substring(1, 2)); - break; - case "SMS": - case "GG": - case "SG": - Pads[0].SetButtons(str.Substring(1, 6)); - Pads[1].SetButtons(str.Substring(8, 6)); - Pads[2].SetButtons(str.Substring(15, 2)); - break; - case "PCE": - case "SGX": - Pads[0].SetButtons(str.Substring(3, 8)); - Pads[1].SetButtons(str.Substring(12, 8)); - Pads[2].SetButtons(str.Substring(21, 8)); - Pads[3].SetButtons(str.Substring(30, 8)); - break; - case "TI83": - Pads[0].SetButtons(str.Substring(2,50)); - break; - case "SNES": - Pads[0].SetButtons(str.Substring(3, 12)); - Pads[1].SetButtons(str.Substring(16, 12)); - Pads[2].SetButtons(str.Substring(29, 12)); - Pads[3].SetButtons(str.Substring(42, 12)); - break; - case "GEN": - Pads[0].SetButtons(str.Substring(3, 8)); - Pads[1].SetButtons(str.Substring(12, 8)); - break; - case "GB": - Pads[0].SetButtons(str.Substring(3,8)); - break; - default: - break; - } - } TASView.BlazingFast = false; } @@ -133,20 +83,20 @@ namespace BizHawk.MultiClient } } - public string GetMnemonic() - { - StringBuilder str = new StringBuilder("|"); //TODO: Control Command virtual pad + //public string GetMnemonic() + //{ + // StringBuilder str = new StringBuilder("|"); //TODO: Control Command virtual pad - //TODO: remove this hack with a nes controls pad - if (Global.Emulator.SystemId == "NES") - { - str.Append("0|"); - } + // //TODO: remove this hack with a nes controls pad + // if (Global.Emulator.SystemId == "NES") + // { + // str.Append("0|"); + // } - for (int x = 0; x < Pads.Count; x++) - str.Append(Pads[x].GetMnemonic()); - return str.ToString(); - } + // for (int x = 0; x < Pads.Count; x++) + // str.Append(Pads[x].GetMnemonic()); + // return str.ToString(); + //} private void TASView_QueryItemBkColor(int index, int column, ref Color color) { @@ -197,9 +147,6 @@ namespace BizHawk.MultiClient { if (!this.IsHandleCreated || this.IsDisposed) return; TASView.Items.Clear(); - ControllerBox.Controls.Clear(); - ClearPads(); - Pads.Clear(); LoadTAStudio(); } @@ -221,135 +168,7 @@ namespace BizHawk.MultiClient } LoadConfigSettings(); - - - DisplayList(); - - //Add virtual pads - switch (Global.Emulator.SystemId) - { - case "NULL": - default: - break; - case "A26": - VirtualPadA26 ataripad1 = new VirtualPadA26(); - ataripad1.Location = new Point(8, 19); - ataripad1.Controller = "P1"; - VirtualPadA26 ataripad2 = new VirtualPadA26(); - ataripad2.Location = new Point(188, 19); - ataripad2.Controller = "P2"; - Pads.Add(ataripad1); - Pads.Add(ataripad2); - ControllerBox.Controls.Add(Pads[0]); - ControllerBox.Controls.Add(Pads[1]); - VirtualPadA26Control ataricontrols = new VirtualPadA26Control(); - ataricontrols.Location = new Point(8, 109); - Pads.Add(ataricontrols); - ControllerBox.Controls.Add(Pads[2]); - break; - case "NES": - VirtualPadNES nespad1 = new VirtualPadNES(); - nespad1.Location = new Point(8, 19); - nespad1.Controller = "P1"; - VirtualPadNES nespad2 = new VirtualPadNES(); - nespad2.Location = new Point(188, 19); - nespad2.Controller = "P2"; - Pads.Add(nespad1); - Pads.Add(nespad2); - ControllerBox.Controls.Add(Pads[0]); - ControllerBox.Controls.Add(Pads[1]); - VirtualPadNESControl controlpad1 = new VirtualPadNESControl(); - controlpad1.Location = new Point(8, 109); - Pads.Add(controlpad1); - ControllerBox.Controls.Add(Pads[2]); - break; - case "SMS": - case "SG": - case "GG": - VirtualPadSMS smspad1 = new VirtualPadSMS(); - smspad1.Location = new Point(8, 19); - smspad1.Controller = "P1"; - VirtualPadSMS smspad2 = new VirtualPadSMS(); - smspad2.Location = new Point(188, 19); - smspad2.Controller = "P2"; - Pads.Add(smspad1); - Pads.Add(smspad2); - ControllerBox.Controls.Add(Pads[0]); - ControllerBox.Controls.Add(Pads[1]); - VirtualPadSMSControl controlpad2 = new VirtualPadSMSControl(); - controlpad2.Location = new Point(8, 109); - Pads.Add(controlpad2); - ControllerBox.Controls.Add(Pads[2]); - break; - case "PCE": - VirtualPadPCE pcepad1 = new VirtualPadPCE(); - pcepad1.Location = new Point(8, 19); - pcepad1.Controller = "P1"; - VirtualPadPCE pcepad2 = new VirtualPadPCE(); - pcepad2.Location = new Point(188, 19); - pcepad2.Controller = "P2"; - VirtualPadPCE pcepad3 = new VirtualPadPCE(); - pcepad3.Location = new Point(8, 109); - pcepad3.Controller = "P3"; - VirtualPadPCE pcepad4 = new VirtualPadPCE(); - pcepad4.Location = new Point(188, 109); - pcepad4.Controller = "P4"; - Pads.Add(pcepad1); - Pads.Add(pcepad2); - Pads.Add(pcepad3); - Pads.Add(pcepad4); - ControllerBox.Controls.Add(Pads[0]); - ControllerBox.Controls.Add(Pads[1]); - ControllerBox.Controls.Add(Pads[2]); - ControllerBox.Controls.Add(Pads[3]); - break; - case "SNES": - VirtualPadSNES snespad1 = new VirtualPadSNES(); - snespad1.Location = new Point(8, 19); - snespad1.Controller = "P1"; - VirtualPadSNES snespad2 = new VirtualPadSNES(); - snespad2.Location = new Point(188, 19); - snespad2.Controller = "P2"; - VirtualPadSNES snespad3 = new VirtualPadSNES(); - snespad3.Location = new Point(8, 95); - snespad3.Controller = "P3"; - VirtualPadSNES snespad4 = new VirtualPadSNES(); - snespad4.Location = new Point(188, 95); - snespad4.Controller = "P4"; - VirtualPadSNESControl snescontrolpad = new VirtualPadSNESControl(); - snescontrolpad.Location = new Point(8, 170); - Pads.Add(snespad1); - Pads.Add(snespad2); - Pads.Add(snespad3); - Pads.Add(snespad4); - Pads.Add(snescontrolpad); - ControllerBox.Controls.Add(Pads[0]); - ControllerBox.Controls.Add(Pads[1]); - ControllerBox.Controls.Add(Pads[2]); - ControllerBox.Controls.Add(Pads[3]); - ControllerBox.Controls.Add(Pads[4]); - break; - case "GB": - case "GBC": - VirtualPadGB gbpad1 = new VirtualPadGB(); - gbpad1.Location = new Point(8, 19); - gbpad1.Controller = ""; - Pads.Add(gbpad1); - ControllerBox.Controls.Add(Pads[0]); - VirtualPadGBControl gbcontrolpad = new VirtualPadGBControl(); - gbcontrolpad.Location = new Point(8, 109); - Pads.Add(gbcontrolpad); - ControllerBox.Controls.Add(Pads[1]); - break; - case "GEN": - VirtualPadGen3Button genpad1 = new VirtualPadGen3Button(); - genpad1.Location = new Point(8, 19); - genpad1.Controller = "P1"; - Pads.Add(genpad1); - ControllerBox.Controls.Add(Pads[0]); - break; - } } private void TAStudio_Load(object sender, EventArgs e) @@ -391,13 +210,6 @@ namespace BizHawk.MultiClient Global.Config.TASWndy = this.Location.Y; Global.Config.TASWidth = this.Right - this.Left; Global.Config.TASHeight = this.Bottom - this.Top; - ClearPads(); - } - - public void ClearPads() - { - for (int x = 0; x < Pads.Count; x++) - Pads[x].Clear(); } private void exitToolStripMenuItem_Click(object sender, EventArgs e) @@ -572,25 +384,6 @@ namespace BizHawk.MultiClient } } - public void ClearVirtualPadHolds() - { - foreach (var controller in ControllerBox.Controls) - { - if (controller is VirtualPad) - ((VirtualPad)controller).Clear(); - } - } - - private void clearVirtualPadsToolStripMenuItem_Click(object sender, EventArgs e) - { - ClearVirtualPadHolds(); - } - - private void clearToolStripMenuItem1_Click(object sender, EventArgs e) - { - ClearVirtualPadHolds(); - } - private void FastForward_Click(object sender, EventArgs e) { this.FastForward.Checked ^= true; diff --git a/BizHawk.MultiClient/tools/TAStudio.resx b/BizHawk.MultiClient/tools/TAStudio.resx index 80f93a8b82..202a80b4f6 100644 --- a/BizHawk.MultiClient/tools/TAStudio.resx +++ b/BizHawk.MultiClient/tools/TAStudio.resx @@ -126,9 +126,6 @@ 416, 17 - - 571, 17 - 126, 17 diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs b/BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs index 27202ea5ce..659d978927 100644 --- a/BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs +++ b/BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VirtualPadForm)); this.ControllerBox = new System.Windows.Forms.GroupBox(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); @@ -37,11 +38,15 @@ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StickyBox = new System.Windows.Forms.CheckBox(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); + this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // ControllerBox // + this.ControllerBox.ContextMenuStrip = this.contextMenuStrip1; this.ControllerBox.Location = new System.Drawing.Point(9, 26); this.ControllerBox.Name = "ControllerBox"; this.ControllerBox.Size = new System.Drawing.Size(367, 207); @@ -110,6 +115,20 @@ this.StickyBox.UseVisualStyleBackColor = true; this.StickyBox.CheckedChanged += new System.EventHandler(this.StickyBox_CheckedChanged); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.clearToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(102, 26); + // + // clearToolStripMenuItem + // + this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; + this.clearToolStripMenuItem.Size = new System.Drawing.Size(101, 22); + this.clearToolStripMenuItem.Text = "&Clear"; + this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); + // // VirtualPadForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -127,6 +146,7 @@ this.Load += new System.EventHandler(this.VirtualPadForm_Load); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); + this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -142,5 +162,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.CheckBox StickyBox; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.cs b/BizHawk.MultiClient/tools/VirtualPadForm.cs index 8252b617a4..adafba42a7 100644 --- a/BizHawk.MultiClient/tools/VirtualPadForm.cs +++ b/BizHawk.MultiClient/tools/VirtualPadForm.cs @@ -269,5 +269,10 @@ namespace BizHawk.MultiClient { Global.Config.VirtualPadSaveWindowPosition ^= true; } + + private void clearToolStripMenuItem_Click(object sender, EventArgs e) + { + ClearVirtualPadHolds(); + } } } diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.resx b/BizHawk.MultiClient/tools/VirtualPadForm.resx index 18e6953c5f..82b68187cf 100644 --- a/BizHawk.MultiClient/tools/VirtualPadForm.resx +++ b/BizHawk.MultiClient/tools/VirtualPadForm.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 132, 17 + 17, 17