From fac788a455baea458c5b74d4eb2dfdb783364621 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 5 Dec 2024 11:01:39 +1000 Subject: [PATCH] Revert unrelated changes to `TAStudio.Designer.cs` fixes 1da3e4d77 see 0189b5110 --- .../tools/TAStudio/TAStudio.Designer.cs | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 342104446b..47639ba9a4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -69,11 +69,11 @@ namespace BizHawk.Client.EmuHawk this.CutMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator8 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.ClearFramesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.DeleteFramesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.InsertFrameMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.InsertNumFramesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); + this.DeleteFramesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CloneFramesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CloneFramesXTimesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); + this.InsertNumFramesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator6 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.TruncateMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.ClearGreenzoneMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -81,6 +81,8 @@ namespace BizHawk.Client.EmuHawk this.StateHistoryIntegrityCheckMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.ConfigSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.SetMaxUndoLevelsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); + this.SetBranchCellHoverIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); + this.SetSeekingCutoffIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CopyIncludesFrameNoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator26 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.autosaveToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -151,8 +153,6 @@ namespace BizHawk.Client.EmuHawk this.aboutToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator10 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.EnableTooltipsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.SetBranchCellHoverIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.SetSeekingCutoffIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.TasView = new BizHawk.Client.EmuHawk.InputRoll(); this.TasStatusStrip = new BizHawk.WinForms.Controls.StatusStripEx(); this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -178,11 +178,11 @@ namespace BizHawk.Client.EmuHawk this.cutToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.separateToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.ClearContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.DeleteFramesContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.InsertFrameContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.InsertNumFramesContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); + this.DeleteFramesContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CloneContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CloneXTimesContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); + this.InsertNumFramesContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator18 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.TruncateContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.BranchContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -433,21 +433,15 @@ namespace BizHawk.Client.EmuHawk this.ClearFramesMenuItem.Text = "Clear"; this.ClearFramesMenuItem.Click += new System.EventHandler(this.ClearFramesMenuItem_Click); // - // DeleteFramesMenuItem - // - this.DeleteFramesMenuItem.Text = "&Delete"; - this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); - // // InsertFrameMenuItem // this.InsertFrameMenuItem.Text = "&Insert"; this.InsertFrameMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); // - // InsertNumFramesMenuItem + // DeleteFramesMenuItem // - this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = ""; - this.InsertNumFramesMenuItem.Text = "Insert # of Frames"; - this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click); + this.DeleteFramesMenuItem.Text = "&Delete"; + this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); // // CloneFramesMenuItem // @@ -459,6 +453,12 @@ namespace BizHawk.Client.EmuHawk this.CloneFramesXTimesMenuItem.Text = "Clone # Times"; this.CloneFramesXTimesMenuItem.Click += new System.EventHandler(this.CloneFramesXTimesMenuItem_Click); // + // InsertNumFramesMenuItem + // + this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = ""; + this.InsertNumFramesMenuItem.Text = "Insert # of Frames"; + this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click); + // // TruncateMenuItem // this.TruncateMenuItem.Text = "&Truncate Movie"; @@ -927,7 +927,7 @@ namespace BizHawk.Client.EmuHawk // MessageStatusLabel // this.MessageStatusLabel.Name = "MessageStatusLabel"; - this.MessageStatusLabel.Size = new System.Drawing.Size(110, 17); + this.MessageStatusLabel.Size = new System.Drawing.Size(103, 17); this.MessageStatusLabel.Text = "TAStudio engaged"; // // ProgressBar @@ -938,7 +938,7 @@ namespace BizHawk.Client.EmuHawk // toolStripStatusLabel2 // this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; - this.toolStripStatusLabel2.Size = new System.Drawing.Size(262, 17); + this.toolStripStatusLabel2.Size = new System.Drawing.Size(269, 17); this.toolStripStatusLabel2.Spring = true; // // SplicerStatusLabel @@ -997,7 +997,7 @@ namespace BizHawk.Client.EmuHawk this.StartNewProjectFromNowMenuItem, this.StartANewProjectFromSaveRamMenuItem}); this.RightClickMenu.Name = "RightClickMenu"; - this.RightClickMenu.Size = new System.Drawing.Size(275, 502); + this.RightClickMenu.Size = new System.Drawing.Size(253, 524); this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened); // // SetMarkersContextMenuItem @@ -1064,20 +1064,15 @@ namespace BizHawk.Client.EmuHawk this.ClearContextMenuItem.Text = "Clear"; this.ClearContextMenuItem.Click += new System.EventHandler(this.ClearFramesMenuItem_Click); // - // DeleteFramesContextMenuItem - // - this.DeleteFramesContextMenuItem.Text = "Delete"; - this.DeleteFramesContextMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); - // // InsertFrameContextMenuItem // this.InsertFrameContextMenuItem.Text = "Insert"; this.InsertFrameContextMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); // - // InsertNumFramesContextMenuItem + // DeleteFramesContextMenuItem // - this.InsertNumFramesContextMenuItem.Text = "Insert # of Frames"; - this.InsertNumFramesContextMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click); + this.DeleteFramesContextMenuItem.Text = "Delete"; + this.DeleteFramesContextMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); // // CloneContextMenuItem // @@ -1089,6 +1084,11 @@ namespace BizHawk.Client.EmuHawk this.CloneXTimesContextMenuItem.Text = "Clone # Times"; this.CloneXTimesContextMenuItem.Click += new System.EventHandler(this.CloneFramesXTimesMenuItem_Click); // + // InsertNumFramesContextMenuItem + // + this.InsertNumFramesContextMenuItem.Text = "Insert # of Frames"; + this.InsertNumFramesContextMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click); + // // TruncateContextMenuItem // this.TruncateContextMenuItem.Text = "Truncate Movie";