From 3be6c8917ca0bf9448d42b2e60d49ba2338e3c71 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Sat, 3 Dec 2016 09:36:35 -0500 Subject: [PATCH] TAStudio fix default window size Prevents marker and branch bozes from having zero size. --- .../tools/TAStudio/PlaybackBox.Designer.cs | 14 +- .../tools/TAStudio/TAStudio.Designer.cs | 370 +++++++++--------- .../tools/TAStudio/TAStudio.cs | 5 + 3 files changed, 207 insertions(+), 182 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs index dade7783ff..6c57792985 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs @@ -57,7 +57,7 @@ this.PlaybackGroupBox.Controls.Add(this.PreviousMarkerButton); this.PlaybackGroupBox.Location = new System.Drawing.Point(3, 3); this.PlaybackGroupBox.Name = "PlaybackGroupBox"; - this.PlaybackGroupBox.Size = new System.Drawing.Size(198, 104); + this.PlaybackGroupBox.Size = new System.Drawing.Size(252, 104); this.PlaybackGroupBox.TabIndex = 0; this.PlaybackGroupBox.TabStop = false; this.PlaybackGroupBox.Text = "Playback"; @@ -67,7 +67,7 @@ this.RecordingModeCheckbox.AutoSize = true; this.RecordingModeCheckbox.Location = new System.Drawing.Point(10, 85); this.RecordingModeCheckbox.Name = "RecordingModeCheckbox"; - this.RecordingModeCheckbox.Size = new System.Drawing.Size(104, 17); + this.RecordingModeCheckbox.Size = new System.Drawing.Size(134, 21); this.RecordingModeCheckbox.TabIndex = 9; this.RecordingModeCheckbox.Text = "Recording mode"; this.RecordingModeCheckbox.UseVisualStyleBackColor = true; @@ -78,7 +78,7 @@ this.AutoRestoreCheckbox.AutoSize = true; this.AutoRestoreCheckbox.Location = new System.Drawing.Point(10, 64); this.AutoRestoreCheckbox.Name = "AutoRestoreCheckbox"; - this.AutoRestoreCheckbox.Size = new System.Drawing.Size(141, 17); + this.AutoRestoreCheckbox.Size = new System.Drawing.Size(188, 21); this.AutoRestoreCheckbox.TabIndex = 8; this.AutoRestoreCheckbox.Text = "Auto-restore last position"; this.AutoRestoreCheckbox.UseVisualStyleBackColor = true; @@ -87,9 +87,9 @@ // TurboSeekCheckbox // this.TurboSeekCheckbox.AutoSize = true; - this.TurboSeekCheckbox.Location = new System.Drawing.Point(103, 43); + this.TurboSeekCheckbox.Location = new System.Drawing.Point(131, 43); this.TurboSeekCheckbox.Name = "TurboSeekCheckbox"; - this.TurboSeekCheckbox.Size = new System.Drawing.Size(80, 17); + this.TurboSeekCheckbox.Size = new System.Drawing.Size(102, 21); this.TurboSeekCheckbox.TabIndex = 6; this.TurboSeekCheckbox.Text = "Turbo seek"; this.TurboSeekCheckbox.UseVisualStyleBackColor = true; @@ -100,7 +100,7 @@ this.FollowCursorCheckbox.AutoSize = true; this.FollowCursorCheckbox.Location = new System.Drawing.Point(10, 43); this.FollowCursorCheckbox.Name = "FollowCursorCheckbox"; - this.FollowCursorCheckbox.Size = new System.Drawing.Size(89, 17); + this.FollowCursorCheckbox.Size = new System.Drawing.Size(115, 21); this.FollowCursorCheckbox.TabIndex = 5; this.FollowCursorCheckbox.Text = "Follow Cursor"; this.FollowCursorCheckbox.UseVisualStyleBackColor = true; @@ -169,7 +169,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.PlaybackGroupBox); this.Name = "PlaybackBox"; - this.Size = new System.Drawing.Size(204, 110); + this.Size = new System.Drawing.Size(258, 110); this.PlaybackGroupBox.ResumeLayout(false); this.PlaybackGroupBox.PerformLayout(); this.ResumeLayout(false); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 23d753033e..b091c9b2e8 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -211,6 +211,7 @@ namespace BizHawk.Client.EmuHawk // TASMenu // this.TASMenu.ClickThrough = true; + this.TASMenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.TASMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu, this.EditSubMenu, @@ -221,7 +222,8 @@ namespace BizHawk.Client.EmuHawk this.HelpSubMenu}); this.TASMenu.Location = new System.Drawing.Point(0, 0); this.TASMenu.Name = "TASMenu"; - this.TASMenu.Size = new System.Drawing.Size(509, 24); + this.TASMenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); + this.TASMenu.Size = new System.Drawing.Size(742, 28); this.TASMenu.TabIndex = 0; this.TASMenu.Text = "menuStrip1"; this.TASMenu.MenuActivate += new System.EventHandler(this.TASMenu_MenuActivate); @@ -247,7 +249,7 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator2, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(35, 20); + this.FileSubMenu.Size = new System.Drawing.Size(44, 24); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -255,7 +257,7 @@ namespace BizHawk.Client.EmuHawk // this.NewTASMenuItem.Name = "NewTASMenuItem"; this.NewTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.NewTASMenuItem.Size = new System.Drawing.Size(201, 22); + this.NewTASMenuItem.Size = new System.Drawing.Size(247, 26); this.NewTASMenuItem.Text = "&New"; this.NewTASMenuItem.Click += new System.EventHandler(this.NewTasMenuItem_Click); // @@ -265,21 +267,21 @@ namespace BizHawk.Client.EmuHawk this.NewFromNowMenuItem, this.NewFromCurrentSaveRamMenuItem}); this.NewFromSubMenu.Name = "NewFromSubMenu"; - this.NewFromSubMenu.Size = new System.Drawing.Size(201, 22); + this.NewFromSubMenu.Size = new System.Drawing.Size(247, 26); this.NewFromSubMenu.Text = "New From"; this.NewFromSubMenu.DropDownOpened += new System.EventHandler(this.NewFromSubMenu_DropDownOpened); // // NewFromNowMenuItem // this.NewFromNowMenuItem.Name = "NewFromNowMenuItem"; - this.NewFromNowMenuItem.Size = new System.Drawing.Size(170, 22); + this.NewFromNowMenuItem.Size = new System.Drawing.Size(197, 26); this.NewFromNowMenuItem.Text = "&Now"; this.NewFromNowMenuItem.Click += new System.EventHandler(this.StartNewProjectFromNowMenuItem_Click); // // NewFromCurrentSaveRamMenuItem // this.NewFromCurrentSaveRamMenuItem.Name = "NewFromCurrentSaveRamMenuItem"; - this.NewFromCurrentSaveRamMenuItem.Size = new System.Drawing.Size(170, 22); + this.NewFromCurrentSaveRamMenuItem.Size = new System.Drawing.Size(197, 26); this.NewFromCurrentSaveRamMenuItem.Text = "&Current SaveRam"; this.NewFromCurrentSaveRamMenuItem.Click += new System.EventHandler(this.StartANewProjectFromSaveRamMenuItem_Click); // @@ -287,7 +289,7 @@ namespace BizHawk.Client.EmuHawk // this.OpenTASMenuItem.Name = "OpenTASMenuItem"; this.OpenTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.OpenTASMenuItem.Size = new System.Drawing.Size(201, 22); + this.OpenTASMenuItem.Size = new System.Drawing.Size(247, 26); this.OpenTASMenuItem.Text = "&Open"; this.OpenTASMenuItem.Click += new System.EventHandler(this.OpenTasMenuItem_Click); // @@ -295,7 +297,7 @@ namespace BizHawk.Client.EmuHawk // this.SaveTASMenuItem.Name = "SaveTASMenuItem"; this.SaveTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.SaveTASMenuItem.Size = new System.Drawing.Size(201, 22); + this.SaveTASMenuItem.Size = new System.Drawing.Size(247, 26); this.SaveTASMenuItem.Text = "&Save"; this.SaveTASMenuItem.Click += new System.EventHandler(this.SaveTasMenuItem_Click); // @@ -304,21 +306,21 @@ namespace BizHawk.Client.EmuHawk this.SaveAsTASMenuItem.Name = "SaveAsTASMenuItem"; this.SaveAsTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.SaveAsTASMenuItem.Size = new System.Drawing.Size(201, 22); + this.SaveAsTASMenuItem.Size = new System.Drawing.Size(247, 26); this.SaveAsTASMenuItem.Text = "Save As"; this.SaveAsTASMenuItem.Click += new System.EventHandler(this.SaveAsTasMenuItem_Click); // // SaveBackupMenuItem // this.SaveBackupMenuItem.Name = "SaveBackupMenuItem"; - this.SaveBackupMenuItem.Size = new System.Drawing.Size(201, 22); + this.SaveBackupMenuItem.Size = new System.Drawing.Size(247, 26); this.SaveBackupMenuItem.Text = "Save Backup"; this.SaveBackupMenuItem.Click += new System.EventHandler(this.SaveBackupMenuItem_Click); // // SaveBk2BackupMenuItem // this.SaveBk2BackupMenuItem.Name = "SaveBk2BackupMenuItem"; - this.SaveBk2BackupMenuItem.Size = new System.Drawing.Size(201, 22); + this.SaveBk2BackupMenuItem.Size = new System.Drawing.Size(247, 26); this.SaveBk2BackupMenuItem.Text = "Save Bk2 Backup"; this.SaveBk2BackupMenuItem.Visible = false; this.SaveBk2BackupMenuItem.Click += new System.EventHandler(this.SaveBk2BackupMenuItem_Click); @@ -329,31 +331,31 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator3}); this.RecentSubMenu.Image = ((System.Drawing.Image)(resources.GetObject("RecentSubMenu.Image"))); this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(201, 22); + this.RecentSubMenu.Size = new System.Drawing.Size(247, 26); this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(63, 6); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(198, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(244, 6); // // saveSelectionToMacroToolStripMenuItem // this.saveSelectionToMacroToolStripMenuItem.Name = "saveSelectionToMacroToolStripMenuItem"; - this.saveSelectionToMacroToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.saveSelectionToMacroToolStripMenuItem.Size = new System.Drawing.Size(247, 26); this.saveSelectionToMacroToolStripMenuItem.Text = "Save Selection to Macro"; this.saveSelectionToMacroToolStripMenuItem.Click += new System.EventHandler(this.saveSelectionToMacroToolStripMenuItem_Click); // // placeMacroAtSelectionToolStripMenuItem // this.placeMacroAtSelectionToolStripMenuItem.Name = "placeMacroAtSelectionToolStripMenuItem"; - this.placeMacroAtSelectionToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.placeMacroAtSelectionToolStripMenuItem.Size = new System.Drawing.Size(247, 26); this.placeMacroAtSelectionToolStripMenuItem.Text = "Place Macro at Selection"; this.placeMacroAtSelectionToolStripMenuItem.Click += new System.EventHandler(this.placeMacroAtSelectionToolStripMenuItem_Click); // @@ -363,37 +365,37 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator22}); this.recentMacrosToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.recentMacrosToolStripMenuItem.Name = "recentMacrosToolStripMenuItem"; - this.recentMacrosToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.recentMacrosToolStripMenuItem.Size = new System.Drawing.Size(247, 26); this.recentMacrosToolStripMenuItem.Text = "Recent Macros"; this.recentMacrosToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentMacrosToolStripMenuItem_DropDownOpened); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(57, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(63, 6); // // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(198, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(244, 6); // // ToBk2MenuItem // this.ToBk2MenuItem.Name = "ToBk2MenuItem"; - this.ToBk2MenuItem.Size = new System.Drawing.Size(201, 22); + this.ToBk2MenuItem.Size = new System.Drawing.Size(247, 26); this.ToBk2MenuItem.Text = "&Export to Bk2"; this.ToBk2MenuItem.Click += new System.EventHandler(this.ToBk2MenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(198, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(244, 6); // // ExitMenuItem // this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Size = new System.Drawing.Size(201, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(247, 26); this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -427,7 +429,7 @@ namespace BizHawk.Client.EmuHawk this.GreenzoneICheckSeparator, this.StateHistoryIntegrityCheckMenuItem}); this.EditSubMenu.Name = "EditSubMenu"; - this.EditSubMenu.Size = new System.Drawing.Size(37, 20); + this.EditSubMenu.Size = new System.Drawing.Size(47, 24); this.EditSubMenu.Text = "&Edit"; this.EditSubMenu.DropDownOpened += new System.EventHandler(this.EditSubMenu_DropDownOpened); // @@ -435,7 +437,7 @@ namespace BizHawk.Client.EmuHawk // this.UndoMenuItem.Name = "UndoMenuItem"; this.UndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.UndoMenuItem.Size = new System.Drawing.Size(291, 22); + this.UndoMenuItem.Size = new System.Drawing.Size(357, 26); this.UndoMenuItem.Text = "&Undo"; this.UndoMenuItem.Click += new System.EventHandler(this.UndoMenuItem_Click); // @@ -444,14 +446,14 @@ namespace BizHawk.Client.EmuHawk this.RedoMenuItem.Enabled = false; this.RedoMenuItem.Name = "RedoMenuItem"; this.RedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.RedoMenuItem.Size = new System.Drawing.Size(291, 22); + this.RedoMenuItem.Size = new System.Drawing.Size(357, 26); this.RedoMenuItem.Text = "&Redo"; this.RedoMenuItem.Click += new System.EventHandler(this.RedoMenuItem_Click); // // showUndoHistoryToolStripMenuItem // this.showUndoHistoryToolStripMenuItem.Name = "showUndoHistoryToolStripMenuItem"; - this.showUndoHistoryToolStripMenuItem.Size = new System.Drawing.Size(291, 22); + this.showUndoHistoryToolStripMenuItem.Size = new System.Drawing.Size(357, 26); this.showUndoHistoryToolStripMenuItem.Text = "Show Undo History"; this.showUndoHistoryToolStripMenuItem.Click += new System.EventHandler(this.showUndoHistoryToolStripMenuItem_Click); // @@ -460,7 +462,7 @@ namespace BizHawk.Client.EmuHawk this.SelectionUndoMenuItem.Enabled = false; this.SelectionUndoMenuItem.Name = "SelectionUndoMenuItem"; this.SelectionUndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); - this.SelectionUndoMenuItem.Size = new System.Drawing.Size(291, 22); + this.SelectionUndoMenuItem.Size = new System.Drawing.Size(357, 26); this.SelectionUndoMenuItem.Text = "Selection Undo"; // // SelectionRedoMenuItem @@ -468,18 +470,18 @@ namespace BizHawk.Client.EmuHawk this.SelectionRedoMenuItem.Enabled = false; this.SelectionRedoMenuItem.Name = "SelectionRedoMenuItem"; this.SelectionRedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); - this.SelectionRedoMenuItem.Size = new System.Drawing.Size(291, 22); + this.SelectionRedoMenuItem.Size = new System.Drawing.Size(357, 26); this.SelectionRedoMenuItem.Text = "Selection Redo"; // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(288, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(354, 6); // // DeselectMenuItem // this.DeselectMenuItem.Name = "DeselectMenuItem"; - this.DeselectMenuItem.Size = new System.Drawing.Size(291, 22); + this.DeselectMenuItem.Size = new System.Drawing.Size(357, 26); this.DeselectMenuItem.Text = "Deselect"; this.DeselectMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); // @@ -487,7 +489,7 @@ namespace BizHawk.Client.EmuHawk // this.SelectBetweenMarkersMenuItem.Name = "SelectBetweenMarkersMenuItem"; this.SelectBetweenMarkersMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(291, 22); + this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(357, 26); this.SelectBetweenMarkersMenuItem.Text = "Select between Markers"; this.SelectBetweenMarkersMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click); // @@ -497,7 +499,7 @@ namespace BizHawk.Client.EmuHawk this.SelectAllMenuItem.ShortcutKeyDisplayString = ""; this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.A))); - this.SelectAllMenuItem.Size = new System.Drawing.Size(291, 22); + this.SelectAllMenuItem.Size = new System.Drawing.Size(357, 26); this.SelectAllMenuItem.Text = "Select &All"; this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); // @@ -505,20 +507,20 @@ namespace BizHawk.Client.EmuHawk // this.ReselectClipboardMenuItem.Name = "ReselectClipboardMenuItem"; this.ReselectClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); - this.ReselectClipboardMenuItem.Size = new System.Drawing.Size(291, 22); + this.ReselectClipboardMenuItem.Size = new System.Drawing.Size(357, 26); this.ReselectClipboardMenuItem.Text = "Reselect Clipboard"; this.ReselectClipboardMenuItem.Click += new System.EventHandler(this.ReselectClipboardMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(288, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(354, 6); // // CopyMenuItem // this.CopyMenuItem.Name = "CopyMenuItem"; this.CopyMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.CopyMenuItem.Size = new System.Drawing.Size(291, 22); + this.CopyMenuItem.Size = new System.Drawing.Size(357, 26); this.CopyMenuItem.Text = "Copy"; this.CopyMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click); // @@ -526,7 +528,7 @@ namespace BizHawk.Client.EmuHawk // this.PasteMenuItem.Name = "PasteMenuItem"; this.PasteMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.PasteMenuItem.Size = new System.Drawing.Size(291, 22); + this.PasteMenuItem.Size = new System.Drawing.Size(357, 26); this.PasteMenuItem.Text = "&Paste"; this.PasteMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click); // @@ -535,7 +537,7 @@ namespace BizHawk.Client.EmuHawk this.PasteInsertMenuItem.Name = "PasteInsertMenuItem"; this.PasteInsertMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.V))); - this.PasteInsertMenuItem.Size = new System.Drawing.Size(291, 22); + this.PasteInsertMenuItem.Size = new System.Drawing.Size(357, 26); this.PasteInsertMenuItem.Text = "&Paste Insert"; this.PasteInsertMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click); // @@ -543,41 +545,41 @@ namespace BizHawk.Client.EmuHawk // this.CutMenuItem.Name = "CutMenuItem"; this.CutMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); - this.CutMenuItem.Size = new System.Drawing.Size(291, 22); + this.CutMenuItem.Size = new System.Drawing.Size(357, 26); this.CutMenuItem.Text = "&Cut"; this.CutMenuItem.Click += new System.EventHandler(this.CutMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(288, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(354, 6); // // ClearFramesMenuItem // this.ClearFramesMenuItem.Name = "ClearFramesMenuItem"; this.ClearFramesMenuItem.ShortcutKeyDisplayString = ""; - this.ClearFramesMenuItem.Size = new System.Drawing.Size(291, 22); + this.ClearFramesMenuItem.Size = new System.Drawing.Size(357, 26); this.ClearFramesMenuItem.Text = "Clear"; this.ClearFramesMenuItem.Click += new System.EventHandler(this.ClearFramesMenuItem_Click); // // InsertFrameMenuItem // this.InsertFrameMenuItem.Name = "InsertFrameMenuItem"; - this.InsertFrameMenuItem.Size = new System.Drawing.Size(291, 22); + this.InsertFrameMenuItem.Size = new System.Drawing.Size(357, 26); this.InsertFrameMenuItem.Text = "&Insert"; this.InsertFrameMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); // // DeleteFramesMenuItem // this.DeleteFramesMenuItem.Name = "DeleteFramesMenuItem"; - this.DeleteFramesMenuItem.Size = new System.Drawing.Size(291, 22); + this.DeleteFramesMenuItem.Size = new System.Drawing.Size(357, 26); this.DeleteFramesMenuItem.Text = "&Delete"; this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); // // CloneFramesMenuItem // this.CloneFramesMenuItem.Name = "CloneFramesMenuItem"; - this.CloneFramesMenuItem.Size = new System.Drawing.Size(291, 22); + this.CloneFramesMenuItem.Size = new System.Drawing.Size(357, 26); this.CloneFramesMenuItem.Text = "&Clone"; this.CloneFramesMenuItem.Click += new System.EventHandler(this.CloneFramesMenuItem_Click); // @@ -587,40 +589,40 @@ namespace BizHawk.Client.EmuHawk this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = ""; this.InsertNumFramesMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.Insert))); - this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(291, 22); + this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(357, 26); this.InsertNumFramesMenuItem.Text = "Insert # of Frames"; this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(288, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(354, 6); // // TruncateMenuItem // this.TruncateMenuItem.Name = "TruncateMenuItem"; - this.TruncateMenuItem.Size = new System.Drawing.Size(291, 22); + this.TruncateMenuItem.Size = new System.Drawing.Size(357, 26); this.TruncateMenuItem.Text = "&Truncate Movie"; this.TruncateMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); // // ClearGreenzoneMenuItem // this.ClearGreenzoneMenuItem.Name = "ClearGreenzoneMenuItem"; - this.ClearGreenzoneMenuItem.Size = new System.Drawing.Size(291, 22); + this.ClearGreenzoneMenuItem.Size = new System.Drawing.Size(357, 26); this.ClearGreenzoneMenuItem.Text = "&Clear Savestate History"; this.ClearGreenzoneMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click); // // GreenzoneICheckSeparator // this.GreenzoneICheckSeparator.Name = "GreenzoneICheckSeparator"; - this.GreenzoneICheckSeparator.Size = new System.Drawing.Size(288, 6); + this.GreenzoneICheckSeparator.Size = new System.Drawing.Size(354, 6); // // StateHistoryIntegrityCheckMenuItem // this.StateHistoryIntegrityCheckMenuItem.Name = "StateHistoryIntegrityCheckMenuItem"; this.StateHistoryIntegrityCheckMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.I))); - this.StateHistoryIntegrityCheckMenuItem.Size = new System.Drawing.Size(291, 22); + this.StateHistoryIntegrityCheckMenuItem.Size = new System.Drawing.Size(357, 26); this.StateHistoryIntegrityCheckMenuItem.Text = "State History Integrity Check"; this.StateHistoryIntegrityCheckMenuItem.Click += new System.EventHandler(this.StateHistoryIntegrityCheckMenuItem_Click); // @@ -652,28 +654,28 @@ namespace BizHawk.Client.EmuHawk this.sepToolStripMenuItem, this.autoHoldFireToolStripMenuItem}); this.ConfigSubMenu.Name = "ConfigSubMenu"; - this.ConfigSubMenu.Size = new System.Drawing.Size(50, 20); + this.ConfigSubMenu.Size = new System.Drawing.Size(65, 24); this.ConfigSubMenu.Text = "&Config"; this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened); // // SetMaxUndoLevelsMenuItem // this.SetMaxUndoLevelsMenuItem.Name = "SetMaxUndoLevelsMenuItem"; - this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(255, 22); + this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(324, 26); this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels"; this.SetMaxUndoLevelsMenuItem.Click += new System.EventHandler(this.SetMaxUndoLevelsMenuItem_Click); // // SetBranchCellHoverIntervalMenuItem // this.SetBranchCellHoverIntervalMenuItem.Name = "SetBranchCellHoverIntervalMenuItem"; - this.SetBranchCellHoverIntervalMenuItem.Size = new System.Drawing.Size(255, 22); + this.SetBranchCellHoverIntervalMenuItem.Size = new System.Drawing.Size(324, 26); this.SetBranchCellHoverIntervalMenuItem.Text = "Set Branch Cell Hover Interval"; this.SetBranchCellHoverIntervalMenuItem.Click += new System.EventHandler(this.SetBranchCellHoverIntervalMenuItem_Click); // // SetSeekingCutoffIntervalMenuItem // this.SetSeekingCutoffIntervalMenuItem.Name = "SetSeekingCutoffIntervalMenuItem"; - this.SetSeekingCutoffIntervalMenuItem.Size = new System.Drawing.Size(255, 22); + this.SetSeekingCutoffIntervalMenuItem.Size = new System.Drawing.Size(324, 26); this.SetSeekingCutoffIntervalMenuItem.Text = "Set Seeking Cutoff Interval"; this.SetSeekingCutoffIntervalMenuItem.Visible = false; this.SetSeekingCutoffIntervalMenuItem.Click += new System.EventHandler(this.SetSeekingCutoffIntervalMenuItem_Click); @@ -681,7 +683,7 @@ namespace BizHawk.Client.EmuHawk // toolStripSeparator26 // this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(252, 6); + this.toolStripSeparator26.Size = new System.Drawing.Size(321, 6); // // autosaveToolStripMenuItem // @@ -690,46 +692,46 @@ namespace BizHawk.Client.EmuHawk this.AutosaveAsBk2MenuItem, this.AutosaveAsBackupFileMenuItem}); this.autosaveToolStripMenuItem.Name = "autosaveToolStripMenuItem"; - this.autosaveToolStripMenuItem.Size = new System.Drawing.Size(255, 22); + this.autosaveToolStripMenuItem.Size = new System.Drawing.Size(324, 26); this.autosaveToolStripMenuItem.Text = "Autosave"; // // SetAutosaveIntervalMenuItem // this.SetAutosaveIntervalMenuItem.Name = "SetAutosaveIntervalMenuItem"; - this.SetAutosaveIntervalMenuItem.Size = new System.Drawing.Size(202, 22); + this.SetAutosaveIntervalMenuItem.Size = new System.Drawing.Size(244, 26); this.SetAutosaveIntervalMenuItem.Text = "Set Autosave Interval"; this.SetAutosaveIntervalMenuItem.Click += new System.EventHandler(this.SetAutosaveIntervalMenuItem_Click); // // AutosaveAsBk2MenuItem // this.AutosaveAsBk2MenuItem.Name = "AutosaveAsBk2MenuItem"; - this.AutosaveAsBk2MenuItem.Size = new System.Drawing.Size(202, 22); + this.AutosaveAsBk2MenuItem.Size = new System.Drawing.Size(244, 26); this.AutosaveAsBk2MenuItem.Text = "Autosave As Bk2"; this.AutosaveAsBk2MenuItem.Click += new System.EventHandler(this.AutosaveAsBk2MenuItem_Click); // // AutosaveAsBackupFileMenuItem // this.AutosaveAsBackupFileMenuItem.Name = "AutosaveAsBackupFileMenuItem"; - this.AutosaveAsBackupFileMenuItem.Size = new System.Drawing.Size(202, 22); + this.AutosaveAsBackupFileMenuItem.Size = new System.Drawing.Size(244, 26); this.AutosaveAsBackupFileMenuItem.Text = "Autosave As Backup File"; this.AutosaveAsBackupFileMenuItem.Click += new System.EventHandler(this.AutosaveAsBackupFileMenuItem_Click); // // BackupPerFileSaveMenuItem // this.BackupPerFileSaveMenuItem.Name = "BackupPerFileSaveMenuItem"; - this.BackupPerFileSaveMenuItem.Size = new System.Drawing.Size(255, 22); + this.BackupPerFileSaveMenuItem.Size = new System.Drawing.Size(324, 26); this.BackupPerFileSaveMenuItem.Text = "Backup Per File Save"; this.BackupPerFileSaveMenuItem.Click += new System.EventHandler(this.BackupPerFileSaveMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(252, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(321, 6); // // AutoRestoreOnMouseUpOnlyMenuItem // this.AutoRestoreOnMouseUpOnlyMenuItem.Name = "AutoRestoreOnMouseUpOnlyMenuItem"; - this.AutoRestoreOnMouseUpOnlyMenuItem.Size = new System.Drawing.Size(255, 22); + this.AutoRestoreOnMouseUpOnlyMenuItem.Size = new System.Drawing.Size(324, 26); this.AutoRestoreOnMouseUpOnlyMenuItem.Text = "Auto-restore on Mouse Up only"; this.AutoRestoreOnMouseUpOnlyMenuItem.Click += new System.EventHandler(this.AutoRestoreOnMouseUpOnlyMenuItem_Click); // @@ -737,13 +739,13 @@ namespace BizHawk.Client.EmuHawk // this.AutoadjustInputMenuItem.CheckOnClick = true; this.AutoadjustInputMenuItem.Name = "AutoadjustInputMenuItem"; - this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(255, 22); + this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(324, 26); this.AutoadjustInputMenuItem.Text = "Auto-adjust Input according to Lag"; // // DrawInputByDraggingMenuItem // this.DrawInputByDraggingMenuItem.Name = "DrawInputByDraggingMenuItem"; - this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(255, 22); + this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(324, 26); this.DrawInputByDraggingMenuItem.Text = "Draw Input by dragging"; this.DrawInputByDraggingMenuItem.Click += new System.EventHandler(this.DrawInputByDraggingMenuItem_Click); // @@ -751,7 +753,7 @@ namespace BizHawk.Client.EmuHawk // this.applyPatternToPaintedInputToolStripMenuItem.CheckOnClick = true; this.applyPatternToPaintedInputToolStripMenuItem.Name = "applyPatternToPaintedInputToolStripMenuItem"; - this.applyPatternToPaintedInputToolStripMenuItem.Size = new System.Drawing.Size(255, 22); + this.applyPatternToPaintedInputToolStripMenuItem.Size = new System.Drawing.Size(324, 26); this.applyPatternToPaintedInputToolStripMenuItem.Text = "Apply Pattern to painted input"; this.applyPatternToPaintedInputToolStripMenuItem.CheckedChanged += new System.EventHandler(this.applyPatternToPaintedInputToolStripMenuItem_CheckedChanged); // @@ -762,14 +764,14 @@ namespace BizHawk.Client.EmuHawk this.onlyOnAutoFireColumnsToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.onlyOnAutoFireColumnsToolStripMenuItem.Enabled = false; this.onlyOnAutoFireColumnsToolStripMenuItem.Name = "onlyOnAutoFireColumnsToolStripMenuItem"; - this.onlyOnAutoFireColumnsToolStripMenuItem.Size = new System.Drawing.Size(255, 22); + this.onlyOnAutoFireColumnsToolStripMenuItem.Size = new System.Drawing.Size(324, 26); this.onlyOnAutoFireColumnsToolStripMenuItem.Text = "Only on Auto-Fire columns"; // // SingleClickFloatEditMenuItem // this.SingleClickFloatEditMenuItem.Enabled = false; this.SingleClickFloatEditMenuItem.Name = "SingleClickFloatEditMenuItem"; - this.SingleClickFloatEditMenuItem.Size = new System.Drawing.Size(255, 22); + this.SingleClickFloatEditMenuItem.Size = new System.Drawing.Size(324, 26); this.SingleClickFloatEditMenuItem.Text = "Enter Float Edit mode by single click"; this.SingleClickFloatEditMenuItem.Click += new System.EventHandler(this.SingleClickFloatEditMenuItem_Click); // @@ -777,13 +779,13 @@ namespace BizHawk.Client.EmuHawk // this.UseInputKeysItem.Enabled = false; this.UseInputKeysItem.Name = "UseInputKeysItem"; - this.UseInputKeysItem.Size = new System.Drawing.Size(255, 22); + this.UseInputKeysItem.Size = new System.Drawing.Size(324, 26); this.UseInputKeysItem.Text = "Use Input keys for Column Set"; // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(252, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(321, 6); // // BindMarkersToInputMenuItem // @@ -791,52 +793,52 @@ namespace BizHawk.Client.EmuHawk this.BindMarkersToInputMenuItem.CheckOnClick = true; this.BindMarkersToInputMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.BindMarkersToInputMenuItem.Name = "BindMarkersToInputMenuItem"; - this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(255, 22); + this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(324, 26); this.BindMarkersToInputMenuItem.Text = "Bind Markers to Input"; this.BindMarkersToInputMenuItem.Click += new System.EventHandler(this.BindMarkersToInputMenuItem_Click); // // EmptyNewMarkerNotesMenuItem // this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem"; - this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(255, 22); + this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(324, 26); this.EmptyNewMarkerNotesMenuItem.Text = "Empty new Marker Notes"; this.EmptyNewMarkerNotesMenuItem.Click += new System.EventHandler(this.EmptyNewMarkerNotesMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(252, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(321, 6); // // BranchesRestoreEntireMovieMenuItem // this.BranchesRestoreEntireMovieMenuItem.Enabled = false; this.BranchesRestoreEntireMovieMenuItem.Name = "BranchesRestoreEntireMovieMenuItem"; - this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(255, 22); + this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(324, 26); this.BranchesRestoreEntireMovieMenuItem.Text = "Branches restore entire Movie"; // // OsdInBranchScreenshotsMenuItem // this.OsdInBranchScreenshotsMenuItem.Enabled = false; this.OsdInBranchScreenshotsMenuItem.Name = "OsdInBranchScreenshotsMenuItem"; - this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(255, 22); + this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(324, 26); this.OsdInBranchScreenshotsMenuItem.Text = "OSD in Branch screenshots"; // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(252, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(321, 6); // // AutopauseAtEndOfMovieMenuItem // this.AutopauseAtEndOfMovieMenuItem.Name = "AutopauseAtEndOfMovieMenuItem"; - this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(255, 22); + this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(324, 26); this.AutopauseAtEndOfMovieMenuItem.Text = "Autopause at end of Movie"; this.AutopauseAtEndOfMovieMenuItem.Click += new System.EventHandler(this.AutopauseAtEndMenuItem_Click); // // sepToolStripMenuItem // this.sepToolStripMenuItem.Name = "sepToolStripMenuItem"; - this.sepToolStripMenuItem.Size = new System.Drawing.Size(252, 6); + this.sepToolStripMenuItem.Size = new System.Drawing.Size(321, 6); // // autoHoldFireToolStripMenuItem // @@ -849,20 +851,20 @@ namespace BizHawk.Client.EmuHawk this.setpToolStripMenuItem, this.setCustomsToolStripMenuItem}); this.autoHoldFireToolStripMenuItem.Name = "autoHoldFireToolStripMenuItem"; - this.autoHoldFireToolStripMenuItem.Size = new System.Drawing.Size(255, 22); + this.autoHoldFireToolStripMenuItem.Size = new System.Drawing.Size(324, 26); this.autoHoldFireToolStripMenuItem.Text = "Auto Hold/Fire"; // // keepSetPatternsToolStripMenuItem // this.keepSetPatternsToolStripMenuItem.CheckOnClick = true; this.keepSetPatternsToolStripMenuItem.Name = "keepSetPatternsToolStripMenuItem"; - this.keepSetPatternsToolStripMenuItem.Size = new System.Drawing.Size(171, 22); + this.keepSetPatternsToolStripMenuItem.Size = new System.Drawing.Size(199, 26); this.keepSetPatternsToolStripMenuItem.Text = "Keep set patterns"; // // sepToolStripMenuItem1 // this.sepToolStripMenuItem1.Name = "sepToolStripMenuItem1"; - this.sepToolStripMenuItem1.Size = new System.Drawing.Size(168, 6); + this.sepToolStripMenuItem1.Size = new System.Drawing.Size(196, 6); // // autoHoldToolStripMenuItem // @@ -870,7 +872,7 @@ namespace BizHawk.Client.EmuHawk this.autoHoldToolStripMenuItem.CheckOnClick = true; this.autoHoldToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.autoHoldToolStripMenuItem.Name = "autoHoldToolStripMenuItem"; - this.autoHoldToolStripMenuItem.Size = new System.Drawing.Size(171, 22); + this.autoHoldToolStripMenuItem.Size = new System.Drawing.Size(199, 26); this.autoHoldToolStripMenuItem.Text = "Auto-Hold"; this.autoHoldToolStripMenuItem.CheckedChanged += new System.EventHandler(this.autoHoldToolStripMenuItem_CheckedChanged); // @@ -878,7 +880,7 @@ namespace BizHawk.Client.EmuHawk // this.autoFireToolStripMenuItem.CheckOnClick = true; this.autoFireToolStripMenuItem.Name = "autoFireToolStripMenuItem"; - this.autoFireToolStripMenuItem.Size = new System.Drawing.Size(171, 22); + this.autoFireToolStripMenuItem.Size = new System.Drawing.Size(199, 26); this.autoFireToolStripMenuItem.Text = "Auto-Fire"; this.autoFireToolStripMenuItem.CheckedChanged += new System.EventHandler(this.autoFireToolStripMenuItem_CheckedChanged); // @@ -886,19 +888,19 @@ namespace BizHawk.Client.EmuHawk // this.customPatternToolStripMenuItem.CheckOnClick = true; this.customPatternToolStripMenuItem.Name = "customPatternToolStripMenuItem"; - this.customPatternToolStripMenuItem.Size = new System.Drawing.Size(171, 22); + this.customPatternToolStripMenuItem.Size = new System.Drawing.Size(199, 26); this.customPatternToolStripMenuItem.Text = "Custom Pattern"; this.customPatternToolStripMenuItem.CheckedChanged += new System.EventHandler(this.customPatternToolStripMenuItem_CheckedChanged); // // setpToolStripMenuItem // this.setpToolStripMenuItem.Name = "setpToolStripMenuItem"; - this.setpToolStripMenuItem.Size = new System.Drawing.Size(168, 6); + this.setpToolStripMenuItem.Size = new System.Drawing.Size(196, 6); // // setCustomsToolStripMenuItem // this.setCustomsToolStripMenuItem.Name = "setCustomsToolStripMenuItem"; - this.setCustomsToolStripMenuItem.Size = new System.Drawing.Size(171, 22); + this.setCustomsToolStripMenuItem.Size = new System.Drawing.Size(199, 26); this.setCustomsToolStripMenuItem.Text = "Set Customs..."; this.setCustomsToolStripMenuItem.Click += new System.EventHandler(this.setCustomsToolStripMenuItem_Click); // @@ -912,46 +914,46 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator21, this.DefaultStateSettingsMenuItem}); this.MetaSubMenu.Name = "MetaSubMenu"; - this.MetaSubMenu.Size = new System.Drawing.Size(65, 20); + this.MetaSubMenu.Size = new System.Drawing.Size(85, 24); this.MetaSubMenu.Text = "&Metadata"; // // HeaderMenuItem // this.HeaderMenuItem.Name = "HeaderMenuItem"; - this.HeaderMenuItem.Size = new System.Drawing.Size(240, 22); + this.HeaderMenuItem.Size = new System.Drawing.Size(288, 26); this.HeaderMenuItem.Text = "&Header..."; this.HeaderMenuItem.Click += new System.EventHandler(this.HeaderMenuItem_Click); // // StateHistorySettingsMenuItem // this.StateHistorySettingsMenuItem.Name = "StateHistorySettingsMenuItem"; - this.StateHistorySettingsMenuItem.Size = new System.Drawing.Size(240, 22); + this.StateHistorySettingsMenuItem.Size = new System.Drawing.Size(288, 26); this.StateHistorySettingsMenuItem.Text = "&Savestate History Settings..."; this.StateHistorySettingsMenuItem.Click += new System.EventHandler(this.StateHistorySettingsMenuItem_Click); // // CommentsMenuItem // this.CommentsMenuItem.Name = "CommentsMenuItem"; - this.CommentsMenuItem.Size = new System.Drawing.Size(240, 22); + this.CommentsMenuItem.Size = new System.Drawing.Size(288, 26); this.CommentsMenuItem.Text = "&Comments..."; this.CommentsMenuItem.Click += new System.EventHandler(this.CommentsMenuItem_Click); // // SubtitlesMenuItem // this.SubtitlesMenuItem.Name = "SubtitlesMenuItem"; - this.SubtitlesMenuItem.Size = new System.Drawing.Size(240, 22); + this.SubtitlesMenuItem.Size = new System.Drawing.Size(288, 26); this.SubtitlesMenuItem.Text = "&Subtitles..."; this.SubtitlesMenuItem.Click += new System.EventHandler(this.SubtitlesMenuItem_Click); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(237, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(285, 6); // // DefaultStateSettingsMenuItem // this.DefaultStateSettingsMenuItem.Name = "DefaultStateSettingsMenuItem"; - this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(240, 22); + this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(288, 26); this.DefaultStateSettingsMenuItem.Text = "&Default State History Settings..."; this.DefaultStateSettingsMenuItem.Click += new System.EventHandler(this.DefaultStateSettingsMenuItem_Click); // @@ -966,14 +968,14 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator25, this.wheelScrollSpeedToolStripMenuItem}); this.SettingsSubMenu.Name = "SettingsSubMenu"; - this.SettingsSubMenu.Size = new System.Drawing.Size(58, 20); + this.SettingsSubMenu.Size = new System.Drawing.Size(74, 24); this.SettingsSubMenu.Text = "&Settings"; this.SettingsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened); // // RotateMenuItem // this.RotateMenuItem.Name = "RotateMenuItem"; - this.RotateMenuItem.Size = new System.Drawing.Size(188, 22); + this.RotateMenuItem.Size = new System.Drawing.Size(222, 26); this.RotateMenuItem.Text = "Rotate"; this.RotateMenuItem.Click += new System.EventHandler(this.RotateMenuItem_Click); // @@ -987,7 +989,7 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator12, this.hideWasLagFramesToolStripMenuItem}); this.HideLagFramesSubMenu.Name = "HideLagFramesSubMenu"; - this.HideLagFramesSubMenu.Size = new System.Drawing.Size(188, 22); + this.HideLagFramesSubMenu.Size = new System.Drawing.Size(222, 26); this.HideLagFramesSubMenu.Text = "Hide Lag Frames"; this.HideLagFramesSubMenu.DropDownOpened += new System.EventHandler(this.HideLagFramesSubMenu_DropDownOpened); // @@ -997,7 +999,7 @@ namespace BizHawk.Client.EmuHawk this.HideLagFrames0.CheckOnClick = true; this.HideLagFrames0.CheckState = System.Windows.Forms.CheckState.Checked; this.HideLagFrames0.Name = "HideLagFrames0"; - this.HideLagFrames0.Size = new System.Drawing.Size(185, 22); + this.HideLagFrames0.Size = new System.Drawing.Size(222, 26); this.HideLagFrames0.Tag = 0; this.HideLagFrames0.Text = "Don\'t Hide"; this.HideLagFrames0.Click += new System.EventHandler(this.HideLagFramesX_Click); @@ -1006,7 +1008,7 @@ namespace BizHawk.Client.EmuHawk // this.HideLagFrames1.CheckOnClick = true; this.HideLagFrames1.Name = "HideLagFrames1"; - this.HideLagFrames1.Size = new System.Drawing.Size(185, 22); + this.HideLagFrames1.Size = new System.Drawing.Size(222, 26); this.HideLagFrames1.Tag = 1; this.HideLagFrames1.Text = "1 (30 fps)"; this.HideLagFrames1.Click += new System.EventHandler(this.HideLagFramesX_Click); @@ -1014,7 +1016,7 @@ namespace BizHawk.Client.EmuHawk // HideLagFrames2 // this.HideLagFrames2.Name = "HideLagFrames2"; - this.HideLagFrames2.Size = new System.Drawing.Size(185, 22); + this.HideLagFrames2.Size = new System.Drawing.Size(222, 26); this.HideLagFrames2.Tag = 2; this.HideLagFrames2.Text = "2 (20 fps)"; this.HideLagFrames2.Click += new System.EventHandler(this.HideLagFramesX_Click); @@ -1023,7 +1025,7 @@ namespace BizHawk.Client.EmuHawk // this.HideLagFrames3.CheckOnClick = true; this.HideLagFrames3.Name = "HideLagFrames3"; - this.HideLagFrames3.Size = new System.Drawing.Size(185, 22); + this.HideLagFrames3.Size = new System.Drawing.Size(222, 26); this.HideLagFrames3.Tag = 3; this.HideLagFrames3.Text = "3 (15fps)"; this.HideLagFrames3.Click += new System.EventHandler(this.HideLagFramesX_Click); @@ -1031,13 +1033,13 @@ namespace BizHawk.Client.EmuHawk // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(182, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(219, 6); // // hideWasLagFramesToolStripMenuItem // this.hideWasLagFramesToolStripMenuItem.CheckOnClick = true; this.hideWasLagFramesToolStripMenuItem.Name = "hideWasLagFramesToolStripMenuItem"; - this.hideWasLagFramesToolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.hideWasLagFramesToolStripMenuItem.Size = new System.Drawing.Size(222, 26); this.hideWasLagFramesToolStripMenuItem.Text = "Hide WasLag Frames"; this.hideWasLagFramesToolStripMenuItem.Click += new System.EventHandler(this.hideWasLagFramesToolStripMenuItem_Click); // @@ -1049,7 +1051,7 @@ namespace BizHawk.Client.EmuHawk this.DenoteMarkersWithIconsToolStripMenuItem, this.DenoteMarkersWithBGColorToolStripMenuItem}); this.iconsToolStripMenuItem.Name = "iconsToolStripMenuItem"; - this.iconsToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.iconsToolStripMenuItem.Size = new System.Drawing.Size(222, 26); this.iconsToolStripMenuItem.Text = "Icons"; this.iconsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.iconsToolStripMenuItem_DropDownOpened); // @@ -1057,7 +1059,7 @@ namespace BizHawk.Client.EmuHawk // this.DenoteStatesWithIconsToolStripMenuItem.CheckOnClick = true; this.DenoteStatesWithIconsToolStripMenuItem.Name = "DenoteStatesWithIconsToolStripMenuItem"; - this.DenoteStatesWithIconsToolStripMenuItem.Size = new System.Drawing.Size(230, 22); + this.DenoteStatesWithIconsToolStripMenuItem.Size = new System.Drawing.Size(287, 26); this.DenoteStatesWithIconsToolStripMenuItem.Text = "Denote States With Icons"; this.DenoteStatesWithIconsToolStripMenuItem.Click += new System.EventHandler(this.DenoteStatesWithIconsToolStripMenuItem_Click); // @@ -1065,7 +1067,7 @@ namespace BizHawk.Client.EmuHawk // this.DenoteStatesWithBGColorToolStripMenuItem.CheckOnClick = true; this.DenoteStatesWithBGColorToolStripMenuItem.Name = "DenoteStatesWithBGColorToolStripMenuItem"; - this.DenoteStatesWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22); + this.DenoteStatesWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(287, 26); this.DenoteStatesWithBGColorToolStripMenuItem.Text = "Denote States With BG Color"; this.DenoteStatesWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.DenoteStatesWithBGColorToolStripMenuItem_Click); // @@ -1073,7 +1075,7 @@ namespace BizHawk.Client.EmuHawk // this.DenoteMarkersWithIconsToolStripMenuItem.CheckOnClick = true; this.DenoteMarkersWithIconsToolStripMenuItem.Name = "DenoteMarkersWithIconsToolStripMenuItem"; - this.DenoteMarkersWithIconsToolStripMenuItem.Size = new System.Drawing.Size(230, 22); + this.DenoteMarkersWithIconsToolStripMenuItem.Size = new System.Drawing.Size(287, 26); this.DenoteMarkersWithIconsToolStripMenuItem.Text = "Denote Markers With Icons"; this.DenoteMarkersWithIconsToolStripMenuItem.Click += new System.EventHandler(this.DenoteMarkersWithIconsToolStripMenuItem_Click); // @@ -1081,14 +1083,14 @@ namespace BizHawk.Client.EmuHawk // this.DenoteMarkersWithBGColorToolStripMenuItem.CheckOnClick = true; this.DenoteMarkersWithBGColorToolStripMenuItem.Name = "DenoteMarkersWithBGColorToolStripMenuItem"; - this.DenoteMarkersWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22); + this.DenoteMarkersWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(287, 26); this.DenoteMarkersWithBGColorToolStripMenuItem.Text = "Denote Markers With BG Color"; this.DenoteMarkersWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.DenoteMarkersWithBGColorToolStripMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(185, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(219, 6); // // followCursorToolStripMenuItem // @@ -1100,7 +1102,7 @@ namespace BizHawk.Client.EmuHawk this.scrollToBottomToolStripMenuItem, this.scrollToCenterToolStripMenuItem}); this.followCursorToolStripMenuItem.Name = "followCursorToolStripMenuItem"; - this.followCursorToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.followCursorToolStripMenuItem.Size = new System.Drawing.Size(222, 26); this.followCursorToolStripMenuItem.Text = "Follow Cursor"; this.followCursorToolStripMenuItem.DropDownOpened += new System.EventHandler(this.followCursorToolStripMenuItem_DropDownOpened); // @@ -1108,14 +1110,14 @@ namespace BizHawk.Client.EmuHawk // this.alwaysScrollToolStripMenuItem.CheckOnClick = true; this.alwaysScrollToolStripMenuItem.Name = "alwaysScrollToolStripMenuItem"; - this.alwaysScrollToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.alwaysScrollToolStripMenuItem.Size = new System.Drawing.Size(193, 26); this.alwaysScrollToolStripMenuItem.Text = "Always Scroll"; this.alwaysScrollToolStripMenuItem.Click += new System.EventHandler(this.alwaysScrollToolStripMenuItem_Click); // // toolStripSeparator24 // this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(157, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(190, 6); // // scrollToViewToolStripMenuItem // @@ -1123,7 +1125,7 @@ namespace BizHawk.Client.EmuHawk this.scrollToViewToolStripMenuItem.CheckOnClick = true; this.scrollToViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.scrollToViewToolStripMenuItem.Name = "scrollToViewToolStripMenuItem"; - this.scrollToViewToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.scrollToViewToolStripMenuItem.Size = new System.Drawing.Size(193, 26); this.scrollToViewToolStripMenuItem.Text = "Scroll to View"; this.scrollToViewToolStripMenuItem.Click += new System.EventHandler(this.scrollToViewToolStripMenuItem_Click); // @@ -1131,7 +1133,7 @@ namespace BizHawk.Client.EmuHawk // this.scrollToTopToolStripMenuItem.CheckOnClick = true; this.scrollToTopToolStripMenuItem.Name = "scrollToTopToolStripMenuItem"; - this.scrollToTopToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.scrollToTopToolStripMenuItem.Size = new System.Drawing.Size(193, 26); this.scrollToTopToolStripMenuItem.Text = "Scroll to Top"; this.scrollToTopToolStripMenuItem.Click += new System.EventHandler(this.scrollToTopToolStripMenuItem_Click); // @@ -1139,7 +1141,7 @@ namespace BizHawk.Client.EmuHawk // this.scrollToBottomToolStripMenuItem.CheckOnClick = true; this.scrollToBottomToolStripMenuItem.Name = "scrollToBottomToolStripMenuItem"; - this.scrollToBottomToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.scrollToBottomToolStripMenuItem.Size = new System.Drawing.Size(193, 26); this.scrollToBottomToolStripMenuItem.Text = "Scroll to Bottom"; this.scrollToBottomToolStripMenuItem.Click += new System.EventHandler(this.scrollToBottomToolStripMenuItem_Click); // @@ -1147,19 +1149,19 @@ namespace BizHawk.Client.EmuHawk // this.scrollToCenterToolStripMenuItem.CheckOnClick = true; this.scrollToCenterToolStripMenuItem.Name = "scrollToCenterToolStripMenuItem"; - this.scrollToCenterToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.scrollToCenterToolStripMenuItem.Size = new System.Drawing.Size(193, 26); this.scrollToCenterToolStripMenuItem.Text = "Scroll to Center"; this.scrollToCenterToolStripMenuItem.Click += new System.EventHandler(this.scrollToCenterToolStripMenuItem_Click); // // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(185, 6); + this.toolStripSeparator25.Size = new System.Drawing.Size(219, 6); // // wheelScrollSpeedToolStripMenuItem // this.wheelScrollSpeedToolStripMenuItem.Name = "wheelScrollSpeedToolStripMenuItem"; - this.wheelScrollSpeedToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.wheelScrollSpeedToolStripMenuItem.Size = new System.Drawing.Size(222, 26); this.wheelScrollSpeedToolStripMenuItem.Text = "Wheel Scroll Speed..."; this.wheelScrollSpeedToolStripMenuItem.Click += new System.EventHandler(this.wheelScrollSpeedToolStripMenuItem_Click); // @@ -1168,13 +1170,13 @@ namespace BizHawk.Client.EmuHawk this.ColumnsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator19}); this.ColumnsSubMenu.Name = "ColumnsSubMenu"; - this.ColumnsSubMenu.Size = new System.Drawing.Size(59, 20); + this.ColumnsSubMenu.Size = new System.Drawing.Size(78, 24); this.ColumnsSubMenu.Text = "&Columns"; // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(57, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(63, 6); // // HelpSubMenu // @@ -1185,14 +1187,14 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator10, this.EnableTooltipsMenuItem}); this.HelpSubMenu.Name = "HelpSubMenu"; - this.HelpSubMenu.Size = new System.Drawing.Size(40, 20); + this.HelpSubMenu.Size = new System.Drawing.Size(53, 24); this.HelpSubMenu.Text = "&Help"; // // TASEditorManualOnlineMenuItem // this.TASEditorManualOnlineMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help; this.TASEditorManualOnlineMenuItem.Name = "TASEditorManualOnlineMenuItem"; - this.TASEditorManualOnlineMenuItem.Size = new System.Drawing.Size(217, 22); + this.TASEditorManualOnlineMenuItem.Size = new System.Drawing.Size(262, 26); this.TASEditorManualOnlineMenuItem.Text = "TAS Editor Manual Online..."; this.TASEditorManualOnlineMenuItem.Click += new System.EventHandler(this.TASEditorManualOnlineMenuItem_Click); // @@ -1200,7 +1202,7 @@ namespace BizHawk.Client.EmuHawk // this.ForumThreadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.ForumThreadMenuItem.Name = "ForumThreadMenuItem"; - this.ForumThreadMenuItem.Size = new System.Drawing.Size(217, 22); + this.ForumThreadMenuItem.Size = new System.Drawing.Size(262, 26); this.ForumThreadMenuItem.Text = "Forum Thread..."; this.ForumThreadMenuItem.Click += new System.EventHandler(this.ForumThreadMenuItem_Click); // @@ -1208,19 +1210,19 @@ namespace BizHawk.Client.EmuHawk // this.aboutToolStripMenuItem.Enabled = false; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(262, 26); this.aboutToolStripMenuItem.Text = "&About"; // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(259, 6); // // EnableTooltipsMenuItem // this.EnableTooltipsMenuItem.Enabled = false; this.EnableTooltipsMenuItem.Name = "EnableTooltipsMenuItem"; - this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(217, 22); + this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(262, 26); this.EnableTooltipsMenuItem.Text = "&Enable Tooltips"; // // TasView @@ -1239,14 +1241,15 @@ namespace BizHawk.Client.EmuHawk this.TasView.HorizontalOrientation = false; this.TasView.LagFramesToHide = 0; this.TasView.letKeysModifySelection = true; - this.TasView.Location = new System.Drawing.Point(3, 0); + this.TasView.Location = new System.Drawing.Point(4, 0); + this.TasView.Margin = new System.Windows.Forms.Padding(4); this.TasView.MaxCharactersInHorizontal = 1; this.TasView.MultiSelect = false; this.TasView.Name = "TasView"; this.TasView.RowCount = 0; this.TasView.ScrollSpeed = 1; this.TasView.SeekingCutoffInterval = 0; - this.TasView.Size = new System.Drawing.Size(289, 528); + this.TasView.Size = new System.Drawing.Size(462, 650); this.TasView.suspendHotkeys = false; this.TasView.TabIndex = 1; this.TasView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick); @@ -1265,50 +1268,55 @@ namespace BizHawk.Client.EmuHawk // TasStatusStrip // this.TasStatusStrip.ClickThrough = true; + this.TasStatusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MessageStatusLabel, this.SavingProgressBar, this.toolStripStatusLabel2, this.SplicerStatusLabel}); - this.TasStatusStrip.Location = new System.Drawing.Point(0, 554); + this.TasStatusStrip.Location = new System.Drawing.Point(0, 683); this.TasStatusStrip.Name = "TasStatusStrip"; - this.TasStatusStrip.Size = new System.Drawing.Size(509, 22); + this.TasStatusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); + this.TasStatusStrip.Size = new System.Drawing.Size(742, 26); this.TasStatusStrip.TabIndex = 4; this.TasStatusStrip.Text = "statusStrip1"; // // MessageStatusLabel // this.MessageStatusLabel.Name = "MessageStatusLabel"; - this.MessageStatusLabel.Size = new System.Drawing.Size(95, 17); + this.MessageStatusLabel.Size = new System.Drawing.Size(132, 21); this.MessageStatusLabel.Text = "TAStudio engaged"; // // SavingProgressBar // this.SavingProgressBar.Name = "SavingProgressBar"; - this.SavingProgressBar.Size = new System.Drawing.Size(100, 16); + this.SavingProgressBar.Size = new System.Drawing.Size(133, 20); // // toolStripStatusLabel2 // this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; - this.toolStripStatusLabel2.Size = new System.Drawing.Size(134, 17); + this.toolStripStatusLabel2.Size = new System.Drawing.Size(239, 21); this.toolStripStatusLabel2.Spring = true; // // SplicerStatusLabel // this.SplicerStatusLabel.Name = "SplicerStatusLabel"; this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); - this.SplicerStatusLabel.Size = new System.Drawing.Size(163, 17); + this.SplicerStatusLabel.Size = new System.Drawing.Size(216, 21); this.SplicerStatusLabel.Text = "0 selected, clipboard: empty"; // // TasPlaybackBox // this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.TasPlaybackBox.Location = new System.Drawing.Point(3, 4); + this.TasPlaybackBox.Location = new System.Drawing.Point(4, 5); + this.TasPlaybackBox.Margin = new System.Windows.Forms.Padding(4); + this.TasPlaybackBox.MinimumSize = new System.Drawing.Size(50, 50); this.TasPlaybackBox.Name = "TasPlaybackBox"; - this.TasPlaybackBox.Size = new System.Drawing.Size(204, 111); + this.TasPlaybackBox.Size = new System.Drawing.Size(257, 137); this.TasPlaybackBox.TabIndex = 5; this.TasPlaybackBox.Tastudio = null; + this.TasPlaybackBox.Load += new System.EventHandler(this.TasPlaybackBox_Load); // // MarkerControl // @@ -1316,14 +1324,16 @@ namespace BizHawk.Client.EmuHawk | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.MarkerControl.Emulator = null; - this.MarkerControl.Location = new System.Drawing.Point(2, 16); + this.MarkerControl.Location = new System.Drawing.Point(3, 20); + this.MarkerControl.Margin = new System.Windows.Forms.Padding(4); this.MarkerControl.Name = "MarkerControl"; - this.MarkerControl.Size = new System.Drawing.Size(194, 193); + this.MarkerControl.Size = new System.Drawing.Size(244, 237); this.MarkerControl.TabIndex = 6; this.MarkerControl.Tastudio = null; // // RightClickMenu // + this.RightClickMenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.RightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SetMarkersContextMenuItem, this.SetMarkerWithTextContextMenuItem, @@ -1352,39 +1362,39 @@ namespace BizHawk.Client.EmuHawk this.StartNewProjectFromNowMenuItem, this.StartANewProjectFromSaveRamMenuItem}); this.RightClickMenu.Name = "RightClickMenu"; - this.RightClickMenu.Size = new System.Drawing.Size(249, 480); + this.RightClickMenu.Size = new System.Drawing.Size(311, 560); this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened); // // SetMarkersContextMenuItem // this.SetMarkersContextMenuItem.Name = "SetMarkersContextMenuItem"; - this.SetMarkersContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetMarkersContextMenuItem.Size = new System.Drawing.Size(310, 26); this.SetMarkersContextMenuItem.Text = "Set Markers"; this.SetMarkersContextMenuItem.Click += new System.EventHandler(this.SetMarkersMenuItem_Click); // // SetMarkerWithTextContextMenuItem // this.SetMarkerWithTextContextMenuItem.Name = "SetMarkerWithTextContextMenuItem"; - this.SetMarkerWithTextContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetMarkerWithTextContextMenuItem.Size = new System.Drawing.Size(310, 26); this.SetMarkerWithTextContextMenuItem.Text = "Set Marker with Text"; this.SetMarkerWithTextContextMenuItem.Click += new System.EventHandler(this.SetMarkerWithTextMenuItem_Click); // // RemoveMarkersContextMenuItem // this.RemoveMarkersContextMenuItem.Name = "RemoveMarkersContextMenuItem"; - this.RemoveMarkersContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.RemoveMarkersContextMenuItem.Size = new System.Drawing.Size(310, 26); this.RemoveMarkersContextMenuItem.Text = "Remove Markers"; this.RemoveMarkersContextMenuItem.Click += new System.EventHandler(this.RemoveMarkersMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(245, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(307, 6); // // DeselectContextMenuItem // this.DeselectContextMenuItem.Name = "DeselectContextMenuItem"; - this.DeselectContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.DeselectContextMenuItem.Size = new System.Drawing.Size(310, 26); this.DeselectContextMenuItem.Text = "Deselect"; this.DeselectContextMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); // @@ -1392,39 +1402,39 @@ namespace BizHawk.Client.EmuHawk // this.SelectBetweenMarkersContextMenuItem.Name = "SelectBetweenMarkersContextMenuItem"; this.SelectBetweenMarkersContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.SelectBetweenMarkersContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.SelectBetweenMarkersContextMenuItem.Size = new System.Drawing.Size(310, 26); this.SelectBetweenMarkersContextMenuItem.Text = "Select between Markers"; this.SelectBetweenMarkersContextMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click); // // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(245, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(307, 6); // // UngreenzoneContextMenuItem // this.UngreenzoneContextMenuItem.Name = "UngreenzoneContextMenuItem"; - this.UngreenzoneContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.UngreenzoneContextMenuItem.Size = new System.Drawing.Size(310, 26); this.UngreenzoneContextMenuItem.Text = "Clear Greenzone"; this.UngreenzoneContextMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click); // // CancelSeekContextMenuItem // this.CancelSeekContextMenuItem.Name = "CancelSeekContextMenuItem"; - this.CancelSeekContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.CancelSeekContextMenuItem.Size = new System.Drawing.Size(310, 26); this.CancelSeekContextMenuItem.Text = "Cancel Seek"; this.CancelSeekContextMenuItem.Click += new System.EventHandler(this.CancelSeekContextMenuItem_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(245, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(307, 6); // // copyToolStripMenuItem // this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(310, 26); this.copyToolStripMenuItem.Text = "Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click); // @@ -1432,7 +1442,7 @@ namespace BizHawk.Client.EmuHawk // this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V"; - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(310, 26); this.pasteToolStripMenuItem.Text = "Paste"; this.pasteToolStripMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click); // @@ -1440,7 +1450,7 @@ namespace BizHawk.Client.EmuHawk // this.pasteInsertToolStripMenuItem.Name = "pasteInsertToolStripMenuItem"; this.pasteInsertToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Shift+V"; - this.pasteInsertToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.pasteInsertToolStripMenuItem.Size = new System.Drawing.Size(310, 26); this.pasteInsertToolStripMenuItem.Text = "Paste Insert"; this.pasteInsertToolStripMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click); // @@ -1448,20 +1458,20 @@ namespace BizHawk.Client.EmuHawk // this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; this.cutToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+X"; - this.cutToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.cutToolStripMenuItem.Size = new System.Drawing.Size(310, 26); this.cutToolStripMenuItem.Text = "Cut"; this.cutToolStripMenuItem.Click += new System.EventHandler(this.CutMenuItem_Click); // // separateToolStripMenuItem // this.separateToolStripMenuItem.Name = "separateToolStripMenuItem"; - this.separateToolStripMenuItem.Size = new System.Drawing.Size(245, 6); + this.separateToolStripMenuItem.Size = new System.Drawing.Size(307, 6); // // ClearContextMenuItem // this.ClearContextMenuItem.Name = "ClearContextMenuItem"; this.ClearContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.ClearContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.ClearContextMenuItem.Size = new System.Drawing.Size(310, 26); this.ClearContextMenuItem.Text = "Clear"; this.ClearContextMenuItem.Click += new System.EventHandler(this.ClearFramesMenuItem_Click); // @@ -1469,7 +1479,7 @@ namespace BizHawk.Client.EmuHawk // this.InsertFrameContextMenuItem.Name = "InsertFrameContextMenuItem"; this.InsertFrameContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert; - this.InsertFrameContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.InsertFrameContextMenuItem.Size = new System.Drawing.Size(310, 26); this.InsertFrameContextMenuItem.Text = "Insert"; this.InsertFrameContextMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); // @@ -1477,7 +1487,7 @@ namespace BizHawk.Client.EmuHawk // this.DeleteFramesContextMenuItem.Name = "DeleteFramesContextMenuItem"; this.DeleteFramesContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); - this.DeleteFramesContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.DeleteFramesContextMenuItem.Size = new System.Drawing.Size(310, 26); this.DeleteFramesContextMenuItem.Text = "Delete"; this.DeleteFramesContextMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); // @@ -1485,7 +1495,7 @@ namespace BizHawk.Client.EmuHawk // this.CloneContextMenuItem.Name = "CloneContextMenuItem"; this.CloneContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert))); - this.CloneContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.CloneContextMenuItem.Size = new System.Drawing.Size(310, 26); this.CloneContextMenuItem.Text = "Clone"; this.CloneContextMenuItem.Click += new System.EventHandler(this.CloneFramesMenuItem_Click); // @@ -1494,45 +1504,45 @@ namespace BizHawk.Client.EmuHawk this.InsertNumFramesContextMenuItem.Name = "InsertNumFramesContextMenuItem"; this.InsertNumFramesContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.Insert))); - this.InsertNumFramesContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.InsertNumFramesContextMenuItem.Size = new System.Drawing.Size(310, 26); this.InsertNumFramesContextMenuItem.Text = "Insert # of Frames"; this.InsertNumFramesContextMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click); // // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(245, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(307, 6); // // TruncateContextMenuItem // this.TruncateContextMenuItem.Name = "TruncateContextMenuItem"; - this.TruncateContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.TruncateContextMenuItem.Size = new System.Drawing.Size(310, 26); this.TruncateContextMenuItem.Text = "Truncate Movie"; this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); // // BranchContextMenuItem // this.BranchContextMenuItem.Name = "BranchContextMenuItem"; - this.BranchContextMenuItem.Size = new System.Drawing.Size(248, 22); + this.BranchContextMenuItem.Size = new System.Drawing.Size(310, 26); this.BranchContextMenuItem.Text = "&Branch"; this.BranchContextMenuItem.Click += new System.EventHandler(this.BranchContextMenuItem_Click); // // StartFromNowSeparator // this.StartFromNowSeparator.Name = "StartFromNowSeparator"; - this.StartFromNowSeparator.Size = new System.Drawing.Size(245, 6); + this.StartFromNowSeparator.Size = new System.Drawing.Size(307, 6); // // StartNewProjectFromNowMenuItem // this.StartNewProjectFromNowMenuItem.Name = "StartNewProjectFromNowMenuItem"; - this.StartNewProjectFromNowMenuItem.Size = new System.Drawing.Size(248, 22); + this.StartNewProjectFromNowMenuItem.Size = new System.Drawing.Size(310, 26); this.StartNewProjectFromNowMenuItem.Text = "Start a new project from Now"; this.StartNewProjectFromNowMenuItem.Click += new System.EventHandler(this.StartNewProjectFromNowMenuItem_Click); // // StartANewProjectFromSaveRamMenuItem // this.StartANewProjectFromSaveRamMenuItem.Name = "StartANewProjectFromSaveRamMenuItem"; - this.StartANewProjectFromSaveRamMenuItem.Size = new System.Drawing.Size(248, 22); + this.StartANewProjectFromSaveRamMenuItem.Size = new System.Drawing.Size(310, 26); this.StartANewProjectFromSaveRamMenuItem.Text = "Start a new project from SaveRam"; this.StartANewProjectFromSaveRamMenuItem.Click += new System.EventHandler(this.StartANewProjectFromSaveRamMenuItem_Click); // @@ -1542,9 +1552,12 @@ namespace BizHawk.Client.EmuHawk | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox1.Controls.Add(this.MarkerControl); - this.groupBox1.Location = new System.Drawing.Point(-2, 3); + this.groupBox1.Location = new System.Drawing.Point(-3, 4); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.MinimumSize = new System.Drawing.Size(50, 50); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(204, 215); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); + this.groupBox1.Size = new System.Drawing.Size(257, 264); this.groupBox1.TabIndex = 7; this.groupBox1.TabStop = false; this.groupBox1.Text = "Markers"; @@ -1555,9 +1568,11 @@ namespace BizHawk.Client.EmuHawk | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.BookMarkControl.HoverInterval = 1; - this.BookMarkControl.Location = new System.Drawing.Point(-2, 5); + this.BookMarkControl.Location = new System.Drawing.Point(-3, 6); + this.BookMarkControl.Margin = new System.Windows.Forms.Padding(4); + this.BookMarkControl.MinimumSize = new System.Drawing.Size(50, 50); this.BookMarkControl.Name = "BookMarkControl"; - this.BookMarkControl.Size = new System.Drawing.Size(204, 173); + this.BookMarkControl.Size = new System.Drawing.Size(257, 212); this.BookMarkControl.TabIndex = 8; this.BookMarkControl.Tastudio = null; // @@ -1566,7 +1581,8 @@ namespace BizHawk.Client.EmuHawk this.BranchesMarkersSplit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.BranchesMarkersSplit.Location = new System.Drawing.Point(3, 121); + this.BranchesMarkersSplit.Location = new System.Drawing.Point(4, 149); + this.BranchesMarkersSplit.Margin = new System.Windows.Forms.Padding(4); this.BranchesMarkersSplit.Name = "BranchesMarkersSplit"; this.BranchesMarkersSplit.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -1577,8 +1593,9 @@ namespace BizHawk.Client.EmuHawk // BranchesMarkersSplit.Panel2 // this.BranchesMarkersSplit.Panel2.Controls.Add(this.groupBox1); - this.BranchesMarkersSplit.Size = new System.Drawing.Size(204, 404); - this.BranchesMarkersSplit.SplitterDistance = 179; + this.BranchesMarkersSplit.Size = new System.Drawing.Size(257, 497); + this.BranchesMarkersSplit.SplitterDistance = 219; + this.BranchesMarkersSplit.SplitterWidth = 5; this.BranchesMarkersSplit.TabIndex = 9; this.BranchesMarkersSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.BranchesMarkersSplit_SplitterMoved); // @@ -1588,7 +1605,8 @@ namespace BizHawk.Client.EmuHawk | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.MainVertialSplit.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.MainVertialSplit.Location = new System.Drawing.Point(2, 23); + this.MainVertialSplit.Location = new System.Drawing.Point(3, 28); + this.MainVertialSplit.Margin = new System.Windows.Forms.Padding(4); this.MainVertialSplit.Name = "MainVertialSplit"; // // MainVertialSplit.Panel1 @@ -1599,24 +1617,26 @@ namespace BizHawk.Client.EmuHawk // this.MainVertialSplit.Panel2.Controls.Add(this.TasPlaybackBox); this.MainVertialSplit.Panel2.Controls.Add(this.BranchesMarkersSplit); - this.MainVertialSplit.Size = new System.Drawing.Size(507, 528); - this.MainVertialSplit.SplitterDistance = 295; + this.MainVertialSplit.Size = new System.Drawing.Size(739, 650); + this.MainVertialSplit.SplitterDistance = 470; + this.MainVertialSplit.SplitterWidth = 5; this.MainVertialSplit.TabIndex = 10; this.MainVertialSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.MainVertialSplit_SplitterMoved); // // TAStudio // this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(509, 576); + this.ClientSize = new System.Drawing.Size(742, 709); this.Controls.Add(this.MainVertialSplit); this.Controls.Add(this.TasStatusStrip); this.Controls.Add(this.TASMenu); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.MainMenuStrip = this.TASMenu; - this.MinimumSize = new System.Drawing.Size(200, 148); + this.Margin = new System.Windows.Forms.Padding(4); + this.MinimumSize = new System.Drawing.Size(261, 171); this.Name = "TAStudio"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "TAStudio"; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 9ac1948a56..1df219aa89 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -1074,5 +1074,10 @@ namespace BizHawk.Client.EmuHawk { base.GenericDragEnter(sender, e); } + + private void TasPlaybackBox_Load(object sender, EventArgs e) + { + + } } }