diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index a3dd6db3e9..d6015c5b9c 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -554,6 +554,9 @@
+
+
+
diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index 9eb33be39d..79aa135970 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -135,8 +135,8 @@
this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.messagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pathsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.soundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.gUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pauseWhenMenuActivatedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -266,7 +266,7 @@
//
this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
- this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.openROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.openROMToolStripMenuItem.Text = "Open ROM";
this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
//
@@ -278,7 +278,7 @@
this.clearToolStripMenuItem,
this.autoloadMostRecentToolStripMenuItem});
this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
- this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.recentROMToolStripMenuItem.Text = "Recent ROM";
this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
//
@@ -311,14 +311,14 @@
//
this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
- this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.closeROMToolStripMenuItem.Text = "&Close ROM";
this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(142, 6);
//
// saveStateToolStripMenuItem
//
@@ -336,7 +336,7 @@
this.toolStripSeparator6,
this.saveNamedStateToolStripMenuItem});
this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
- this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.saveStateToolStripMenuItem.Text = "Save State";
this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened);
//
@@ -438,7 +438,7 @@
this.toolStripSeparator7,
this.loadNamedStateToolStripMenuItem});
this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
- this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.loadStateToolStripMenuItem.Text = "Load State";
this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened);
//
@@ -543,7 +543,7 @@
this.saveToCurrentSlotToolStripMenuItem,
this.loadCurrentSlotToolStripMenuItem});
this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
- this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.saveSlotToolStripMenuItem.Text = "SaveSlot";
this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened);
//
@@ -653,7 +653,7 @@
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
- this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6);
+ this.toolStripMenuItem2.Size = new System.Drawing.Size(142, 6);
//
// movieToolStripMenuItem
//
@@ -669,7 +669,7 @@
this.bindSavestatesToMoviesToolStripMenuItem,
this.automaticallyBackupMoviesToolStripMenuItem});
this.movieToolStripMenuItem.Name = "movieToolStripMenuItem";
- this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.movieToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.movieToolStripMenuItem.Text = "Movie";
this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened);
//
@@ -775,7 +775,7 @@
this.screenshotF12ToolStripMenuItem,
this.screenshotAsToolStripMenuItem});
this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem";
- this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.screenshotToolStripMenuItem.Text = "Screenshot";
//
// screenshotF12ToolStripMenuItem
@@ -795,13 +795,13 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(142, 6);
//
// exitToolStripMenuItem
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
- this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.exitToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
@@ -1020,8 +1020,8 @@
this.hotkeysToolStripMenuItem,
this.messagesToolStripMenuItem,
this.pathsToolStripMenuItem,
- this.toolStripSeparator9,
this.soundToolStripMenuItem,
+ this.toolStripSeparator9,
this.gUIToolStripMenuItem,
this.frameSkipToolStripMenuItem,
this.toolStripSeparator10,
@@ -1049,6 +1049,7 @@
//
// messagesToolStripMenuItem
//
+ this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig;
this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem";
this.messagesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.messagesToolStripMenuItem.Text = "&Messages...";
@@ -1056,23 +1057,25 @@
//
// pathsToolStripMenuItem
//
+ this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS;
this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem";
this.pathsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.pathsToolStripMenuItem.Text = "Paths...";
this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click);
//
+ // soundToolStripMenuItem
+ //
+ this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS;
+ this.soundToolStripMenuItem.Name = "soundToolStripMenuItem";
+ this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.soundToolStripMenuItem.Text = "&Sound...";
+ this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click);
+ //
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6);
//
- // soundToolStripMenuItem
- //
- this.soundToolStripMenuItem.Name = "soundToolStripMenuItem";
- this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.soundToolStripMenuItem.Text = "&Sound";
- this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click);
- //
// gUIToolStripMenuItem
//
this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1359,20 +1362,20 @@
//
this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox;
this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem";
- this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.toolBoxToolStripMenuItem.Text = "&Tool Box";
this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(149, 6);
//
// rAMWatchToolStripMenuItem
//
this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem";
- this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rAMWatchToolStripMenuItem.Text = "RAM &Watch";
this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click);
//
@@ -1380,7 +1383,7 @@
//
this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search;
this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem";
- this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rAMSearchToolStripMenuItem.Text = "RAM &Search";
this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click);
//
@@ -1388,7 +1391,7 @@
//
this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem";
- this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rAMPokeToolStripMenuItem.Text = "RAM &Poke";
this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click);
//
@@ -1396,7 +1399,7 @@
//
this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem";
- this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.hexEditorToolStripMenuItem.Text = "&Hex Editor";
this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click);
//
@@ -1404,20 +1407,20 @@
//
this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem";
- this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.tAStudioToolStripMenuItem.Text = "&TAStudio";
this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6);
//
// luaConsoleToolStripMenuItem
//
this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua;
this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem";
- this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.luaConsoleToolStripMenuItem.Text = "Lua Console";
this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click);
//
@@ -1425,7 +1428,7 @@
//
this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem";
- this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.cheatsToolStripMenuItem.Text = "Cheats";
this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click);
//
diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index 9a7f042039..099d8295c1 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -36,8 +36,8 @@ namespace BizHawk.MultiClient
{
//var window = new BizHawk.MultiClient.tools.LuaWindow();
//window.Show();
- LuaConsole l = new LuaConsole();
- l.Show();
+ LuaConsole l = new LuaConsole();
+ l.Show();
}
private void miLimitFramerate_Click(object sender, EventArgs e)
@@ -67,16 +67,16 @@ namespace BizHawk.MultiClient
private void miFrameskip8_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 8; }
private void miFrameskip9_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 9; }
- void ClickSpeedItem(int num)
- {
- if ((Control.ModifierKeys & Keys.Control) != 0) SetSpeedPercentAlternate(num);
- else SetSpeedPercent(num);
- }
+ void ClickSpeedItem(int num)
+ {
+ if ((Control.ModifierKeys & Keys.Control) != 0) SetSpeedPercentAlternate(num);
+ else SetSpeedPercent(num);
+ }
private void miSpeed50_Click(object sender, EventArgs e) { ClickSpeedItem(50); }
- private void miSpeed75_Click(object sender, EventArgs e) { ClickSpeedItem(75); }
- private void miSpeed100_Click(object sender, EventArgs e) { ClickSpeedItem(100); }
- private void miSpeed150_Click(object sender, EventArgs e) { ClickSpeedItem(150); }
- private void miSpeed200_Click(object sender, EventArgs e) { ClickSpeedItem(200); }
+ private void miSpeed75_Click(object sender, EventArgs e) { ClickSpeedItem(75); }
+ private void miSpeed100_Click(object sender, EventArgs e) { ClickSpeedItem(100); }
+ private void miSpeed150_Click(object sender, EventArgs e) { ClickSpeedItem(150); }
+ private void miSpeed200_Click(object sender, EventArgs e) { ClickSpeedItem(200); }
private void pauseWhenMenuActivatedToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -125,45 +125,45 @@ namespace BizHawk.MultiClient
private void recordMovieToolStripMenuItem_Click(object sender, EventArgs e)
{
- RecordMovie();
+ RecordMovie();
}
private void playMovieToolStripMenuItem_Click(object sender, EventArgs e)
{
- PlayMovie();
+ 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);
- }
- }
+ 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);
+ }
+ }
- public void StopInputLog()
- {
- if (InputLog.GetMovieMode() == MOVIEMODE.RECORD)
- InputLog.StopMovie();
- }
+ public void StopInputLog()
+ {
+ if (InputLog.GetMovieMode() == MOVIEMODE.RECORD)
+ InputLog.StopMovie();
+ }
private void stopMovieToolStripMenuItem_Click(object sender, EventArgs e)
{
- StopUserMovie();
+ StopUserMovie();
}
private void playFromBeginningToolStripMenuItem_Click(object sender, EventArgs e)
{
- PlayMovieFromBeginning();
+ PlayMovieFromBeginning();
}
@@ -251,12 +251,12 @@ namespace BizHawk.MultiClient
private void previousSlotToolStripMenuItem_Click(object sender, EventArgs e)
{
- PreviousSlot();
+ PreviousSlot();
}
private void nextSlotToolStripMenuItem_Click(object sender, EventArgs e)
{
- NextSlot();
+ NextSlot();
}
private void saveToCurrentSlotToolStripMenuItem_Click(object sender, EventArgs e)
@@ -271,7 +271,7 @@ namespace BizHawk.MultiClient
private void closeROMToolStripMenuItem_Click(object sender, EventArgs e)
{
- CloseROM();
+ CloseROM();
}
private void saveStateToolStripMenuItem_Click(object sender, EventArgs e)
@@ -295,7 +295,7 @@ namespace BizHawk.MultiClient
private void resetToolStripMenuItem_Click(object sender, EventArgs e)
{
if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset"))
- Global.ActiveController.ForceButton("Reset");
+ Global.ActiveController.ForceButton("Reset");
}
private void pauseToolStripMenuItem_Click(object sender, EventArgs e)
@@ -332,31 +332,31 @@ namespace BizHawk.MultiClient
{
BizHawk.MultiClient.tools.HotkeyWindow h = new BizHawk.MultiClient.tools.HotkeyWindow();
h.ShowDialog();
- if (h.DialogResult == DialogResult.OK)
- {
- InitControls();
- SyncControls();
- }
+ if (h.DialogResult == DialogResult.OK)
+ {
+ InitControls();
+ SyncControls();
+ }
}
private void displayFPSToolStripMenuItem_Click(object sender, EventArgs e)
{
- ToggleFPS();
+ ToggleFPS();
}
private void displayFrameCounterToolStripMenuItem_Click(object sender, EventArgs e)
{
- ToggleFrameCounter();
+ ToggleFrameCounter();
}
private void displayInputToolStripMenuItem_Click(object sender, EventArgs e)
{
- ToggleInputDisplay();
+ ToggleInputDisplay();
}
private void displayLagCounterToolStripMenuItem_Click(object sender, EventArgs e)
{
- ToggleLagCounter();
+ ToggleLagCounter();
}
private void screenshotF12ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -394,7 +394,7 @@ namespace BizHawk.MultiClient
private void openROMToolStripMenuItem_Click(object sender, EventArgs e)
{
- OpenROM();
+ OpenROM();
}
private void PPUViewerToolStripMenuItem_Click(object sender, EventArgs e)
@@ -433,273 +433,273 @@ namespace BizHawk.MultiClient
SyncPresentationMode();
}
- private void debuggerToolStripMenuItem_Click(object sender, EventArgs e)
- {
- LoadNESDebugger();
- }
+ private void debuggerToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ LoadNESDebugger();
+ }
- private void saveStateToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
- {
- savestate1toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot1;
- savestate2toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot2;
- savestate3toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot3;
- savestate4toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot4;
- savestate5toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot5;
- savestate6toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot6;
- savestate7toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot7;
- savestate8toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot8;
- savestate9toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot9;
- savestate0toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot0;
- saveNamedStateToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveNamedState;
- }
+ private void saveStateToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+ {
+ savestate1toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot1;
+ savestate2toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot2;
+ savestate3toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot3;
+ savestate4toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot4;
+ savestate5toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot5;
+ savestate6toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot6;
+ savestate7toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot7;
+ savestate8toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot8;
+ savestate9toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot9;
+ savestate0toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveSlot0;
+ saveNamedStateToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SaveNamedState;
+ }
- private void loadStateToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
- {
- loadstate1toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot0;
- loadstate2toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot1;
- loadstate3toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot2;
- loadstate4toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot3;
- loadstate5toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot4;
- loadstate6toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot5;
- loadstate7toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot6;
- loadstate8toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot7;
- loadstate9toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot8;
- loadstate0toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot9;
- loadNamedStateToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadNamedState;
- }
+ private void loadStateToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+ {
+ loadstate1toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot0;
+ loadstate2toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot1;
+ loadstate3toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot2;
+ loadstate4toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot3;
+ loadstate5toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot4;
+ loadstate6toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot5;
+ loadstate7toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot6;
+ loadstate8toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot7;
+ loadstate9toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot8;
+ loadstate0toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot9;
+ loadNamedStateToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadNamedState;
+ }
- private void nametableViewerToolStripMenuItem_Click(object sender, EventArgs e)
- {
- LoadNESNameTable();
- }
-
- private void saveNamedStateToolStripMenuItem_Click(object sender, EventArgs e)
- {
- SaveStateAs();
- }
+ private void nametableViewerToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ LoadNESNameTable();
+ }
- private void loadNamedStateToolStripMenuItem_Click(object sender, EventArgs e)
- {
- LoadStateAs();
- }
+ private void saveNamedStateToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ SaveStateAs();
+ }
- private void toolBoxToolStripMenuItem_Click(object sender, EventArgs e)
- {
- LoadToolBox();
- }
+ private void loadNamedStateToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ LoadStateAs();
+ }
- private void toolsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
- {
- toolBoxToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.ToolBox;
- if (!ToolBox1.IsHandleCreated || ToolBox1.IsDisposed)
- toolBoxToolStripMenuItem.Enabled = true;
- else
- toolBoxToolStripMenuItem.Enabled = false;
+ private void toolBoxToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ LoadToolBox();
+ }
- rAMWatchToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RamWatch;
- rAMSearchToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RamSearch;
- rAMPokeToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RamPoke;
- hexEditorToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HexEditor;
- luaConsoleToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LuaConsole;
- cheatsToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.Cheats;
- }
+ private void toolsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+ {
+ toolBoxToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.ToolBox;
+ if (!ToolBox1.IsHandleCreated || ToolBox1.IsDisposed)
+ toolBoxToolStripMenuItem.Enabled = true;
+ else
+ toolBoxToolStripMenuItem.Enabled = false;
- private void saveSlotToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
- {
- selectSlot10ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot0;
- selectSlot1ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot1;
- selectSlot2ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot2;
- selectSlot3ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot3;
- selectSlot4ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot4;
- selectSlot5ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot5;
- selectSlot6ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot6;
- selectSlot7ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot7;
- selectSlot8ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot8;
- selectSlot9ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot9;
- previousSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PreviousSlot;
- nextSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.NextSlot;
- saveToCurrentSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.QuickSave;
- loadCurrentSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.QuickLoad;
- }
+ rAMWatchToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RamWatch;
+ rAMSearchToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RamSearch;
+ rAMPokeToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RamPoke;
+ hexEditorToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HexEditor;
+ luaConsoleToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LuaConsole;
+ cheatsToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.Cheats;
+ }
- private void switchToFullscreenToolStripMenuItem_Click(object sender, EventArgs e)
- {
- ToggleFullscreen();
- }
+ private void saveSlotToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+ {
+ selectSlot10ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot0;
+ selectSlot1ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot1;
+ selectSlot2ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot2;
+ selectSlot3ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot3;
+ selectSlot4ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot4;
+ selectSlot5ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot5;
+ selectSlot6ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot6;
+ selectSlot7ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot7;
+ selectSlot8ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot8;
+ selectSlot9ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot9;
+ previousSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PreviousSlot;
+ nextSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.NextSlot;
+ saveToCurrentSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.QuickSave;
+ loadCurrentSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.QuickLoad;
+ }
- private void messagesToolStripMenuItem_Click(object sender, EventArgs e)
- {
- MessageConfig m = new MessageConfig();
- m.ShowDialog();
- }
+ private void switchToFullscreenToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ ToggleFullscreen();
+ }
- private void autoloadVirtualKeyboardToolStripMenuItem_Click(object sender, EventArgs e)
- {
- if (!(Global.Emulator is TI83)) return;
- Global.Config.TI83autoloadKeyPad ^= true;
- }
+ private void messagesToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ MessageConfig m = new MessageConfig();
+ m.ShowDialog();
+ }
- private void keypadToolStripMenuItem_Click(object sender, EventArgs e)
- {
- if (!(Global.Emulator is TI83))
- return;
- LoadTI83KeyPad();
- }
+ private void autoloadVirtualKeyboardToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (!(Global.Emulator is TI83)) return;
+ Global.Config.TI83autoloadKeyPad ^= true;
+ }
- private void disableSaveslotKeysOnLoToolStripMenuItem_Click(object sender, EventArgs e)
- {
- if (!(Global.Emulator is TI83)) return;
- Global.Config.TI83disableSaveSlotKeys ^= true;
- }
+ private void keypadToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (!(Global.Emulator is TI83))
+ return;
+ LoadTI83KeyPad();
+ }
- private void tI83ToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
- {
- disableSaveslotKeysOnLoToolStripMenuItem.Checked = Global.Config.TI83disableSaveSlotKeys;
- autoloadVirtualKeyboardToolStripMenuItem.Checked = Global.Config.TI83autoloadKeyPad;
- }
+ private void disableSaveslotKeysOnLoToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (!(Global.Emulator is TI83)) return;
+ Global.Config.TI83disableSaveSlotKeys ^= true;
+ }
- private void pathsToolStripMenuItem_Click(object sender, EventArgs e)
- {
- PathConfig p = new PathConfig();
- p.ShowDialog();
- }
+ private void tI83ToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+ {
+ disableSaveslotKeysOnLoToolStripMenuItem.Checked = Global.Config.TI83disableSaveSlotKeys;
+ autoloadVirtualKeyboardToolStripMenuItem.Checked = Global.Config.TI83autoloadKeyPad;
+ }
- private void displayRerecordCountToolStripMenuItem_Click(object sender, EventArgs e)
- {
- Global.Config.DisplayRerecordCount ^= true;
- }
+ private void pathsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ PathConfig p = new PathConfig();
+ p.ShowDialog();
+ }
- private void recentROMToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
- {
- //Clear out recent Roms list
- //repopulate it with an up to date list
- recentROMToolStripMenuItem.DropDownItems.Clear();
+ private void displayRerecordCountToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ Global.Config.DisplayRerecordCount ^= true;
+ }
- if (Global.Config.RecentRoms.IsEmpty())
- {
- var none = new ToolStripMenuItem();
- none.Enabled = false;
- none.Text = "None";
- recentROMToolStripMenuItem.DropDownItems.Add(none);
- }
- else
- {
- for (int x = 0; x < Global.Config.RecentRoms.Length(); x++)
- {
- string path = Global.Config.RecentRoms.GetRecentFileByPosition(x);
- var item = new ToolStripMenuItem();
- item.Text = path;
- item.Click += (o, ev) => LoadRomFromRecent(path);
- recentROMToolStripMenuItem.DropDownItems.Add(item);
- }
- }
+ private void recentROMToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+ {
+ //Clear out recent Roms list
+ //repopulate it with an up to date list
+ recentROMToolStripMenuItem.DropDownItems.Clear();
- recentROMToolStripMenuItem.DropDownItems.Add("-");
+ if (Global.Config.RecentRoms.IsEmpty())
+ {
+ var none = new ToolStripMenuItem();
+ none.Enabled = false;
+ none.Text = "None";
+ recentROMToolStripMenuItem.DropDownItems.Add(none);
+ }
+ else
+ {
+ for (int x = 0; x < Global.Config.RecentRoms.Length(); x++)
+ {
+ string path = Global.Config.RecentRoms.GetRecentFileByPosition(x);
+ var item = new ToolStripMenuItem();
+ item.Text = path;
+ item.Click += (o, ev) => LoadRomFromRecent(path);
+ recentROMToolStripMenuItem.DropDownItems.Add(item);
+ }
+ }
- var clearitem = new ToolStripMenuItem();
- clearitem.Text = "&Clear";
- clearitem.Click += (o, ev) => Global.Config.RecentRoms.Clear();
- recentROMToolStripMenuItem.DropDownItems.Add(clearitem);
+ recentROMToolStripMenuItem.DropDownItems.Add("-");
- var auto = new ToolStripMenuItem();
- auto.Text = "&Autoload Most Recent";
- auto.Click += (o, ev) => UpdateAutoLoadRecentRom();
- if (Global.Config.AutoLoadMostRecentRom == true)
- auto.Checked = true;
- else
- auto.Checked = false;
- recentROMToolStripMenuItem.DropDownItems.Add(auto);
- }
+ var clearitem = new ToolStripMenuItem();
+ clearitem.Text = "&Clear";
+ clearitem.Click += (o, ev) => Global.Config.RecentRoms.Clear();
+ recentROMToolStripMenuItem.DropDownItems.Add(clearitem);
- private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
- {
- //Clear out recent Movies list
- //repopulate it with an up to date list
+ var auto = new ToolStripMenuItem();
+ auto.Text = "&Autoload Most Recent";
+ auto.Click += (o, ev) => UpdateAutoLoadRecentRom();
+ if (Global.Config.AutoLoadMostRecentRom == true)
+ auto.Checked = true;
+ else
+ auto.Checked = false;
+ recentROMToolStripMenuItem.DropDownItems.Add(auto);
+ }
- recentToolStripMenuItem.DropDownItems.Clear();
+ private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+ {
+ //Clear out recent Movies list
+ //repopulate it with an up to date list
- if (Global.Config.RecentMovies.IsEmpty())
- {
- var none = new ToolStripMenuItem();
- none.Enabled = false;
- none.Text = "None";
- recentToolStripMenuItem.DropDownItems.Add(none);
- }
- else
- {
- for (int x = 0; x < Global.Config.RecentMovies.Length(); x++)
- {
- string path = Global.Config.RecentMovies.GetRecentFileByPosition(x);
- var item = new ToolStripMenuItem();
- item.Text = path;
- item.Click += (o, ev) => LoadMoviesFromRecent(path);
- recentToolStripMenuItem.DropDownItems.Add(item);
- }
- }
+ recentToolStripMenuItem.DropDownItems.Clear();
- recentToolStripMenuItem.DropDownItems.Add("-");
+ if (Global.Config.RecentMovies.IsEmpty())
+ {
+ var none = new ToolStripMenuItem();
+ none.Enabled = false;
+ none.Text = "None";
+ recentToolStripMenuItem.DropDownItems.Add(none);
+ }
+ else
+ {
+ for (int x = 0; x < Global.Config.RecentMovies.Length(); x++)
+ {
+ string path = Global.Config.RecentMovies.GetRecentFileByPosition(x);
+ var item = new ToolStripMenuItem();
+ item.Text = path;
+ item.Click += (o, ev) => LoadMoviesFromRecent(path);
+ recentToolStripMenuItem.DropDownItems.Add(item);
+ }
+ }
- var clearitem = new ToolStripMenuItem();
- clearitem.Text = "&Clear";
- clearitem.Click += (o, ev) => Global.Config.RecentMovies.Clear();
- recentToolStripMenuItem.DropDownItems.Add(clearitem);
+ recentToolStripMenuItem.DropDownItems.Add("-");
- var auto = new ToolStripMenuItem();
- auto.Text = "&Autoload Most Recent";
- auto.Click += (o, ev) => UpdateAutoLoadRecentMovie();
- if (Global.Config.AutoLoadMostRecentMovie == true)
- auto.Checked = true;
- else
- auto.Checked = false;
- recentToolStripMenuItem.DropDownItems.Add(auto);
- }
+ var clearitem = new ToolStripMenuItem();
+ clearitem.Text = "&Clear";
+ clearitem.Click += (o, ev) => Global.Config.RecentMovies.Clear();
+ recentToolStripMenuItem.DropDownItems.Add(clearitem);
- private void screenshotAsToolStripMenuItem_Click(object sender, EventArgs e)
- {
- string path = String.Format(Global.Game.ScreenshotPrefix + ".{0:yyyy-MM-dd HH.mm.ss}.png", DateTime.Now);
-
- SaveFileDialog sfd = new SaveFileDialog();
- sfd.InitialDirectory = Path.GetDirectoryName(path);
- sfd.FileName = Path.GetFileName(path);
- sfd.Filter = "PNG File (*.png)|*.png";
+ var auto = new ToolStripMenuItem();
+ auto.Text = "&Autoload Most Recent";
+ auto.Click += (o, ev) => UpdateAutoLoadRecentMovie();
+ if (Global.Config.AutoLoadMostRecentMovie == true)
+ auto.Checked = true;
+ else
+ auto.Checked = false;
+ recentToolStripMenuItem.DropDownItems.Add(auto);
+ }
- Global.Sound.StopSound();
- var result = sfd.ShowDialog();
- Global.Sound.StartSound();
- if (result != DialogResult.OK)
- return;
- MakeScreenshot(sfd.FileName);
+ private void screenshotAsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ string path = String.Format(Global.Game.ScreenshotPrefix + ".{0:yyyy-MM-dd HH.mm.ss}.png", DateTime.Now);
- MakeScreenshot(path);
- }
+ SaveFileDialog sfd = new SaveFileDialog();
+ sfd.InitialDirectory = Path.GetDirectoryName(path);
+ sfd.FileName = Path.GetFileName(path);
+ sfd.Filter = "PNG File (*.png)|*.png";
- private void runInBackgroundToolStripMenuItem_Click(object sender, EventArgs e)
- {
- Global.Config.RunInBackground ^= true;
- }
+ Global.Sound.StopSound();
+ var result = sfd.ShowDialog();
+ Global.Sound.StartSound();
+ if (result != DialogResult.OK)
+ return;
+ MakeScreenshot(sfd.FileName);
- private void bindSavestatesToMoviesToolStripMenuItem_Click(object sender, EventArgs e)
- {
- Global.Config.BindSavestatesToMovies ^= true;
- }
+ MakeScreenshot(path);
+ }
- private void acceptBackgroundInputToolStripMenuItem_Click(object sender, EventArgs e)
- {
- Global.Config.AcceptBackgroundInput ^= true;
- MessageBox.Show("Background input settings will take effect the next time Bizhawk loads", "Background input property change", MessageBoxButtons.OK, MessageBoxIcon.Information);
- }
+ private void runInBackgroundToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ Global.Config.RunInBackground ^= true;
+ }
- private void displayStatusBarToolStripMenuItem_Click(object sender, EventArgs e)
- {
- Global.Config.DisplayStatusBar ^= true;
- displayStatusBarToolStripMenuItem.Checked = Global.Config.DisplayStatusBar;
- if (!InFullscreen)
- {
- statusStrip1.Visible = Global.Config.DisplayStatusBar;
- PerformLayout();
- FrameBufferResized();
- }
- }
+ private void bindSavestatesToMoviesToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ Global.Config.BindSavestatesToMovies ^= true;
+ }
+
+ private void acceptBackgroundInputToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ Global.Config.AcceptBackgroundInput ^= true;
+ MessageBox.Show("Background input settings will take effect the next time Bizhawk loads", "Background input property change", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+
+ private void displayStatusBarToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ Global.Config.DisplayStatusBar ^= true;
+ displayStatusBarToolStripMenuItem.Checked = Global.Config.DisplayStatusBar;
+ if (!InFullscreen)
+ {
+ statusStrip1.Visible = Global.Config.DisplayStatusBar;
+ PerformLayout();
+ FrameBufferResized();
+ }
+ }
private void graphicsSettingsToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -856,7 +856,7 @@ namespace BizHawk.MultiClient
{
UserMovie.WriteBackup();
}
-
+
private void automaticallyBackupMoviesToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.EnableBackupMovies ^= true;
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index 715d0c5e79..458a64e91e 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -60,6 +60,13 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ internal static System.Drawing.Bitmap AudioHS {
+ get {
+ object obj = ResourceManager.GetObject("AudioHS", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap Back {
get {
object obj = ResourceManager.GetObject("Back", resourceCulture);
@@ -137,6 +144,13 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ internal static System.Drawing.Bitmap CopyFolderHS {
+ get {
+ object obj = ResourceManager.GetObject("CopyFolderHS", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap CutHS {
get {
object obj = ResourceManager.GetObject("CutHS", resourceCulture);
@@ -235,6 +249,13 @@ namespace BizHawk.MultiClient.Properties {
}
}
+ internal static System.Drawing.Bitmap MessageConfig {
+ get {
+ object obj = ResourceManager.GetObject("MessageConfig", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap NESController {
get {
object obj = ResourceManager.GetObject("NESController", resourceCulture);
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx
index 90823dec79..fc8a84fd26 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -720,7 +720,16 @@
..\images\SaveConfig.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\images\AudioHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\images\Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\images\CopyFolderHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\images\MessageConfig.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/BizHawk.MultiClient/RecordMovie.Designer.cs b/BizHawk.MultiClient/RecordMovie.Designer.cs
index e3094dfb40..e7ce509e8c 100644
--- a/BizHawk.MultiClient/RecordMovie.Designer.cs
+++ b/BizHawk.MultiClient/RecordMovie.Designer.cs
@@ -35,10 +35,10 @@
this.RecordBox = new System.Windows.Forms.TextBox();
this.StartFromCombo = new System.Windows.Forms.ComboBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.AuthorBox = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
- this.AuthorBox = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
@@ -46,7 +46,7 @@
//
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.Cancel.Location = new System.Drawing.Point(394, 139);
+ this.Cancel.Location = new System.Drawing.Point(391, 139);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 0;
@@ -57,7 +57,7 @@
// OK
//
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.OK.Location = new System.Drawing.Point(301, 139);
+ this.OK.Location = new System.Drawing.Point(310, 139);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 1;
@@ -68,11 +68,11 @@
// Browse
//
this.Browse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.Browse.Location = new System.Drawing.Point(389, 11);
+ this.Browse.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+ this.Browse.Location = new System.Drawing.Point(423, 13);
this.Browse.Name = "Browse";
- this.Browse.Size = new System.Drawing.Size(62, 23);
+ this.Browse.Size = new System.Drawing.Size(25, 23);
this.Browse.TabIndex = 2;
- this.Browse.Text = "&Browse...";
this.Browse.UseVisualStyleBackColor = true;
this.Browse.Click += new System.EventHandler(this.button1_Click);
//
@@ -83,7 +83,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.RecordBox.Location = new System.Drawing.Point(83, 13);
this.RecordBox.Name = "RecordBox";
- this.RecordBox.Size = new System.Drawing.Size(300, 20);
+ this.RecordBox.Size = new System.Drawing.Size(334, 20);
this.RecordBox.TabIndex = 3;
this.RecordBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.RecordBox_DragDrop);
this.RecordBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.RecordBox_DragEnter);
@@ -98,7 +98,7 @@
this.StartFromCombo.Location = new System.Drawing.Point(83, 65);
this.StartFromCombo.MaxDropDownItems = 32;
this.StartFromCombo.Name = "StartFromCombo";
- this.StartFromCombo.Size = new System.Drawing.Size(199, 21);
+ this.StartFromCombo.Size = new System.Drawing.Size(152, 21);
this.StartFromCombo.TabIndex = 4;
//
// groupBox1
@@ -114,10 +114,20 @@
this.groupBox1.Controls.Add(this.RecordBox);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(457, 112);
+ this.groupBox1.Size = new System.Drawing.Size(454, 112);
this.groupBox1.TabIndex = 5;
this.groupBox1.TabStop = false;
//
+ // AuthorBox
+ //
+ this.AuthorBox.AllowDrop = true;
+ this.AuthorBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.AuthorBox.Location = new System.Drawing.Point(83, 39);
+ this.AuthorBox.Name = "AuthorBox";
+ this.AuthorBox.Size = new System.Drawing.Size(365, 20);
+ this.AuthorBox.TabIndex = 7;
+ //
// label3
//
this.label3.AutoSize = true;
@@ -145,23 +155,13 @@
this.label1.TabIndex = 4;
this.label1.Text = "File:";
//
- // AuthorBox
- //
- this.AuthorBox.AllowDrop = true;
- this.AuthorBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.AuthorBox.Location = new System.Drawing.Point(83, 39);
- this.AuthorBox.Name = "AuthorBox";
- this.AuthorBox.Size = new System.Drawing.Size(300, 20);
- this.AuthorBox.TabIndex = 7;
- //
// RecordMovie
//
this.AcceptButton = this.OK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
- this.ClientSize = new System.Drawing.Size(485, 174);
+ this.ClientSize = new System.Drawing.Size(478, 174);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.OK);
this.Controls.Add(this.Cancel);
diff --git a/BizHawk.MultiClient/config/PathConfig.Designer.cs b/BizHawk.MultiClient/config/PathConfig.Designer.cs
index cba4076262..b89b2b2c28 100644
--- a/BizHawk.MultiClient/config/PathConfig.Designer.cs
+++ b/BizHawk.MultiClient/config/PathConfig.Designer.cs
@@ -68,6 +68,9 @@
this.BrowseAVI = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.NESPaletteDescription = new System.Windows.Forms.Label();
+ this.NESBrowsePalette = new System.Windows.Forms.Button();
+ this.NESPaletteBox = new System.Windows.Forms.TextBox();
this.NESCheatsDescription = new System.Windows.Forms.Label();
this.NESBrowseCheats = new System.Windows.Forms.Button();
this.NESCheatsBox = new System.Windows.Forms.TextBox();
@@ -201,9 +204,6 @@
this.BaseDescription = new System.Windows.Forms.Label();
this.RecentForROMs = new System.Windows.Forms.CheckBox();
this.SaveButton = new System.Windows.Forms.Button();
- this.NESPaletteBox = new System.Windows.Forms.TextBox();
- this.NESBrowsePalette = new System.Windows.Forms.Button();
- this.NESPaletteDescription = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
@@ -653,6 +653,37 @@
this.tabPage1.Text = "NES";
this.tabPage1.UseVisualStyleBackColor = true;
//
+ // NESPaletteDescription
+ //
+ this.NESPaletteDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.NESPaletteDescription.AutoSize = true;
+ this.NESPaletteDescription.Location = new System.Drawing.Point(360, 212);
+ this.NESPaletteDescription.Name = "NESPaletteDescription";
+ this.NESPaletteDescription.Size = new System.Drawing.Size(40, 13);
+ this.NESPaletteDescription.TabIndex = 26;
+ this.NESPaletteDescription.Text = "Palette";
+ //
+ // NESBrowsePalette
+ //
+ this.NESBrowsePalette.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.NESBrowsePalette.Location = new System.Drawing.Point(299, 208);
+ this.NESBrowsePalette.Name = "NESBrowsePalette";
+ this.NESBrowsePalette.Size = new System.Drawing.Size(54, 23);
+ this.NESBrowsePalette.TabIndex = 25;
+ this.NESBrowsePalette.Text = "Browse";
+ this.NESBrowsePalette.UseVisualStyleBackColor = true;
+ this.NESBrowsePalette.Click += new System.EventHandler(this.NESBrowsePalette_Click);
+ //
+ // NESPaletteBox
+ //
+ this.NESPaletteBox.AcceptsTab = true;
+ this.NESPaletteBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.NESPaletteBox.Location = new System.Drawing.Point(13, 209);
+ this.NESPaletteBox.Name = "NESPaletteBox";
+ this.NESPaletteBox.Size = new System.Drawing.Size(280, 20);
+ this.NESPaletteBox.TabIndex = 24;
+ //
// NESCheatsDescription
//
this.NESCheatsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -2122,37 +2153,6 @@
this.SaveButton.UseVisualStyleBackColor = true;
this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click);
//
- // NESPaletteBox
- //
- this.NESPaletteBox.AcceptsTab = true;
- this.NESPaletteBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.NESPaletteBox.Location = new System.Drawing.Point(13, 209);
- this.NESPaletteBox.Name = "NESPaletteBox";
- this.NESPaletteBox.Size = new System.Drawing.Size(280, 20);
- this.NESPaletteBox.TabIndex = 24;
- //
- // NESBrowsePalette
- //
- this.NESBrowsePalette.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.NESBrowsePalette.Location = new System.Drawing.Point(299, 208);
- this.NESBrowsePalette.Name = "NESBrowsePalette";
- this.NESBrowsePalette.Size = new System.Drawing.Size(54, 23);
- this.NESBrowsePalette.TabIndex = 25;
- this.NESBrowsePalette.Text = "Browse";
- this.NESBrowsePalette.UseVisualStyleBackColor = true;
- this.NESBrowsePalette.Click += new System.EventHandler(this.NESBrowsePalette_Click);
- //
- // NESPaletteDescription
- //
- this.NESPaletteDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.NESPaletteDescription.AutoSize = true;
- this.NESPaletteDescription.Location = new System.Drawing.Point(360, 212);
- this.NESPaletteDescription.Name = "NESPaletteDescription";
- this.NESPaletteDescription.Size = new System.Drawing.Size(40, 13);
- this.NESPaletteDescription.TabIndex = 26;
- this.NESPaletteDescription.Text = "Palette";
- //
// PathConfig
//
this.AcceptButton = this.OK;
diff --git a/BizHawk.MultiClient/images/AudioHS.png b/BizHawk.MultiClient/images/AudioHS.png
new file mode 100644
index 0000000000..aec03b788d
Binary files /dev/null and b/BizHawk.MultiClient/images/AudioHS.png differ
diff --git a/BizHawk.MultiClient/images/CopyFolderHS.png b/BizHawk.MultiClient/images/CopyFolderHS.png
new file mode 100644
index 0000000000..d099db26de
Binary files /dev/null and b/BizHawk.MultiClient/images/CopyFolderHS.png differ
diff --git a/BizHawk.MultiClient/images/MessageConfig.png b/BizHawk.MultiClient/images/MessageConfig.png
new file mode 100644
index 0000000000..f3a657481b
Binary files /dev/null and b/BizHawk.MultiClient/images/MessageConfig.png differ
diff --git a/BizHawk.MultiClient/images/SaveAllHS.png b/BizHawk.MultiClient/images/SaveAllHS.png
new file mode 100644
index 0000000000..7bde10a6d2
Binary files /dev/null and b/BizHawk.MultiClient/images/SaveAllHS.png differ