diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index b528457000..182969f497 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -328,12 +328,6 @@
SubtitleMaker.cs
-
- Form
-
-
- N64VideoConfig.cs
-
Form
@@ -613,9 +607,6 @@
MainForm.cs
Designer
-
- N64VideoConfig.cs
-
NameStateForm.cs
Designer
diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index f6b6e85931..958a536167 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -288,8 +288,7 @@
this.colecoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.skipBIOSIntroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.n64ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.videoConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.tempN64PluginControlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.N64PluginSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -2505,25 +2504,17 @@
// n64ToolStripMenuItem
//
this.n64ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.videoConfigToolStripMenuItem,
- this.tempN64PluginControlToolStripMenuItem});
+ this.N64PluginSettingsToolStripMenuItem});
this.n64ToolStripMenuItem.Name = "n64ToolStripMenuItem";
this.n64ToolStripMenuItem.Size = new System.Drawing.Size(38, 17);
this.n64ToolStripMenuItem.Text = "N64";
//
- // videoConfigToolStripMenuItem
- //
- this.videoConfigToolStripMenuItem.Name = "videoConfigToolStripMenuItem";
- this.videoConfigToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
- this.videoConfigToolStripMenuItem.Text = "Video Settings";
- this.videoConfigToolStripMenuItem.Click += new System.EventHandler(this.videoConfigToolStripMenuItem_Click);
- //
// tempN64PluginControlToolStripMenuItem
//
- this.tempN64PluginControlToolStripMenuItem.Name = "tempN64PluginControlToolStripMenuItem";
- this.tempN64PluginControlToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
- this.tempN64PluginControlToolStripMenuItem.Text = "Temp N64 Plugin Control";
- this.tempN64PluginControlToolStripMenuItem.Click += new System.EventHandler(this.tempN64PluginControlToolStripMenuItem_Click);
+ this.N64PluginSettingsToolStripMenuItem.Name = "tempN64PluginControlToolStripMenuItem";
+ this.N64PluginSettingsToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+ this.N64PluginSettingsToolStripMenuItem.Text = "Video Plugin Settings";
+ this.N64PluginSettingsToolStripMenuItem.Click += new System.EventHandler(this.tempN64PluginControlToolStripMenuItem_Click);
//
// helpToolStripMenuItem
//
@@ -3286,8 +3277,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator29;
private System.Windows.Forms.ToolStripMenuItem createDualGBXMLToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem n64ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem videoConfigToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem tempN64PluginControlToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem N64PluginSettingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem savestateTypeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem defaultToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem binaryToolStripMenuItem;
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 1da9854f39..9aa063dc72 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -5435,11 +5435,6 @@ namespace BizHawk.MultiClient
Global.Sound.StartSound();
}
- private void videoConfigToolStripMenuItem_Click(object sender, EventArgs e)
- {
- new N64VideoConfig().ShowDialog();
- }
-
private void tempN64PluginControlToolStripMenuItem_Click(object sender, EventArgs e)
{
new N64VideoPluginconfig().ShowDialog();
diff --git a/BizHawk.MultiClient/N64tools/N64VideoConfig.Designer.cs b/BizHawk.MultiClient/N64tools/N64VideoConfig.Designer.cs
deleted file mode 100644
index 0ecf0ea0e1..0000000000
--- a/BizHawk.MultiClient/N64tools/N64VideoConfig.Designer.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-namespace BizHawk.MultiClient
-{
- partial class N64VideoConfig
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.OK = new System.Windows.Forms.Button();
- this.Cancel = new System.Windows.Forms.Button();
- this.VideoResolutionComboBox = new System.Windows.Forms.ComboBox();
- this.label1 = new System.Windows.Forms.Label();
- this.SuspendLayout();
- //
- // 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(287, 360);
- this.OK.Name = "OK";
- this.OK.Size = new System.Drawing.Size(75, 23);
- this.OK.TabIndex = 0;
- this.OK.Text = "&Ok";
- this.OK.UseVisualStyleBackColor = true;
- this.OK.Click += new System.EventHandler(this.OK_Click);
- //
- // Cancel
- //
- 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(368, 360);
- this.Cancel.Name = "Cancel";
- this.Cancel.Size = new System.Drawing.Size(75, 23);
- this.Cancel.TabIndex = 1;
- this.Cancel.Text = "&Cancel";
- this.Cancel.UseVisualStyleBackColor = true;
- this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
- //
- // VideoResolutionComboBox
- //
- this.VideoResolutionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.VideoResolutionComboBox.FormattingEnabled = true;
- this.VideoResolutionComboBox.Items.AddRange(new object[] {
- "320 x 240",
- "400 x 300",
- "480 x 360",
- "512 x 384",
- "640 x 480",
- "800 x 600",
- "1024 x 768",
- "1152 x 864",
- "1280 x 960",
- "1400 x 1050",
- "1600 x 1200",
- "1920 x 1440",
- "2048 x 1536"});
- this.VideoResolutionComboBox.Location = new System.Drawing.Point(16, 29);
- this.VideoResolutionComboBox.Name = "VideoResolutionComboBox";
- this.VideoResolutionComboBox.Size = new System.Drawing.Size(136, 21);
- this.VideoResolutionComboBox.TabIndex = 10;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(13, 13);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(87, 13);
- this.label1.TabIndex = 11;
- this.label1.Text = "Video Resolution";
- //
- // N64VideoConfig
- //
- 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(455, 395);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.VideoResolutionComboBox);
- this.Controls.Add(this.Cancel);
- this.Controls.Add(this.OK);
- this.Name = "N64VideoConfig";
- this.ShowIcon = false;
- this.Text = "Video Configuration";
- this.Load += new System.EventHandler(this.N64VideoConfig_Load);
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.Button OK;
- private System.Windows.Forms.Button Cancel;
- private System.Windows.Forms.ComboBox VideoResolutionComboBox;
- private System.Windows.Forms.Label label1;
- }
-}
\ No newline at end of file
diff --git a/BizHawk.MultiClient/N64tools/N64VideoConfig.cs b/BizHawk.MultiClient/N64tools/N64VideoConfig.cs
deleted file mode 100644
index 7af06ee22f..0000000000
--- a/BizHawk.MultiClient/N64tools/N64VideoConfig.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace BizHawk.MultiClient
-{
- public partial class N64VideoConfig : Form
- {
- public N64VideoConfig()
- {
- InitializeComponent();
- }
-
- private void N64VideoConfig_Load(object sender, EventArgs e)
- {
- string video_setting = Global.Config.N64VideoSizeX.ToString()
- + " x "
- + Global.Config.N64VideoSizeY.ToString();
-
- int index = VideoResolutionComboBox.Items.IndexOf(video_setting);
- if (index > 0)
- {
- VideoResolutionComboBox.SelectedIndex = index;
- }
- }
-
- private void OK_Click(object sender, EventArgs e)
- {
- SaveSettings();
- Global.OSD.AddMessage("Video settings saved.");
- Close();
- }
-
- private void Cancel_Click(object sender, EventArgs e)
- {
- Global.OSD.AddMessage("Video config cancelled.");
- Close();
- }
-
- private void SaveSettings()
- {
- string video_settings = VideoResolutionComboBox.SelectedItem.ToString();
- string[] strArr = video_settings.Split('x');
- Global.Config.N64VideoSizeX = Int32.Parse(strArr[0].Trim());
- Global.Config.N64VideoSizeY = Int32.Parse(strArr[1].Trim());
-
- Global.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind
- }
- }
-}
diff --git a/BizHawk.MultiClient/N64tools/N64VideoConfig.resx b/BizHawk.MultiClient/N64tools/N64VideoConfig.resx
deleted file mode 100644
index 29dcb1b3a3..0000000000
--- a/BizHawk.MultiClient/N64tools/N64VideoConfig.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file