MultiHawk - add some more movie menu and contextmenu items I realize I use all the time

This commit is contained in:
adelikat 2015-03-06 02:08:31 +00:00
parent 06d9fd7b06
commit ea592e534b
6 changed files with 94 additions and 13 deletions

View File

@ -345,6 +345,9 @@
<ItemGroup>
<None Include="images\Save.png" />
</ItemGroup>
<ItemGroup>
<None Include="images\restart.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

View File

@ -54,6 +54,7 @@
this.RecordMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PlayMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.StopMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.RestartMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.RecentMovieSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
@ -70,8 +71,11 @@
this.PlayRecordStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
this.StatusBarMessageLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.LoadLastMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.RecordMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PlayMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.LoadLastMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.StopMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.RestartMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainformMenu.SuspendLayout();
this.WorkspacePanel.SuspendLayout();
this.MainStatusBar.SuspendLayout();
@ -180,7 +184,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(57, 6);
//
// toolStripSeparator5
//
@ -253,6 +257,7 @@
this.RecordMovieMenuItem,
this.PlayMovieMenuItem,
this.StopMovieMenuItem,
this.RestartMovieMenuItem,
this.RecentMovieSubMenu,
this.toolStripSeparator2,
this.ToggleReadonlyMenuItem});
@ -285,6 +290,14 @@
this.StopMovieMenuItem.Text = "&Stop Movie";
this.StopMovieMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
//
// RestartMovieMenuItem
//
this.RestartMovieMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.restart;
this.RestartMovieMenuItem.Name = "RestartMovieMenuItem";
this.RestartMovieMenuItem.Size = new System.Drawing.Size(168, 22);
this.RestartMovieMenuItem.Text = "Restart Movie";
this.RestartMovieMenuItem.Click += new System.EventHandler(this.RestartMovieMenuItem_Click);
//
// RecentMovieSubMenu
//
this.RecentMovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -407,12 +420,31 @@
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.LoadLastMovieContextMenuItem,
this.RecordMovieContextMenuItem});
this.RecordMovieContextMenuItem,
this.PlayMovieContextMenuItem,
this.RestartMovieContextMenuItem,
this.StopMovieContextMenuItem,
this.LoadLastMovieContextMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(161, 48);
this.contextMenuStrip1.Size = new System.Drawing.Size(161, 114);
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
//
// RecordMovieContextMenuItem
//
this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.RecordHS;
this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem";
this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
this.RecordMovieContextMenuItem.Text = "Record Movie";
this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
//
// PlayMovieContextMenuItem
//
this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Play;
this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem";
this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
this.PlayMovieContextMenuItem.Text = "Play Movie";
this.PlayMovieContextMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click);
//
// LoadLastMovieContextMenuItem
//
this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Recent;
@ -421,13 +453,21 @@
this.LoadLastMovieContextMenuItem.Text = "Load Last Movie";
this.LoadLastMovieContextMenuItem.Click += new System.EventHandler(this.LoadLastMovieMenuItem_Click);
//
// RecordMovieContextMenuItem
// StopMovieContextMenuItem
//
this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.RecordHS;
this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem";
this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
this.RecordMovieContextMenuItem.Text = "Record Movie";
this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
this.StopMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Stop;
this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem";
this.StopMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
this.StopMovieContextMenuItem.Text = "Stop Movie";
this.StopMovieContextMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
//
// RestartMovieContextMenuItem
//
this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.restart;
this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem";
this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
this.RestartMovieContextMenuItem.Text = "Restart Movie";
this.RestartMovieContextMenuItem.Click += new System.EventHandler(this.RestartMovieMenuItem_Click);
//
// Mainform
//
@ -498,6 +538,10 @@
private System.Windows.Forms.ToolStripMenuItem RecentMovieSubMenu;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripMenuItem RecordMovieContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem StopMovieContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem PlayMovieContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem RestartMovieMenuItem;
private System.Windows.Forms.ToolStripMenuItem RestartMovieContextMenuItem;
}
}

View File

@ -85,6 +85,8 @@ namespace BizHawk.Client.MultiHawk
Closing += (o, e) =>
{
Global.MovieSession.Movie.Stop();
foreach (var ew in EmulatorWindows.ToList())
{
ew.ShutDown();
@ -1081,7 +1083,9 @@ namespace BizHawk.Client.MultiHawk
RecordMovieMenuItem.Enabled =
EmulatorWindows.Any();
StopMovieMenuItem.Enabled = Global.MovieSession.Movie.IsActive;
StopMovieMenuItem.Enabled =
RestartMovieMenuItem.Enabled =
Global.MovieSession.Movie.IsActive;
}
private void RecordMovieMenuItem_Click(object sender, EventArgs e)
@ -1487,7 +1491,15 @@ namespace BizHawk.Client.MultiHawk
private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)
{
LoadLastMovieContextMenuItem.Enabled = !Global.Config.RecentMovies.Empty;
LoadLastMovieContextMenuItem.Visible = !Global.Config.RecentMovies.Empty;
PlayMovieContextMenuItem.Visible =
RecordMovieContextMenuItem.Visible =
!Global.MovieSession.Movie.IsActive;
StopMovieContextMenuItem.Visible =
RestartMovieContextMenuItem.Visible =
Global.MovieSession.Movie.IsActive;
}
private void RecentMovieSubMenu_DropDownOpened(object sender, EventArgs e)
@ -1496,5 +1508,14 @@ namespace BizHawk.Client.MultiHawk
RecentMovieSubMenu.DropDownItems.AddRange(
Global.Config.RecentMovies.RecentMenu(LoadMoviesFromRecent, autoload: true));
}
private void RestartMovieMenuItem_Click(object sender, EventArgs e)
{
if (Global.MovieSession.Movie.IsActive)
{
StartNewMovie(Global.MovieSession.Movie, false);
AddMessage("Replaying movie file in read-only mode");
}
}
}
}

View File

@ -230,6 +230,16 @@ namespace BizHawk.Client.MultiHawk.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap restart {
get {
object obj = ResourceManager.GetObject("restart", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View File

@ -184,4 +184,7 @@
<data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\Save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="restart" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\restart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 B