new N64 plugin config dialog - save stuff

This commit is contained in:
adelikat 2014-07-20 13:29:06 +00:00
parent 6f919c64a7
commit 16daa26c17
3 changed files with 40 additions and 1 deletions

View File

@ -366,6 +366,7 @@
this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.newPluginConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainformMenu.SuspendLayout();
this.MainStatusBar.SuspendLayout();
this.MainFormContextMenu.SuspendLayout();
@ -2465,6 +2466,7 @@
//
this.N64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.N64PluginSettingsMenuItem,
this.newPluginConfigToolStripMenuItem,
this.N64ControllerSettingsMenuItem,
this.toolStripSeparator23,
this.N64CircularAnalogRangeMenuItem});
@ -3203,6 +3205,13 @@
this.ShowMenuContextMenuItem.Text = "Show Menu";
this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click);
//
// newPluginConfigToolStripMenuItem
//
this.newPluginConfigToolStripMenuItem.Name = "newPluginConfigToolStripMenuItem";
this.newPluginConfigToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.newPluginConfigToolStripMenuItem.Text = "New Plugin Config";
this.newPluginConfigToolStripMenuItem.Click += new System.EventHandler(this.newPluginConfigToolStripMenuItem_Click);
//
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@ -3580,6 +3589,7 @@
private System.Windows.Forms.ToolStripMenuItem MovieEndRecordMenuItem;
private System.Windows.Forms.ToolStripMenuItem MovieEndStopMenuItem;
private System.Windows.Forms.ToolStripMenuItem MovieEndPauseMenuItem;
private System.Windows.Forms.ToolStripMenuItem newPluginConfigToolStripMenuItem;
}
}

View File

@ -1739,7 +1739,19 @@ namespace BizHawk.Client.EmuHawk
private void N64PluginSettingsMenuItem_Click(object sender, EventArgs e)
{
//if (new N64VideoPluginconfig().ShowDialog() == DialogResult.OK)
if (new N64VideoPluginconfig().ShowDialog() == DialogResult.OK)
{
GlobalWin.MainForm.FlagNeedsReboot();
GlobalWin.OSD.AddMessage("Plugin settings saved but a core reboot is required");
}
else
{
GlobalWin.OSD.AddMessage("Plugin settings aborted");
}
}
private void newPluginConfigToolStripMenuItem_Click(object sender, EventArgs e)
{
if (new NewN64PluginSettings().ShowDialog() == DialogResult.OK)
{
GlobalWin.MainForm.FlagNeedsReboot();

View File

@ -30,6 +30,23 @@ namespace BizHawk.Client.EmuHawk
private void SaveBtn_Click(object sender, EventArgs e)
{
var video_settings = VideoResolutionComboBox.SelectedItem.ToString();
var strArr = video_settings.Split('x');
s.VideoSizeX = int.Parse(strArr[0].Trim());
s.VideoSizeY = int.Parse(strArr[1].Trim());
ss.CoreType = CoreTypeDropdown.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.CORETYPE>();
ss.RspType = RspTypeDropdown.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.RSPTYPE>();
ss.VidPlugin = PluginComboBox.SelectedItem
.ToString()
.GetEnumFromDescription<PLUGINTYPE>();
PutSettings(s);
PutSyncSettings(ss);