Movies - add hotkeys for play movie, record movie, stop movie, playbeginning, toggle read-only. Made multitrack tab just a movie tab. Other misc cleanups
This commit is contained in:
parent
85e52c3bcb
commit
2331e12c9f
|
@ -280,6 +280,11 @@
|
|||
public string FPSBinding = "";
|
||||
public string LagCounterBinding = "";
|
||||
public string InputDisplayBinding = "";
|
||||
public string ReadOnlyToggleBinding = "Q";
|
||||
public string PlayMovieBinding = "";
|
||||
public string RecordMovieBinding = "";
|
||||
public string StopMovieBinding = "";
|
||||
public string PlayBeginningBinding = "";
|
||||
|
||||
// SMS / GameGear Settings
|
||||
public bool SmsEnableFM = true;
|
||||
|
|
|
@ -120,22 +120,28 @@ namespace BizHawk.MultiClient
|
|||
|
||||
private void recordMovieToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
RecordMovie r = new RecordMovie();
|
||||
r.ShowDialog();
|
||||
RecordMovie();
|
||||
}
|
||||
|
||||
private void playMovieToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
PlayMovie p = new PlayMovie();
|
||||
DialogResult d = p.ShowDialog();
|
||||
PlayMovie();
|
||||
}
|
||||
|
||||
public void StopUserMovie()
|
||||
{
|
||||
string message = "Movie ";
|
||||
if (UserMovie.GetMovieMode() == MOVIEMODE.RECORD)
|
||||
message += "recording ";
|
||||
else if (UserMovie.GetMovieMode() == MOVIEMODE.PLAY
|
||||
|| UserMovie.GetMovieMode() == MOVIEMODE.FINISHED)
|
||||
message += "playback ";
|
||||
message += "stopped.";
|
||||
if (UserMovie.GetMovieMode() != MOVIEMODE.INACTIVE)
|
||||
{
|
||||
UserMovie.StopMovie();
|
||||
Global.ActiveController.MovieMode = false;
|
||||
Global.RenderPanel.AddMessage(message);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -152,11 +158,7 @@ namespace BizHawk.MultiClient
|
|||
|
||||
private void playFromBeginningToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (InputLog.GetMovieMode() != MOVIEMODE.INACTIVE)
|
||||
{
|
||||
LoadRom(CurrentlyOpenRom);
|
||||
UserMovie.StartPlayback();
|
||||
}
|
||||
PlayMovieFromBeginning();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -267,7 +267,8 @@ namespace BizHawk.MultiClient
|
|||
"SelectSlot5", "SelectSlot6", "SelectSlot7", "SelectSlot8", "SelectSlot9", "SaveSlot0", "SaveSlot1", "SaveSlot2", "SaveSlot3", "SaveSlot4",
|
||||
"SaveSlot5","SaveSlot6","SaveSlot7","SaveSlot8","SaveSlot9","LoadSlot0","LoadSlot1","LoadSlot2","LoadSlot3","LoadSlot4","LoadSlot5","LoadSlot6",
|
||||
"LoadSlot7","LoadSlot8","LoadSlot9", "ToolBox", "Previous Slot", "Next Slot", "Ram Watch", "Ram Search", "Ram Poke", "Hex Editor",
|
||||
"Lua Console", "Cheats", "Open ROM", "Close ROM", "Display FPS", "Display FrameCounter", "Display LagCounter", "Display Input"}
|
||||
"Lua Console", "Cheats", "Open ROM", "Close ROM", "Display FPS", "Display FrameCounter", "Display LagCounter", "Display Input", "Toggle Read Only",
|
||||
"Play Movie", "Record Movie", "Stop Movie", "Play Beginning"}
|
||||
};
|
||||
|
||||
private void InitControls()
|
||||
|
@ -330,6 +331,11 @@ namespace BizHawk.MultiClient
|
|||
controls.BindMulti("Display FrameCounter", Global.Config.FrameCounterBinding);
|
||||
controls.BindMulti("Display LagCounter", Global.Config.LagCounterBinding);
|
||||
controls.BindMulti("Display Input", Global.Config.InputDisplayBinding);
|
||||
controls.BindMulti("Toggle Read Only", Global.Config.ReadOnlyToggleBinding);
|
||||
controls.BindMulti("Play Movie", Global.Config.PlayMovieBinding);
|
||||
controls.BindMulti("Record Movie", Global.Config.RecordMovieBinding);
|
||||
controls.BindMulti("Stop Movie", Global.Config.StopMovieBinding);
|
||||
controls.BindMulti("Play Beginning", Global.Config.PlayBeginningBinding);
|
||||
|
||||
Global.ClientControls = controls;
|
||||
|
||||
|
@ -472,7 +478,7 @@ namespace BizHawk.MultiClient
|
|||
if (IsValidMovieExtension(Path.GetExtension(filePaths[0])))
|
||||
{
|
||||
Movie m = new Movie(filePaths[0], MOVIEMODE.PLAY);
|
||||
StartNewMovie(m);
|
||||
StartNewMovie(m, false);
|
||||
|
||||
}
|
||||
else
|
||||
|
@ -902,6 +908,36 @@ namespace BizHawk.MultiClient
|
|||
ToggleInputDisplay();
|
||||
Global.ClientControls.UnpressButton("Display Input");
|
||||
}
|
||||
|
||||
if (Global.ClientControls["Toggle Read Only"])
|
||||
{
|
||||
ToggleReadOnly();
|
||||
Global.ClientControls.UnpressButton("Toggle Read Only");
|
||||
}
|
||||
|
||||
if (Global.ClientControls["Play Movie"])
|
||||
{
|
||||
PlayMovie();
|
||||
Global.ClientControls.UnpressButton("Play Movie");
|
||||
}
|
||||
|
||||
if (Global.ClientControls["Record Movie"])
|
||||
{
|
||||
RecordMovie();
|
||||
Global.ClientControls.UnpressButton("Record Movie");
|
||||
}
|
||||
|
||||
if (Global.ClientControls["Stop Movie"])
|
||||
{
|
||||
StopUserMovie();
|
||||
Global.ClientControls.UnpressButton("Stop Movie");
|
||||
}
|
||||
|
||||
if (Global.ClientControls["Play Beginning"])
|
||||
{
|
||||
PlayMovieFromBeginning();
|
||||
Global.ClientControls.UnpressButton("Play Beginning");
|
||||
}
|
||||
}
|
||||
|
||||
void StepRunLoop_Throttle()
|
||||
|
@ -1764,7 +1800,7 @@ namespace BizHawk.MultiClient
|
|||
readonlyToolStripMenuItem.Checked = false;
|
||||
}
|
||||
|
||||
private void readonlyToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
public void ToggleReadOnly()
|
||||
{
|
||||
ReadOnly ^= true;
|
||||
if (ReadOnly)
|
||||
|
@ -1773,13 +1809,21 @@ namespace BizHawk.MultiClient
|
|||
Global.RenderPanel.AddMessage("Movie read+write mode");
|
||||
}
|
||||
|
||||
public void StartNewMovie(Movie m)
|
||||
private void readonlyToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
ToggleReadOnly();
|
||||
}
|
||||
|
||||
public void StartNewMovie(Movie m, bool record)
|
||||
{
|
||||
|
||||
UserMovie = m;
|
||||
InputLog.StopMovie();
|
||||
LoadRom(Global.MainForm.CurrentlyOpenRom);
|
||||
UserMovie.LoadMovie();
|
||||
if (record)
|
||||
UserMovie.StartNewRecording();
|
||||
else
|
||||
UserMovie.StartPlayback();
|
||||
}
|
||||
|
||||
|
@ -1802,5 +1846,26 @@ namespace BizHawk.MultiClient
|
|||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
private void PlayMovie()
|
||||
{
|
||||
PlayMovie p = new PlayMovie();
|
||||
DialogResult d = p.ShowDialog();
|
||||
}
|
||||
|
||||
private void RecordMovie()
|
||||
{
|
||||
RecordMovie r = new RecordMovie();
|
||||
r.ShowDialog();
|
||||
}
|
||||
|
||||
public void PlayMovieFromBeginning()
|
||||
{
|
||||
if (InputLog.GetMovieMode() != MOVIEMODE.INACTIVE)
|
||||
{
|
||||
LoadRom(CurrentlyOpenRom);
|
||||
UserMovie.StartPlayback();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -56,7 +56,7 @@ namespace BizHawk.MultiClient
|
|||
|
||||
private void OK_Click(object sender, EventArgs e)
|
||||
{
|
||||
Global.MainForm.StartNewMovie(MovieList[MovieView.SelectedIndices[0]]);
|
||||
Global.MainForm.StartNewMovie(MovieList[MovieView.SelectedIndices[0]], false);
|
||||
this.Close();
|
||||
}
|
||||
|
||||
|
|
|
@ -12,6 +12,15 @@ namespace BizHawk.MultiClient
|
|||
{
|
||||
public partial class RecordMovie : Form
|
||||
{
|
||||
//TODO: on OK check that the user actually selected a movie (text box != empty?)
|
||||
//Have an editiable listview for header info and any other settings, or appropriate widgets
|
||||
//Some header/settings that needs to be editable:
|
||||
// System ID
|
||||
// Game
|
||||
// Author (very important)
|
||||
// Some comments?
|
||||
// Platform specific bools like PAL vs NTSC or an FDS flag, etc
|
||||
|
||||
Movie MovieToRecord;
|
||||
|
||||
public RecordMovie()
|
||||
|
@ -21,8 +30,7 @@ namespace BizHawk.MultiClient
|
|||
|
||||
private void OK_Click(object sender, EventArgs e)
|
||||
{
|
||||
Global.MainForm.UserMovie = MovieToRecord;
|
||||
Global.MainForm.UserMovie.StartNewRecording();
|
||||
Global.MainForm.StartNewMovie(MovieToRecord, true);
|
||||
this.Close();
|
||||
}
|
||||
|
||||
|
|
|
@ -314,6 +314,23 @@ namespace BizHawk.MultiClient
|
|||
MessageFont.DrawString(null, MakeRerecordCount(), Global.Config.DispRecx,
|
||||
Global.Config.DispRecy, Color.FromArgb(Global.Config.MessagesColor));
|
||||
}
|
||||
|
||||
//TODO: clean this up or replace with simple draw symbols
|
||||
if (Global.MainForm.UserMovie.GetMovieMode() == MOVIEMODE.PLAY
|
||||
|| Global.MainForm.UserMovie.GetMovieMode() == MOVIEMODE.PLAY)
|
||||
{
|
||||
MessageFont.DrawString(null, "Playback", 208 + 1,
|
||||
0 + 1, new Color4(Color.Black));
|
||||
MessageFont.DrawString(null, "Playback", 208,
|
||||
0, new Color4(Color.Red));
|
||||
}
|
||||
else if (Global.MainForm.UserMovie.GetMovieMode() == MOVIEMODE.RECORD)
|
||||
{
|
||||
AlertFont.DrawString(null, "Recording", 208 + 1,
|
||||
0 + 1, new Color4(Color.Black));
|
||||
AlertFont.DrawString(null, "Recording", 208,
|
||||
0, new Color4(Color.Red));
|
||||
}
|
||||
}
|
||||
|
||||
private string MakeFrameCounter()
|
||||
|
|
|
@ -31,6 +31,12 @@
|
|||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeyWindow));
|
||||
this.hotkeyTabs = new System.Windows.Forms.TabControl();
|
||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||
this.IDW_InputDisplay = new BizHawk.MultiClient.InputWidget();
|
||||
this.label62 = new System.Windows.Forms.Label();
|
||||
this.IDW_LagCounter = new BizHawk.MultiClient.InputWidget();
|
||||
this.label61 = new System.Windows.Forms.Label();
|
||||
this.IDW_FrameCounter = new BizHawk.MultiClient.InputWidget();
|
||||
this.label60 = new System.Windows.Forms.Label();
|
||||
this.IDW_DisplayFPS = new BizHawk.MultiClient.InputWidget();
|
||||
this.label59 = new System.Windows.Forms.Label();
|
||||
this.IDW_CloseROM = new BizHawk.MultiClient.InputWidget();
|
||||
|
@ -126,6 +132,8 @@
|
|||
this.IDW_SS3 = new BizHawk.MultiClient.InputWidget();
|
||||
this.IDW_SS2 = new BizHawk.MultiClient.InputWidget();
|
||||
this.tabPage3 = new System.Windows.Forms.TabPage();
|
||||
this.IDW_TOGGLEREADONLY = new BizHawk.MultiClient.InputWidget();
|
||||
this.label63 = new System.Windows.Forms.Label();
|
||||
this.IDW_TOGGLEMTRACK = new BizHawk.MultiClient.InputWidget();
|
||||
this.IDW_MTDECPLAYER = new BizHawk.MultiClient.InputWidget();
|
||||
this.IDW_MTINCPLAYER = new BizHawk.MultiClient.InputWidget();
|
||||
|
@ -154,12 +162,14 @@
|
|||
this.IDB_SAVE = new System.Windows.Forms.Button();
|
||||
this.IDB_CANCEL = new System.Windows.Forms.Button();
|
||||
this.label38 = new System.Windows.Forms.Label();
|
||||
this.IDW_FrameCounter = new BizHawk.MultiClient.InputWidget();
|
||||
this.label60 = new System.Windows.Forms.Label();
|
||||
this.IDW_LagCounter = new BizHawk.MultiClient.InputWidget();
|
||||
this.label61 = new System.Windows.Forms.Label();
|
||||
this.IDW_InputDisplay = new BizHawk.MultiClient.InputWidget();
|
||||
this.label62 = new System.Windows.Forms.Label();
|
||||
this.IDW_RECORDMOVIE = new BizHawk.MultiClient.InputWidget();
|
||||
this.label64 = new System.Windows.Forms.Label();
|
||||
this.IDW_PLAYMOVIE = new BizHawk.MultiClient.InputWidget();
|
||||
this.label65 = new System.Windows.Forms.Label();
|
||||
this.IDW_STOPMOVIE = new BizHawk.MultiClient.InputWidget();
|
||||
this.label66 = new System.Windows.Forms.Label();
|
||||
this.IDW_PLAYBEGINNING = new BizHawk.MultiClient.InputWidget();
|
||||
this.label67 = new System.Windows.Forms.Label();
|
||||
this.hotkeyTabs.SuspendLayout();
|
||||
this.tabPage1.SuspendLayout();
|
||||
this.tabPage2.SuspendLayout();
|
||||
|
@ -222,6 +232,60 @@
|
|||
this.tabPage1.Text = "General";
|
||||
this.tabPage1.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// IDW_InputDisplay
|
||||
//
|
||||
this.IDW_InputDisplay.AcceptsTab = true;
|
||||
this.IDW_InputDisplay.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_InputDisplay.Location = new System.Drawing.Point(295, 178);
|
||||
this.IDW_InputDisplay.Name = "IDW_InputDisplay";
|
||||
this.IDW_InputDisplay.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_InputDisplay.TabIndex = 23;
|
||||
//
|
||||
// label62
|
||||
//
|
||||
this.label62.AutoSize = true;
|
||||
this.label62.Location = new System.Drawing.Point(209, 181);
|
||||
this.label62.Name = "label62";
|
||||
this.label62.Size = new System.Drawing.Size(68, 13);
|
||||
this.label62.TabIndex = 24;
|
||||
this.label62.Text = "Input Display";
|
||||
//
|
||||
// IDW_LagCounter
|
||||
//
|
||||
this.IDW_LagCounter.AcceptsTab = true;
|
||||
this.IDW_LagCounter.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_LagCounter.Location = new System.Drawing.Point(295, 153);
|
||||
this.IDW_LagCounter.Name = "IDW_LagCounter";
|
||||
this.IDW_LagCounter.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_LagCounter.TabIndex = 21;
|
||||
//
|
||||
// label61
|
||||
//
|
||||
this.label61.AutoSize = true;
|
||||
this.label61.Location = new System.Drawing.Point(209, 156);
|
||||
this.label61.Name = "label61";
|
||||
this.label61.Size = new System.Drawing.Size(65, 13);
|
||||
this.label61.TabIndex = 22;
|
||||
this.label61.Text = "Lag Counter";
|
||||
//
|
||||
// IDW_FrameCounter
|
||||
//
|
||||
this.IDW_FrameCounter.AcceptsTab = true;
|
||||
this.IDW_FrameCounter.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_FrameCounter.Location = new System.Drawing.Point(295, 129);
|
||||
this.IDW_FrameCounter.Name = "IDW_FrameCounter";
|
||||
this.IDW_FrameCounter.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_FrameCounter.TabIndex = 19;
|
||||
//
|
||||
// label60
|
||||
//
|
||||
this.label60.AutoSize = true;
|
||||
this.label60.Location = new System.Drawing.Point(209, 132);
|
||||
this.label60.Name = "label60";
|
||||
this.label60.Size = new System.Drawing.Size(76, 13);
|
||||
this.label60.TabIndex = 20;
|
||||
this.label60.Text = "Frame Counter";
|
||||
//
|
||||
// IDW_DisplayFPS
|
||||
//
|
||||
this.IDW_DisplayFPS.AcceptsTab = true;
|
||||
|
@ -1071,6 +1135,16 @@
|
|||
//
|
||||
// tabPage3
|
||||
//
|
||||
this.tabPage3.Controls.Add(this.IDW_PLAYBEGINNING);
|
||||
this.tabPage3.Controls.Add(this.label67);
|
||||
this.tabPage3.Controls.Add(this.IDW_STOPMOVIE);
|
||||
this.tabPage3.Controls.Add(this.label66);
|
||||
this.tabPage3.Controls.Add(this.IDW_PLAYMOVIE);
|
||||
this.tabPage3.Controls.Add(this.label65);
|
||||
this.tabPage3.Controls.Add(this.IDW_RECORDMOVIE);
|
||||
this.tabPage3.Controls.Add(this.label64);
|
||||
this.tabPage3.Controls.Add(this.IDW_TOGGLEREADONLY);
|
||||
this.tabPage3.Controls.Add(this.label63);
|
||||
this.tabPage3.Controls.Add(this.IDW_TOGGLEMTRACK);
|
||||
this.tabPage3.Controls.Add(this.IDW_MTDECPLAYER);
|
||||
this.tabPage3.Controls.Add(this.IDW_MTINCPLAYER);
|
||||
|
@ -1086,9 +1160,27 @@
|
|||
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.tabPage3.Size = new System.Drawing.Size(590, 315);
|
||||
this.tabPage3.TabIndex = 2;
|
||||
this.tabPage3.Text = "MultiTrack";
|
||||
this.tabPage3.Text = "Movie";
|
||||
this.tabPage3.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// IDW_TOGGLEREADONLY
|
||||
//
|
||||
this.IDW_TOGGLEREADONLY.AcceptsTab = true;
|
||||
this.IDW_TOGGLEREADONLY.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_TOGGLEREADONLY.Location = new System.Drawing.Point(105, 126);
|
||||
this.IDW_TOGGLEREADONLY.Name = "IDW_TOGGLEREADONLY";
|
||||
this.IDW_TOGGLEREADONLY.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_TOGGLEREADONLY.TabIndex = 78;
|
||||
//
|
||||
// label63
|
||||
//
|
||||
this.label63.AutoSize = true;
|
||||
this.label63.Location = new System.Drawing.Point(6, 129);
|
||||
this.label63.Name = "label63";
|
||||
this.label63.Size = new System.Drawing.Size(86, 13);
|
||||
this.label63.TabIndex = 77;
|
||||
this.label63.Text = "Toggle read-only";
|
||||
//
|
||||
// IDW_TOGGLEMTRACK
|
||||
//
|
||||
this.IDW_TOGGLEMTRACK.AcceptsTab = true;
|
||||
|
@ -1357,59 +1449,77 @@
|
|||
this.label38.TabIndex = 3;
|
||||
this.label38.Text = "* Escape clears a key mapping";
|
||||
//
|
||||
// IDW_FrameCounter
|
||||
// IDW_RECORDMOVIE
|
||||
//
|
||||
this.IDW_FrameCounter.AcceptsTab = true;
|
||||
this.IDW_FrameCounter.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_FrameCounter.Location = new System.Drawing.Point(295, 129);
|
||||
this.IDW_FrameCounter.Name = "IDW_FrameCounter";
|
||||
this.IDW_FrameCounter.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_FrameCounter.TabIndex = 19;
|
||||
this.IDW_RECORDMOVIE.AcceptsTab = true;
|
||||
this.IDW_RECORDMOVIE.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_RECORDMOVIE.Location = new System.Drawing.Point(105, 152);
|
||||
this.IDW_RECORDMOVIE.Name = "IDW_RECORDMOVIE";
|
||||
this.IDW_RECORDMOVIE.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_RECORDMOVIE.TabIndex = 80;
|
||||
//
|
||||
// label60
|
||||
// label64
|
||||
//
|
||||
this.label60.AutoSize = true;
|
||||
this.label60.Location = new System.Drawing.Point(209, 132);
|
||||
this.label60.Name = "label60";
|
||||
this.label60.Size = new System.Drawing.Size(76, 13);
|
||||
this.label60.TabIndex = 20;
|
||||
this.label60.Text = "Frame Counter";
|
||||
this.label64.AutoSize = true;
|
||||
this.label64.Location = new System.Drawing.Point(6, 155);
|
||||
this.label64.Name = "label64";
|
||||
this.label64.Size = new System.Drawing.Size(73, 13);
|
||||
this.label64.TabIndex = 79;
|
||||
this.label64.Text = "Record movie";
|
||||
//
|
||||
// IDW_LagCounter
|
||||
// IDW_PLAYMOVIE
|
||||
//
|
||||
this.IDW_LagCounter.AcceptsTab = true;
|
||||
this.IDW_LagCounter.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_LagCounter.Location = new System.Drawing.Point(295, 153);
|
||||
this.IDW_LagCounter.Name = "IDW_LagCounter";
|
||||
this.IDW_LagCounter.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_LagCounter.TabIndex = 21;
|
||||
this.IDW_PLAYMOVIE.AcceptsTab = true;
|
||||
this.IDW_PLAYMOVIE.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_PLAYMOVIE.Location = new System.Drawing.Point(105, 178);
|
||||
this.IDW_PLAYMOVIE.Name = "IDW_PLAYMOVIE";
|
||||
this.IDW_PLAYMOVIE.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_PLAYMOVIE.TabIndex = 82;
|
||||
//
|
||||
// label61
|
||||
// label65
|
||||
//
|
||||
this.label61.AutoSize = true;
|
||||
this.label61.Location = new System.Drawing.Point(209, 156);
|
||||
this.label61.Name = "label61";
|
||||
this.label61.Size = new System.Drawing.Size(65, 13);
|
||||
this.label61.TabIndex = 22;
|
||||
this.label61.Text = "Lag Counter";
|
||||
this.label65.AutoSize = true;
|
||||
this.label65.Location = new System.Drawing.Point(6, 181);
|
||||
this.label65.Name = "label65";
|
||||
this.label65.Size = new System.Drawing.Size(58, 13);
|
||||
this.label65.TabIndex = 81;
|
||||
this.label65.Text = "Play movie";
|
||||
//
|
||||
// IDW_InputDisplay
|
||||
// IDW_STOPMOVIE
|
||||
//
|
||||
this.IDW_InputDisplay.AcceptsTab = true;
|
||||
this.IDW_InputDisplay.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_InputDisplay.Location = new System.Drawing.Point(295, 178);
|
||||
this.IDW_InputDisplay.Name = "IDW_InputDisplay";
|
||||
this.IDW_InputDisplay.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_InputDisplay.TabIndex = 23;
|
||||
this.IDW_STOPMOVIE.AcceptsTab = true;
|
||||
this.IDW_STOPMOVIE.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_STOPMOVIE.Location = new System.Drawing.Point(105, 204);
|
||||
this.IDW_STOPMOVIE.Name = "IDW_STOPMOVIE";
|
||||
this.IDW_STOPMOVIE.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_STOPMOVIE.TabIndex = 84;
|
||||
//
|
||||
// label62
|
||||
// label66
|
||||
//
|
||||
this.label62.AutoSize = true;
|
||||
this.label62.Location = new System.Drawing.Point(209, 181);
|
||||
this.label62.Name = "label62";
|
||||
this.label62.Size = new System.Drawing.Size(68, 13);
|
||||
this.label62.TabIndex = 24;
|
||||
this.label62.Text = "Input Display";
|
||||
this.label66.AutoSize = true;
|
||||
this.label66.Location = new System.Drawing.Point(6, 207);
|
||||
this.label66.Name = "label66";
|
||||
this.label66.Size = new System.Drawing.Size(60, 13);
|
||||
this.label66.TabIndex = 83;
|
||||
this.label66.Text = "Stop movie";
|
||||
//
|
||||
// IDW_PLAYBEGINNING
|
||||
//
|
||||
this.IDW_PLAYBEGINNING.AcceptsTab = true;
|
||||
this.IDW_PLAYBEGINNING.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.IDW_PLAYBEGINNING.Location = new System.Drawing.Point(105, 230);
|
||||
this.IDW_PLAYBEGINNING.Name = "IDW_PLAYBEGINNING";
|
||||
this.IDW_PLAYBEGINNING.Size = new System.Drawing.Size(100, 20);
|
||||
this.IDW_PLAYBEGINNING.TabIndex = 86;
|
||||
//
|
||||
// label67
|
||||
//
|
||||
this.label67.AutoSize = true;
|
||||
this.label67.Location = new System.Drawing.Point(6, 233);
|
||||
this.label67.Name = "label67";
|
||||
this.label67.Size = new System.Drawing.Size(99, 13);
|
||||
this.label67.TabIndex = 85;
|
||||
this.label67.Text = "Play from beginning";
|
||||
//
|
||||
// HotkeyWindow
|
||||
//
|
||||
|
@ -1426,6 +1536,7 @@
|
|||
this.MinimizeBox = false;
|
||||
this.Name = "HotkeyWindow";
|
||||
this.Text = "Configure Hotkeys";
|
||||
this.Load += new System.EventHandler(this.HotkeyWindow_Load);
|
||||
this.hotkeyTabs.ResumeLayout(false);
|
||||
this.tabPage1.ResumeLayout(false);
|
||||
this.tabPage1.PerformLayout();
|
||||
|
@ -1573,5 +1684,15 @@
|
|||
private System.Windows.Forms.Label label61;
|
||||
private InputWidget IDW_FrameCounter;
|
||||
private System.Windows.Forms.Label label60;
|
||||
private InputWidget IDW_TOGGLEREADONLY;
|
||||
private System.Windows.Forms.Label label63;
|
||||
private InputWidget IDW_PLAYMOVIE;
|
||||
private System.Windows.Forms.Label label65;
|
||||
private InputWidget IDW_RECORDMOVIE;
|
||||
private System.Windows.Forms.Label label64;
|
||||
private InputWidget IDW_STOPMOVIE;
|
||||
private System.Windows.Forms.Label label66;
|
||||
private InputWidget IDW_PLAYBEGINNING;
|
||||
private System.Windows.Forms.Label label67;
|
||||
}
|
||||
}
|
|
@ -74,6 +74,11 @@ namespace BizHawk.MultiClient.tools
|
|||
IDW_FrameCounter.Text = Global.Config.FrameCounterBinding;
|
||||
IDW_LagCounter.Text = Global.Config.LagCounterBinding;
|
||||
IDW_InputDisplay.Text = Global.Config.InputDisplayBinding;
|
||||
IDW_TOGGLEREADONLY.Text = Global.Config.ReadOnlyToggleBinding;
|
||||
IDW_PLAYMOVIE.Text = Global.Config.PlayMovieBinding;
|
||||
IDW_RECORDMOVIE.Text = Global.Config.RecordMovieBinding;
|
||||
IDW_STOPMOVIE.Text = Global.Config.StopMovieBinding;
|
||||
IDW_PLAYBEGINNING.Text = Global.Config.PlayBeginningBinding;
|
||||
}
|
||||
private void button2_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
@ -143,6 +148,11 @@ namespace BizHawk.MultiClient.tools
|
|||
Global.Config.FrameCounterBinding = IDW_FrameCounter.Text;
|
||||
Global.Config.LagCounterBinding = IDW_LagCounter.Text;
|
||||
Global.Config.InputDisplayBinding = IDW_InputDisplay.Text;
|
||||
Global.Config.ReadOnlyToggleBinding = IDW_TOGGLEREADONLY.Text;
|
||||
Global.Config.PlayMovieBinding = IDW_PLAYMOVIE.Text;
|
||||
Global.Config.RecordMovieBinding = IDW_RECORDMOVIE.Text;
|
||||
Global.Config.StopMovieBinding = IDW_STOPMOVIE.Text;
|
||||
Global.Config.PlayBeginningBinding = IDW_PLAYBEGINNING.Text;
|
||||
|
||||
this.DialogResult = DialogResult.OK;
|
||||
this.Close();
|
||||
|
@ -152,5 +162,10 @@ namespace BizHawk.MultiClient.tools
|
|||
{
|
||||
hotkeyTabs.TabPages[hotkeyTabs.SelectedIndex].Controls[0].Focus();
|
||||
}
|
||||
|
||||
private void HotkeyWindow_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue