From ce6623ba39eff30a48ac8b6fc677248d1089a2be Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 25 Jul 2015 17:03:13 -0400 Subject: [PATCH] Tastudio - split container for bookmarks vs markers --- .../tools/TAStudio/PlaybackBox.Designer.cs | 60 ++++++++-------- .../tools/TAStudio/TAStudio.Designer.cs | 70 +++++++++++++------ 2 files changed, 79 insertions(+), 51 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs index d64348af48..6881638103 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs @@ -33,10 +33,10 @@ this.TurboSeekCheckbox = new System.Windows.Forms.CheckBox(); this.FollowCursorCheckbox = new System.Windows.Forms.CheckBox(); this.NextMarkerButton = new System.Windows.Forms.Button(); - this.PauseButton = new System.Windows.Forms.Button(); - this.PreviousMarkerButton = new System.Windows.Forms.Button(); this.FrameAdvanceButton = new BizHawk.Client.EmuHawk.RepeatButton(); + this.PauseButton = new System.Windows.Forms.Button(); this.RewindButton = new BizHawk.Client.EmuHawk.RepeatButton(); + this.PreviousMarkerButton = new System.Windows.Forms.Button(); this.PlaybackGroupBox.SuspendLayout(); this.SuspendLayout(); // @@ -55,7 +55,7 @@ this.PlaybackGroupBox.Controls.Add(this.PreviousMarkerButton); this.PlaybackGroupBox.Location = new System.Drawing.Point(3, 3); this.PlaybackGroupBox.Name = "PlaybackGroupBox"; - this.PlaybackGroupBox.Size = new System.Drawing.Size(198, 90); + this.PlaybackGroupBox.Size = new System.Drawing.Size(198, 81); this.PlaybackGroupBox.TabIndex = 0; this.PlaybackGroupBox.TabStop = false; this.PlaybackGroupBox.Text = "Playback"; @@ -63,7 +63,7 @@ // AutoRestoreCheckbox // this.AutoRestoreCheckbox.AutoSize = true; - this.AutoRestoreCheckbox.Location = new System.Drawing.Point(10, 69); + this.AutoRestoreCheckbox.Location = new System.Drawing.Point(10, 64); this.AutoRestoreCheckbox.Name = "AutoRestoreCheckbox"; this.AutoRestoreCheckbox.Size = new System.Drawing.Size(141, 17); this.AutoRestoreCheckbox.TabIndex = 8; @@ -74,7 +74,7 @@ // TurboSeekCheckbox // this.TurboSeekCheckbox.AutoSize = true; - this.TurboSeekCheckbox.Location = new System.Drawing.Point(103, 48); + this.TurboSeekCheckbox.Location = new System.Drawing.Point(103, 43); this.TurboSeekCheckbox.Name = "TurboSeekCheckbox"; this.TurboSeekCheckbox.Size = new System.Drawing.Size(80, 17); this.TurboSeekCheckbox.TabIndex = 6; @@ -85,7 +85,7 @@ // FollowCursorCheckbox // this.FollowCursorCheckbox.AutoSize = true; - this.FollowCursorCheckbox.Location = new System.Drawing.Point(10, 48); + this.FollowCursorCheckbox.Location = new System.Drawing.Point(10, 43); this.FollowCursorCheckbox.Name = "FollowCursorCheckbox"; this.FollowCursorCheckbox.Size = new System.Drawing.Size(89, 17); this.FollowCursorCheckbox.TabIndex = 5; @@ -95,7 +95,7 @@ // // NextMarkerButton // - this.NextMarkerButton.Location = new System.Drawing.Point(154, 19); + this.NextMarkerButton.Location = new System.Drawing.Point(154, 17); this.NextMarkerButton.Name = "NextMarkerButton"; this.NextMarkerButton.Size = new System.Drawing.Size(38, 23); this.NextMarkerButton.TabIndex = 4; @@ -103,30 +103,10 @@ this.NextMarkerButton.UseVisualStyleBackColor = true; this.NextMarkerButton.Click += new System.EventHandler(this.NextMarkerButton_Click); // - // PauseButton - // - this.PauseButton.Location = new System.Drawing.Point(80, 19); - this.PauseButton.Name = "PauseButton"; - this.PauseButton.Size = new System.Drawing.Size(38, 23); - this.PauseButton.TabIndex = 2; - this.PauseButton.Text = "| |"; - this.PauseButton.UseVisualStyleBackColor = true; - this.PauseButton.Click += new System.EventHandler(this.PauseButton_Click); - // - // PreviousMarkerButton - // - this.PreviousMarkerButton.Location = new System.Drawing.Point(6, 19); - this.PreviousMarkerButton.Name = "PreviousMarkerButton"; - this.PreviousMarkerButton.Size = new System.Drawing.Size(38, 23); - this.PreviousMarkerButton.TabIndex = 0; - this.PreviousMarkerButton.Text = "<<"; - this.PreviousMarkerButton.UseVisualStyleBackColor = true; - this.PreviousMarkerButton.Click += new System.EventHandler(this.PreviousMarkerButton_Click); - // // FrameAdvanceButton // this.FrameAdvanceButton.InitialDelay = 500; - this.FrameAdvanceButton.Location = new System.Drawing.Point(117, 19); + this.FrameAdvanceButton.Location = new System.Drawing.Point(117, 17); this.FrameAdvanceButton.Name = "FrameAdvanceButton"; this.FrameAdvanceButton.RepeatDelay = 50; this.FrameAdvanceButton.Size = new System.Drawing.Size(38, 23); @@ -135,10 +115,20 @@ this.FrameAdvanceButton.UseVisualStyleBackColor = true; this.FrameAdvanceButton.Click += new System.EventHandler(this.FrameAdvanceButton_Click); // + // PauseButton + // + this.PauseButton.Location = new System.Drawing.Point(80, 17); + this.PauseButton.Name = "PauseButton"; + this.PauseButton.Size = new System.Drawing.Size(38, 23); + this.PauseButton.TabIndex = 2; + this.PauseButton.Text = "| |"; + this.PauseButton.UseVisualStyleBackColor = true; + this.PauseButton.Click += new System.EventHandler(this.PauseButton_Click); + // // RewindButton // this.RewindButton.InitialDelay = 1000; - this.RewindButton.Location = new System.Drawing.Point(43, 19); + this.RewindButton.Location = new System.Drawing.Point(43, 17); this.RewindButton.Name = "RewindButton"; this.RewindButton.RepeatDelay = 100; this.RewindButton.Size = new System.Drawing.Size(38, 23); @@ -147,12 +137,22 @@ this.RewindButton.UseVisualStyleBackColor = true; this.RewindButton.Click += new System.EventHandler(this.RewindButton_Click); // + // PreviousMarkerButton + // + this.PreviousMarkerButton.Location = new System.Drawing.Point(6, 17); + this.PreviousMarkerButton.Name = "PreviousMarkerButton"; + this.PreviousMarkerButton.Size = new System.Drawing.Size(38, 23); + this.PreviousMarkerButton.TabIndex = 0; + this.PreviousMarkerButton.Text = "<<"; + this.PreviousMarkerButton.UseVisualStyleBackColor = true; + this.PreviousMarkerButton.Click += new System.EventHandler(this.PreviousMarkerButton_Click); + // // PlaybackBox // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.PlaybackGroupBox); this.Name = "PlaybackBox"; - this.Size = new System.Drawing.Size(204, 96); + this.Size = new System.Drawing.Size(204, 91); this.PlaybackGroupBox.ResumeLayout(false); this.PlaybackGroupBox.PerformLayout(); this.ResumeLayout(false); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 8cf7a3c0ee..5b0c832cba 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -127,6 +127,8 @@ namespace BizHawk.Client.EmuHawk this.scrollToTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.scrollToBottomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.scrollToCenterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); + this.wheelScrollSpeedToolStripMenuItem = 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(); @@ -173,13 +175,16 @@ namespace BizHawk.Client.EmuHawk this.StartNewProjectFromNowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.BookMarkControl = new BizHawk.Client.EmuHawk.BookmarksBranchesBox(); - this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); - this.wheelScrollSpeedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.BranchesMarkersSplit = new System.Windows.Forms.SplitContainer(); this.TASMenu.SuspendLayout(); this.TasStatusStrip.SuspendLayout(); this.MarkerContextMenu.SuspendLayout(); this.RightClickMenu.SuspendLayout(); this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).BeginInit(); + this.BranchesMarkersSplit.Panel1.SuspendLayout(); + this.BranchesMarkersSplit.Panel2.SuspendLayout(); + this.BranchesMarkersSplit.SuspendLayout(); this.SuspendLayout(); // // TASMenu @@ -974,6 +979,18 @@ namespace BizHawk.Client.EmuHawk this.scrollToCenterToolStripMenuItem.Text = "Scroll to Center"; this.scrollToCenterToolStripMenuItem.Click += new System.EventHandler(this.scrollToCenterToolStripMenuItem_Click); // + // toolStripSeparator25 + // + this.toolStripSeparator25.Name = "toolStripSeparator25"; + this.toolStripSeparator25.Size = new System.Drawing.Size(180, 6); + // + // wheelScrollSpeedToolStripMenuItem + // + this.wheelScrollSpeedToolStripMenuItem.Name = "wheelScrollSpeedToolStripMenuItem"; + this.wheelScrollSpeedToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.wheelScrollSpeedToolStripMenuItem.Text = "Wheel Scroll Speed..."; + this.wheelScrollSpeedToolStripMenuItem.Click += new System.EventHandler(this.wheelScrollSpeedToolStripMenuItem_Click); + // // ColumnsSubMenu // this.ColumnsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1035,6 +1052,7 @@ namespace BizHawk.Client.EmuHawk this.TasView.MultiSelect = false; this.TasView.Name = "TasView"; this.TasView.RowCount = 0; + this.TasView.ScrollSpeed = 1; this.TasView.Size = new System.Drawing.Size(288, 528); this.TasView.TabIndex = 1; this.TasView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick); @@ -1093,7 +1111,7 @@ namespace BizHawk.Client.EmuHawk 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.Size = new System.Drawing.Size(204, 92); this.TasPlaybackBox.TabIndex = 5; this.TasPlaybackBox.Tastudio = null; // @@ -1106,7 +1124,7 @@ namespace BizHawk.Client.EmuHawk this.MarkerControl.Emulator = null; this.MarkerControl.Location = new System.Drawing.Point(2, 16); this.MarkerControl.Name = "MarkerControl"; - this.MarkerControl.Size = new System.Drawing.Size(201, 206); + this.MarkerControl.Size = new System.Drawing.Size(194, 235); this.MarkerControl.TabIndex = 6; this.MarkerControl.Tastudio = null; // @@ -1350,36 +1368,42 @@ namespace BizHawk.Client.EmuHawk // // 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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); this.groupBox1.Controls.Add(this.MarkerControl); - this.groupBox1.Location = new System.Drawing.Point(304, 323); + this.groupBox1.Location = new System.Drawing.Point(-2, 3); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(204, 228); + this.groupBox1.Size = new System.Drawing.Size(204, 257); this.groupBox1.TabIndex = 7; this.groupBox1.TabStop = false; this.groupBox1.Text = "Markers"; // // BookMarkControl // - this.BookMarkControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BookMarkControl.Location = new System.Drawing.Point(302, 120); + this.BookMarkControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.BookMarkControl.Location = new System.Drawing.Point(-2, 0); this.BookMarkControl.Name = "BookMarkControl"; - this.BookMarkControl.Size = new System.Drawing.Size(204, 205); + this.BookMarkControl.Size = new System.Drawing.Size(204, 163); this.BookMarkControl.TabIndex = 8; this.BookMarkControl.Tastudio = null; // - // toolStripSeparator25 + // BranchesMarkersSplit // - this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(180, 6); + this.BranchesMarkersSplit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.BranchesMarkersSplit.Location = new System.Drawing.Point(302, 115); + this.BranchesMarkersSplit.Name = "BranchesMarkersSplit"; + this.BranchesMarkersSplit.Orientation = System.Windows.Forms.Orientation.Horizontal; // - // wheelScrollSpeedToolStripMenuItem + // BranchesMarkersSplit.Panel1 // - this.wheelScrollSpeedToolStripMenuItem.Name = "wheelScrollSpeedToolStripMenuItem"; - this.wheelScrollSpeedToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.wheelScrollSpeedToolStripMenuItem.Text = "Wheel Scroll Speed..."; - this.wheelScrollSpeedToolStripMenuItem.Click += new System.EventHandler(this.wheelScrollSpeedToolStripMenuItem_Click); + this.BranchesMarkersSplit.Panel1.Controls.Add(this.BookMarkControl); + // + // BranchesMarkersSplit.Panel2 + // + this.BranchesMarkersSplit.Panel2.Controls.Add(this.groupBox1); + this.BranchesMarkersSplit.Size = new System.Drawing.Size(204, 436); + this.BranchesMarkersSplit.SplitterDistance = 169; + this.BranchesMarkersSplit.TabIndex = 9; // // TAStudio // @@ -1387,8 +1411,7 @@ namespace BizHawk.Client.EmuHawk this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(506, 576); - this.Controls.Add(this.BookMarkControl); - this.Controls.Add(this.groupBox1); + this.Controls.Add(this.BranchesMarkersSplit); this.Controls.Add(this.TasPlaybackBox); this.Controls.Add(this.TasStatusStrip); this.Controls.Add(this.TASMenu); @@ -1413,6 +1436,10 @@ namespace BizHawk.Client.EmuHawk this.MarkerContextMenu.ResumeLayout(false); this.RightClickMenu.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.BranchesMarkersSplit.Panel1.ResumeLayout(false); + this.BranchesMarkersSplit.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).EndInit(); + this.BranchesMarkersSplit.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1563,5 +1590,6 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolStripMenuItem BranchContextMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator25; private System.Windows.Forms.ToolStripMenuItem wheelScrollSpeedToolStripMenuItem; + private System.Windows.Forms.SplitContainer BranchesMarkersSplit; } } \ No newline at end of file