ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added RightClickMenu ContextMenuStrip to TAStudio, enabled all but three options which need to be implemented in code. Fixed a couple of short key combinations not working.

This commit is contained in:
kylelyk 2014-08-23 01:18:05 +00:00
parent 92bdba7938
commit 7b03f11091
4 changed files with 850 additions and 672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -1150,6 +1150,9 @@
<EmbeddedResource Include="CustomControls\QuickProgressPopup.resx">
<DependentUpon>QuickProgressPopup.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CustomControls\TasListView.resx">
<DependentUpon>TasListView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Designer</SubType>

167
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs generated
View File

@ -30,6 +30,7 @@ namespace BizHawk.Client.EmuHawk
/// </summary>
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();
@ -108,8 +109,25 @@ namespace BizHawk.Client.EmuHawk
this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox();
this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl();
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.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.TASMenu.SuspendLayout();
this.TasStatusStrip.SuspendLayout();
this.RightClickMenu.SuspendLayout();
this.SuspendLayout();
//
// TASMenu
@ -295,7 +313,8 @@ namespace BizHawk.Client.EmuHawk
// SelectAllMenuItem
//
this.SelectAllMenuItem.Name = "SelectAllMenuItem";
this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A";
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(272, 22);
this.SelectAllMenuItem.Text = "Select &All";
this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
@ -397,7 +416,8 @@ namespace BizHawk.Client.EmuHawk
// InsertNumFramesMenuItem
//
this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem";
this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = "Ins";
this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = "";
this.InsertNumFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert;
this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(272, 22);
this.InsertNumFramesMenuItem.Text = "Insert # of Frames";
this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click);
@ -756,6 +776,132 @@ namespace BizHawk.Client.EmuHawk
this.MarkerControl.TabIndex = 6;
this.MarkerControl.Tastudio = null;
//
// RightClickMenu
//
this.RightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SetMarkersContextMenuItem,
this.RemoveMarkersContextMenuItem,
this.toolStripSeparator15,
this.DeselectContextMenuItem,
this.SelectBetweenMarkersContextMenuItem,
this.toolStripSeparator16,
this.UngreenzoneContextMenuItem,
this.toolStripSeparator17,
this.ClearContextMenuItem,
this.DeleteFramesContextMenuItem,
this.CloneContextMenuItem,
this.InsertFrameContextMenuItem,
this.InsertNumFramesContextMenuItem,
this.toolStripSeparator18,
this.TruncateContextMenuItem});
this.RightClickMenu.Name = "RightClickMenu";
this.RightClickMenu.Size = new System.Drawing.Size(273, 270);
//
// SetMarkersContextMenuItem
//
this.SetMarkersContextMenuItem.Enabled = false;
this.SetMarkersContextMenuItem.Name = "SetMarkersContextMenuItem";
this.SetMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22);
this.SetMarkersContextMenuItem.Text = "Set Markers";
//
// RemoveMarkersContextMenuItem
//
this.RemoveMarkersContextMenuItem.Enabled = false;
this.RemoveMarkersContextMenuItem.Name = "RemoveMarkersContextMenuItem";
this.RemoveMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22);
this.RemoveMarkersContextMenuItem.Text = "Remove Markers";
//
// 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.Enabled = false;
this.UngreenzoneContextMenuItem.Name = "UngreenzoneContextMenuItem";
this.UngreenzoneContextMenuItem.Size = new System.Drawing.Size(272, 22);
this.UngreenzoneContextMenuItem.Text = "Ungreenzone";
//
// 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);
//
// TAStudio
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -778,6 +924,7 @@ namespace BizHawk.Client.EmuHawk
this.TASMenu.PerformLayout();
this.TasStatusStrip.ResumeLayout(false);
this.TasStatusStrip.PerformLayout();
this.RightClickMenu.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@ -862,5 +1009,21 @@ namespace BizHawk.Client.EmuHawk
private System.Windows.Forms.ToolStripMenuItem SubtitlesMenuItem;
private System.Windows.Forms.ToolStripMenuItem GreenzoneSettingsMenuItem;
private MarkerControl MarkerControl;
private System.Windows.Forms.ContextMenuStrip RightClickMenu;
private System.Windows.Forms.ToolStripMenuItem SetMarkersContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem RemoveMarkersContextMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
private System.Windows.Forms.ToolStripMenuItem DeselectContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem SelectBetweenMarkersContextMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator16;
private System.Windows.Forms.ToolStripMenuItem UngreenzoneContextMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator17;
private System.Windows.Forms.ToolStripMenuItem ClearContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem DeleteFramesContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem InsertFrameContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem InsertNumFramesContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem CloneContextMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator18;
private System.Windows.Forms.ToolStripMenuItem TruncateContextMenuItem;
}
}

9
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -232,6 +232,15 @@ namespace BizHawk.Client.EmuHawk
}
}
}
else if (e.Button == MouseButtons.Right)
{
var frame = TasView.PointedCell.Row.Value;
var buttonName = TasView.PointedCell.Column;
if (TasView.SelectedIndices.IndexOf(frame) != -1 && (buttonName == MarkerColumnName || buttonName == FrameColumnName))
{
RightClickMenu.Show(TasView, e.X, e.Y);
}
}
}
}

3
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx
View File

@ -184,6 +184,9 @@
<metadata name="TasStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>121, 17</value>
</metadata>
<metadata name="RightClickMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>249, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA