diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs index faa7f293bd..30ff41d4b2 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs @@ -38,7 +38,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.BookmarksBranchesGroupBox.Location = new System.Drawing.Point(3, 0); this.BookmarksBranchesGroupBox.Name = "BookmarksBranchesGroupBox"; - this.BookmarksBranchesGroupBox.Size = new System.Drawing.Size(198, 237); + this.BookmarksBranchesGroupBox.Size = new System.Drawing.Size(198, 249); this.BookmarksBranchesGroupBox.TabIndex = 0; this.BookmarksBranchesGroupBox.TabStop = false; this.BookmarksBranchesGroupBox.Text = "Bookmarks / Branches"; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs index e6fa2205b8..e7d7a06d29 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs @@ -66,6 +66,7 @@ // AutoRestoreCheckbox // this.AutoRestoreCheckbox.AutoSize = true; + this.AutoRestoreCheckbox.Enabled = false; this.AutoRestoreCheckbox.Location = new System.Drawing.Point(10, 87); this.AutoRestoreCheckbox.Name = "AutoRestoreCheckbox"; this.AutoRestoreCheckbox.Size = new System.Drawing.Size(141, 17); @@ -75,6 +76,7 @@ // // SeekProgressBar // + this.SeekProgressBar.Enabled = false; this.SeekProgressBar.Location = new System.Drawing.Point(6, 71); this.SeekProgressBar.Name = "SeekProgressBar"; this.SeekProgressBar.Size = new System.Drawing.Size(186, 10); @@ -84,6 +86,7 @@ // TurboSeekCheckbox // this.TurboSeekCheckbox.AutoSize = true; + this.TurboSeekCheckbox.Enabled = false; this.TurboSeekCheckbox.Location = new System.Drawing.Point(103, 48); this.TurboSeekCheckbox.Name = "TurboSeekCheckbox"; this.TurboSeekCheckbox.Size = new System.Drawing.Size(80, 17); @@ -94,6 +97,7 @@ // FollowCursorCheckbox // this.FollowCursorCheckbox.AutoSize = true; + this.FollowCursorCheckbox.Enabled = false; this.FollowCursorCheckbox.Location = new System.Drawing.Point(10, 48); this.FollowCursorCheckbox.Name = "FollowCursorCheckbox"; this.FollowCursorCheckbox.Size = new System.Drawing.Size(89, 17); @@ -103,6 +107,7 @@ // // NextMarkerButton // + this.NextMarkerButton.Enabled = false; this.NextMarkerButton.Location = new System.Drawing.Point(154, 19); this.NextMarkerButton.Name = "NextMarkerButton"; this.NextMarkerButton.Size = new System.Drawing.Size(38, 23); @@ -112,6 +117,7 @@ // // FrameAdvanceButton // + this.FrameAdvanceButton.Enabled = false; this.FrameAdvanceButton.Location = new System.Drawing.Point(117, 19); this.FrameAdvanceButton.Name = "FrameAdvanceButton"; this.FrameAdvanceButton.Size = new System.Drawing.Size(38, 23); @@ -121,6 +127,7 @@ // // PauseButton // + this.PauseButton.Enabled = false; this.PauseButton.Location = new System.Drawing.Point(80, 19); this.PauseButton.Name = "PauseButton"; this.PauseButton.Size = new System.Drawing.Size(38, 23); @@ -130,6 +137,7 @@ // // RewindButton // + this.RewindButton.Enabled = false; this.RewindButton.Location = new System.Drawing.Point(43, 19); this.RewindButton.Name = "RewindButton"; this.RewindButton.Size = new System.Drawing.Size(38, 23); @@ -139,6 +147,7 @@ // // PreviousMarkerButton // + this.PreviousMarkerButton.Enabled = false; this.PreviousMarkerButton.Location = new System.Drawing.Point(6, 19); this.PreviousMarkerButton.Name = "PreviousMarkerButton"; this.PreviousMarkerButton.Size = new System.Drawing.Size(38, 23); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/SplicerBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/SplicerBox.Designer.cs index 112a91ca3b..c582a3ebba 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/SplicerBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/SplicerBox.Designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { this.SplicerGroupBox = new System.Windows.Forms.GroupBox(); - this.SelectionNameLabel = new System.Windows.Forms.Label(); - this.ClipboardNameLabel = new System.Windows.Forms.Label(); - this.SelectionStatsLabel = new System.Windows.Forms.Label(); this.ClipboardStatsLabel = new System.Windows.Forms.Label(); + this.SelectionStatsLabel = new System.Windows.Forms.Label(); + this.ClipboardNameLabel = new System.Windows.Forms.Label(); + this.SelectionNameLabel = new System.Windows.Forms.Label(); this.SplicerGroupBox.SuspendLayout(); this.SuspendLayout(); // @@ -52,14 +52,25 @@ this.SplicerGroupBox.TabStop = false; this.SplicerGroupBox.Text = "Splicer"; // - // SelectionNameLabel + // ClipboardStatsLabel // - this.SelectionNameLabel.AutoSize = true; - this.SelectionNameLabel.Location = new System.Drawing.Point(6, 16); - this.SelectionNameLabel.Name = "SelectionNameLabel"; - this.SelectionNameLabel.Size = new System.Drawing.Size(54, 13); - this.SelectionNameLabel.TabIndex = 0; - this.SelectionNameLabel.Text = "Selection:"; + this.ClipboardStatsLabel.AutoSize = true; + this.ClipboardStatsLabel.Enabled = false; + this.ClipboardStatsLabel.Location = new System.Drawing.Point(66, 33); + this.ClipboardStatsLabel.Name = "ClipboardStatsLabel"; + this.ClipboardStatsLabel.Size = new System.Drawing.Size(35, 13); + this.ClipboardStatsLabel.TabIndex = 3; + this.ClipboardStatsLabel.Text = "empty"; + // + // SelectionStatsLabel + // + this.SelectionStatsLabel.AutoSize = true; + this.SelectionStatsLabel.Enabled = false; + this.SelectionStatsLabel.Location = new System.Drawing.Point(66, 16); + this.SelectionStatsLabel.Name = "SelectionStatsLabel"; + this.SelectionStatsLabel.Size = new System.Drawing.Size(87, 13); + this.SelectionStatsLabel.TabIndex = 2; + this.SelectionStatsLabel.Text = "1 row, 8 columns"; // // ClipboardNameLabel // @@ -70,23 +81,14 @@ this.ClipboardNameLabel.TabIndex = 1; this.ClipboardNameLabel.Text = "Clipboard:"; // - // SelectionStatsLabel + // SelectionNameLabel // - this.SelectionStatsLabel.AutoSize = true; - this.SelectionStatsLabel.Location = new System.Drawing.Point(66, 16); - this.SelectionStatsLabel.Name = "SelectionStatsLabel"; - this.SelectionStatsLabel.Size = new System.Drawing.Size(87, 13); - this.SelectionStatsLabel.TabIndex = 2; - this.SelectionStatsLabel.Text = "1 row, 8 columns"; - // - // ClipboardStatsLabel - // - this.ClipboardStatsLabel.AutoSize = true; - this.ClipboardStatsLabel.Location = new System.Drawing.Point(66, 33); - this.ClipboardStatsLabel.Name = "ClipboardStatsLabel"; - this.ClipboardStatsLabel.Size = new System.Drawing.Size(35, 13); - this.ClipboardStatsLabel.TabIndex = 3; - this.ClipboardStatsLabel.Text = "empty"; + this.SelectionNameLabel.AutoSize = true; + this.SelectionNameLabel.Location = new System.Drawing.Point(6, 16); + this.SelectionNameLabel.Name = "SelectionNameLabel"; + this.SelectionNameLabel.Size = new System.Drawing.Size(54, 13); + this.SelectionNameLabel.TabIndex = 0; + this.SelectionNameLabel.Text = "Selection:"; // // SplicerBox // diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 98ec637b7d..5ed19a1755 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -102,9 +102,13 @@ namespace BizHawk.Client.EmuHawk this.TASView = new BizHawk.Client.EmuHawk.TasListView(); this.Frame = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Log = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.PreviousMarkerFromFrameControl = new BizHawk.Client.EmuHawk.MarkerControl(); - this.PreviousMarkerFromSelectionControl = new BizHawk.Client.EmuHawk.MarkerControl(); + this.TasStatusStrip = new System.Windows.Forms.StatusStrip(); + this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox(); + this.TasSplicerBox = new BizHawk.Client.EmuHawk.SplicerBox(); + this.TasBookmarksBranchesBox = new BizHawk.Client.EmuHawk.BookmarksBranchesBox(); this.TASMenu.SuspendLayout(); + this.TasStatusStrip.SuspendLayout(); this.SuspendLayout(); // // TASMenu @@ -118,7 +122,7 @@ namespace BizHawk.Client.EmuHawk this.HelpSubMenu}); this.TASMenu.Location = new System.Drawing.Point(0, 0); this.TASMenu.Name = "TASMenu"; - this.TASMenu.Size = new System.Drawing.Size(530, 24); + this.TASMenu.Size = new System.Drawing.Size(506, 24); this.TASMenu.TabIndex = 0; this.TASMenu.Text = "menuStrip1"; // @@ -666,10 +670,10 @@ namespace BizHawk.Client.EmuHawk this.TASView.GridLines = true; this.TASView.InputPaintingMode = false; this.TASView.ItemCount = 0; - this.TASView.Location = new System.Drawing.Point(12, 49); + this.TASView.Location = new System.Drawing.Point(8, 27); this.TASView.Name = "TASView"; this.TASView.selectedItem = -1; - this.TASView.Size = new System.Drawing.Size(291, 444); + this.TASView.Size = new System.Drawing.Size(288, 471); this.TASView.TabIndex = 1; this.TASView.UseCompatibleStateImageBehavior = false; this.TASView.View = System.Windows.Forms.View.Details; @@ -685,31 +689,55 @@ namespace BizHawk.Client.EmuHawk this.Log.Text = "Log"; this.Log.Width = 222; // - // PreviousMarkerFromFrameControl + // TasStatusStrip // - this.PreviousMarkerFromFrameControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.PreviousMarkerFromFrameControl.Location = new System.Drawing.Point(12, 25); - this.PreviousMarkerFromFrameControl.Name = "PreviousMarkerFromFrameControl"; - this.PreviousMarkerFromFrameControl.Size = new System.Drawing.Size(292, 24); - this.PreviousMarkerFromFrameControl.TabIndex = 2; + this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MessageStatusLabel}); + 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"; // - // PreviousMarkerFromSelectionControl + // MessageStatusLabel // - this.PreviousMarkerFromSelectionControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.PreviousMarkerFromSelectionControl.Location = new System.Drawing.Point(11, 493); - this.PreviousMarkerFromSelectionControl.Name = "PreviousMarkerFromSelectionControl"; - this.PreviousMarkerFromSelectionControl.Size = new System.Drawing.Size(292, 24); - this.PreviousMarkerFromSelectionControl.TabIndex = 3; + this.MessageStatusLabel.Name = "MessageStatusLabel"; + this.MessageStatusLabel.Size = new System.Drawing.Size(105, 17); + this.MessageStatusLabel.Text = "TAStudio engaged"; + // + // 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, 120); + this.TasPlaybackBox.TabIndex = 5; + // + // TasSplicerBox + // + this.TasSplicerBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.TasSplicerBox.Location = new System.Drawing.Point(302, 145); + this.TasSplicerBox.Name = "TasSplicerBox"; + this.TasSplicerBox.Size = new System.Drawing.Size(204, 65); + this.TasSplicerBox.TabIndex = 6; + // + // TasBookmarksBranchesBox + // + this.TasBookmarksBranchesBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.TasBookmarksBranchesBox.Location = new System.Drawing.Point(302, 216); + this.TasBookmarksBranchesBox.Name = "TasBookmarksBranchesBox"; + this.TasBookmarksBranchesBox.Size = new System.Drawing.Size(204, 278); + this.TasBookmarksBranchesBox.TabIndex = 7; // // TAStudio // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(530, 519); - this.Controls.Add(this.PreviousMarkerFromSelectionControl); - this.Controls.Add(this.PreviousMarkerFromFrameControl); + this.ClientSize = new System.Drawing.Size(506, 519); + this.Controls.Add(this.TasBookmarksBranchesBox); + this.Controls.Add(this.TasSplicerBox); + 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"))); @@ -721,6 +749,8 @@ namespace BizHawk.Client.EmuHawk this.Load += new System.EventHandler(this.TAStudio_Load); this.TASMenu.ResumeLayout(false); this.TASMenu.PerformLayout(); + this.TasStatusStrip.ResumeLayout(false); + this.TasStatusStrip.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -799,7 +829,10 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; private System.Windows.Forms.ToolStripMenuItem RestoreDefaultSettingsMenuItem; private System.Windows.Forms.ToolStripMenuItem AutoloadProjectMenuItem; - private MarkerControl PreviousMarkerFromFrameControl; - private MarkerControl PreviousMarkerFromSelectionControl; + private System.Windows.Forms.StatusStrip TasStatusStrip; + private System.Windows.Forms.ToolStripStatusLabel MessageStatusLabel; + private PlaybackBox TasPlaybackBox; + private SplicerBox TasSplicerBox; + private BookmarksBranchesBox TasBookmarksBranchesBox; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 600d6da7b9..9a41e6931e 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -501,6 +501,11 @@ namespace BizHawk.Client.EmuHawk #endregion + private void PreviousMarkerFromFrameControl_Load(object sender, EventArgs e) + { + + } + #endregion } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx index 1dc359e417..3a0ad13883 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx @@ -168,7 +168,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAAk1JREFUOE+VkktvUlEU + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAk1JREFUOE+VkktvUlEU hVsfsdHoREcOHJr4C/RPONHoXzBxoOlAJybOlAZtkdSa2piYNsjjFiiX8qY8ChYL+ECB2lKB8rq0k5bE miiRbtc+6b2B6MTBR/ZZa+919j3tEBH9RbudHD6E63/2qAwctreT58BVRVnWl8vBbLEg7wNC/QPaMrwb 4GT/jFa024mzQLe56c9GwjM7klXXlcw6ksyPSbLoKByc/lUq+TbQMwrODARAGAF3SxtexSMbf8vOCVp9 @@ -181,6 +181,9 @@ 68JLo+eSOjMQwKDpGLgCJtDoBysgBXzQDOBifz8zcPh/aOgP7nYTiVA2JaoAAAAASUVORK5CYII= + + 121, 17 + AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA