From 5a6c2adb0ba5ca6c92dd4bced65757a3b4699e25 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 19 Nov 2014 16:12:59 +0000 Subject: [PATCH] Tastudio - expose in release builds and mark it as beta in the title --- BizHawk.Client.EmuHawk/MainForm.Events.cs | 2 - .../tools/TAStudio/TAStudio.Designer.cs | 1844 ++++++++--------- BizHawk.Client.EmuHawk/tools/ToolBox.cs | 2 - VersionInfo.cs | 2 +- 4 files changed, 923 insertions(+), 927 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 62201c3677..6101996920 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1125,8 +1125,6 @@ namespace BizHawk.Client.EmuHawk Global.Emulator.HasMemoryDomains(); batchRunnerToolStripMenuItem.Visible = VersionInfo.DeveloperBuild; - - TAStudioMenuItem.Visible = VersionInfo.DeveloperBuild; } private void ToolBoxMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 49aaf3109d..9fc94d809b 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -30,126 +30,126 @@ namespace BizHawk.Client.EmuHawk /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio)); - this.TASMenu = new MenuStripEx(); - this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.NewTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OpenTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveAsTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.ToBk2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EditSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.UndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectionUndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectionRedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.DeselectMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectBetweenMarkersMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ReselectClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.CopyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PasteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PasteInsertMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CutMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.ClearMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DeleteFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CloneMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InsertFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InsertNumFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.TruncateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ClearGreenzoneMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.GreenzoneICheckSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.GreenZoneIntegrityCheckMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.SetMaxUndoLevelsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); - this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CombineConsecutiveRecordingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UseInputKeysItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.BindMarkersToInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EmptyNewMarkerNotesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); - this.BranchesRestoreEntireMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OsdInBranchScreenshotsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); - this.AutopauseAtEndOfMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator(); - this.RotateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MetaSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.HeaderMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.GreenzoneSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CommentsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); - this.DefaultStateSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoloadProjectMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); - this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ColumnsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator(); - this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); - this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TasView = new BizHawk.Client.EmuHawk.InputRoll(); - this.TasStatusStrip = new StatusStripEx(); - this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox(); - this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl(); - this.MarkerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.EditMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AddMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RemoveMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RightClickMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.SetMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RemoveMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); - this.DeselectContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectBetweenMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); - this.UngreenzoneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CancelSeekContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); - this.ClearContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DeleteFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CloneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InsertFrameContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InsertNumFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); - this.TruncateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.StartFromNowSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.StartNewProjectFromNowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.TASMenu.SuspendLayout(); - this.TasStatusStrip.SuspendLayout(); - this.MarkerContextMenu.SuspendLayout(); - this.RightClickMenu.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.SuspendLayout(); - // - // TASMenu - // - this.TASMenu.ClickThrough = true; - this.TASMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio)); + this.TASMenu = new MenuStripEx(); + this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.NewTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OpenTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveAsTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.ToBk2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EditSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.UndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectionUndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectionRedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.DeselectMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectBetweenMarkersMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ReselectClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.CopyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PasteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PasteInsertMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CutMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.ClearMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DeleteFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CloneMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.InsertFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.InsertNumFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.TruncateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ClearGreenzoneMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.GreenzoneICheckSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.GreenZoneIntegrityCheckMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.SetMaxUndoLevelsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CombineConsecutiveRecordingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.UseInputKeysItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.BindMarkersToInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EmptyNewMarkerNotesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); + this.BranchesRestoreEntireMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OsdInBranchScreenshotsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); + this.AutopauseAtEndOfMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator(); + this.RotateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MetaSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.HeaderMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.GreenzoneSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CommentsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); + this.DefaultStateSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoloadProjectMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); + this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ColumnsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator(); + this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); + this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.TasView = new BizHawk.Client.EmuHawk.InputRoll(); + this.TasStatusStrip = new StatusStripEx(); + this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox(); + this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl(); + this.MarkerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.EditMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AddMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RemoveMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RightClickMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.SetMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RemoveMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); + this.DeselectContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectBetweenMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); + this.UngreenzoneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CancelSeekContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); + this.ClearContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DeleteFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CloneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.InsertFrameContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.InsertNumFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); + this.TruncateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.StartFromNowSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.StartNewProjectFromNowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.TASMenu.SuspendLayout(); + this.TasStatusStrip.SuspendLayout(); + this.MarkerContextMenu.SuspendLayout(); + this.RightClickMenu.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // TASMenu + // + this.TASMenu.ClickThrough = true; + this.TASMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu, this.EditSubMenu, this.ConfigSubMenu, @@ -157,15 +157,15 @@ namespace BizHawk.Client.EmuHawk this.SettingsSubMenu, this.ColumnsSubMenu, this.HelpSubMenu}); - this.TASMenu.Location = new System.Drawing.Point(0, 0); - this.TASMenu.Name = "TASMenu"; - this.TASMenu.Size = new System.Drawing.Size(506, 24); - this.TASMenu.TabIndex = 0; - this.TASMenu.Text = "menuStrip1"; - // - // FileSubMenu - // - this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.TASMenu.Location = new System.Drawing.Point(0, 0); + this.TASMenu.Name = "TASMenu"; + this.TASMenu.Size = new System.Drawing.Size(506, 24); + this.TASMenu.TabIndex = 0; + this.TASMenu.Text = "menuStrip1"; + // + // FileSubMenu + // + this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NewTASMenuItem, this.OpenTASMenuItem, this.SaveTASMenuItem, @@ -175,87 +175,87 @@ namespace BizHawk.Client.EmuHawk this.ToBk2MenuItem, this.toolStripSeparator2, this.ExitMenuItem}); - this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 20); - this.FileSubMenu.Text = "&File"; - this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); - // - // NewTASMenuItem - // - 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(186, 22); - this.NewTASMenuItem.Text = "&New"; - this.NewTASMenuItem.Click += new System.EventHandler(this.NewTasMenuItem_Click); - // - // OpenTASMenuItem - // - 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(186, 22); - this.OpenTASMenuItem.Text = "&Open"; - this.OpenTASMenuItem.Click += new System.EventHandler(this.OpenTasMenuItem_Click); - // - // SaveTASMenuItem - // - 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(186, 22); - this.SaveTASMenuItem.Text = "&Save"; - this.SaveTASMenuItem.Click += new System.EventHandler(this.SaveTasMenuItem_Click); - // - // SaveAsTASMenuItem - // - this.SaveAsTASMenuItem.Name = "SaveAsTASMenuItem"; - this.SaveAsTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.FileSubMenu.Name = "FileSubMenu"; + this.FileSubMenu.Size = new System.Drawing.Size(37, 20); + this.FileSubMenu.Text = "&File"; + this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); + // + // NewTASMenuItem + // + 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(186, 22); + this.NewTASMenuItem.Text = "&New"; + this.NewTASMenuItem.Click += new System.EventHandler(this.NewTasMenuItem_Click); + // + // OpenTASMenuItem + // + 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(186, 22); + this.OpenTASMenuItem.Text = "&Open"; + this.OpenTASMenuItem.Click += new System.EventHandler(this.OpenTasMenuItem_Click); + // + // SaveTASMenuItem + // + 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(186, 22); + this.SaveTASMenuItem.Text = "&Save"; + this.SaveTASMenuItem.Click += new System.EventHandler(this.SaveTasMenuItem_Click); + // + // SaveAsTASMenuItem + // + 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(186, 22); - this.SaveAsTASMenuItem.Text = "Save As"; - this.SaveAsTASMenuItem.Click += new System.EventHandler(this.SaveAsTasMenuItem_Click); - // - // RecentSubMenu - // - this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SaveAsTASMenuItem.Size = new System.Drawing.Size(186, 22); + this.SaveAsTASMenuItem.Text = "Save As"; + this.SaveAsTASMenuItem.Click += new System.EventHandler(this.SaveAsTasMenuItem_Click); + // + // RecentSubMenu + // + this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator3}); - this.RecentSubMenu.Image = ((System.Drawing.Image)(resources.GetObject("RecentSubMenu.Image"))); - this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(186, 22); - 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); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(183, 6); - // - // ToBk2MenuItem - // - this.ToBk2MenuItem.Name = "ToBk2MenuItem"; - this.ToBk2MenuItem.Size = new System.Drawing.Size(186, 22); - 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(183, 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(186, 22); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // - // EditSubMenu - // - this.EditSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.RecentSubMenu.Image = ((System.Drawing.Image)(resources.GetObject("RecentSubMenu.Image"))); + this.RecentSubMenu.Name = "RecentSubMenu"; + this.RecentSubMenu.Size = new System.Drawing.Size(186, 22); + 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); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(183, 6); + // + // ToBk2MenuItem + // + this.ToBk2MenuItem.Name = "ToBk2MenuItem"; + this.ToBk2MenuItem.Size = new System.Drawing.Size(186, 22); + 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(183, 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(186, 22); + this.ExitMenuItem.Text = "E&xit"; + this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); + // + // EditSubMenu + // + this.EditSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.UndoMenuItem, this.RedoMenuItem, this.SelectionUndoMenuItem, @@ -281,203 +281,203 @@ namespace BizHawk.Client.EmuHawk this.ClearGreenzoneMenuItem, this.GreenzoneICheckSeparator, this.GreenZoneIntegrityCheckMenuItem}); - this.EditSubMenu.Name = "EditSubMenu"; - this.EditSubMenu.Size = new System.Drawing.Size(39, 20); - this.EditSubMenu.Text = "&Edit"; - this.EditSubMenu.DropDownOpened += new System.EventHandler(this.EditSubMenu_DropDownOpened); - // - // UndoMenuItem - // - this.UndoMenuItem.Enabled = false; - 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(282, 22); - this.UndoMenuItem.Text = "&Undo"; - // - // RedoMenuItem - // - 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(282, 22); - this.RedoMenuItem.Text = "&Redo"; - // - // SelectionUndoMenuItem - // - 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(282, 22); - this.SelectionUndoMenuItem.Text = "Selection Undo"; - // - // SelectionRedoMenuItem - // - 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(282, 22); - this.SelectionRedoMenuItem.Text = "Selection Redo"; - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(279, 6); - // - // DeselectMenuItem - // - this.DeselectMenuItem.Name = "DeselectMenuItem"; - this.DeselectMenuItem.Size = new System.Drawing.Size(282, 22); - this.DeselectMenuItem.Text = "Deselect"; - this.DeselectMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); - // - // SelectAllMenuItem - // - this.SelectAllMenuItem.Name = "SelectAllMenuItem"; - this.SelectAllMenuItem.ShortcutKeyDisplayString = ""; - this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.SelectAllMenuItem.Size = new System.Drawing.Size(282, 22); - this.SelectAllMenuItem.Text = "Select &All"; - this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); - // - // SelectBetweenMarkersMenuItem - // - this.SelectBetweenMarkersMenuItem.Name = "SelectBetweenMarkersMenuItem"; - this.SelectBetweenMarkersMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.EditSubMenu.Name = "EditSubMenu"; + this.EditSubMenu.Size = new System.Drawing.Size(39, 20); + this.EditSubMenu.Text = "&Edit"; + this.EditSubMenu.DropDownOpened += new System.EventHandler(this.EditSubMenu_DropDownOpened); + // + // UndoMenuItem + // + this.UndoMenuItem.Enabled = false; + 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(282, 22); + this.UndoMenuItem.Text = "&Undo"; + // + // RedoMenuItem + // + 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(282, 22); + this.RedoMenuItem.Text = "&Redo"; + // + // SelectionUndoMenuItem + // + 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(282, 22); + this.SelectionUndoMenuItem.Text = "Selection Undo"; + // + // SelectionRedoMenuItem + // + 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(282, 22); + this.SelectionRedoMenuItem.Text = "Selection Redo"; + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(279, 6); + // + // DeselectMenuItem + // + this.DeselectMenuItem.Name = "DeselectMenuItem"; + this.DeselectMenuItem.Size = new System.Drawing.Size(282, 22); + this.DeselectMenuItem.Text = "Deselect"; + this.DeselectMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); + // + // SelectAllMenuItem + // + this.SelectAllMenuItem.Name = "SelectAllMenuItem"; + this.SelectAllMenuItem.ShortcutKeyDisplayString = ""; + this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); + this.SelectAllMenuItem.Size = new System.Drawing.Size(282, 22); + this.SelectAllMenuItem.Text = "Select &All"; + this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); + // + // SelectBetweenMarkersMenuItem + // + this.SelectBetweenMarkersMenuItem.Name = "SelectBetweenMarkersMenuItem"; + this.SelectBetweenMarkersMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.A))); - this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(282, 22); - this.SelectBetweenMarkersMenuItem.Text = "Select between Markers"; - this.SelectBetweenMarkersMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click); - // - // ReselectClipboardMenuItem - // - 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(282, 22); - 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(279, 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(282, 22); - this.CopyMenuItem.Text = "Copy"; - this.CopyMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click); - // - // PasteMenuItem - // - 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(282, 22); - this.PasteMenuItem.Text = "&Paste"; - this.PasteMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click); - // - // PasteInsertMenuItem - // - this.PasteInsertMenuItem.Name = "PasteInsertMenuItem"; - this.PasteInsertMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(282, 22); + this.SelectBetweenMarkersMenuItem.Text = "Select between Markers"; + this.SelectBetweenMarkersMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click); + // + // ReselectClipboardMenuItem + // + 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(282, 22); + 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(279, 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(282, 22); + this.CopyMenuItem.Text = "Copy"; + this.CopyMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click); + // + // PasteMenuItem + // + 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(282, 22); + this.PasteMenuItem.Text = "&Paste"; + this.PasteMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click); + // + // PasteInsertMenuItem + // + 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(282, 22); - this.PasteInsertMenuItem.Text = "&Paste Insert"; - this.PasteInsertMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click); - // - // CutMenuItem - // - 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(282, 22); - 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(279, 6); - // - // ClearMenuItem - // - this.ClearMenuItem.Name = "ClearMenuItem"; - this.ClearMenuItem.ShortcutKeyDisplayString = ""; - this.ClearMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); - this.ClearMenuItem.Size = new System.Drawing.Size(282, 22); - this.ClearMenuItem.Text = "Clear"; - this.ClearMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); - // - // DeleteFramesMenuItem - // - this.DeleteFramesMenuItem.Name = "DeleteFramesMenuItem"; - this.DeleteFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.DeleteFramesMenuItem.Size = new System.Drawing.Size(282, 22); - this.DeleteFramesMenuItem.Text = "&Delete"; - this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); - // - // CloneMenuItem - // - this.CloneMenuItem.Name = "CloneMenuItem"; - this.CloneMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert))); - this.CloneMenuItem.Size = new System.Drawing.Size(282, 22); - this.CloneMenuItem.Text = "&Clone"; - this.CloneMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click); - // - // InsertFrameMenuItem - // - this.InsertFrameMenuItem.Name = "InsertFrameMenuItem"; - this.InsertFrameMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.PasteInsertMenuItem.Size = new System.Drawing.Size(282, 22); + this.PasteInsertMenuItem.Text = "&Paste Insert"; + this.PasteInsertMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click); + // + // CutMenuItem + // + 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(282, 22); + 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(279, 6); + // + // ClearMenuItem + // + this.ClearMenuItem.Name = "ClearMenuItem"; + this.ClearMenuItem.ShortcutKeyDisplayString = ""; + this.ClearMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); + this.ClearMenuItem.Size = new System.Drawing.Size(282, 22); + this.ClearMenuItem.Text = "Clear"; + this.ClearMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); + // + // DeleteFramesMenuItem + // + this.DeleteFramesMenuItem.Name = "DeleteFramesMenuItem"; + this.DeleteFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; + this.DeleteFramesMenuItem.Size = new System.Drawing.Size(282, 22); + this.DeleteFramesMenuItem.Text = "&Delete"; + this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); + // + // CloneMenuItem + // + this.CloneMenuItem.Name = "CloneMenuItem"; + this.CloneMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert))); + this.CloneMenuItem.Size = new System.Drawing.Size(282, 22); + this.CloneMenuItem.Text = "&Clone"; + this.CloneMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click); + // + // InsertFrameMenuItem + // + this.InsertFrameMenuItem.Name = "InsertFrameMenuItem"; + this.InsertFrameMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.Insert))); - this.InsertFrameMenuItem.Size = new System.Drawing.Size(282, 22); - this.InsertFrameMenuItem.Text = "&Insert"; - this.InsertFrameMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); - // - // InsertNumFramesMenuItem - // - this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem"; - this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = ""; - this.InsertNumFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert; - this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(282, 22); - 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(279, 6); - // - // TruncateMenuItem - // - this.TruncateMenuItem.Name = "TruncateMenuItem"; - this.TruncateMenuItem.Size = new System.Drawing.Size(282, 22); - 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(282, 22); - 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(279, 6); - // - // GreenZoneIntegrityCheckMenuItem - // - this.GreenZoneIntegrityCheckMenuItem.Name = "GreenZoneIntegrityCheckMenuItem"; - this.GreenZoneIntegrityCheckMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.InsertFrameMenuItem.Size = new System.Drawing.Size(282, 22); + this.InsertFrameMenuItem.Text = "&Insert"; + this.InsertFrameMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); + // + // InsertNumFramesMenuItem + // + this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem"; + this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = ""; + this.InsertNumFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert; + this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(282, 22); + 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(279, 6); + // + // TruncateMenuItem + // + this.TruncateMenuItem.Name = "TruncateMenuItem"; + this.TruncateMenuItem.Size = new System.Drawing.Size(282, 22); + 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(282, 22); + 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(279, 6); + // + // GreenZoneIntegrityCheckMenuItem + // + this.GreenZoneIntegrityCheckMenuItem.Name = "GreenZoneIntegrityCheckMenuItem"; + this.GreenZoneIntegrityCheckMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.I))); - this.GreenZoneIntegrityCheckMenuItem.Size = new System.Drawing.Size(282, 22); - this.GreenZoneIntegrityCheckMenuItem.Text = "Greenzone Integrity Check"; - this.GreenZoneIntegrityCheckMenuItem.Click += new System.EventHandler(this.GreenZzoneIntegrityCheckMenuItem_Click); - // - // ConfigSubMenu - // - this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.GreenZoneIntegrityCheckMenuItem.Size = new System.Drawing.Size(282, 22); + this.GreenZoneIntegrityCheckMenuItem.Text = "Greenzone Integrity Check"; + this.GreenZoneIntegrityCheckMenuItem.Click += new System.EventHandler(this.GreenZzoneIntegrityCheckMenuItem_Click); + // + // ConfigSubMenu + // + this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SetMaxUndoLevelsMenuItem, this.toolStripSeparator9, this.AutoadjustInputMenuItem, @@ -495,174 +495,174 @@ namespace BizHawk.Client.EmuHawk this.AutopauseAtEndOfMovieMenuItem, this.toolStripSeparator20, this.RotateMenuItem}); - this.ConfigSubMenu.Name = "ConfigSubMenu"; - this.ConfigSubMenu.Size = new System.Drawing.Size(55, 20); - this.ConfigSubMenu.Text = "&Config"; - this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened); - // - // SetMaxUndoLevelsMenuItem - // - this.SetMaxUndoLevelsMenuItem.Enabled = false; - this.SetMaxUndoLevelsMenuItem.Name = "SetMaxUndoLevelsMenuItem"; - this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(288, 22); - this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels"; - // - // toolStripSeparator9 - // - this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(285, 6); - // - // AutoadjustInputMenuItem - // - this.AutoadjustInputMenuItem.Enabled = false; - this.AutoadjustInputMenuItem.Name = "AutoadjustInputMenuItem"; - this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(288, 22); - this.AutoadjustInputMenuItem.Text = "Auto-adjust Input according to Lag"; - // - // toolStripSeparator11 - // - this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(285, 6); - // - // DrawInputByDraggingMenuItem - // - this.DrawInputByDraggingMenuItem.Name = "DrawInputByDraggingMenuItem"; - this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(288, 22); - this.DrawInputByDraggingMenuItem.Text = "Draw Input by dragging"; - this.DrawInputByDraggingMenuItem.Click += new System.EventHandler(this.DrawInputByDraggingMenuItem_Click); - // - // CombineConsecutiveRecordingsMenuItem - // - this.CombineConsecutiveRecordingsMenuItem.Enabled = false; - this.CombineConsecutiveRecordingsMenuItem.Name = "CombineConsecutiveRecordingsMenuItem"; - this.CombineConsecutiveRecordingsMenuItem.Size = new System.Drawing.Size(288, 22); - this.CombineConsecutiveRecordingsMenuItem.Text = "Combine consecutive Recordings/Draws"; - // - // UseInputKeysItem - // - this.UseInputKeysItem.Enabled = false; - this.UseInputKeysItem.Name = "UseInputKeysItem"; - this.UseInputKeysItem.Size = new System.Drawing.Size(288, 22); - this.UseInputKeysItem.Text = "Use Input keys for Column Set"; - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(285, 6); - // - // BindMarkersToInputMenuItem - // - this.BindMarkersToInputMenuItem.Enabled = false; - this.BindMarkersToInputMenuItem.Name = "BindMarkersToInputMenuItem"; - this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(288, 22); - this.BindMarkersToInputMenuItem.Text = "Bind Markers to Input"; - // - // EmptyNewMarkerNotesMenuItem - // - this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem"; - this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(288, 22); - 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(285, 6); - // - // BranchesRestoreEntireMovieMenuItem - // - this.BranchesRestoreEntireMovieMenuItem.Enabled = false; - this.BranchesRestoreEntireMovieMenuItem.Name = "BranchesRestoreEntireMovieMenuItem"; - this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(288, 22); - this.BranchesRestoreEntireMovieMenuItem.Text = "Branches restore entire Movie"; - // - // OsdInBranchScreenshotsMenuItem - // - this.OsdInBranchScreenshotsMenuItem.Enabled = false; - this.OsdInBranchScreenshotsMenuItem.Name = "OsdInBranchScreenshotsMenuItem"; - this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(288, 22); - this.OsdInBranchScreenshotsMenuItem.Text = "OSD in Branch screenshots"; - // - // toolStripSeparator14 - // - this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(285, 6); - // - // AutopauseAtEndOfMovieMenuItem - // - this.AutopauseAtEndOfMovieMenuItem.Name = "AutopauseAtEndOfMovieMenuItem"; - this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(288, 22); - this.AutopauseAtEndOfMovieMenuItem.Text = "Autopause at end of Movie"; - this.AutopauseAtEndOfMovieMenuItem.Click += new System.EventHandler(this.AutopauseAtEndMenuItem_Click); - // - // toolStripSeparator20 - // - this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(285, 6); - // - // RotateMenuItem - // - this.RotateMenuItem.Name = "RotateMenuItem"; - this.RotateMenuItem.Size = new System.Drawing.Size(288, 22); - this.RotateMenuItem.Text = "Rotate"; - this.RotateMenuItem.Click += new System.EventHandler(this.RotateMenuItem_Click); - // - // MetaSubMenu - // - this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ConfigSubMenu.Name = "ConfigSubMenu"; + this.ConfigSubMenu.Size = new System.Drawing.Size(55, 20); + this.ConfigSubMenu.Text = "&Config"; + this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened); + // + // SetMaxUndoLevelsMenuItem + // + this.SetMaxUndoLevelsMenuItem.Enabled = false; + this.SetMaxUndoLevelsMenuItem.Name = "SetMaxUndoLevelsMenuItem"; + this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(288, 22); + this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels"; + // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(285, 6); + // + // AutoadjustInputMenuItem + // + this.AutoadjustInputMenuItem.Enabled = false; + this.AutoadjustInputMenuItem.Name = "AutoadjustInputMenuItem"; + this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(288, 22); + this.AutoadjustInputMenuItem.Text = "Auto-adjust Input according to Lag"; + // + // toolStripSeparator11 + // + this.toolStripSeparator11.Name = "toolStripSeparator11"; + this.toolStripSeparator11.Size = new System.Drawing.Size(285, 6); + // + // DrawInputByDraggingMenuItem + // + this.DrawInputByDraggingMenuItem.Name = "DrawInputByDraggingMenuItem"; + this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(288, 22); + this.DrawInputByDraggingMenuItem.Text = "Draw Input by dragging"; + this.DrawInputByDraggingMenuItem.Click += new System.EventHandler(this.DrawInputByDraggingMenuItem_Click); + // + // CombineConsecutiveRecordingsMenuItem + // + this.CombineConsecutiveRecordingsMenuItem.Enabled = false; + this.CombineConsecutiveRecordingsMenuItem.Name = "CombineConsecutiveRecordingsMenuItem"; + this.CombineConsecutiveRecordingsMenuItem.Size = new System.Drawing.Size(288, 22); + this.CombineConsecutiveRecordingsMenuItem.Text = "Combine consecutive Recordings/Draws"; + // + // UseInputKeysItem + // + this.UseInputKeysItem.Enabled = false; + this.UseInputKeysItem.Name = "UseInputKeysItem"; + this.UseInputKeysItem.Size = new System.Drawing.Size(288, 22); + this.UseInputKeysItem.Text = "Use Input keys for Column Set"; + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(285, 6); + // + // BindMarkersToInputMenuItem + // + this.BindMarkersToInputMenuItem.Enabled = false; + this.BindMarkersToInputMenuItem.Name = "BindMarkersToInputMenuItem"; + this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(288, 22); + this.BindMarkersToInputMenuItem.Text = "Bind Markers to Input"; + // + // EmptyNewMarkerNotesMenuItem + // + this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem"; + this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(288, 22); + 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(285, 6); + // + // BranchesRestoreEntireMovieMenuItem + // + this.BranchesRestoreEntireMovieMenuItem.Enabled = false; + this.BranchesRestoreEntireMovieMenuItem.Name = "BranchesRestoreEntireMovieMenuItem"; + this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(288, 22); + this.BranchesRestoreEntireMovieMenuItem.Text = "Branches restore entire Movie"; + // + // OsdInBranchScreenshotsMenuItem + // + this.OsdInBranchScreenshotsMenuItem.Enabled = false; + this.OsdInBranchScreenshotsMenuItem.Name = "OsdInBranchScreenshotsMenuItem"; + this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(288, 22); + this.OsdInBranchScreenshotsMenuItem.Text = "OSD in Branch screenshots"; + // + // toolStripSeparator14 + // + this.toolStripSeparator14.Name = "toolStripSeparator14"; + this.toolStripSeparator14.Size = new System.Drawing.Size(285, 6); + // + // AutopauseAtEndOfMovieMenuItem + // + this.AutopauseAtEndOfMovieMenuItem.Name = "AutopauseAtEndOfMovieMenuItem"; + this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(288, 22); + this.AutopauseAtEndOfMovieMenuItem.Text = "Autopause at end of Movie"; + this.AutopauseAtEndOfMovieMenuItem.Click += new System.EventHandler(this.AutopauseAtEndMenuItem_Click); + // + // toolStripSeparator20 + // + this.toolStripSeparator20.Name = "toolStripSeparator20"; + this.toolStripSeparator20.Size = new System.Drawing.Size(285, 6); + // + // RotateMenuItem + // + this.RotateMenuItem.Name = "RotateMenuItem"; + this.RotateMenuItem.Size = new System.Drawing.Size(288, 22); + this.RotateMenuItem.Text = "Rotate"; + this.RotateMenuItem.Click += new System.EventHandler(this.RotateMenuItem_Click); + // + // MetaSubMenu + // + this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.HeaderMenuItem, this.GreenzoneSettingsMenuItem, this.CommentsMenuItem, this.SubtitlesMenuItem, this.toolStripSeparator21, this.DefaultStateSettingsMenuItem}); - this.MetaSubMenu.Name = "MetaSubMenu"; - this.MetaSubMenu.Size = new System.Drawing.Size(69, 20); - this.MetaSubMenu.Text = "&Metadata"; - // - // HeaderMenuItem - // - this.HeaderMenuItem.Name = "HeaderMenuItem"; - this.HeaderMenuItem.Size = new System.Drawing.Size(236, 22); - this.HeaderMenuItem.Text = "&Header..."; - this.HeaderMenuItem.Click += new System.EventHandler(this.HeaderMenuItem_Click); - // - // GreenzoneSettingsMenuItem - // - this.GreenzoneSettingsMenuItem.Name = "GreenzoneSettingsMenuItem"; - this.GreenzoneSettingsMenuItem.Size = new System.Drawing.Size(236, 22); - this.GreenzoneSettingsMenuItem.Text = "&Savestate History Settings..."; - this.GreenzoneSettingsMenuItem.Click += new System.EventHandler(this.GreenzoneSettingsMenuItem_Click); - // - // CommentsMenuItem - // - this.CommentsMenuItem.Name = "CommentsMenuItem"; - this.CommentsMenuItem.Size = new System.Drawing.Size(236, 22); - 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(236, 22); - 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(233, 6); - // - // DefaultStateSettingsMenuItem - // - this.DefaultStateSettingsMenuItem.Name = "DefaultStateSettingsMenuItem"; - this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(236, 22); - this.DefaultStateSettingsMenuItem.Text = "&Default State History Settings..."; - this.DefaultStateSettingsMenuItem.Click += new System.EventHandler(this.DefaultStateSettingsMenuItem_Click); - // - // SettingsSubMenu - // - this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MetaSubMenu.Name = "MetaSubMenu"; + this.MetaSubMenu.Size = new System.Drawing.Size(69, 20); + this.MetaSubMenu.Text = "&Metadata"; + // + // HeaderMenuItem + // + this.HeaderMenuItem.Name = "HeaderMenuItem"; + this.HeaderMenuItem.Size = new System.Drawing.Size(236, 22); + this.HeaderMenuItem.Text = "&Header..."; + this.HeaderMenuItem.Click += new System.EventHandler(this.HeaderMenuItem_Click); + // + // GreenzoneSettingsMenuItem + // + this.GreenzoneSettingsMenuItem.Name = "GreenzoneSettingsMenuItem"; + this.GreenzoneSettingsMenuItem.Size = new System.Drawing.Size(236, 22); + this.GreenzoneSettingsMenuItem.Text = "&Savestate History Settings..."; + this.GreenzoneSettingsMenuItem.Click += new System.EventHandler(this.GreenzoneSettingsMenuItem_Click); + // + // CommentsMenuItem + // + this.CommentsMenuItem.Name = "CommentsMenuItem"; + this.CommentsMenuItem.Size = new System.Drawing.Size(236, 22); + 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(236, 22); + 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(233, 6); + // + // DefaultStateSettingsMenuItem + // + this.DefaultStateSettingsMenuItem.Name = "DefaultStateSettingsMenuItem"; + this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(236, 22); + this.DefaultStateSettingsMenuItem.Text = "&Default State History Settings..."; + this.DefaultStateSettingsMenuItem.Click += new System.EventHandler(this.DefaultStateSettingsMenuItem_Click); + // + // SettingsSubMenu + // + this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AutoloadMenuItem, this.AutoloadProjectMenuItem, this.SaveWindowPositionMenuItem, @@ -670,210 +670,210 @@ namespace BizHawk.Client.EmuHawk this.FloatingWindowMenuItem, this.toolStripSeparator12, this.RestoreDefaultSettingsMenuItem}); - this.SettingsSubMenu.Name = "SettingsSubMenu"; - this.SettingsSubMenu.Size = new System.Drawing.Size(61, 20); - this.SettingsSubMenu.Text = "&Settings"; - this.SettingsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened); - // - // AutoloadMenuItem - // - this.AutoloadMenuItem.Name = "AutoloadMenuItem"; - this.AutoloadMenuItem.Size = new System.Drawing.Size(199, 22); - this.AutoloadMenuItem.Text = "Autoload"; - this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click); - // - // AutoloadProjectMenuItem - // - this.AutoloadProjectMenuItem.Name = "AutoloadProjectMenuItem"; - this.AutoloadProjectMenuItem.Size = new System.Drawing.Size(199, 22); - this.AutoloadProjectMenuItem.Text = "Autload &Project"; - this.AutoloadProjectMenuItem.Click += new System.EventHandler(this.AutoloadProjectMenuItem_Click); - // - // SaveWindowPositionMenuItem - // - this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); - this.SaveWindowPositionMenuItem.Text = "Save Window Position"; - this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); - // - // AlwaysOnTopMenuItem - // - this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; - this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(199, 22); - this.AlwaysOnTopMenuItem.Text = "Always On Top"; - this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); - // - // FloatingWindowMenuItem - // - this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; - this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); - this.FloatingWindowMenuItem.Text = "Floating Window"; - this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); - // - // toolStripSeparator12 - // - this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(196, 6); - // - // RestoreDefaultSettingsMenuItem - // - this.RestoreDefaultSettingsMenuItem.Name = "RestoreDefaultSettingsMenuItem"; - this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(199, 22); - this.RestoreDefaultSettingsMenuItem.Text = "Restore Default Settings"; - this.RestoreDefaultSettingsMenuItem.Click += new System.EventHandler(this.RestoreDefaultSettingsMenuItem_Click); - // - // ColumnsSubMenu - // - this.ColumnsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SettingsSubMenu.Name = "SettingsSubMenu"; + this.SettingsSubMenu.Size = new System.Drawing.Size(61, 20); + this.SettingsSubMenu.Text = "&Settings"; + this.SettingsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened); + // + // AutoloadMenuItem + // + this.AutoloadMenuItem.Name = "AutoloadMenuItem"; + this.AutoloadMenuItem.Size = new System.Drawing.Size(199, 22); + this.AutoloadMenuItem.Text = "Autoload"; + this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click); + // + // AutoloadProjectMenuItem + // + this.AutoloadProjectMenuItem.Name = "AutoloadProjectMenuItem"; + this.AutoloadProjectMenuItem.Size = new System.Drawing.Size(199, 22); + this.AutoloadProjectMenuItem.Text = "Autload &Project"; + this.AutoloadProjectMenuItem.Click += new System.EventHandler(this.AutoloadProjectMenuItem_Click); + // + // SaveWindowPositionMenuItem + // + this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; + this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); + this.SaveWindowPositionMenuItem.Text = "Save Window Position"; + this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); + // + // AlwaysOnTopMenuItem + // + this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; + this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(199, 22); + this.AlwaysOnTopMenuItem.Text = "Always On Top"; + this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); + // + // FloatingWindowMenuItem + // + this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; + this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); + this.FloatingWindowMenuItem.Text = "Floating Window"; + this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); + // + // toolStripSeparator12 + // + this.toolStripSeparator12.Name = "toolStripSeparator12"; + this.toolStripSeparator12.Size = new System.Drawing.Size(196, 6); + // + // RestoreDefaultSettingsMenuItem + // + this.RestoreDefaultSettingsMenuItem.Name = "RestoreDefaultSettingsMenuItem"; + this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(199, 22); + this.RestoreDefaultSettingsMenuItem.Text = "Restore Default Settings"; + this.RestoreDefaultSettingsMenuItem.Click += new System.EventHandler(this.RestoreDefaultSettingsMenuItem_Click); + // + // ColumnsSubMenu + // + this.ColumnsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator19}); - this.ColumnsSubMenu.Name = "ColumnsSubMenu"; - this.ColumnsSubMenu.Size = new System.Drawing.Size(67, 20); - this.ColumnsSubMenu.Text = "&Columns"; - this.ColumnsSubMenu.DropDownOpened += new System.EventHandler(this.ColumnsSubMenu_DropDownOpened); - // - // toolStripSeparator19 - // - this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(57, 6); - // - // HelpSubMenu - // - this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ColumnsSubMenu.Name = "ColumnsSubMenu"; + this.ColumnsSubMenu.Size = new System.Drawing.Size(67, 20); + this.ColumnsSubMenu.Text = "&Columns"; + this.ColumnsSubMenu.DropDownOpened += new System.EventHandler(this.ColumnsSubMenu_DropDownOpened); + // + // toolStripSeparator19 + // + this.toolStripSeparator19.Name = "toolStripSeparator19"; + this.toolStripSeparator19.Size = new System.Drawing.Size(57, 6); + // + // HelpSubMenu + // + this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.EnableTooltipsMenuItem, this.toolStripSeparator10, this.aboutToolStripMenuItem}); - this.HelpSubMenu.Name = "HelpSubMenu"; - this.HelpSubMenu.Size = new System.Drawing.Size(44, 20); - this.HelpSubMenu.Text = "&Help"; - // - // EnableTooltipsMenuItem - // - this.EnableTooltipsMenuItem.Enabled = false; - this.EnableTooltipsMenuItem.Name = "EnableTooltipsMenuItem"; - this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(155, 22); - this.EnableTooltipsMenuItem.Text = "&Enable Tooltips"; - // - // toolStripSeparator10 - // - this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(152, 6); - // - // aboutToolStripMenuItem - // - this.aboutToolStripMenuItem.Enabled = false; - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(155, 22); - this.aboutToolStripMenuItem.Text = "&About"; - // - // TasView - // - this.TasView.AllowColumnReorder = false; - this.TasView.AllowColumnResize = false; - this.TasView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.HelpSubMenu.Name = "HelpSubMenu"; + this.HelpSubMenu.Size = new System.Drawing.Size(44, 20); + this.HelpSubMenu.Text = "&Help"; + // + // EnableTooltipsMenuItem + // + this.EnableTooltipsMenuItem.Enabled = false; + this.EnableTooltipsMenuItem.Name = "EnableTooltipsMenuItem"; + this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(155, 22); + this.EnableTooltipsMenuItem.Text = "&Enable Tooltips"; + // + // toolStripSeparator10 + // + this.toolStripSeparator10.Name = "toolStripSeparator10"; + this.toolStripSeparator10.Size = new System.Drawing.Size(152, 6); + // + // aboutToolStripMenuItem + // + this.aboutToolStripMenuItem.Enabled = false; + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(155, 22); + this.aboutToolStripMenuItem.Text = "&About"; + // + // TasView + // + this.TasView.AllowColumnReorder = false; + this.TasView.AllowColumnResize = false; + this.TasView.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.TasView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TasView.FullRowSelect = true; - this.TasView.HorizontalOrientation = false; - this.TasView.LastVisibleRow = 27; - this.TasView.Location = new System.Drawing.Point(8, 27); - this.TasView.MaxCharactersInHorizontal = 1; - this.TasView.MultiSelect = false; - this.TasView.Name = "TasView"; - this.TasView.RowCount = 0; - this.TasView.Size = new System.Drawing.Size(288, 471); - this.TasView.TabIndex = 1; - this.TasView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick); - this.TasView.ColumnRightClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnRightClick); - this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged); - this.TasView.RightMouseScrolled += new BizHawk.Client.EmuHawk.InputRoll.RightMouseScrollEventHandler(this.TasView_MouseWheel); - this.TasView.ColumnReordered += new BizHawk.Client.EmuHawk.InputRoll.ColumnReorderedEventHandler(this.TasView_ColumnReordered); - this.TasView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TasView_KeyDown); - this.TasView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDoubleClick); - this.TasView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDown); - this.TasView.MouseEnter += new System.EventHandler(this.TasView_MouseEnter); - this.TasView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseUp); - // - // TasStatusStrip - // - this.TasStatusStrip.ClickThrough = true; - this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.TasView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.TasView.FullRowSelect = true; + this.TasView.HorizontalOrientation = false; + this.TasView.LastVisibleRow = 27; + this.TasView.Location = new System.Drawing.Point(8, 27); + this.TasView.MaxCharactersInHorizontal = 1; + this.TasView.MultiSelect = false; + this.TasView.Name = "TasView"; + this.TasView.RowCount = 0; + this.TasView.Size = new System.Drawing.Size(288, 471); + this.TasView.TabIndex = 1; + this.TasView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick); + this.TasView.ColumnRightClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnRightClick); + this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged); + this.TasView.RightMouseScrolled += new BizHawk.Client.EmuHawk.InputRoll.RightMouseScrollEventHandler(this.TasView_MouseWheel); + this.TasView.ColumnReordered += new BizHawk.Client.EmuHawk.InputRoll.ColumnReorderedEventHandler(this.TasView_ColumnReordered); + this.TasView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TasView_KeyDown); + this.TasView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDoubleClick); + this.TasView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDown); + this.TasView.MouseEnter += new System.EventHandler(this.TasView_MouseEnter); + this.TasView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseUp); + // + // TasStatusStrip + // + this.TasStatusStrip.ClickThrough = true; + this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MessageStatusLabel, this.SplicerStatusLabel}); - this.TasStatusStrip.Location = new System.Drawing.Point(0, 497); - this.TasStatusStrip.Name = "TasStatusStrip"; - this.TasStatusStrip.Size = new System.Drawing.Size(506, 22); - this.TasStatusStrip.TabIndex = 4; - this.TasStatusStrip.Text = "statusStrip1"; - // - // MessageStatusLabel - // - this.MessageStatusLabel.Name = "MessageStatusLabel"; - this.MessageStatusLabel.Size = new System.Drawing.Size(105, 17); - this.MessageStatusLabel.Text = "TAStudio engaged"; - // - // SplicerStatusLabel - // - this.SplicerStatusLabel.Name = "SplicerStatusLabel"; - this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); - this.SplicerStatusLabel.Size = new System.Drawing.Size(175, 17); - this.SplicerStatusLabel.Text = "0 selected, clipboard: empty"; - // - // TasPlaybackBox - // - this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.TasPlaybackBox.Location = new System.Drawing.Point(302, 25); - this.TasPlaybackBox.Name = "TasPlaybackBox"; - this.TasPlaybackBox.Size = new System.Drawing.Size(204, 98); - this.TasPlaybackBox.TabIndex = 5; - this.TasPlaybackBox.Tastudio = null; - // - // MarkerControl - // - this.MarkerControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.TasStatusStrip.Location = new System.Drawing.Point(0, 497); + this.TasStatusStrip.Name = "TasStatusStrip"; + this.TasStatusStrip.Size = new System.Drawing.Size(506, 22); + this.TasStatusStrip.TabIndex = 4; + this.TasStatusStrip.Text = "statusStrip1"; + // + // MessageStatusLabel + // + this.MessageStatusLabel.Name = "MessageStatusLabel"; + this.MessageStatusLabel.Size = new System.Drawing.Size(105, 17); + this.MessageStatusLabel.Text = "TAStudio engaged"; + // + // SplicerStatusLabel + // + this.SplicerStatusLabel.Name = "SplicerStatusLabel"; + this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); + this.SplicerStatusLabel.Size = new System.Drawing.Size(175, 17); + this.SplicerStatusLabel.Text = "0 selected, clipboard: empty"; + // + // TasPlaybackBox + // + this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.TasPlaybackBox.Location = new System.Drawing.Point(302, 25); + this.TasPlaybackBox.Name = "TasPlaybackBox"; + this.TasPlaybackBox.Size = new System.Drawing.Size(204, 98); + this.TasPlaybackBox.TabIndex = 5; + this.TasPlaybackBox.Tastudio = null; + // + // MarkerControl + // + this.MarkerControl.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.MarkerControl.ContextMenuStrip = this.MarkerContextMenu; - this.MarkerControl.Location = new System.Drawing.Point(2, 16); - this.MarkerControl.Name = "MarkerControl"; - this.MarkerControl.Size = new System.Drawing.Size(198, 343); - this.MarkerControl.TabIndex = 6; - this.MarkerControl.Tastudio = null; - // - // MarkerContextMenu - // - this.MarkerContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MarkerControl.ContextMenuStrip = this.MarkerContextMenu; + this.MarkerControl.Location = new System.Drawing.Point(2, 16); + this.MarkerControl.Name = "MarkerControl"; + this.MarkerControl.Size = new System.Drawing.Size(198, 343); + this.MarkerControl.TabIndex = 6; + this.MarkerControl.Tastudio = null; + // + // MarkerContextMenu + // + this.MarkerContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.EditMarkerContextMenuItem, this.AddMarkerContextMenuItem, this.RemoveMarkerContextMenuItem}); - this.MarkerContextMenu.Name = "MarkerContextMenu"; - this.MarkerContextMenu.Size = new System.Drawing.Size(118, 70); - this.MarkerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MarkerContextMenu_Opening); - // - // EditMarkerContextMenuItem - // - this.EditMarkerContextMenuItem.Name = "EditMarkerContextMenuItem"; - this.EditMarkerContextMenuItem.Size = new System.Drawing.Size(117, 22); - this.EditMarkerContextMenuItem.Text = "Edit"; - this.EditMarkerContextMenuItem.Click += new System.EventHandler(this.EditMarkerContextMenuItem_Click); - // - // AddMarkerContextMenuItem - // - this.AddMarkerContextMenuItem.Name = "AddMarkerContextMenuItem"; - this.AddMarkerContextMenuItem.Size = new System.Drawing.Size(117, 22); - this.AddMarkerContextMenuItem.Text = "Add"; - this.AddMarkerContextMenuItem.Click += new System.EventHandler(this.AddMarkerContextMenuItem_Click); - // - // RemoveMarkerContextMenuItem - // - this.RemoveMarkerContextMenuItem.Name = "RemoveMarkerContextMenuItem"; - this.RemoveMarkerContextMenuItem.Size = new System.Drawing.Size(117, 22); - this.RemoveMarkerContextMenuItem.Text = "Remove"; - this.RemoveMarkerContextMenuItem.Click += new System.EventHandler(this.RemoveMarkerContextMenuItem_Click); - // - // RightClickMenu - // - this.RightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MarkerContextMenu.Name = "MarkerContextMenu"; + this.MarkerContextMenu.Size = new System.Drawing.Size(118, 70); + this.MarkerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MarkerContextMenu_Opening); + // + // EditMarkerContextMenuItem + // + this.EditMarkerContextMenuItem.Name = "EditMarkerContextMenuItem"; + this.EditMarkerContextMenuItem.Size = new System.Drawing.Size(117, 22); + this.EditMarkerContextMenuItem.Text = "Edit"; + this.EditMarkerContextMenuItem.Click += new System.EventHandler(this.EditMarkerContextMenuItem_Click); + // + // AddMarkerContextMenuItem + // + this.AddMarkerContextMenuItem.Name = "AddMarkerContextMenuItem"; + this.AddMarkerContextMenuItem.Size = new System.Drawing.Size(117, 22); + this.AddMarkerContextMenuItem.Text = "Add"; + this.AddMarkerContextMenuItem.Click += new System.EventHandler(this.AddMarkerContextMenuItem_Click); + // + // RemoveMarkerContextMenuItem + // + this.RemoveMarkerContextMenuItem.Name = "RemoveMarkerContextMenuItem"; + this.RemoveMarkerContextMenuItem.Size = new System.Drawing.Size(117, 22); + this.RemoveMarkerContextMenuItem.Text = "Remove"; + this.RemoveMarkerContextMenuItem.Click += new System.EventHandler(this.RemoveMarkerContextMenuItem_Click); + // + // RightClickMenu + // + this.RightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SetMarkersContextMenuItem, this.RemoveMarkersContextMenuItem, this.toolStripSeparator15, @@ -892,177 +892,177 @@ namespace BizHawk.Client.EmuHawk this.TruncateContextMenuItem, this.StartFromNowSeparator, this.StartNewProjectFromNowMenuItem}); - this.RightClickMenu.Name = "RightClickMenu"; - this.RightClickMenu.Size = new System.Drawing.Size(273, 342); - this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened); - // - // SetMarkersContextMenuItem - // - this.SetMarkersContextMenuItem.Name = "SetMarkersContextMenuItem"; - this.SetMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22); - this.SetMarkersContextMenuItem.Text = "Set Markers"; - this.SetMarkersContextMenuItem.Click += new System.EventHandler(this.SetMarkersMenuItem_Click); - // - // RemoveMarkersContextMenuItem - // - this.RemoveMarkersContextMenuItem.Name = "RemoveMarkersContextMenuItem"; - this.RemoveMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22); - 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(269, 6); - // - // DeselectContextMenuItem - // - this.DeselectContextMenuItem.Name = "DeselectContextMenuItem"; - this.DeselectContextMenuItem.Size = new System.Drawing.Size(272, 22); - this.DeselectContextMenuItem.Text = "Deselect"; - this.DeselectContextMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); - // - // SelectBetweenMarkersContextMenuItem - // - this.SelectBetweenMarkersContextMenuItem.Name = "SelectBetweenMarkersContextMenuItem"; - this.SelectBetweenMarkersContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.RightClickMenu.Name = "RightClickMenu"; + this.RightClickMenu.Size = new System.Drawing.Size(273, 320); + this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened); + // + // SetMarkersContextMenuItem + // + this.SetMarkersContextMenuItem.Name = "SetMarkersContextMenuItem"; + this.SetMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22); + this.SetMarkersContextMenuItem.Text = "Set Markers"; + this.SetMarkersContextMenuItem.Click += new System.EventHandler(this.SetMarkersMenuItem_Click); + // + // RemoveMarkersContextMenuItem + // + this.RemoveMarkersContextMenuItem.Name = "RemoveMarkersContextMenuItem"; + this.RemoveMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22); + 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(269, 6); + // + // DeselectContextMenuItem + // + this.DeselectContextMenuItem.Name = "DeselectContextMenuItem"; + this.DeselectContextMenuItem.Size = new System.Drawing.Size(272, 22); + this.DeselectContextMenuItem.Text = "Deselect"; + this.DeselectContextMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); + // + // SelectBetweenMarkersContextMenuItem + // + this.SelectBetweenMarkersContextMenuItem.Name = "SelectBetweenMarkersContextMenuItem"; + this.SelectBetweenMarkersContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.A))); - this.SelectBetweenMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22); - 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(269, 6); - // - // UngreenzoneContextMenuItem - // - this.UngreenzoneContextMenuItem.Name = "UngreenzoneContextMenuItem"; - this.UngreenzoneContextMenuItem.Size = new System.Drawing.Size(272, 22); - 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(272, 22); - 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(269, 6); - // - // ClearContextMenuItem - // - this.ClearContextMenuItem.Name = "ClearContextMenuItem"; - this.ClearContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); - this.ClearContextMenuItem.Size = new System.Drawing.Size(272, 22); - this.ClearContextMenuItem.Text = "Clear"; - this.ClearContextMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); - // - // DeleteFramesContextMenuItem - // - this.DeleteFramesContextMenuItem.Name = "DeleteFramesContextMenuItem"; - this.DeleteFramesContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.DeleteFramesContextMenuItem.Size = new System.Drawing.Size(272, 22); - this.DeleteFramesContextMenuItem.Text = "Delete"; - this.DeleteFramesContextMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); - // - // CloneContextMenuItem - // - 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(272, 22); - this.CloneContextMenuItem.Text = "Clone"; - this.CloneContextMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click); - // - // InsertFrameContextMenuItem - // - this.InsertFrameContextMenuItem.Name = "InsertFrameContextMenuItem"; - this.InsertFrameContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.SelectBetweenMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22); + 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(269, 6); + // + // UngreenzoneContextMenuItem + // + this.UngreenzoneContextMenuItem.Name = "UngreenzoneContextMenuItem"; + this.UngreenzoneContextMenuItem.Size = new System.Drawing.Size(272, 22); + 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(272, 22); + 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(269, 6); + // + // ClearContextMenuItem + // + this.ClearContextMenuItem.Name = "ClearContextMenuItem"; + this.ClearContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); + this.ClearContextMenuItem.Size = new System.Drawing.Size(272, 22); + this.ClearContextMenuItem.Text = "Clear"; + this.ClearContextMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); + // + // DeleteFramesContextMenuItem + // + this.DeleteFramesContextMenuItem.Name = "DeleteFramesContextMenuItem"; + this.DeleteFramesContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; + this.DeleteFramesContextMenuItem.Size = new System.Drawing.Size(272, 22); + this.DeleteFramesContextMenuItem.Text = "Delete"; + this.DeleteFramesContextMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); + // + // CloneContextMenuItem + // + 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(272, 22); + this.CloneContextMenuItem.Text = "Clone"; + this.CloneContextMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click); + // + // InsertFrameContextMenuItem + // + this.InsertFrameContextMenuItem.Name = "InsertFrameContextMenuItem"; + this.InsertFrameContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.Insert))); - this.InsertFrameContextMenuItem.Size = new System.Drawing.Size(272, 22); - this.InsertFrameContextMenuItem.Text = "Insert"; - this.InsertFrameContextMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); - // - // InsertNumFramesContextMenuItem - // - this.InsertNumFramesContextMenuItem.Name = "InsertNumFramesContextMenuItem"; - this.InsertNumFramesContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert; - this.InsertNumFramesContextMenuItem.Size = new System.Drawing.Size(272, 22); - 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(269, 6); - // - // TruncateContextMenuItem - // - this.TruncateContextMenuItem.Name = "TruncateContextMenuItem"; - this.TruncateContextMenuItem.Size = new System.Drawing.Size(272, 22); - this.TruncateContextMenuItem.Text = "Truncate Movie"; - this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); - // - // StartFromNowSeparator - // - this.StartFromNowSeparator.Name = "StartFromNowSeparator"; - this.StartFromNowSeparator.Size = new System.Drawing.Size(269, 6); - // - // StartNewProjectFromNowMenuItem - // - this.StartNewProjectFromNowMenuItem.Name = "StartNewProjectFromNowMenuItem"; - this.StartNewProjectFromNowMenuItem.Size = new System.Drawing.Size(272, 22); - this.StartNewProjectFromNowMenuItem.Text = "Start a new project from Here"; - this.StartNewProjectFromNowMenuItem.Click += new System.EventHandler(this.StartNewProjectFromNowMenuItem_Click); - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.InsertFrameContextMenuItem.Size = new System.Drawing.Size(272, 22); + this.InsertFrameContextMenuItem.Text = "Insert"; + this.InsertFrameContextMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); + // + // InsertNumFramesContextMenuItem + // + this.InsertNumFramesContextMenuItem.Name = "InsertNumFramesContextMenuItem"; + this.InsertNumFramesContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert; + this.InsertNumFramesContextMenuItem.Size = new System.Drawing.Size(272, 22); + 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(269, 6); + // + // TruncateContextMenuItem + // + this.TruncateContextMenuItem.Name = "TruncateContextMenuItem"; + this.TruncateContextMenuItem.Size = new System.Drawing.Size(272, 22); + this.TruncateContextMenuItem.Text = "Truncate Movie"; + this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); + // + // StartFromNowSeparator + // + this.StartFromNowSeparator.Name = "StartFromNowSeparator"; + this.StartFromNowSeparator.Size = new System.Drawing.Size(269, 6); + // + // StartNewProjectFromNowMenuItem + // + this.StartNewProjectFromNowMenuItem.Name = "StartNewProjectFromNowMenuItem"; + this.StartNewProjectFromNowMenuItem.Size = new System.Drawing.Size(272, 22); + this.StartNewProjectFromNowMenuItem.Text = "Start a new project from Here"; + this.StartNewProjectFromNowMenuItem.Click += new System.EventHandler(this.StartNewProjectFromNowMenuItem_Click); + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox1.Controls.Add(this.MarkerControl); - this.groupBox1.Location = new System.Drawing.Point(302, 129); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(201, 365); - this.groupBox1.TabIndex = 7; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Markers"; - // - // TAStudio - // - this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(506, 519); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.TasPlaybackBox); - this.Controls.Add(this.TasStatusStrip); - this.Controls.Add(this.TASMenu); - this.Controls.Add(this.TasView); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.TASMenu; - this.MinimumSize = new System.Drawing.Size(437, 148); - this.Name = "TAStudio"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "TAStudio"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Tastudio_Closing); - this.Load += new System.EventHandler(this.Tastudio_Load); - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragEnter); - this.MouseLeave += new System.EventHandler(this.TAStudio_MouseLeave); - this.TASMenu.ResumeLayout(false); - this.TASMenu.PerformLayout(); - this.TasStatusStrip.ResumeLayout(false); - this.TasStatusStrip.PerformLayout(); - this.MarkerContextMenu.ResumeLayout(false); - this.RightClickMenu.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + this.groupBox1.Controls.Add(this.MarkerControl); + this.groupBox1.Location = new System.Drawing.Point(302, 129); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(201, 365); + this.groupBox1.TabIndex = 7; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Markers"; + // + // TAStudio + // + this.AllowDrop = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(506, 519); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.TasPlaybackBox); + this.Controls.Add(this.TasStatusStrip); + this.Controls.Add(this.TASMenu); + this.Controls.Add(this.TasView); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.TASMenu; + this.MinimumSize = new System.Drawing.Size(437, 148); + this.Name = "TAStudio"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "TAStudio - Beta Release (use at your own risk)"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Tastudio_Closing); + this.Load += new System.EventHandler(this.Tastudio_Load); + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragEnter); + this.MouseLeave += new System.EventHandler(this.TAStudio_MouseLeave); + this.TASMenu.ResumeLayout(false); + this.TASMenu.PerformLayout(); + this.TasStatusStrip.ResumeLayout(false); + this.TasStatusStrip.PerformLayout(); + this.MarkerContextMenu.ResumeLayout(false); + this.RightClickMenu.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs index 31b21cabba..41110bf67f 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -103,8 +103,6 @@ namespace BizHawk.Client.EmuHawk } NesDebuggerToolbarItem.Visible = VersionInfo.DeveloperBuild && Global.Emulator.SystemId == "NES"; - - TAStudioToolbarItem.Visible = VersionInfo.DeveloperBuild; } private void SetSize() diff --git a/VersionInfo.cs b/VersionInfo.cs index d3d6637a0f..b9e18219a0 100644 --- a/VersionInfo.cs +++ b/VersionInfo.cs @@ -2,7 +2,7 @@ static class VersionInfo { public const string MAINVERSION = "1.9.0"; public static string RELEASEDATE = "November 23, 2014"; - public static bool DeveloperBuild = true; + public static bool DeveloperBuild = false; public static string GetEmuVersion() {