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

Add Save Movie hotkey and context menu item

This commit is contained in:
adelikat 2012-10-28 23:38:41 +00:00
parent 14d5844af8
commit e8b9bb38b6
6 changed files with 784 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/Config.cs
View File

@ -593,6 +593,7 @@ namespace BizHawk.MultiClient
public string ToggleSNESOBJ2Binding = "";
public string ToggleSNESOBJ3Binding = "";
public string ToggleSNESOBJ4Binding = "";
public string SaveMovieBinding = "";
// NES Sound settings
public bool NESEnableSquare1 = true;

27
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

@ -86,6 +86,7 @@
this.stopMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.playFromBeginningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -295,7 +296,7 @@
this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem();
this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem();
this.saveMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.StatusSlot0.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
@ -867,6 +868,14 @@
this.importMovieToolStripMenuItem.Text = "Import Movies...";
this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click);
//
// saveMovieToolStripMenuItem
//
this.saveMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
this.saveMovieToolStripMenuItem.Name = "saveMovieToolStripMenuItem";
this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
this.saveMovieToolStripMenuItem.Text = "&Save Movie";
this.saveMovieToolStripMenuItem.Click += new System.EventHandler(this.saveMovieToolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
@ -2398,6 +2407,7 @@
this.cmiViewSubtitles,
this.cmiAddSubtitle,
this.cmiViewComments,
this.saveMovieToolStripMenuItem1,
this.toolStripSeparator_afterMovie,
this.cmiUndoSavestate,
this.cmiSeparator20,
@ -2406,7 +2416,7 @@
this.cmiCloseRom,
this.cmiShowMenu});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(204, 374);
this.contextMenuStrip1.Size = new System.Drawing.Size(204, 418);
this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing);
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
//
@ -2547,13 +2557,13 @@
this.cmiShowMenu.Text = "Show Menu";
this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
//
// saveMovieToolStripMenuItem
// saveMovieToolStripMenuItem1
//
this.saveMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
this.saveMovieToolStripMenuItem.Name = "saveMovieToolStripMenuItem";
this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
this.saveMovieToolStripMenuItem.Text = "&Save Movie";
this.saveMovieToolStripMenuItem.Click += new System.EventHandler(this.saveMovieToolStripMenuItem_Click);
this.saveMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
this.saveMovieToolStripMenuItem1.Name = "saveMovieToolStripMenuItem1";
this.saveMovieToolStripMenuItem1.Size = new System.Drawing.Size(203, 22);
this.saveMovieToolStripMenuItem1.Text = "Save Movie";
this.saveMovieToolStripMenuItem1.Click += new System.EventHandler(this.saveMovieToolStripMenuItem1_Click);
//
// MainForm
//
@ -2862,6 +2872,7 @@
private System.Windows.Forms.ToolStripMenuItem highlightActiveDisplayRegionToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem fDSToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveMovieToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveMovieToolStripMenuItem1;
}
}

3
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -1020,6 +1020,7 @@ namespace BizHawk.MultiClient
cmiMakeMovieBackup.Visible = true;
cmiViewSubtitles.Visible = true;
cmiViewComments.Visible = true;
saveMovieToolStripMenuItem1.Visible = true;
toolStripSeparator_afterMovie.Visible = true;
if (ReadOnly == true)
{
@ -1046,6 +1047,7 @@ namespace BizHawk.MultiClient
cmiViewComments.Visible = false;
toolStripSeparator_afterMovie.Visible = true;
cmiAddSubtitle.Visible = false;
saveMovieToolStripMenuItem1.Visible = false;
}
cmiUndoSavestate.Visible = true;
@ -1251,6 +1253,7 @@ namespace BizHawk.MultiClient
playMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PlayMovieBinding;
stopMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.StopMovieBinding;
playFromBeginningToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PlayBeginningBinding;
saveMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveMovieBinding;
}
private void saveConfigToolStripMenuItem_Click(object sender, EventArgs e)

18
BizHawk.MultiClient/MainForm.cs
View File

@ -602,7 +602,7 @@ namespace BizHawk.MultiClient
"Play Movie", "Record Movie", "Stop Movie", "Play Beginning", "Volume Up", "Volume Down", "Toggle MultiTrack", "Record All", "Record None", "Increment Player",
"Soft Reset", "Decrement Player", "Record AVI/WAV", "Stop AVI/WAV", "Toggle Menu", "Increase Speed", "Decrease Speed", "Toggle Background Input",
"Autohold", "Clear Autohold", "SNES Toggle BG 1", "SNES Toggle BG 2", "SNES Toggle BG 3", "SNES Toggle BG 4", "SNES Toggle OBJ 1", "SNES Toggle OBJ 2", "SNES Toggle OBJ 3",
"SNES Toggle OBJ 4", "Reboot Core" }
"SNES Toggle OBJ 4", "Reboot Core", "Save Movie" }
};
private void InitControls()
@ -618,7 +618,7 @@ namespace BizHawk.MultiClient
controls.BindMulti("SNES Toggle OBJ 2", Global.Config.ToggleSNESOBJ2Binding);
controls.BindMulti("SNES Toggle OBJ 3", Global.Config.ToggleSNESOBJ3Binding);
controls.BindMulti("SNES Toggle OBJ 4", Global.Config.ToggleSNESOBJ4Binding);
controls.BindMulti("Save Movie", Global.Config.SaveMovieBinding);
controls.BindMulti("IncreaseWindowSize", Global.Config.IncreaseWindowSize);
controls.BindMulti("DecreaseWindowSize", Global.Config.DecreaseWindowSize);
controls.BindMulti("Fast Forward", Global.Config.FastForwardBinding);
@ -2022,7 +2022,9 @@ namespace BizHawk.MultiClient
case "SNES Toggle OBJ 4":
SNES_ToggleOBJ4();
break;
case "Save Movie":
SaveMovie();
break;
case "Clear Autohold":
ClearAutohold();
break;
@ -4118,6 +4120,11 @@ namespace BizHawk.MultiClient
}
private void saveMovieToolStripMenuItem_Click(object sender, EventArgs e)
{
SaveMovie();
}
private void SaveMovie()
{
if (Global.MovieSession.Movie.IsActive)
{
@ -4125,5 +4132,10 @@ namespace BizHawk.MultiClient
Global.OSD.AddMessage(Global.MovieSession.Movie.Filename + " saved.");
}
}
private void saveMovieToolStripMenuItem1_Click(object sender, EventArgs e)
{
SaveMovie();
}
}
}

1464
BizHawk.MultiClient/config/HotkeyWindow.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
BizHawk.MultiClient/config/HotkeyWindow.cs
View File

@ -112,6 +112,7 @@ namespace BizHawk.MultiClient
IDW_SNES_ToggleOBJ2.SetBindings(Global.Config.ToggleSNESOBJ2Binding);
IDW_SNES_ToggleOBJ3.SetBindings(Global.Config.ToggleSNESOBJ3Binding);
IDW_SNES_ToggleOBJ4.SetBindings(Global.Config.ToggleSNESOBJ4Binding);
IDW_SaveMovie.SetBindings(Global.Config.SaveMovieBinding);
}
private void button2_Click(object sender, EventArgs e)
{
@ -214,6 +215,7 @@ namespace BizHawk.MultiClient
Global.Config.AVIRecordBinding = IDW_RecordAVI.Text;
Global.Config.AVIStopBinding = IDW_StopAVI.Text;
Global.Config.ToggleMenuBinding = IDW_ToggleMenu.Text;
Global.Config.SaveMovieBinding = IDW_SaveMovie.Text;
Global.Config.IncreaseWindowSize = IDW_IncreaseWindowSize.Text;
Global.Config.DecreaseWindowSize = IDW_DecreaseWindowSize.Text;