ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

N64 - plugin dialog UI tweaks

This commit is contained in:
adelikat 2013-07-14 23:23:35 +00:00
parent af8a041727
commit 0f628dfcbc
4 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.MultiClient/MainForm.cs
View File

@ -4590,7 +4590,15 @@ namespace BizHawk.MultiClient
private void tempN64PluginControlToolStripMenuItem_Click(object sender, EventArgs e) private void tempN64PluginControlToolStripMenuItem_Click(object sender, EventArgs e)
{ {
new N64VideoPluginconfig().ShowDialog(); var result = new N64VideoPluginconfig().ShowDialog();
if (result == DialogResult.OK)
{
Global.OSD.AddMessage("Plugin settings saved");
}
else
{
Global.OSD.AddMessage("Plugin settings aborted");
}
} }
private void savestateTypeToolStripMenuItem_DropDownOpened(object sender, EventArgs e) private void savestateTypeToolStripMenuItem_DropDownOpened(object sender, EventArgs e)

44
BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs generated
View File

@ -32,7 +32,6 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(N64VideoPluginconfig)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(N64VideoPluginconfig));
this.N64plugintabcontrol = new System.Windows.Forms.TabControl(); this.N64plugintabcontrol = new System.Windows.Forms.TabControl();
this.N64vpluginglobaltab = new System.Windows.Forms.TabPage(); this.N64vpluginglobaltab = new System.Windows.Forms.TabPage();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.VideoResolutionComboBox = new System.Windows.Forms.ComboBox(); this.VideoResolutionComboBox = new System.Windows.Forms.ComboBox();
this.PluginComboBox = new System.Windows.Forms.ComboBox(); this.PluginComboBox = new System.Windows.Forms.ComboBox();
@ -208,7 +207,7 @@
this.label33 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label();
this.Glide_depth_bias = new System.Windows.Forms.TextBox(); this.Glide_depth_bias = new System.Windows.Forms.TextBox();
this.GlideUseDefaultHacks2 = new System.Windows.Forms.CheckBox(); this.GlideUseDefaultHacks2 = new System.Windows.Forms.CheckBox();
this.button1 = new System.Windows.Forms.Button(); this.SaveButton = new System.Windows.Forms.Button();
this.CancelBT = new System.Windows.Forms.Button(); this.CancelBT = new System.Windows.Forms.Button();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.N64plugintabcontrol.SuspendLayout(); this.N64plugintabcontrol.SuspendLayout();
@ -239,12 +238,11 @@
this.N64plugintabcontrol.Location = new System.Drawing.Point(-2, -2); this.N64plugintabcontrol.Location = new System.Drawing.Point(-2, -2);
this.N64plugintabcontrol.Name = "N64plugintabcontrol"; this.N64plugintabcontrol.Name = "N64plugintabcontrol";
this.N64plugintabcontrol.SelectedIndex = 0; this.N64plugintabcontrol.SelectedIndex = 0;
this.N64plugintabcontrol.Size = new System.Drawing.Size(580, 365); this.N64plugintabcontrol.Size = new System.Drawing.Size(580, 369);
this.N64plugintabcontrol.TabIndex = 0; this.N64plugintabcontrol.TabIndex = 0;
// //
// N64vpluginglobaltab // N64vpluginglobaltab
// //
this.N64vpluginglobaltab.Controls.Add(this.label3);
this.N64vpluginglobaltab.Controls.Add(this.label2); this.N64vpluginglobaltab.Controls.Add(this.label2);
this.N64vpluginglobaltab.Controls.Add(this.VideoResolutionComboBox); this.N64vpluginglobaltab.Controls.Add(this.VideoResolutionComboBox);
this.N64vpluginglobaltab.Controls.Add(this.PluginComboBox); this.N64vpluginglobaltab.Controls.Add(this.PluginComboBox);
@ -252,20 +250,11 @@
this.N64vpluginglobaltab.Location = new System.Drawing.Point(4, 22); this.N64vpluginglobaltab.Location = new System.Drawing.Point(4, 22);
this.N64vpluginglobaltab.Name = "N64vpluginglobaltab"; this.N64vpluginglobaltab.Name = "N64vpluginglobaltab";
this.N64vpluginglobaltab.Padding = new System.Windows.Forms.Padding(3); this.N64vpluginglobaltab.Padding = new System.Windows.Forms.Padding(3);
this.N64vpluginglobaltab.Size = new System.Drawing.Size(572, 339); this.N64vpluginglobaltab.Size = new System.Drawing.Size(572, 343);
this.N64vpluginglobaltab.TabIndex = 0; this.N64vpluginglobaltab.TabIndex = 0;
this.N64vpluginglobaltab.Text = "Global"; this.N64vpluginglobaltab.Text = "Global";
this.N64vpluginglobaltab.UseVisualStyleBackColor = true; this.N64vpluginglobaltab.UseVisualStyleBackColor = true;
// //
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(54, 199);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(103, 13);
this.label3.TabIndex = 14;
this.label3.Text = "More Global Options";
//
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
@ -2406,19 +2395,21 @@
this.GlideUseDefaultHacks2.UseVisualStyleBackColor = true; this.GlideUseDefaultHacks2.UseVisualStyleBackColor = true;
this.GlideUseDefaultHacks2.CheckedChanged += new System.EventHandler(this.GlideUseDefaultHacks2_CheckedChanged); this.GlideUseDefaultHacks2.CheckedChanged += new System.EventHandler(this.GlideUseDefaultHacks2_CheckedChanged);
// //
// button1 // SaveButton
// //
this.button1.Location = new System.Drawing.Point(365, 373); this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button1.Name = "button1"; this.SaveButton.Location = new System.Drawing.Point(409, 373);
this.button1.Size = new System.Drawing.Size(75, 23); this.SaveButton.Name = "SaveButton";
this.button1.TabIndex = 1; this.SaveButton.Size = new System.Drawing.Size(75, 23);
this.button1.Text = "Save"; this.SaveButton.TabIndex = 1;
this.button1.UseVisualStyleBackColor = true; this.SaveButton.Text = "Save";
this.button1.Click += new System.EventHandler(this.button1_Click); this.SaveButton.UseVisualStyleBackColor = true;
this.SaveButton.Click += new System.EventHandler(this.button1_Click);
// //
// CancelBT // CancelBT
// //
this.CancelBT.Location = new System.Drawing.Point(461, 373); this.CancelBT.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.CancelBT.Location = new System.Drawing.Point(490, 373);
this.CancelBT.Name = "CancelBT"; this.CancelBT.Name = "CancelBT";
this.CancelBT.Size = new System.Drawing.Size(75, 23); this.CancelBT.Size = new System.Drawing.Size(75, 23);
this.CancelBT.TabIndex = 2; this.CancelBT.TabIndex = 2;
@ -2438,9 +2429,9 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(577, 408); this.ClientSize = new System.Drawing.Size(577, 401);
this.Controls.Add(this.CancelBT); this.Controls.Add(this.CancelBT);
this.Controls.Add(this.button1); this.Controls.Add(this.SaveButton);
this.Controls.Add(this.N64plugintabcontrol); this.Controls.Add(this.N64plugintabcontrol);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Name = "N64VideoPluginconfig"; this.Name = "N64VideoPluginconfig";
@ -2480,10 +2471,9 @@
private System.Windows.Forms.TabPage N64vpluginglobaltab; private System.Windows.Forms.TabPage N64vpluginglobaltab;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox PluginComboBox; private System.Windows.Forms.ComboBox PluginComboBox;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox VideoResolutionComboBox; private System.Windows.Forms.ComboBox VideoResolutionComboBox;
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button SaveButton;
private System.Windows.Forms.Button CancelBT; private System.Windows.Forms.Button CancelBT;
private System.Windows.Forms.TabPage RiceTabPage; private System.Windows.Forms.TabPage RiceTabPage;
private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.ToolTip toolTip1;

3
BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
View File

@ -19,12 +19,14 @@ namespace BizHawk.MultiClient
private void CancelBT_Click(object sender, EventArgs e) private void CancelBT_Click(object sender, EventArgs e)
{ {
//Add confirmation of cancelling change //Add confirmation of cancelling change
DialogResult = DialogResult.Cancel;
Close(); Close();
} }
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
{ {
SaveSettings(); SaveSettings();
DialogResult = DialogResult.OK;
Close(); Close();
} }
@ -229,7 +231,6 @@ namespace BizHawk.MultiClient
PluginComboBox.Text = Global.Config.N64VidPlugin; PluginComboBox.Text = Global.Config.N64VidPlugin;
//Rice //Rice
Global.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind
RiceNormalAlphaBlender_CB.Checked = Global.Config.RicePlugin.NormalAlphaBlender; RiceNormalAlphaBlender_CB.Checked = Global.Config.RicePlugin.NormalAlphaBlender;
RiceFastTextureLoading_CB.Checked = Global.Config.RicePlugin.FastTextureLoading; RiceFastTextureLoading_CB.Checked = Global.Config.RicePlugin.FastTextureLoading;
RiceAccurateTextureMapping_CB.Checked = Global.Config.RicePlugin.AccurateTextureMapping; RiceAccurateTextureMapping_CB.Checked = Global.Config.RicePlugin.AccurateTextureMapping;

3
BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx
View File

@ -120,9 +120,6 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="AnisotropicFiltering_LB.ToolTip" xml:space="preserve"> <data name="AnisotropicFiltering_LB.ToolTip" xml:space="preserve">
<value>Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality). <value>Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality).
This is uneffective if Mipmapping is 0. This is uneffective if Mipmapping is 0.