Remove NewN64PluginSettings dialog since it was never built or used, and there's better ways to do things now anyway
This commit is contained in:
adelikat
parent
f5b15b2e6a
commit
87897b936a
|
|
@ -377,12 +377,6 @@
|
|||
<Compile Include="config\N64\N64VideoPluginconfig.Designer.cs">
|
||||
<DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="config\N64\NewN64PluginSettings.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="config\N64\NewN64PluginSettings.Designer.cs">
|
||||
<DependentUpon>NewN64PluginSettings.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="config\NES\DataTableDictionaryBind.cs" />
|
||||
<Compile Include="config\NES\NesControllerSettings.cs">
|
||||
<SubType>Form</SubType>
|
||||
|
|
@ -1327,9 +1321,6 @@
|
|||
<EmbeddedResource Include="config\N64\N64VideoPluginconfig.resx">
|
||||
<DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="config\N64\NewN64PluginSettings.resx">
|
||||
<DependentUpon>NewN64PluginSettings.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="config\NES\NesControllerSettings.resx">
|
||||
<DependentUpon>NesControllerSettings.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
|
|
|||
|
|
@ -1,402 +0,0 @@
|
|||
namespace BizHawk.Client.EmuHawk
|
||||
{
|
||||
partial class NewN64PluginSettings
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewN64PluginSettings));
|
||||
this.PluginTabs = new System.Windows.Forms.TabControl();
|
||||
this.GlobalTab = new System.Windows.Forms.TabPage();
|
||||
this.VideoResolutionYTextBox = new System.Windows.Forms.TextBox();
|
||||
this.LabelVideoResolutionY = new System.Windows.Forms.Label();
|
||||
this.VideoResolutionXTextBox = new System.Windows.Forms.TextBox();
|
||||
this.LabelVideoResolutionX = new System.Windows.Forms.Label();
|
||||
this.label49 = new System.Windows.Forms.Label();
|
||||
this.RspTypeDropdown = new System.Windows.Forms.ComboBox();
|
||||
this.label48 = new System.Windows.Forms.Label();
|
||||
this.CoreTypeDropdown = new System.Windows.Forms.ComboBox();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.VideoResolutionComboBox = new System.Windows.Forms.ComboBox();
|
||||
this.PluginComboBox = new System.Windows.Forms.ComboBox();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.RiceTab = new System.Windows.Forms.TabPage();
|
||||
this.RicePropertyGrid = new System.Windows.Forms.PropertyGrid();
|
||||
this.Glide64mk2 = new System.Windows.Forms.TabPage();
|
||||
this.Glidemk2PropertyGrid = new System.Windows.Forms.PropertyGrid();
|
||||
this.Glide64Tab = new System.Windows.Forms.TabPage();
|
||||
this.GlidePropertyGrid = new System.Windows.Forms.PropertyGrid();
|
||||
this.JaboTab = new System.Windows.Forms.TabPage();
|
||||
this.JaboPropertyGrid = new System.Windows.Forms.PropertyGrid();
|
||||
this.SaveBtn = new System.Windows.Forms.Button();
|
||||
this.CancelBtn = new System.Windows.Forms.Button();
|
||||
this.PluginTabs.SuspendLayout();
|
||||
this.GlobalTab.SuspendLayout();
|
||||
this.RiceTab.SuspendLayout();
|
||||
this.Glide64mk2.SuspendLayout();
|
||||
this.Glide64Tab.SuspendLayout();
|
||||
this.JaboTab.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// PluginTabs
|
||||
//
|
||||
this.PluginTabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.PluginTabs.Controls.Add(this.GlobalTab);
|
||||
this.PluginTabs.Controls.Add(this.RiceTab);
|
||||
this.PluginTabs.Controls.Add(this.Glide64mk2);
|
||||
this.PluginTabs.Controls.Add(this.Glide64Tab);
|
||||
this.PluginTabs.Controls.Add(this.JaboTab);
|
||||
this.PluginTabs.Location = new System.Drawing.Point(12, 12);
|
||||
this.PluginTabs.Name = "PluginTabs";
|
||||
this.PluginTabs.SelectedIndex = 0;
|
||||
this.PluginTabs.Size = new System.Drawing.Size(580, 468);
|
||||
this.PluginTabs.TabIndex = 0;
|
||||
//
|
||||
// GlobalTab
|
||||
//
|
||||
this.GlobalTab.Controls.Add(this.VideoResolutionYTextBox);
|
||||
this.GlobalTab.Controls.Add(this.LabelVideoResolutionY);
|
||||
this.GlobalTab.Controls.Add(this.VideoResolutionXTextBox);
|
||||
this.GlobalTab.Controls.Add(this.LabelVideoResolutionX);
|
||||
this.GlobalTab.Controls.Add(this.label49);
|
||||
this.GlobalTab.Controls.Add(this.RspTypeDropdown);
|
||||
this.GlobalTab.Controls.Add(this.label48);
|
||||
this.GlobalTab.Controls.Add(this.CoreTypeDropdown);
|
||||
this.GlobalTab.Controls.Add(this.label2);
|
||||
this.GlobalTab.Controls.Add(this.VideoResolutionComboBox);
|
||||
this.GlobalTab.Controls.Add(this.PluginComboBox);
|
||||
this.GlobalTab.Controls.Add(this.label1);
|
||||
this.GlobalTab.Location = new System.Drawing.Point(4, 22);
|
||||
this.GlobalTab.Name = "GlobalTab";
|
||||
this.GlobalTab.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.GlobalTab.Size = new System.Drawing.Size(572, 442);
|
||||
this.GlobalTab.TabIndex = 0;
|
||||
this.GlobalTab.Text = "Global";
|
||||
this.GlobalTab.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// VideoResolutionYTextBox
|
||||
//
|
||||
this.VideoResolutionYTextBox.Location = new System.Drawing.Point(494, 91);
|
||||
this.VideoResolutionYTextBox.MaxLength = 5;
|
||||
this.VideoResolutionYTextBox.Name = "VideoResolutionYTextBox";
|
||||
this.VideoResolutionYTextBox.Size = new System.Drawing.Size(35, 20);
|
||||
this.VideoResolutionYTextBox.TabIndex = 108;
|
||||
this.VideoResolutionYTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
|
||||
this.VideoResolutionYTextBox.Visible = false;
|
||||
//
|
||||
// LabelVideoResolutionY
|
||||
//
|
||||
this.LabelVideoResolutionY.AutoSize = true;
|
||||
this.LabelVideoResolutionY.Location = new System.Drawing.Point(447, 94);
|
||||
this.LabelVideoResolutionY.Name = "LabelVideoResolutionY";
|
||||
this.LabelVideoResolutionY.Size = new System.Drawing.Size(41, 13);
|
||||
this.LabelVideoResolutionY.TabIndex = 107;
|
||||
this.LabelVideoResolutionY.Text = "Height:";
|
||||
this.LabelVideoResolutionY.Visible = false;
|
||||
//
|
||||
// VideoResolutionXTextBox
|
||||
//
|
||||
this.VideoResolutionXTextBox.Location = new System.Drawing.Point(402, 91);
|
||||
this.VideoResolutionXTextBox.MaxLength = 5;
|
||||
this.VideoResolutionXTextBox.Name = "VideoResolutionXTextBox";
|
||||
this.VideoResolutionXTextBox.Size = new System.Drawing.Size(35, 20);
|
||||
this.VideoResolutionXTextBox.TabIndex = 28;
|
||||
this.VideoResolutionXTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
|
||||
this.VideoResolutionXTextBox.Visible = false;
|
||||
//
|
||||
// LabelVideoResolutionX
|
||||
//
|
||||
this.LabelVideoResolutionX.AutoSize = true;
|
||||
this.LabelVideoResolutionX.Location = new System.Drawing.Point(358, 94);
|
||||
this.LabelVideoResolutionX.Name = "LabelVideoResolutionX";
|
||||
this.LabelVideoResolutionX.Size = new System.Drawing.Size(38, 13);
|
||||
this.LabelVideoResolutionX.TabIndex = 27;
|
||||
this.LabelVideoResolutionX.Text = "Width:";
|
||||
this.LabelVideoResolutionX.Visible = false;
|
||||
//
|
||||
// label49
|
||||
//
|
||||
this.label49.AutoSize = true;
|
||||
this.label49.Location = new System.Drawing.Point(213, 13);
|
||||
this.label49.Name = "label49";
|
||||
this.label49.Size = new System.Drawing.Size(58, 13);
|
||||
this.label49.TabIndex = 26;
|
||||
this.label49.Text = "Rsp Plugin";
|
||||
//
|
||||
// RspTypeDropdown
|
||||
//
|
||||
this.RspTypeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.RspTypeDropdown.FormattingEnabled = true;
|
||||
this.RspTypeDropdown.Items.AddRange(new object[] {
|
||||
"Pure Interpreter",
|
||||
"Interpreter",
|
||||
"DynaRec"});
|
||||
this.RspTypeDropdown.Location = new System.Drawing.Point(216, 29);
|
||||
this.RspTypeDropdown.Name = "RspTypeDropdown";
|
||||
this.RspTypeDropdown.Size = new System.Drawing.Size(136, 21);
|
||||
this.RspTypeDropdown.TabIndex = 25;
|
||||
//
|
||||
// label48
|
||||
//
|
||||
this.label48.AutoSize = true;
|
||||
this.label48.Location = new System.Drawing.Point(17, 13);
|
||||
this.label48.Name = "label48";
|
||||
this.label48.Size = new System.Drawing.Size(56, 13);
|
||||
this.label48.TabIndex = 24;
|
||||
this.label48.Text = "Core Type";
|
||||
//
|
||||
// CoreTypeDropdown
|
||||
//
|
||||
this.CoreTypeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.CoreTypeDropdown.FormattingEnabled = true;
|
||||
this.CoreTypeDropdown.Items.AddRange(new object[] {
|
||||
"Pure Interpreter",
|
||||
"Interpreter",
|
||||
"DynaRec"});
|
||||
this.CoreTypeDropdown.Location = new System.Drawing.Point(20, 29);
|
||||
this.CoreTypeDropdown.Name = "CoreTypeDropdown";
|
||||
this.CoreTypeDropdown.Size = new System.Drawing.Size(136, 21);
|
||||
this.CoreTypeDropdown.TabIndex = 19;
|
||||
//
|
||||
// label2
|
||||
//
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(213, 75);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(87, 13);
|
||||
this.label2.TabIndex = 23;
|
||||
this.label2.Text = "Video Resolution";
|
||||
//
|
||||
// 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",
|
||||
"Custom"});
|
||||
this.VideoResolutionComboBox.Location = new System.Drawing.Point(216, 91);
|
||||
this.VideoResolutionComboBox.Name = "VideoResolutionComboBox";
|
||||
this.VideoResolutionComboBox.Size = new System.Drawing.Size(136, 21);
|
||||
this.VideoResolutionComboBox.TabIndex = 22;
|
||||
this.VideoResolutionComboBox.SelectedIndexChanged += new System.EventHandler(this.VideoResolutionComboBox_SelectedIndexChanged);
|
||||
//
|
||||
// PluginComboBox
|
||||
//
|
||||
this.PluginComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.PluginComboBox.FormattingEnabled = true;
|
||||
this.PluginComboBox.Items.AddRange(new object[] {
|
||||
"Rice",
|
||||
"Glide64",
|
||||
"Glide64mk2",
|
||||
"Jabo 1.6.1"});
|
||||
this.PluginComboBox.Location = new System.Drawing.Point(20, 91);
|
||||
this.PluginComboBox.Name = "PluginComboBox";
|
||||
this.PluginComboBox.Size = new System.Drawing.Size(136, 21);
|
||||
this.PluginComboBox.TabIndex = 21;
|
||||
//
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(17, 75);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(99, 13);
|
||||
this.label1.TabIndex = 20;
|
||||
this.label1.Text = "Active Video Plugin";
|
||||
//
|
||||
// RiceTab
|
||||
//
|
||||
this.RiceTab.Controls.Add(this.RicePropertyGrid);
|
||||
this.RiceTab.Location = new System.Drawing.Point(4, 22);
|
||||
this.RiceTab.Name = "RiceTab";
|
||||
this.RiceTab.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.RiceTab.Size = new System.Drawing.Size(572, 442);
|
||||
this.RiceTab.TabIndex = 1;
|
||||
this.RiceTab.Text = "Rice";
|
||||
this.RiceTab.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// RicePropertyGrid
|
||||
//
|
||||
this.RicePropertyGrid.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText;
|
||||
this.RicePropertyGrid.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.RicePropertyGrid.Location = new System.Drawing.Point(3, 3);
|
||||
this.RicePropertyGrid.Name = "RicePropertyGrid";
|
||||
this.RicePropertyGrid.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.RicePropertyGrid.Size = new System.Drawing.Size(566, 436);
|
||||
this.RicePropertyGrid.TabIndex = 1;
|
||||
this.RicePropertyGrid.ToolbarVisible = false;
|
||||
//
|
||||
// Glide64mk2
|
||||
//
|
||||
this.Glide64mk2.Controls.Add(this.Glidemk2PropertyGrid);
|
||||
this.Glide64mk2.Location = new System.Drawing.Point(4, 22);
|
||||
this.Glide64mk2.Name = "Glide64mk2";
|
||||
this.Glide64mk2.Size = new System.Drawing.Size(572, 442);
|
||||
this.Glide64mk2.TabIndex = 3;
|
||||
this.Glide64mk2.Text = "Glide64mk2";
|
||||
this.Glide64mk2.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// Glidemk2PropertyGrid
|
||||
//
|
||||
this.Glidemk2PropertyGrid.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText;
|
||||
this.Glidemk2PropertyGrid.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.Glidemk2PropertyGrid.Location = new System.Drawing.Point(0, 0);
|
||||
this.Glidemk2PropertyGrid.Name = "Glidemk2PropertyGrid";
|
||||
this.Glidemk2PropertyGrid.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.Glidemk2PropertyGrid.Size = new System.Drawing.Size(572, 442);
|
||||
this.Glidemk2PropertyGrid.TabIndex = 2;
|
||||
this.Glidemk2PropertyGrid.ToolbarVisible = false;
|
||||
//
|
||||
// Glide64Tab
|
||||
//
|
||||
this.Glide64Tab.Controls.Add(this.GlidePropertyGrid);
|
||||
this.Glide64Tab.Location = new System.Drawing.Point(4, 22);
|
||||
this.Glide64Tab.Name = "Glide64Tab";
|
||||
this.Glide64Tab.Size = new System.Drawing.Size(572, 442);
|
||||
this.Glide64Tab.TabIndex = 2;
|
||||
this.Glide64Tab.Text = "Glide64";
|
||||
this.Glide64Tab.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// GlidePropertyGrid
|
||||
//
|
||||
this.GlidePropertyGrid.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText;
|
||||
this.GlidePropertyGrid.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.GlidePropertyGrid.Location = new System.Drawing.Point(0, 0);
|
||||
this.GlidePropertyGrid.Name = "GlidePropertyGrid";
|
||||
this.GlidePropertyGrid.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.GlidePropertyGrid.Size = new System.Drawing.Size(572, 442);
|
||||
this.GlidePropertyGrid.TabIndex = 3;
|
||||
this.GlidePropertyGrid.ToolbarVisible = false;
|
||||
//
|
||||
// JaboTab
|
||||
//
|
||||
this.JaboTab.Controls.Add(this.JaboPropertyGrid);
|
||||
this.JaboTab.Location = new System.Drawing.Point(4, 22);
|
||||
this.JaboTab.Name = "JaboTab";
|
||||
this.JaboTab.Size = new System.Drawing.Size(572, 442);
|
||||
this.JaboTab.TabIndex = 4;
|
||||
this.JaboTab.Text = "Jabo";
|
||||
this.JaboTab.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// JaboPropertyGrid
|
||||
//
|
||||
this.JaboPropertyGrid.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText;
|
||||
this.JaboPropertyGrid.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.JaboPropertyGrid.Location = new System.Drawing.Point(0, 0);
|
||||
this.JaboPropertyGrid.Name = "JaboPropertyGrid";
|
||||
this.JaboPropertyGrid.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.JaboPropertyGrid.Size = new System.Drawing.Size(572, 442);
|
||||
this.JaboPropertyGrid.TabIndex = 3;
|
||||
this.JaboPropertyGrid.ToolbarVisible = false;
|
||||
//
|
||||
// SaveBtn
|
||||
//
|
||||
this.SaveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.SaveBtn.Location = new System.Drawing.Point(466, 486);
|
||||
this.SaveBtn.Name = "SaveBtn";
|
||||
this.SaveBtn.Size = new System.Drawing.Size(60, 23);
|
||||
this.SaveBtn.TabIndex = 101;
|
||||
this.SaveBtn.Text = "Save";
|
||||
this.SaveBtn.UseVisualStyleBackColor = true;
|
||||
this.SaveBtn.Click += new System.EventHandler(this.SaveBtn_Click);
|
||||
//
|
||||
// CancelBtn
|
||||
//
|
||||
this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.CancelBtn.Location = new System.Drawing.Point(532, 486);
|
||||
this.CancelBtn.Name = "CancelBtn";
|
||||
this.CancelBtn.Size = new System.Drawing.Size(60, 23);
|
||||
this.CancelBtn.TabIndex = 106;
|
||||
this.CancelBtn.Text = "Cancel";
|
||||
this.CancelBtn.UseVisualStyleBackColor = true;
|
||||
this.CancelBtn.Click += new System.EventHandler(this.CancelBtn_Click);
|
||||
//
|
||||
// NewN64PluginSettings
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(604, 521);
|
||||
this.Controls.Add(this.CancelBtn);
|
||||
this.Controls.Add(this.SaveBtn);
|
||||
this.Controls.Add(this.PluginTabs);
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
this.Name = "NewN64PluginSettings";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
this.Text = "New Plugin Settings";
|
||||
this.Load += new System.EventHandler(this.NewN64PluginSettings_Load);
|
||||
this.PluginTabs.ResumeLayout(false);
|
||||
this.GlobalTab.ResumeLayout(false);
|
||||
this.GlobalTab.PerformLayout();
|
||||
this.RiceTab.ResumeLayout(false);
|
||||
this.Glide64mk2.ResumeLayout(false);
|
||||
this.Glide64Tab.ResumeLayout(false);
|
||||
this.JaboTab.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.TabControl PluginTabs;
|
||||
private System.Windows.Forms.TabPage GlobalTab;
|
||||
private System.Windows.Forms.TabPage RiceTab;
|
||||
private System.Windows.Forms.Button SaveBtn;
|
||||
private System.Windows.Forms.Button CancelBtn;
|
||||
private System.Windows.Forms.TabPage Glide64Tab;
|
||||
private System.Windows.Forms.TabPage Glide64mk2;
|
||||
private System.Windows.Forms.TabPage JaboTab;
|
||||
private System.Windows.Forms.Label label49;
|
||||
private System.Windows.Forms.ComboBox RspTypeDropdown;
|
||||
private System.Windows.Forms.Label label48;
|
||||
private System.Windows.Forms.ComboBox CoreTypeDropdown;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.ComboBox VideoResolutionComboBox;
|
||||
private System.Windows.Forms.ComboBox PluginComboBox;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.PropertyGrid RicePropertyGrid;
|
||||
private System.Windows.Forms.PropertyGrid Glidemk2PropertyGrid;
|
||||
private System.Windows.Forms.PropertyGrid GlidePropertyGrid;
|
||||
private System.Windows.Forms.PropertyGrid JaboPropertyGrid;
|
||||
private System.Windows.Forms.Label LabelVideoResolutionX;
|
||||
private System.Windows.Forms.TextBox VideoResolutionXTextBox;
|
||||
private System.Windows.Forms.Label LabelVideoResolutionY;
|
||||
private System.Windows.Forms.TextBox VideoResolutionYTextBox;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,182 +0,0 @@
|
|||
using System;
|
||||
using System.Windows.Forms;
|
||||
|
||||
using BizHawk.Common.StringExtensions;
|
||||
using BizHawk.Common.ReflectionExtensions;
|
||||
using BizHawk.Emulation.Cores.Nintendo.N64;
|
||||
using BizHawk.Client.Common;
|
||||
using BizHawk.Client.EmuHawk.WinFormExtensions;
|
||||
|
||||
namespace BizHawk.Client.EmuHawk
|
||||
{
|
||||
public partial class NewN64PluginSettings : Form
|
||||
{
|
||||
private N64Settings _s;
|
||||
private N64SyncSettings _ss;
|
||||
|
||||
public NewN64PluginSettings()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private void CancelBtn_Click(object sender, EventArgs e)
|
||||
{
|
||||
DialogResult = DialogResult.Cancel;
|
||||
Close();
|
||||
}
|
||||
|
||||
private void SaveBtn_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (VideoResolutionComboBox.Text != "Custom")
|
||||
{
|
||||
var videoSettings = VideoResolutionComboBox.SelectedItem.ToString();
|
||||
var strArr = videoSettings.Split('x');
|
||||
_s.VideoSizeX = int.Parse(strArr[0].Trim());
|
||||
_s.VideoSizeY = int.Parse(strArr[1].Trim());
|
||||
}
|
||||
else
|
||||
{
|
||||
_s.VideoSizeX =
|
||||
VideoResolutionXTextBox.Text.IsUnsigned() ?
|
||||
int.Parse(VideoResolutionXTextBox.Text) : 320;
|
||||
|
||||
_s.VideoSizeY =
|
||||
VideoResolutionYTextBox.Text.IsUnsigned() ?
|
||||
int.Parse(VideoResolutionYTextBox.Text) : 240;
|
||||
}
|
||||
|
||||
_ss.Core = CoreTypeDropdown.SelectedItem
|
||||
.ToString()
|
||||
.GetEnumFromDescription<N64SyncSettings.CoreType>();
|
||||
|
||||
_ss.Rsp = RspTypeDropdown.SelectedItem
|
||||
.ToString()
|
||||
.GetEnumFromDescription<N64SyncSettings.RspType>();
|
||||
|
||||
_ss.VideoPlugin = PluginComboBox.SelectedItem
|
||||
.ToString()
|
||||
.GetEnumFromDescription<PluginType>();
|
||||
|
||||
PutSettings(_s);
|
||||
PutSyncSettings(_ss);
|
||||
|
||||
DialogResult = DialogResult.OK;
|
||||
Close();
|
||||
}
|
||||
|
||||
private void NewN64PluginSettings_Load(object sender, EventArgs e)
|
||||
{
|
||||
_s = GetSettings();
|
||||
_ss = GetSyncSettings();
|
||||
|
||||
CoreTypeDropdown.PopulateFromEnum<N64SyncSettings.CoreType>(_ss.Core);
|
||||
RspTypeDropdown.PopulateFromEnum<N64SyncSettings.RspType>(_ss.Rsp);
|
||||
PluginComboBox.PopulateFromEnum<PluginType>(_ss.VideoPlugin);
|
||||
|
||||
VideoResolutionXTextBox.Text = _s.VideoSizeX.ToString();
|
||||
VideoResolutionYTextBox.Text = _s.VideoSizeY.ToString();
|
||||
|
||||
var videoSetting = _s.VideoSizeX
|
||||
+ " x "
|
||||
+ _s.VideoSizeY;
|
||||
|
||||
var index = VideoResolutionComboBox.Items.IndexOf(videoSetting);
|
||||
if (index >= 0)
|
||||
{
|
||||
VideoResolutionComboBox.SelectedIndex = index;
|
||||
}
|
||||
else if (PluginComboBox.SelectedIndex != 4)
|
||||
{
|
||||
VideoResolutionComboBox.SelectedIndex = 13;
|
||||
ShowCustomVideoResolutionControls();
|
||||
}
|
||||
|
||||
RicePropertyGrid.SelectedObject = _ss.RicePlugin;
|
||||
Glidemk2PropertyGrid.SelectedObject = _ss.Glide64mk2Plugin;
|
||||
GlidePropertyGrid.SelectedObject = _ss.GlidePlugin;
|
||||
//JaboPropertyGrid.SelectedObject = _ss.JaboPlugin;
|
||||
}
|
||||
|
||||
#region Setting Get/Set
|
||||
|
||||
private static N64SyncSettings GetSyncSettings()
|
||||
{
|
||||
if (Global.Emulator is N64)
|
||||
{
|
||||
return ((N64)Global.Emulator).GetSyncSettings();
|
||||
}
|
||||
|
||||
return (N64SyncSettings)Global.Config.GetCoreSyncSettings<N64>()
|
||||
?? new N64SyncSettings();
|
||||
}
|
||||
|
||||
private static N64Settings GetSettings()
|
||||
{
|
||||
if (Global.Emulator is N64)
|
||||
{
|
||||
return ((N64)Global.Emulator).GetSettings();
|
||||
}
|
||||
|
||||
return (N64Settings)Global.Config.GetCoreSettings<N64>()
|
||||
?? new N64Settings();
|
||||
}
|
||||
|
||||
private static void PutSyncSettings(N64SyncSettings s)
|
||||
{
|
||||
if (Global.Emulator is N64)
|
||||
{
|
||||
GlobalWin.MainForm.PutCoreSyncSettings(s);
|
||||
}
|
||||
else
|
||||
{
|
||||
Global.Config.PutCoreSyncSettings<N64>(s);
|
||||
}
|
||||
}
|
||||
|
||||
private static void PutSettings(N64Settings s)
|
||||
{
|
||||
if (Global.Emulator is N64)
|
||||
{
|
||||
GlobalWin.MainForm.PutCoreSettings(s);
|
||||
}
|
||||
else
|
||||
{
|
||||
Global.Config.PutCoreSettings<N64>(s);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private void VideoResolutionComboBox_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (VideoResolutionComboBox.Text == "Custom")
|
||||
{
|
||||
ShowCustomVideoResolutionControls();
|
||||
}
|
||||
else
|
||||
{
|
||||
HideCustomVideoResolutionControls();
|
||||
var newResolution = VideoResolutionComboBox.SelectedItem.ToString();
|
||||
var strArr = newResolution.Split('x');
|
||||
VideoResolutionXTextBox.Text = strArr[0].Trim();
|
||||
VideoResolutionYTextBox.Text = strArr[1].Trim();
|
||||
}
|
||||
}
|
||||
|
||||
private void ShowCustomVideoResolutionControls()
|
||||
{
|
||||
LabelVideoResolutionX.Visible = true;
|
||||
LabelVideoResolutionY.Visible = true;
|
||||
VideoResolutionXTextBox.Visible = true;
|
||||
VideoResolutionYTextBox.Visible = true;
|
||||
}
|
||||
|
||||
private void HideCustomVideoResolutionControls()
|
||||
{
|
||||
LabelVideoResolutionX.Visible = false;
|
||||
LabelVideoResolutionY.Visible = false;
|
||||
VideoResolutionXTextBox.Visible = false;
|
||||
VideoResolutionYTextBox.Visible = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue