cleanup GenericCoreConfig.cs
This commit is contained in:
adelikat
parent
c3627eee03
commit
d93f71c1a3
|
|
@ -28,130 +28,130 @@
|
|||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.tabControl1 = new System.Windows.Forms.TabControl();
|
||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||
this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
|
||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||
this.propertyGrid2 = new System.Windows.Forms.PropertyGrid();
|
||||
this.button1 = new System.Windows.Forms.Button();
|
||||
this.button2 = new System.Windows.Forms.Button();
|
||||
this.buttonDefaults = new System.Windows.Forms.Button();
|
||||
this.tabControl1.SuspendLayout();
|
||||
this.tabPage1.SuspendLayout();
|
||||
this.tabPage2.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// tabControl1
|
||||
//
|
||||
this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
this.tabControl1 = new System.Windows.Forms.TabControl();
|
||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||
this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
|
||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||
this.propertyGrid2 = new System.Windows.Forms.PropertyGrid();
|
||||
this.OkBtn = new System.Windows.Forms.Button();
|
||||
this.CancelBtn = new System.Windows.Forms.Button();
|
||||
this.DefaultsBtn = new System.Windows.Forms.Button();
|
||||
this.tabControl1.SuspendLayout();
|
||||
this.tabPage1.SuspendLayout();
|
||||
this.tabPage2.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// tabControl1
|
||||
//
|
||||
this.tabControl1.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.tabControl1.Controls.Add(this.tabPage1);
|
||||
this.tabControl1.Controls.Add(this.tabPage2);
|
||||
this.tabControl1.Location = new System.Drawing.Point(12, 12);
|
||||
this.tabControl1.Name = "tabControl1";
|
||||
this.tabControl1.SelectedIndex = 0;
|
||||
this.tabControl1.Size = new System.Drawing.Size(320, 331);
|
||||
this.tabControl1.TabIndex = 0;
|
||||
//
|
||||
// tabPage1
|
||||
//
|
||||
this.tabPage1.Controls.Add(this.propertyGrid1);
|
||||
this.tabPage1.Location = new System.Drawing.Point(4, 22);
|
||||
this.tabPage1.Name = "tabPage1";
|
||||
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.tabPage1.Size = new System.Drawing.Size(312, 305);
|
||||
this.tabPage1.TabIndex = 0;
|
||||
this.tabPage1.Text = "Non-Sync Settings";
|
||||
this.tabPage1.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// propertyGrid1
|
||||
//
|
||||
this.propertyGrid1.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText;
|
||||
this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.propertyGrid1.Location = new System.Drawing.Point(3, 3);
|
||||
this.propertyGrid1.Name = "propertyGrid1";
|
||||
this.propertyGrid1.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.propertyGrid1.Size = new System.Drawing.Size(306, 299);
|
||||
this.propertyGrid1.TabIndex = 0;
|
||||
this.propertyGrid1.ToolbarVisible = false;
|
||||
//
|
||||
// tabPage2
|
||||
//
|
||||
this.tabPage2.Controls.Add(this.propertyGrid2);
|
||||
this.tabPage2.Location = new System.Drawing.Point(4, 22);
|
||||
this.tabPage2.Name = "tabPage2";
|
||||
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.tabPage2.Size = new System.Drawing.Size(312, 305);
|
||||
this.tabPage2.TabIndex = 1;
|
||||
this.tabPage2.Text = "Sync Settings";
|
||||
this.tabPage2.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// propertyGrid2
|
||||
//
|
||||
this.propertyGrid2.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText;
|
||||
this.propertyGrid2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.propertyGrid2.Location = new System.Drawing.Point(3, 3);
|
||||
this.propertyGrid2.Name = "propertyGrid2";
|
||||
this.propertyGrid2.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.propertyGrid2.Size = new System.Drawing.Size(306, 299);
|
||||
this.propertyGrid2.TabIndex = 0;
|
||||
this.propertyGrid2.ToolbarVisible = false;
|
||||
this.propertyGrid2.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.propertyGrid2_PropertyValueChanged);
|
||||
//
|
||||
// button1
|
||||
//
|
||||
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.button1.Location = new System.Drawing.Point(176, 349);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(75, 23);
|
||||
this.button1.TabIndex = 1;
|
||||
this.button1.Text = "OK";
|
||||
this.button1.UseVisualStyleBackColor = true;
|
||||
this.button1.Click += new System.EventHandler(this.button1_Click);
|
||||
//
|
||||
// button2
|
||||
//
|
||||
this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.button2.Location = new System.Drawing.Point(257, 349);
|
||||
this.button2.Name = "button2";
|
||||
this.button2.Size = new System.Drawing.Size(75, 23);
|
||||
this.button2.TabIndex = 2;
|
||||
this.button2.Text = "Cancel";
|
||||
this.button2.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// buttonDefaults
|
||||
//
|
||||
this.buttonDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.buttonDefaults.Location = new System.Drawing.Point(12, 349);
|
||||
this.buttonDefaults.Name = "buttonDefaults";
|
||||
this.buttonDefaults.Size = new System.Drawing.Size(75, 23);
|
||||
this.buttonDefaults.TabIndex = 3;
|
||||
this.buttonDefaults.Text = "Defaults";
|
||||
this.buttonDefaults.UseVisualStyleBackColor = true;
|
||||
this.buttonDefaults.Click += new System.EventHandler(this.buttonDefaults_Click);
|
||||
//
|
||||
// GenericCoreConfig
|
||||
//
|
||||
this.AcceptButton = this.button1;
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.CancelButton = this.button2;
|
||||
this.ClientSize = new System.Drawing.Size(344, 384);
|
||||
this.Controls.Add(this.buttonDefaults);
|
||||
this.Controls.Add(this.button2);
|
||||
this.Controls.Add(this.button1);
|
||||
this.Controls.Add(this.tabControl1);
|
||||
this.Name = "GenericCoreConfig";
|
||||
this.ShowIcon = false;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
this.Text = "GenericCoreConfig";
|
||||
this.Load += new System.EventHandler(this.GenericCoreConfig_Load);
|
||||
this.tabControl1.ResumeLayout(false);
|
||||
this.tabPage1.ResumeLayout(false);
|
||||
this.tabPage2.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
this.tabControl1.Controls.Add(this.tabPage1);
|
||||
this.tabControl1.Controls.Add(this.tabPage2);
|
||||
this.tabControl1.Location = new System.Drawing.Point(12, 12);
|
||||
this.tabControl1.Name = "tabControl1";
|
||||
this.tabControl1.SelectedIndex = 0;
|
||||
this.tabControl1.Size = new System.Drawing.Size(320, 331);
|
||||
this.tabControl1.TabIndex = 0;
|
||||
//
|
||||
// tabPage1
|
||||
//
|
||||
this.tabPage1.Controls.Add(this.propertyGrid1);
|
||||
this.tabPage1.Location = new System.Drawing.Point(4, 22);
|
||||
this.tabPage1.Name = "tabPage1";
|
||||
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.tabPage1.Size = new System.Drawing.Size(312, 305);
|
||||
this.tabPage1.TabIndex = 0;
|
||||
this.tabPage1.Text = "Non-Sync Settings";
|
||||
this.tabPage1.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// propertyGrid1
|
||||
//
|
||||
this.propertyGrid1.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText;
|
||||
this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.propertyGrid1.Location = new System.Drawing.Point(3, 3);
|
||||
this.propertyGrid1.Name = "propertyGrid1";
|
||||
this.propertyGrid1.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.propertyGrid1.Size = new System.Drawing.Size(306, 299);
|
||||
this.propertyGrid1.TabIndex = 0;
|
||||
this.propertyGrid1.ToolbarVisible = false;
|
||||
//
|
||||
// tabPage2
|
||||
//
|
||||
this.tabPage2.Controls.Add(this.propertyGrid2);
|
||||
this.tabPage2.Location = new System.Drawing.Point(4, 22);
|
||||
this.tabPage2.Name = "tabPage2";
|
||||
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.tabPage2.Size = new System.Drawing.Size(312, 305);
|
||||
this.tabPage2.TabIndex = 1;
|
||||
this.tabPage2.Text = "Sync Settings";
|
||||
this.tabPage2.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// propertyGrid2
|
||||
//
|
||||
this.propertyGrid2.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText;
|
||||
this.propertyGrid2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.propertyGrid2.Location = new System.Drawing.Point(3, 3);
|
||||
this.propertyGrid2.Name = "propertyGrid2";
|
||||
this.propertyGrid2.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.propertyGrid2.Size = new System.Drawing.Size(306, 299);
|
||||
this.propertyGrid2.TabIndex = 0;
|
||||
this.propertyGrid2.ToolbarVisible = false;
|
||||
this.propertyGrid2.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.PropertyGrid2_PropertyValueChanged);
|
||||
//
|
||||
// OkBtn
|
||||
//
|
||||
this.OkBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.OkBtn.Location = new System.Drawing.Point(176, 349);
|
||||
this.OkBtn.Name = "OkBtn";
|
||||
this.OkBtn.Size = new System.Drawing.Size(75, 23);
|
||||
this.OkBtn.TabIndex = 1;
|
||||
this.OkBtn.Text = "OK";
|
||||
this.OkBtn.UseVisualStyleBackColor = true;
|
||||
this.OkBtn.Click += new System.EventHandler(this.OkBtn_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(257, 349);
|
||||
this.CancelBtn.Name = "CancelBtn";
|
||||
this.CancelBtn.Size = new System.Drawing.Size(75, 23);
|
||||
this.CancelBtn.TabIndex = 2;
|
||||
this.CancelBtn.Text = "Cancel";
|
||||
this.CancelBtn.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// DefaultsBtn
|
||||
//
|
||||
this.DefaultsBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.DefaultsBtn.Location = new System.Drawing.Point(12, 349);
|
||||
this.DefaultsBtn.Name = "DefaultsBtn";
|
||||
this.DefaultsBtn.Size = new System.Drawing.Size(75, 23);
|
||||
this.DefaultsBtn.TabIndex = 3;
|
||||
this.DefaultsBtn.Text = "Defaults";
|
||||
this.DefaultsBtn.UseVisualStyleBackColor = true;
|
||||
this.DefaultsBtn.Click += new System.EventHandler(this.DefaultsBtn_Click);
|
||||
//
|
||||
// GenericCoreConfig
|
||||
//
|
||||
this.AcceptButton = this.OkBtn;
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.CancelButton = this.CancelBtn;
|
||||
this.ClientSize = new System.Drawing.Size(344, 384);
|
||||
this.Controls.Add(this.DefaultsBtn);
|
||||
this.Controls.Add(this.CancelBtn);
|
||||
this.Controls.Add(this.OkBtn);
|
||||
this.Controls.Add(this.tabControl1);
|
||||
this.Name = "GenericCoreConfig";
|
||||
this.ShowIcon = false;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
this.Text = "GenericCoreConfig";
|
||||
this.Load += new System.EventHandler(this.GenericCoreConfig_Load);
|
||||
this.tabControl1.ResumeLayout(false);
|
||||
this.tabPage1.ResumeLayout(false);
|
||||
this.tabPage2.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -162,8 +162,8 @@
|
|||
private System.Windows.Forms.TabPage tabPage2;
|
||||
private System.Windows.Forms.PropertyGrid propertyGrid1;
|
||||
private System.Windows.Forms.PropertyGrid propertyGrid2;
|
||||
private System.Windows.Forms.Button button1;
|
||||
private System.Windows.Forms.Button button2;
|
||||
private System.Windows.Forms.Button buttonDefaults;
|
||||
private System.Windows.Forms.Button OkBtn;
|
||||
private System.Windows.Forms.Button CancelBtn;
|
||||
private System.Windows.Forms.Button DefaultsBtn;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,62 +1,73 @@
|
|||
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;
|
||||
using BizHawk.Client.Common;
|
||||
using BizHawk.Client.EmuHawk;
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
namespace BizHawk.Client.EmuHawk
|
||||
{
|
||||
public partial class GenericCoreConfig : Form
|
||||
{
|
||||
object s;
|
||||
object ss;
|
||||
bool syncsettingschanged = false;
|
||||
private object _s;
|
||||
private object _ss;
|
||||
private bool _syncsettingschanged;
|
||||
|
||||
GenericCoreConfig(bool ignoresettings, bool ignoresyncsettings)
|
||||
private GenericCoreConfig(bool ignoresettings, bool ignoresyncsettings)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
var settable = new SettingsAdapter(Global.Emulator);
|
||||
|
||||
if (settable.HasSettings && !ignoresettings)
|
||||
s = settable.GetSettings();
|
||||
if (settable.HasSyncSettings && !ignoresyncsettings)
|
||||
ss = settable.GetSyncSettings();
|
||||
|
||||
if (s != null)
|
||||
propertyGrid1.SelectedObject = s;
|
||||
else
|
||||
tabControl1.TabPages.Remove(tabPage1);
|
||||
if (ss != null)
|
||||
propertyGrid2.SelectedObject = ss;
|
||||
else
|
||||
tabControl1.TabPages.Remove(tabPage2);
|
||||
|
||||
if (Global.MovieSession.Movie.IsActive)
|
||||
propertyGrid2.Enabled = false; // disable changes to sync setting when movie, so as not to confuse user
|
||||
}
|
||||
|
||||
GenericCoreConfig()
|
||||
:this(false, false)
|
||||
{
|
||||
}
|
||||
|
||||
private void button1_Click(object sender, EventArgs e)
|
||||
{
|
||||
var settable = new SettingsAdapter(Global.Emulator);
|
||||
if (s != null && settable.HasSettings)
|
||||
{
|
||||
settable.PutSettings(s);
|
||||
_s = settable.GetSettings();
|
||||
}
|
||||
|
||||
if (ss != null && syncsettingschanged)
|
||||
GlobalWin.MainForm.PutCoreSyncSettings(ss);
|
||||
if (settable.HasSyncSettings && !ignoresyncsettings)
|
||||
{
|
||||
_ss = settable.GetSyncSettings();
|
||||
}
|
||||
|
||||
if (_s != null)
|
||||
{
|
||||
propertyGrid1.SelectedObject = _s;
|
||||
}
|
||||
else
|
||||
{
|
||||
tabControl1.TabPages.Remove(tabPage1);
|
||||
}
|
||||
|
||||
if (_ss != null)
|
||||
{
|
||||
propertyGrid2.SelectedObject = _ss;
|
||||
}
|
||||
else
|
||||
{
|
||||
tabControl1.TabPages.Remove(tabPage2);
|
||||
}
|
||||
|
||||
if (Global.MovieSession.Movie.IsActive)
|
||||
{
|
||||
propertyGrid2.Enabled = false; // disable changes to sync setting when movie, so as not to confuse user
|
||||
}
|
||||
}
|
||||
|
||||
private GenericCoreConfig()
|
||||
: this(false, false)
|
||||
{
|
||||
}
|
||||
|
||||
private void OkBtn_Click(object sender, EventArgs e)
|
||||
{
|
||||
var settable = new SettingsAdapter(Global.Emulator);
|
||||
if (_s != null && settable.HasSettings)
|
||||
{
|
||||
settable.PutSettings(_s);
|
||||
}
|
||||
|
||||
if (_ss != null && _syncsettingschanged)
|
||||
{
|
||||
GlobalWin.MainForm.PutCoreSyncSettings(_ss);
|
||||
}
|
||||
|
||||
DialogResult = DialogResult.OK;
|
||||
Close();
|
||||
|
|
@ -65,40 +76,43 @@ namespace BizHawk.Client.EmuHawk
|
|||
public static void DoDialog(IWin32Window owner, string title)
|
||||
{
|
||||
using (var dlg = new GenericCoreConfig { Text = title })
|
||||
{
|
||||
dlg.ShowDialog(owner);
|
||||
}
|
||||
}
|
||||
|
||||
public static void DoDialog(IWin32Window owner, string title, bool hidesettings, bool hidesyncsettings)
|
||||
{
|
||||
using (var dlg = new GenericCoreConfig(hidesettings, hidesyncsettings) { Text = title })
|
||||
{
|
||||
dlg.ShowDialog(owner);
|
||||
}
|
||||
}
|
||||
|
||||
private void propertyGrid2_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
|
||||
private void PropertyGrid2_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
|
||||
{
|
||||
syncsettingschanged = true;
|
||||
_syncsettingschanged = true;
|
||||
}
|
||||
|
||||
private void GenericCoreConfig_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void buttonDefaults_Click(object sender, EventArgs e)
|
||||
private void DefaultsBtn_Click(object sender, EventArgs e)
|
||||
{
|
||||
// the new config objects guarantee that the default constructor gives a default-settings object
|
||||
if (s != null)
|
||||
if (_s != null)
|
||||
{
|
||||
s = Activator.CreateInstance(s.GetType());
|
||||
propertyGrid1.SelectedObject = s;
|
||||
}
|
||||
if (ss != null)
|
||||
{
|
||||
ss = Activator.CreateInstance(ss.GetType());
|
||||
propertyGrid2.SelectedObject = ss;
|
||||
syncsettingschanged = true;
|
||||
_s = Activator.CreateInstance(_s.GetType());
|
||||
propertyGrid1.SelectedObject = _s;
|
||||
}
|
||||
|
||||
if (_ss != null)
|
||||
{
|
||||
_ss = Activator.CreateInstance(_ss.GetType());
|
||||
propertyGrid2.SelectedObject = _ss;
|
||||
_syncsettingschanged = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue