From f7ddab25c77da5411ff7c7bb1ffd23228c948d7d Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 2 Mar 2020 16:58:53 +1000 Subject: [PATCH] Redesign 4 config dialogs as a proof-of-concept --- .../config/AutofireConfig.Designer.cs | 184 +- .../config/AutofireConfig.cs | 32 +- .../config/DisplayConfig.Designer.cs | 2066 ++++++++--------- .../config/DisplayConfig.cs | 196 +- .../config/DisplayConfig.resx | 4 +- .../config/EmuHawkOptions.Designer.cs | 1180 +++++----- .../config/EmuHawkOptions.cs | 106 +- .../config/SoundConfig.Designer.cs | 616 +++-- BizHawk.Client.EmuHawk/config/SoundConfig.cs | 93 +- 9 files changed, 2195 insertions(+), 2282 deletions(-) diff --git a/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs index 58922e3123..4c86d6d76e 100644 --- a/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs @@ -10,173 +10,167 @@ /// private void InitializeComponent() { - this.Ok = new System.Windows.Forms.Button(); - this.Cancel = new System.Windows.Forms.Button(); - this.OnNumeric = new System.Windows.Forms.NumericUpDown(); - this.OffNumeric = new System.Windows.Forms.NumericUpDown(); - this.label1 = new BizHawk.WinForms.Controls.LabelEx(); - this.label2 = new BizHawk.WinForms.Controls.LabelEx(); - this.flpButtons = new BizHawk.WinForms.Controls.LocSzSingleRowFLP(); - this.flpMain = new BizHawk.WinForms.Controls.LocSzSingleColumnFLP(); + this.btnDialogOK = new BizHawk.WinForms.Controls.SzButtonEx(); + this.btnDialogCancel = new BizHawk.WinForms.Controls.SzButtonEx(); + this.nudPatternOn = new BizHawk.WinForms.Controls.SzNUDEx(); + this.nudPatternOff = new BizHawk.WinForms.Controls.SzNUDEx(); + this.lblPatternOn = new BizHawk.WinForms.Controls.LabelEx(); + this.lblPatternOff = new BizHawk.WinForms.Controls.LabelEx(); + this.flpDialogButtons = new BizHawk.WinForms.Controls.LocSzSingleRowFLP(); + this.flpDialog = new BizHawk.WinForms.Controls.LocSzSingleColumnFLP(); this.flpPattern = new BizHawk.WinForms.Controls.SingleRowFLP(); - this.lblPattern = new BizHawk.WinForms.Controls.LabelEx(); - this.LagFrameCheck = new System.Windows.Forms.CheckBox(); - ((System.ComponentModel.ISupportInitialize)(this.OnNumeric)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.OffNumeric)).BeginInit(); - this.flpButtons.SuspendLayout(); - this.flpMain.SuspendLayout(); + this.lblPatternDesc = new BizHawk.WinForms.Controls.LabelEx(); + this.cbConsiderLag = new BizHawk.WinForms.Controls.CheckBoxEx(); + ((System.ComponentModel.ISupportInitialize)(this.nudPatternOn)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudPatternOff)).BeginInit(); + this.flpDialogButtons.SuspendLayout(); + this.flpDialog.SuspendLayout(); this.flpPattern.SuspendLayout(); this.SuspendLayout(); // - // Ok + // btnDialogOK // - this.Ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Ok.Name = "Ok"; - this.Ok.Text = "&OK"; - this.Ok.UseVisualStyleBackColor = true; - this.Ok.Click += new System.EventHandler(this.Ok_Click); + this.btnDialogOK.Name = "btnDialogOK"; + this.btnDialogOK.Size = new System.Drawing.Size(75, 23); + this.btnDialogOK.Text = "&OK"; + this.btnDialogOK.Click += new System.EventHandler(this.btnDialogOK_Click); // - // Cancel + // btnDialogCancel // - 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.Name = "Cancel"; - this.Cancel.Text = "&Cancel"; - this.Cancel.UseVisualStyleBackColor = true; - this.Cancel.Click += new System.EventHandler(this.Cancel_Click); + this.btnDialogCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnDialogCancel.Name = "btnDialogCancel"; + this.btnDialogCancel.Size = new System.Drawing.Size(75, 23); + this.btnDialogCancel.Text = "&Cancel"; + this.btnDialogCancel.Click += new System.EventHandler(this.btnDialogCancel_Click); // - // OnNumeric + // nudPatternOn // - this.OnNumeric.Maximum = new decimal(new int[] { + this.nudPatternOn.Maximum = new decimal(new int[] { 512, 0, 0, 0}); - this.OnNumeric.Minimum = new decimal(new int[] { + this.nudPatternOn.Minimum = new decimal(new int[] { 1, 0, 0, 0}); - this.OnNumeric.Name = "OnNumeric"; - this.OnNumeric.Size = new System.Drawing.Size(48, 19); - this.OnNumeric.Value = new decimal(new int[] { + this.nudPatternOn.Name = "nudPatternOn"; + this.nudPatternOn.Size = new System.Drawing.Size(48, 20); + this.nudPatternOn.Value = new decimal(new int[] { 1, 0, 0, 0}); // - // OffNumeric + // nudPatternOff // - this.OffNumeric.Maximum = new decimal(new int[] { + this.nudPatternOff.Maximum = new decimal(new int[] { 512, 0, 0, 0}); - this.OffNumeric.Minimum = new decimal(new int[] { + this.nudPatternOff.Minimum = new decimal(new int[] { 1, 0, 0, 0}); - this.OffNumeric.Name = "OffNumeric"; - this.OffNumeric.Size = new System.Drawing.Size(48, 19); - this.OffNumeric.Value = new decimal(new int[] { + this.nudPatternOff.Name = "nudPatternOff"; + this.nudPatternOff.Size = new System.Drawing.Size(48, 20); + this.nudPatternOff.Value = new decimal(new int[] { 1, 0, 0, 0}); // - // label1 + // lblPatternOn // - this.label1.Name = "label1"; - this.label1.Text = "on,"; + this.lblPatternOn.Name = "lblPatternOn"; + this.lblPatternOn.Text = "on,"; // - // label2 + // lblPatternOff // - this.label2.Name = "label2"; - this.label2.Text = "off"; + this.lblPatternOff.Name = "lblPatternOff"; + this.lblPatternOff.Text = "off"; // - // flpButtons + // flpDialogButtons // - this.flpButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.flpButtons.Controls.Add(this.Ok); - this.flpButtons.Controls.Add(this.Cancel); - this.flpButtons.Location = new System.Drawing.Point(161, 61); - this.flpButtons.Name = "flpButtons"; - this.flpButtons.Size = new System.Drawing.Size(162, 29); + this.flpDialogButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.flpDialogButtons.Controls.Add(this.btnDialogOK); + this.flpDialogButtons.Controls.Add(this.btnDialogCancel); + this.flpDialogButtons.Location = new System.Drawing.Point(161, 61); + this.flpDialogButtons.Name = "flpDialogButtons"; + this.flpDialogButtons.Size = new System.Drawing.Size(162, 29); // - // flpMain + // flpDialog // - this.flpMain.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.flpDialog.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.flpMain.Controls.Add(this.flpPattern); - this.flpMain.Controls.Add(this.LagFrameCheck); - this.flpMain.Location = new System.Drawing.Point(0, 0); - this.flpMain.Name = "flpMain"; - this.flpMain.Size = new System.Drawing.Size(323, 55); + this.flpDialog.Controls.Add(this.flpPattern); + this.flpDialog.Controls.Add(this.cbConsiderLag); + this.flpDialog.Location = new System.Drawing.Point(0, 0); + this.flpDialog.Name = "flpDialog"; + this.flpDialog.Size = new System.Drawing.Size(323, 55); // // flpPattern // - this.flpPattern.Controls.Add(this.lblPattern); - this.flpPattern.Controls.Add(this.OnNumeric); - this.flpPattern.Controls.Add(this.label1); - this.flpPattern.Controls.Add(this.OffNumeric); - this.flpPattern.Controls.Add(this.label2); + this.flpPattern.Controls.Add(this.lblPatternDesc); + this.flpPattern.Controls.Add(this.nudPatternOn); + this.flpPattern.Controls.Add(this.lblPatternOn); + this.flpPattern.Controls.Add(this.nudPatternOff); + this.flpPattern.Controls.Add(this.lblPatternOff); this.flpPattern.Name = "flpPattern"; // - // lblPattern + // lblPatternDesc // - this.lblPattern.Name = "lblPattern"; - this.lblPattern.Text = "Pattern:"; + this.lblPatternDesc.Name = "lblPatternDesc"; + this.lblPatternDesc.Text = "Pattern:"; // - // LagFrameCheck + // cbConsiderLag // - this.LagFrameCheck.AutoSize = true; - this.LagFrameCheck.Name = "LagFrameCheck"; - this.LagFrameCheck.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); - this.LagFrameCheck.Text = "Take lag frames into account"; - this.LagFrameCheck.UseVisualStyleBackColor = true; + this.cbConsiderLag.Name = "cbConsiderLag"; + this.cbConsiderLag.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.cbConsiderLag.Text = "Take lag frames into account"; // // AutofireConfig // - this.AcceptButton = this.Ok; + this.AcceptButton = this.btnDialogOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.Cancel; + this.CancelButton = this.btnDialogCancel; this.ClientSize = new System.Drawing.Size(323, 90); - this.Controls.Add(this.flpMain); - this.Controls.Add(this.flpButtons); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning_MultiSize; + this.Controls.Add(this.flpDialog); + this.Controls.Add(this.flpDialogButtons); this.MaximizeBox = false; this.MinimumSize = new System.Drawing.Size(339, 129); this.Name = "AutofireConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Autofire Configuration"; this.Load += new System.EventHandler(this.AutofireConfig_Load); - ((System.ComponentModel.ISupportInitialize)(this.OnNumeric)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.OffNumeric)).EndInit(); - this.flpButtons.ResumeLayout(false); - this.flpMain.ResumeLayout(false); - this.flpMain.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudPatternOn)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudPatternOff)).EndInit(); + this.flpDialogButtons.ResumeLayout(false); + this.flpDialog.ResumeLayout(false); + this.flpDialog.PerformLayout(); this.flpPattern.ResumeLayout(false); this.flpPattern.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private System.Windows.Forms.Button Ok; - private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.NumericUpDown OffNumeric; - private BizHawk.WinForms.Controls.LabelEx label1; - private BizHawk.WinForms.Controls.LabelEx label2; + private BizHawk.WinForms.Controls.SzButtonEx btnDialogOK; + private BizHawk.WinForms.Controls.SzButtonEx btnDialogCancel; + private BizHawk.WinForms.Controls.SzNUDEx nudPatternOff; + private BizHawk.WinForms.Controls.LabelEx lblPatternOn; + private BizHawk.WinForms.Controls.LabelEx lblPatternOff; private BizHawk.WinForms.Controls.SingleRowFLP flpPattern; - private BizHawk.WinForms.Controls.LocSzSingleColumnFLP flpMain; - private BizHawk.WinForms.Controls.LocSzSingleRowFLP flpButtons; - private BizHawk.WinForms.Controls.LabelEx lblPattern; - public System.Windows.Forms.NumericUpDown OnNumeric; - private System.Windows.Forms.CheckBox LagFrameCheck; + private BizHawk.WinForms.Controls.LocSzSingleColumnFLP flpDialog; + private BizHawk.WinForms.Controls.LocSzSingleRowFLP flpDialogButtons; + private BizHawk.WinForms.Controls.LabelEx lblPatternDesc; + public BizHawk.WinForms.Controls.SzNUDEx nudPatternOn; + private BizHawk.WinForms.Controls.CheckBoxEx cbConsiderLag; } } diff --git a/BizHawk.Client.EmuHawk/config/AutofireConfig.cs b/BizHawk.Client.EmuHawk/config/AutofireConfig.cs index 745b03632f..d7fb2b783e 100644 --- a/BizHawk.Client.EmuHawk/config/AutofireConfig.cs +++ b/BizHawk.Client.EmuHawk/config/AutofireConfig.cs @@ -23,46 +23,46 @@ namespace BizHawk.Client.EmuHawk private void AutofireConfig_Load(object sender, EventArgs e) { - if (_config.AutofireOn < OnNumeric.Minimum) + if (_config.AutofireOn < nudPatternOn.Minimum) { - OnNumeric.Value = OnNumeric.Minimum; + nudPatternOn.Value = nudPatternOn.Minimum; } - else if (_config.AutofireOn > OnNumeric.Maximum) + else if (_config.AutofireOn > nudPatternOn.Maximum) { - OnNumeric.Value = OnNumeric.Maximum; + nudPatternOn.Value = nudPatternOn.Maximum; } else { - OnNumeric.Value = _config.AutofireOn; + nudPatternOn.Value = _config.AutofireOn; } - if (_config.AutofireOff < OffNumeric.Minimum) + if (_config.AutofireOff < nudPatternOff.Minimum) { - OffNumeric.Value = OffNumeric.Minimum; + nudPatternOff.Value = nudPatternOff.Minimum; } - else if (_config.AutofireOff > OffNumeric.Maximum) + else if (_config.AutofireOff > nudPatternOff.Maximum) { - OffNumeric.Value = OffNumeric.Maximum; + nudPatternOff.Value = nudPatternOff.Maximum; } else { - OffNumeric.Value = _config.AutofireOff; + nudPatternOff.Value = _config.AutofireOff; } - LagFrameCheck.Checked = _config.AutofireLagFrames; + cbConsiderLag.Checked = _config.AutofireLagFrames; } - private void Ok_Click(object sender, EventArgs e) + private void btnDialogOK_Click(object sender, EventArgs e) { - _autoFireController.On = _config.AutofireOn = (int)OnNumeric.Value; - _autoFireController.Off = _config.AutofireOff = (int)OffNumeric.Value; - _config.AutofireLagFrames = LagFrameCheck.Checked; + _autoFireController.On = _config.AutofireOn = (int)nudPatternOn.Value; + _autoFireController.Off = _config.AutofireOff = (int)nudPatternOff.Value; + _config.AutofireLagFrames = cbConsiderLag.Checked; _stickyXorAdapter.SetOnOffPatternFromConfig(); Close(); } - private void Cancel_Click(object sender, EventArgs e) + private void btnDialogCancel_Click(object sender, EventArgs e) { Close(); } diff --git a/BizHawk.Client.EmuHawk/config/DisplayConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/DisplayConfig.Designer.cs index 1c62a50ce6..bf0c9e8537 100644 --- a/BizHawk.Client.EmuHawk/config/DisplayConfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/DisplayConfig.Designer.cs @@ -28,1067 +28,1017 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayConfig)); - this.btnCancel = new System.Windows.Forms.Button(); - this.btnOk = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.lblScanlines = new System.Windows.Forms.Label(); - this.lblUserFilterName = new System.Windows.Forms.Label(); - this.btnSelectUserFilter = new System.Windows.Forms.Button(); - this.rbUser = new System.Windows.Forms.RadioButton(); - this.tbScanlineIntensity = new BizHawk.Client.EmuHawk.TransparentTrackBar(); - this.rbNone = new System.Windows.Forms.RadioButton(); - this.rbScanlines = new System.Windows.Forms.RadioButton(); - this.rbHq2x = new System.Windows.Forms.RadioButton(); - this.checkLetterbox = new System.Windows.Forms.CheckBox(); - this.checkPadInteger = new System.Windows.Forms.CheckBox(); - this.grpFinalFilter = new System.Windows.Forms.GroupBox(); - this.rbFinalFilterBicubic = new System.Windows.Forms.RadioButton(); - this.rbFinalFilterNone = new System.Windows.Forms.RadioButton(); - this.rbFinalFilterBilinear = new System.Windows.Forms.RadioButton(); - this.rbUseRaw = new System.Windows.Forms.RadioButton(); - this.rbUseSystem = new System.Windows.Forms.RadioButton(); - this.grpARSelection = new System.Windows.Forms.GroupBox(); - this.txtCustomARY = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); - this.txtCustomARX = new System.Windows.Forms.TextBox(); - this.rbUseCustomRatio = new System.Windows.Forms.RadioButton(); - this.label4 = new System.Windows.Forms.Label(); - this.txtCustomARHeight = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.txtCustomARWidth = new System.Windows.Forms.TextBox(); - this.rbUseCustom = new System.Windows.Forms.RadioButton(); - this.rbOpenGL = new System.Windows.Forms.RadioButton(); - this.label5 = new System.Windows.Forms.Label(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tpAR = new System.Windows.Forms.TabPage(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.label16 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.txtCropBottom = new System.Windows.Forms.TextBox(); - this.label17 = new System.Windows.Forms.Label(); - this.txtCropRight = new System.Windows.Forms.TextBox(); - this.txtCropTop = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); - this.txtCropLeft = new System.Windows.Forms.TextBox(); - this.btnDefaults = new System.Windows.Forms.Button(); - this.cbAutoPrescale = new System.Windows.Forms.CheckBox(); - this.label11 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.nudPrescale = new System.Windows.Forms.NumericUpDown(); - this.tpDispMethod = new System.Windows.Forms.TabPage(); - this.label6 = new System.Windows.Forms.Label(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.label13 = new System.Windows.Forms.Label(); - this.cbAlternateVsync = new System.Windows.Forms.CheckBox(); - this.label8 = new System.Windows.Forms.Label(); - this.rbD3D9 = new System.Windows.Forms.RadioButton(); - this.label7 = new System.Windows.Forms.Label(); - this.rbGDIPlus = new System.Windows.Forms.RadioButton(); - this.tpMisc = new System.Windows.Forms.TabPage(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.rbDisplayAbsoluteZero = new System.Windows.Forms.RadioButton(); - this.rbDisplayMinimal = new System.Windows.Forms.RadioButton(); - this.rbDisplayFull = new System.Windows.Forms.RadioButton(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.cbAllowDoubleclickFullscreen = new System.Windows.Forms.CheckBox(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.cbFSAutohideMouse = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); - this.cbFullscreenHacks = new System.Windows.Forms.CheckBox(); - this.cbStatusBarFullscreen = new System.Windows.Forms.CheckBox(); - this.cbMenuFullscreen = new System.Windows.Forms.CheckBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.lblFrameTypeWindowed = new System.Windows.Forms.Label(); - this.cbStatusBarWindowed = new System.Windows.Forms.CheckBox(); - this.label9 = new System.Windows.Forms.Label(); - this.cbMenuWindowed = new System.Windows.Forms.CheckBox(); - this.trackbarFrameSizeWindowed = new BizHawk.Client.EmuHawk.TransparentTrackBar(); - this.cbCaptionWindowed = new System.Windows.Forms.CheckBox(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tbScanlineIntensity)).BeginInit(); - this.grpFinalFilter.SuspendLayout(); - this.grpARSelection.SuspendLayout(); - this.tabControl1.SuspendLayout(); - this.tpAR.SuspendLayout(); - this.groupBox6.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudPrescale)).BeginInit(); - this.tpDispMethod.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.tpMisc.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.trackbarFrameSizeWindowed)).BeginInit(); - this.SuspendLayout(); - // - // btnCancel - // - this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(473, 339); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 5; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - // - // btnOk - // - this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnOk.Location = new System.Drawing.Point(392, 339); - this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(75, 23); - this.btnOk.TabIndex = 4; - this.btnOk.Text = "OK"; - this.btnOk.UseVisualStyleBackColor = true; - this.btnOk.Click += new System.EventHandler(this.btnOk_Click); - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.lblScanlines); - this.groupBox1.Controls.Add(this.lblUserFilterName); - this.groupBox1.Controls.Add(this.btnSelectUserFilter); - this.groupBox1.Controls.Add(this.rbUser); - this.groupBox1.Controls.Add(this.tbScanlineIntensity); - this.groupBox1.Controls.Add(this.rbNone); - this.groupBox1.Controls.Add(this.rbScanlines); - this.groupBox1.Controls.Add(this.rbHq2x); - this.groupBox1.Location = new System.Drawing.Point(6, 33); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(193, 132); - this.groupBox1.TabIndex = 7; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Scaling Filter"; - // - // lblScanlines - // - this.lblScanlines.AutoSize = true; - this.lblScanlines.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblScanlines.Location = new System.Drawing.Point(104, 39); - this.lblScanlines.Name = "lblScanlines"; - this.lblScanlines.Size = new System.Drawing.Size(15, 13); - this.lblScanlines.TabIndex = 11; - this.lblScanlines.Text = "%"; - // - // lblUserFilterName - // - this.lblUserFilterName.Location = new System.Drawing.Point(6, 114); - this.lblUserFilterName.Name = "lblUserFilterName"; - this.lblUserFilterName.Size = new System.Drawing.Size(161, 15); - this.lblUserFilterName.TabIndex = 10; - this.lblUserFilterName.Text = "Will contain user filter name"; - // - // btnSelectUserFilter - // - this.btnSelectUserFilter.Location = new System.Drawing.Point(83, 88); - this.btnSelectUserFilter.Name = "btnSelectUserFilter"; - this.btnSelectUserFilter.Size = new System.Drawing.Size(75, 23); - this.btnSelectUserFilter.TabIndex = 5; - this.btnSelectUserFilter.Text = "Select"; - this.btnSelectUserFilter.UseVisualStyleBackColor = true; - this.btnSelectUserFilter.Click += new System.EventHandler(this.btnSelectUserFilter_Click); - // - // rbUser - // - this.rbUser.AutoSize = true; - this.rbUser.Location = new System.Drawing.Point(6, 88); - this.rbUser.Name = "rbUser"; - this.rbUser.Size = new System.Drawing.Size(47, 17); - this.rbUser.TabIndex = 4; - this.rbUser.TabStop = true; - this.rbUser.Text = "User"; - this.rbUser.UseVisualStyleBackColor = true; - // - // tbScanlineIntensity - // - this.tbScanlineIntensity.LargeChange = 32; - this.tbScanlineIntensity.Location = new System.Drawing.Point(83, 55); - this.tbScanlineIntensity.Maximum = 256; - this.tbScanlineIntensity.Name = "tbScanlineIntensity"; - this.tbScanlineIntensity.Size = new System.Drawing.Size(70, 42); - this.tbScanlineIntensity.TabIndex = 3; - this.tbScanlineIntensity.TickFrequency = 32; - this.tbScanlineIntensity.TickStyle = System.Windows.Forms.TickStyle.TopLeft; - this.tbScanlineIntensity.Scroll += new System.EventHandler(this.tbScanlineIntensity_Scroll); - this.tbScanlineIntensity.ValueChanged += new System.EventHandler(this.tbScanlineIntensity_Scroll); - // - // rbNone - // - this.rbNone.AutoSize = true; - this.rbNone.Location = new System.Drawing.Point(6, 19); - this.rbNone.Name = "rbNone"; - this.rbNone.Size = new System.Drawing.Size(51, 17); - this.rbNone.TabIndex = 2; - this.rbNone.TabStop = true; - this.rbNone.Text = "None"; - this.rbNone.UseVisualStyleBackColor = true; - // - // rbScanlines - // - this.rbScanlines.AutoSize = true; - this.rbScanlines.Location = new System.Drawing.Point(6, 65); - this.rbScanlines.Name = "rbScanlines"; - this.rbScanlines.Size = new System.Drawing.Size(71, 17); - this.rbScanlines.TabIndex = 1; - this.rbScanlines.TabStop = true; - this.rbScanlines.Text = "Scanlines"; - this.rbScanlines.UseVisualStyleBackColor = true; - // - // rbHq2x - // - this.rbHq2x.AutoSize = true; - this.rbHq2x.Location = new System.Drawing.Point(6, 42); - this.rbHq2x.Name = "rbHq2x"; - this.rbHq2x.Size = new System.Drawing.Size(50, 17); - this.rbHq2x.TabIndex = 0; - this.rbHq2x.TabStop = true; - this.rbHq2x.Text = "Hq2x"; - this.rbHq2x.UseVisualStyleBackColor = true; - // - // checkLetterbox - // - this.checkLetterbox.AutoSize = true; - this.checkLetterbox.Location = new System.Drawing.Point(209, 12); - this.checkLetterbox.Name = "checkLetterbox"; - this.checkLetterbox.Size = new System.Drawing.Size(173, 17); - this.checkLetterbox.TabIndex = 8; - this.checkLetterbox.Text = "Maintain aspect ratio (letterbox)"; - this.checkLetterbox.UseVisualStyleBackColor = true; - this.checkLetterbox.CheckedChanged += new System.EventHandler(this.checkLetterbox_CheckedChanged); - // - // checkPadInteger - // - this.checkPadInteger.AutoSize = true; - this.checkPadInteger.Location = new System.Drawing.Point(218, 171); - this.checkPadInteger.Name = "checkPadInteger"; - this.checkPadInteger.Size = new System.Drawing.Size(250, 17); - this.checkPadInteger.TabIndex = 9; - this.checkPadInteger.Text = "Expand pixels by integers only (e.g. no 1.3333x)"; - this.checkPadInteger.UseVisualStyleBackColor = true; - this.checkPadInteger.CheckedChanged += new System.EventHandler(this.checkPadInteger_CheckedChanged); - // - // grpFinalFilter - // - this.grpFinalFilter.Controls.Add(this.rbFinalFilterBicubic); - this.grpFinalFilter.Controls.Add(this.rbFinalFilterNone); - this.grpFinalFilter.Controls.Add(this.rbFinalFilterBilinear); - this.grpFinalFilter.Location = new System.Drawing.Point(6, 194); - this.grpFinalFilter.Name = "grpFinalFilter"; - this.grpFinalFilter.Size = new System.Drawing.Size(187, 90); - this.grpFinalFilter.TabIndex = 8; - this.grpFinalFilter.TabStop = false; - this.grpFinalFilter.Text = "Final Filter"; - // - // rbFinalFilterBicubic - // - this.rbFinalFilterBicubic.AutoSize = true; - this.rbFinalFilterBicubic.Location = new System.Drawing.Point(6, 64); - this.rbFinalFilterBicubic.Name = "rbFinalFilterBicubic"; - this.rbFinalFilterBicubic.Size = new System.Drawing.Size(142, 17); - this.rbFinalFilterBicubic.TabIndex = 3; - this.rbFinalFilterBicubic.TabStop = true; - this.rbFinalFilterBicubic.Text = "Bicubic (shader. buggy?)"; - this.rbFinalFilterBicubic.UseVisualStyleBackColor = true; - // - // rbFinalFilterNone - // - this.rbFinalFilterNone.AutoSize = true; - this.rbFinalFilterNone.Location = new System.Drawing.Point(6, 18); - this.rbFinalFilterNone.Name = "rbFinalFilterNone"; - this.rbFinalFilterNone.Size = new System.Drawing.Size(51, 17); - this.rbFinalFilterNone.TabIndex = 2; - this.rbFinalFilterNone.TabStop = true; - this.rbFinalFilterNone.Text = "None"; - this.rbFinalFilterNone.UseVisualStyleBackColor = true; - // - // rbFinalFilterBilinear - // - this.rbFinalFilterBilinear.AutoSize = true; - this.rbFinalFilterBilinear.Location = new System.Drawing.Point(6, 41); - this.rbFinalFilterBilinear.Name = "rbFinalFilterBilinear"; - this.rbFinalFilterBilinear.Size = new System.Drawing.Size(59, 17); - this.rbFinalFilterBilinear.TabIndex = 0; - this.rbFinalFilterBilinear.TabStop = true; - this.rbFinalFilterBilinear.Text = "Bilinear"; - this.rbFinalFilterBilinear.UseVisualStyleBackColor = true; - // - // rbUseRaw - // - this.rbUseRaw.AutoSize = true; - this.rbUseRaw.Location = new System.Drawing.Point(6, 19); - this.rbUseRaw.Name = "rbUseRaw"; - this.rbUseRaw.Size = new System.Drawing.Size(240, 17); - this.rbUseRaw.TabIndex = 11; - this.rbUseRaw.TabStop = true; - this.rbUseRaw.Text = "Use 1:1 pixel size (for crispness or debugging)"; - this.rbUseRaw.UseVisualStyleBackColor = true; - this.rbUseRaw.CheckedChanged += new System.EventHandler(this.rbUseRaw_CheckedChanged); - // - // rbUseSystem - // - this.rbUseSystem.AutoSize = true; - this.rbUseSystem.Location = new System.Drawing.Point(16, 58); - this.rbUseSystem.Name = "rbUseSystem"; - this.rbUseSystem.Size = new System.Drawing.Size(167, 17); - this.rbUseSystem.TabIndex = 12; - this.rbUseSystem.TabStop = true; - this.rbUseSystem.Text = "Use system\'s recommendation"; - this.rbUseSystem.UseVisualStyleBackColor = true; - this.rbUseSystem.CheckedChanged += new System.EventHandler(this.rbUseSystem_CheckedChanged); - // - // grpARSelection - // - this.grpARSelection.Controls.Add(this.txtCustomARY); - this.grpARSelection.Controls.Add(this.label12); - this.grpARSelection.Controls.Add(this.txtCustomARX); - this.grpARSelection.Controls.Add(this.rbUseCustomRatio); - this.grpARSelection.Controls.Add(this.label4); - this.grpARSelection.Controls.Add(this.txtCustomARHeight); - this.grpARSelection.Controls.Add(this.label3); - this.grpARSelection.Controls.Add(this.txtCustomARWidth); - this.grpARSelection.Controls.Add(this.rbUseCustom); - this.grpARSelection.Controls.Add(this.rbUseRaw); - this.grpARSelection.Controls.Add(this.rbUseSystem); - this.grpARSelection.Location = new System.Drawing.Point(218, 35); - this.grpARSelection.Name = "grpARSelection"; - this.grpARSelection.Size = new System.Drawing.Size(302, 130); - this.grpARSelection.TabIndex = 13; - this.grpARSelection.TabStop = false; - this.grpARSelection.Text = "Aspect Ratio Selection"; - // - // txtCustomARY - // - this.txtCustomARY.Location = new System.Drawing.Point(220, 102); - this.txtCustomARY.Name = "txtCustomARY"; - this.txtCustomARY.Size = new System.Drawing.Size(72, 20); - this.txtCustomARY.TabIndex = 19; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(202, 107); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(10, 13); - this.label12.TabIndex = 17; - this.label12.Text = ":"; - // - // txtCustomARX - // - this.txtCustomARX.Location = new System.Drawing.Point(124, 102); - this.txtCustomARX.Name = "txtCustomARX"; - this.txtCustomARX.Size = new System.Drawing.Size(72, 20); - this.txtCustomARX.TabIndex = 18; - // - // rbUseCustomRatio - // - this.rbUseCustomRatio.AutoSize = true; - this.rbUseCustomRatio.Location = new System.Drawing.Point(16, 103); - this.rbUseCustomRatio.Name = "rbUseCustomRatio"; - this.rbUseCustomRatio.Size = new System.Drawing.Size(102, 17); - this.rbUseCustomRatio.TabIndex = 16; - this.rbUseCustomRatio.TabStop = true; - this.rbUseCustomRatio.Text = "Use custom AR:"; - this.rbUseCustomRatio.UseVisualStyleBackColor = true; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(13, 41); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(257, 13); - this.label4.TabIndex = 12; - this.label4.Text = "Allow pixel distortion (e.g. 2x1 pixels, for better AR fit):"; - // - // txtCustomARHeight - // - this.txtCustomARHeight.Location = new System.Drawing.Point(220, 79); - this.txtCustomARHeight.Name = "txtCustomARHeight"; - this.txtCustomARHeight.Size = new System.Drawing.Size(72, 20); - this.txtCustomARHeight.TabIndex = 15; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(202, 84); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(12, 13); - this.label3.TabIndex = 12; - this.label3.Text = "x"; - // - // txtCustomARWidth - // - this.txtCustomARWidth.Location = new System.Drawing.Point(124, 79); - this.txtCustomARWidth.Name = "txtCustomARWidth"; - this.txtCustomARWidth.Size = new System.Drawing.Size(72, 20); - this.txtCustomARWidth.TabIndex = 14; - // - // rbUseCustom - // - this.rbUseCustom.AutoSize = true; - this.rbUseCustom.Location = new System.Drawing.Point(16, 80); - this.rbUseCustom.Name = "rbUseCustom"; - this.rbUseCustom.Size = new System.Drawing.Size(105, 17); - this.rbUseCustom.TabIndex = 13; - this.rbUseCustom.TabStop = true; - this.rbUseCustom.Text = "Use custom size:"; - this.rbUseCustom.UseVisualStyleBackColor = true; - // - // rbOpenGL - // - this.rbOpenGL.AutoSize = true; - this.rbOpenGL.Checked = true; - this.rbOpenGL.Location = new System.Drawing.Point(6, 103); - this.rbOpenGL.Name = "rbOpenGL"; - this.rbOpenGL.Size = new System.Drawing.Size(65, 17); - this.rbOpenGL.TabIndex = 3; - this.rbOpenGL.TabStop = true; - this.rbOpenGL.Text = "OpenGL"; - this.rbOpenGL.UseVisualStyleBackColor = true; - // - // label5 - // - this.label5.Location = new System.Drawing.Point(21, 123); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(359, 47); - this.label5.TabIndex = 16; - this.label5.Text = " • May malfunction on some systems.\r\n • May have increased performance for OpenGL" + - "-based emulation cores.\r\n • May have reduced performance on some systems.\r\n"; - // - // 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.tpAR); - this.tabControl1.Controls.Add(this.tpDispMethod); - this.tabControl1.Controls.Add(this.tpMisc); - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Location = new System.Drawing.Point(12, 12); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(536, 317); - this.tabControl1.TabIndex = 17; - // - // tpAR - // - this.tpAR.Controls.Add(this.groupBox6); - this.tpAR.Controls.Add(this.btnDefaults); - this.tpAR.Controls.Add(this.cbAutoPrescale); - this.tpAR.Controls.Add(this.label11); - this.tpAR.Controls.Add(this.groupBox1); - this.tpAR.Controls.Add(this.label10); - this.tpAR.Controls.Add(this.checkLetterbox); - this.tpAR.Controls.Add(this.nudPrescale); - this.tpAR.Controls.Add(this.checkPadInteger); - this.tpAR.Controls.Add(this.grpARSelection); - this.tpAR.Controls.Add(this.grpFinalFilter); - this.tpAR.Location = new System.Drawing.Point(4, 22); - this.tpAR.Name = "tpAR"; - this.tpAR.Padding = new System.Windows.Forms.Padding(3); - this.tpAR.Size = new System.Drawing.Size(528, 291); - this.tpAR.TabIndex = 0; - this.tpAR.Text = "Scaling & Filtering"; - this.tpAR.UseVisualStyleBackColor = true; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.label16); - this.groupBox6.Controls.Add(this.label15); - this.groupBox6.Controls.Add(this.txtCropBottom); - this.groupBox6.Controls.Add(this.label17); - this.groupBox6.Controls.Add(this.txtCropRight); - this.groupBox6.Controls.Add(this.txtCropTop); - this.groupBox6.Controls.Add(this.label14); - this.groupBox6.Controls.Add(this.txtCropLeft); - this.groupBox6.Location = new System.Drawing.Point(218, 195); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(302, 61); - this.groupBox6.TabIndex = 9; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "Cropping"; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(217, 25); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(43, 13); - this.label16.TabIndex = 30; - this.label16.Text = "Bottom:"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(74, 25); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(29, 13); - this.label15.TabIndex = 29; - this.label15.Text = "Top:"; - // - // txtCropBottom - // - this.txtCropBottom.Location = new System.Drawing.Point(261, 22); - this.txtCropBottom.Name = "txtCropBottom"; - this.txtCropBottom.Size = new System.Drawing.Size(34, 20); - this.txtCropBottom.TabIndex = 28; - this.txtCropBottom.Text = "8000"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(144, 25); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(35, 13); - this.label17.TabIndex = 26; - this.label17.Text = "Right:"; - // - // txtCropRight - // - this.txtCropRight.Location = new System.Drawing.Point(180, 22); - this.txtCropRight.Name = "txtCropRight"; - this.txtCropRight.Size = new System.Drawing.Size(34, 20); - this.txtCropRight.TabIndex = 25; - this.txtCropRight.Text = "8000"; - // - // txtCropTop - // - this.txtCropTop.Location = new System.Drawing.Point(104, 22); - this.txtCropTop.Name = "txtCropTop"; - this.txtCropTop.Size = new System.Drawing.Size(34, 20); - this.txtCropTop.TabIndex = 24; - this.txtCropTop.Text = "8000"; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(6, 25); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(28, 13); - this.label14.TabIndex = 16; - this.label14.Text = "Left:"; - // - // txtCropLeft - // - this.txtCropLeft.Location = new System.Drawing.Point(34, 22); - this.txtCropLeft.Name = "txtCropLeft"; - this.txtCropLeft.Size = new System.Drawing.Size(34, 20); - this.txtCropLeft.TabIndex = 15; - this.txtCropLeft.Text = "8000"; - // - // btnDefaults - // - this.btnDefaults.Location = new System.Drawing.Point(447, 262); - this.btnDefaults.Name = "btnDefaults"; - this.btnDefaults.Size = new System.Drawing.Size(75, 23); - this.btnDefaults.TabIndex = 18; - this.btnDefaults.Text = "Defaults"; - this.toolTip1.SetToolTip(this.btnDefaults, "Unless I forgot to update the button\'s code when I changed a default"); - this.btnDefaults.UseVisualStyleBackColor = true; - this.btnDefaults.Click += new System.EventHandler(this.btnDefaults_Click); - // - // cbAutoPrescale - // - this.cbAutoPrescale.AutoSize = true; - this.cbAutoPrescale.Location = new System.Drawing.Point(6, 171); - this.cbAutoPrescale.Name = "cbAutoPrescale"; - this.cbAutoPrescale.Size = new System.Drawing.Size(92, 17); - this.cbAutoPrescale.TabIndex = 17; - this.cbAutoPrescale.Text = "Auto Prescale"; - this.cbAutoPrescale.UseVisualStyleBackColor = true; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(140, 11); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(14, 13); - this.label11.TabIndex = 16; - this.label11.Text = "X"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(7, 11); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(76, 13); - this.label10.TabIndex = 15; - this.label10.Text = "User Prescale:"; - // - // nudPrescale - // - this.nudPrescale.Location = new System.Drawing.Point(93, 7); - this.nudPrescale.Maximum = new decimal(new int[] { - 16, - 0, - 0, - 0}); - this.nudPrescale.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.nudPrescale.Name = "nudPrescale"; - this.nudPrescale.Size = new System.Drawing.Size(45, 20); - this.nudPrescale.TabIndex = 14; - this.nudPrescale.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // tpDispMethod - // - this.tpDispMethod.Controls.Add(this.label6); - this.tpDispMethod.Controls.Add(this.groupBox3); - this.tpDispMethod.Location = new System.Drawing.Point(4, 22); - this.tpDispMethod.Name = "tpDispMethod"; - this.tpDispMethod.Size = new System.Drawing.Size(528, 291); - this.tpDispMethod.TabIndex = 2; - this.tpDispMethod.Text = "Display Method"; - this.tpDispMethod.UseVisualStyleBackColor = true; - // - // label6 - // - this.label6.Location = new System.Drawing.Point(3, 258); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(359, 23); - this.label6.TabIndex = 18; - this.label6.Text = "Changes require restart of program to take effect.\r\n"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.label13); - this.groupBox3.Controls.Add(this.cbAlternateVsync); - this.groupBox3.Controls.Add(this.label8); - this.groupBox3.Controls.Add(this.rbD3D9); - this.groupBox3.Controls.Add(this.label7); - this.groupBox3.Controls.Add(this.rbGDIPlus); - this.groupBox3.Controls.Add(this.label5); - this.groupBox3.Controls.Add(this.rbOpenGL); - this.groupBox3.Location = new System.Drawing.Point(6, 5); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(415, 241); - this.groupBox3.TabIndex = 16; - this.groupBox3.TabStop = false; - // - // label13 - // - this.label13.Location = new System.Drawing.Point(45, 60); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(359, 43); - this.label13.TabIndex = 22; - this.label13.Text = resources.GetString("label13.Text"); - this.label13.Click += new System.EventHandler(this.label13_Click); - this.label13.DoubleClick += new System.EventHandler(this.label13_Click); - // - // cbAlternateVsync - // - this.cbAlternateVsync.AutoSize = true; - this.cbAlternateVsync.Location = new System.Drawing.Point(28, 60); - this.cbAlternateVsync.Name = "cbAlternateVsync"; - this.cbAlternateVsync.Size = new System.Drawing.Size(15, 14); - this.cbAlternateVsync.TabIndex = 21; - this.cbAlternateVsync.UseVisualStyleBackColor = true; - // - // label8 - // - this.label8.Location = new System.Drawing.Point(21, 30); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(359, 27); - this.label8.TabIndex = 20; - this.label8.Text = " • Best compatibility\r\n • May have trouble with OpenGL-based cores (N64)\r\n"; - // - // rbD3D9 - // - this.rbD3D9.AutoSize = true; - this.rbD3D9.Checked = true; - this.rbD3D9.Location = new System.Drawing.Point(6, 10); - this.rbD3D9.Name = "rbD3D9"; - this.rbD3D9.Size = new System.Drawing.Size(73, 17); - this.rbD3D9.TabIndex = 19; - this.rbD3D9.TabStop = true; - this.rbD3D9.Text = "Direct3D9"; - this.rbD3D9.UseVisualStyleBackColor = true; - // - // label7 - // - this.label7.Location = new System.Drawing.Point(21, 191); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(359, 47); - this.label7.TabIndex = 18; - this.label7.Text = " • Slow; Mainly for compatibility purposes\r\n • Missing many features\r\n • Works be" + - "tter over Remote Desktop, etc.\r\n"; - // - // rbGDIPlus - // - this.rbGDIPlus.AutoSize = true; - this.rbGDIPlus.Checked = true; - this.rbGDIPlus.Location = new System.Drawing.Point(6, 171); - this.rbGDIPlus.Name = "rbGDIPlus"; - this.rbGDIPlus.Size = new System.Drawing.Size(50, 17); - this.rbGDIPlus.TabIndex = 17; - this.rbGDIPlus.TabStop = true; - this.rbGDIPlus.Text = "GDI+"; - this.rbGDIPlus.UseVisualStyleBackColor = true; - // - // tpMisc - // - this.tpMisc.Controls.Add(this.groupBox5); - this.tpMisc.Location = new System.Drawing.Point(4, 22); - this.tpMisc.Name = "tpMisc"; - this.tpMisc.Size = new System.Drawing.Size(528, 291); - this.tpMisc.TabIndex = 3; - this.tpMisc.Text = "Misc"; - this.tpMisc.UseVisualStyleBackColor = true; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.rbDisplayAbsoluteZero); - this.groupBox5.Controls.Add(this.rbDisplayMinimal); - this.groupBox5.Controls.Add(this.rbDisplayFull); - this.groupBox5.Location = new System.Drawing.Point(6, 6); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(371, 96); - this.groupBox5.TabIndex = 20; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "Display Features (for speeding up replays)"; - // - // rbDisplayAbsoluteZero - // - this.rbDisplayAbsoluteZero.AutoSize = true; - this.rbDisplayAbsoluteZero.Location = new System.Drawing.Point(7, 66); - this.rbDisplayAbsoluteZero.Name = "rbDisplayAbsoluteZero"; - this.rbDisplayAbsoluteZero.Size = new System.Drawing.Size(174, 17); - this.rbDisplayAbsoluteZero.TabIndex = 2; - this.rbDisplayAbsoluteZero.TabStop = true; - this.rbDisplayAbsoluteZero.Text = "Absolute Zero - Display Nothing"; - this.rbDisplayAbsoluteZero.UseVisualStyleBackColor = true; - // - // rbDisplayMinimal - // - this.rbDisplayMinimal.AutoSize = true; - this.rbDisplayMinimal.Enabled = false; - this.rbDisplayMinimal.Location = new System.Drawing.Point(7, 43); - this.rbDisplayMinimal.Name = "rbDisplayMinimal"; - this.rbDisplayMinimal.Size = new System.Drawing.Size(185, 17); - this.rbDisplayMinimal.TabIndex = 1; - this.rbDisplayMinimal.TabStop = true; - this.rbDisplayMinimal.Text = "Minimal - Display HUD Only (TBD)"; - this.rbDisplayMinimal.UseVisualStyleBackColor = true; - // - // rbDisplayFull - // - this.rbDisplayFull.AutoSize = true; - this.rbDisplayFull.Location = new System.Drawing.Point(7, 20); - this.rbDisplayFull.Name = "rbDisplayFull"; - this.rbDisplayFull.Size = new System.Drawing.Size(137, 17); - this.rbDisplayFull.TabIndex = 0; - this.rbDisplayFull.TabStop = true; - this.rbDisplayFull.Text = "Full - Display Everything"; - this.rbDisplayFull.UseVisualStyleBackColor = true; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.cbAllowDoubleclickFullscreen); - this.tabPage1.Controls.Add(this.groupBox4); - this.tabPage1.Controls.Add(this.groupBox2); - 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(528, 291); - this.tabPage1.TabIndex = 4; - this.tabPage1.Text = "Window"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // cbAllowDoubleclickFullscreen - // - this.cbAllowDoubleclickFullscreen.AutoSize = true; - this.cbAllowDoubleclickFullscreen.Location = new System.Drawing.Point(12, 223); - this.cbAllowDoubleclickFullscreen.Name = "cbAllowDoubleclickFullscreen"; - this.cbAllowDoubleclickFullscreen.Size = new System.Drawing.Size(471, 17); - this.cbAllowDoubleclickFullscreen.TabIndex = 27; - this.cbAllowDoubleclickFullscreen.Text = "Allow Double-Click Fullscreen (hold shift to force fullscreen to toggle in case u" + - "sing zapper, etc.)"; - this.cbAllowDoubleclickFullscreen.UseVisualStyleBackColor = true; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.cbFSAutohideMouse); - this.groupBox4.Controls.Add(this.label1); - this.groupBox4.Controls.Add(this.cbFullscreenHacks); - this.groupBox4.Controls.Add(this.cbStatusBarFullscreen); - this.groupBox4.Controls.Add(this.cbMenuFullscreen); - this.groupBox4.Location = new System.Drawing.Point(143, 6); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(266, 211); - this.groupBox4.TabIndex = 27; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "Fullscreen"; - // - // cbFSAutohideMouse - // - this.cbFSAutohideMouse.AutoSize = true; - this.cbFSAutohideMouse.Location = new System.Drawing.Point(87, 19); - this.cbFSAutohideMouse.Name = "cbFSAutohideMouse"; - this.cbFSAutohideMouse.Size = new System.Drawing.Size(141, 17); - this.cbFSAutohideMouse.TabIndex = 28; - this.cbFSAutohideMouse.Text = "Auto-Hide Mouse Cursor"; - this.cbFSAutohideMouse.UseVisualStyleBackColor = true; - // - // label1 - // - this.label1.Location = new System.Drawing.Point(7, 88); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(240, 115); - this.label1.TabIndex = 27; - this.label1.Text = resources.GetString("label1.Text"); - // - // cbFullscreenHacks - // - this.cbFullscreenHacks.AutoSize = true; - this.cbFullscreenHacks.Location = new System.Drawing.Point(6, 65); - this.cbFullscreenHacks.Name = "cbFullscreenHacks"; - this.cbFullscreenHacks.Size = new System.Drawing.Size(191, 17); - this.cbFullscreenHacks.TabIndex = 26; - this.cbFullscreenHacks.Text = "Enable Windows Fullscreen Hacks"; - this.cbFullscreenHacks.UseVisualStyleBackColor = true; - // - // cbStatusBarFullscreen - // - this.cbStatusBarFullscreen.AutoSize = true; - this.cbStatusBarFullscreen.Location = new System.Drawing.Point(6, 19); - this.cbStatusBarFullscreen.Name = "cbStatusBarFullscreen"; - this.cbStatusBarFullscreen.Size = new System.Drawing.Size(75, 17); - this.cbStatusBarFullscreen.TabIndex = 23; - this.cbStatusBarFullscreen.Text = "Status Bar"; - this.cbStatusBarFullscreen.UseVisualStyleBackColor = true; - // - // cbMenuFullscreen - // - this.cbMenuFullscreen.AutoSize = true; - this.cbMenuFullscreen.Location = new System.Drawing.Point(6, 42); - this.cbMenuFullscreen.Name = "cbMenuFullscreen"; - this.cbMenuFullscreen.Size = new System.Drawing.Size(53, 17); - this.cbMenuFullscreen.TabIndex = 25; - this.cbMenuFullscreen.Text = "Menu"; - this.cbMenuFullscreen.UseVisualStyleBackColor = true; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.lblFrameTypeWindowed); - this.groupBox2.Controls.Add(this.cbStatusBarWindowed); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.cbMenuWindowed); - this.groupBox2.Controls.Add(this.trackbarFrameSizeWindowed); - this.groupBox2.Controls.Add(this.cbCaptionWindowed); - this.groupBox2.Location = new System.Drawing.Point(6, 6); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(131, 211); - this.groupBox2.TabIndex = 26; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Windowed"; - // - // lblFrameTypeWindowed - // - this.lblFrameTypeWindowed.AutoSize = true; - this.lblFrameTypeWindowed.Location = new System.Drawing.Point(51, 17); - this.lblFrameTypeWindowed.Name = "lblFrameTypeWindowed"; - this.lblFrameTypeWindowed.Size = new System.Drawing.Size(62, 13); - this.lblFrameTypeWindowed.TabIndex = 26; - this.lblFrameTypeWindowed.Text = "(frame type)"; - // - // cbStatusBarWindowed - // - this.cbStatusBarWindowed.AutoSize = true; - this.cbStatusBarWindowed.Location = new System.Drawing.Point(9, 81); - this.cbStatusBarWindowed.Name = "cbStatusBarWindowed"; - this.cbStatusBarWindowed.Size = new System.Drawing.Size(75, 17); - this.cbStatusBarWindowed.TabIndex = 23; - this.cbStatusBarWindowed.Text = "Status Bar"; - this.cbStatusBarWindowed.UseVisualStyleBackColor = true; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(6, 17); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(39, 13); - this.label9.TabIndex = 22; - this.label9.Text = "Frame:"; - // - // cbMenuWindowed - // - this.cbMenuWindowed.AutoSize = true; - this.cbMenuWindowed.Location = new System.Drawing.Point(9, 127); - this.cbMenuWindowed.Name = "cbMenuWindowed"; - this.cbMenuWindowed.Size = new System.Drawing.Size(53, 17); - this.cbMenuWindowed.TabIndex = 25; - this.cbMenuWindowed.Text = "Menu"; - this.cbMenuWindowed.UseVisualStyleBackColor = true; - // - // trackbarFrameSizeWindowed - // - this.trackbarFrameSizeWindowed.LargeChange = 1; - this.trackbarFrameSizeWindowed.Location = new System.Drawing.Point(6, 33); - this.trackbarFrameSizeWindowed.Maximum = 2; - this.trackbarFrameSizeWindowed.Name = "trackbarFrameSizeWindowed"; - this.trackbarFrameSizeWindowed.Size = new System.Drawing.Size(99, 42); - this.trackbarFrameSizeWindowed.TabIndex = 21; - this.trackbarFrameSizeWindowed.Value = 1; - this.trackbarFrameSizeWindowed.ValueChanged += new System.EventHandler(this.TrackBarFrameSizeWindowed_ValueChanged); - // - // cbCaptionWindowed - // - this.cbCaptionWindowed.AutoSize = true; - this.cbCaptionWindowed.Location = new System.Drawing.Point(9, 104); - this.cbCaptionWindowed.Name = "cbCaptionWindowed"; - this.cbCaptionWindowed.Size = new System.Drawing.Size(62, 17); - this.cbCaptionWindowed.TabIndex = 24; - this.cbCaptionWindowed.Text = "Caption"; - this.cbCaptionWindowed.UseVisualStyleBackColor = true; - // - // linkLabel1 - // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(12, 404); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(79, 13); - this.linkLabel1.TabIndex = 18; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "Documentation"; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); - // - // DisplayConfigLite - // - this.AcceptButton = this.btnOk; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(564, 374); - this.Controls.Add(this.linkLabel1); - this.Controls.Add(this.tabControl1); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.btnOk); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Name = "DisplayConfig"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Display Configuration"; - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tbScanlineIntensity)).EndInit(); - this.grpFinalFilter.ResumeLayout(false); - this.grpFinalFilter.PerformLayout(); - this.grpARSelection.ResumeLayout(false); - this.grpARSelection.PerformLayout(); - this.tabControl1.ResumeLayout(false); - this.tpAR.ResumeLayout(false); - this.tpAR.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudPrescale)).EndInit(); - this.tpDispMethod.ResumeLayout(false); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.tpMisc.ResumeLayout(false); - this.tpMisc.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.trackbarFrameSizeWindowed)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayConfig)); + this.btnDialogCancel = new BizHawk.WinForms.Controls.SzButtonEx(); + this.btnDialogOK = new BizHawk.WinForms.Controls.SzButtonEx(); + this.rbDispMethodOpenGL = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.lblDispMethodOpenGL = new BizHawk.WinForms.Controls.LocLabelEx(); + this.tcDialog = new System.Windows.Forms.TabControl(); + this.tpScaling = new BizHawk.WinForms.Controls.TabPageEx(); + this.flpTpScaling = new BizHawk.WinForms.Controls.SzColumnsToRightFLP(); + this.flpUserPrescale = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.lblUserPrescale = new BizHawk.WinForms.Controls.LabelEx(); + this.nudUserPrescale = new BizHawk.WinForms.Controls.SzNUDEx(); + this.lblUserPrescaleUnits = new BizHawk.WinForms.Controls.LabelEx(); + this.grpFilter = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.tlpGrpFilter = new System.Windows.Forms.TableLayoutPanel(); + this.rbFilterNone = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbFilterUser = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbFilterHq2x = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbFilterScanline = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.flpFilterUser = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.btnFilterUser = new BizHawk.WinForms.Controls.SzButtonEx(); + this.lblFilterUser = new BizHawk.WinForms.Controls.LabelEx(); + this.flpFilterScanlineAlpha = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.lblFilterScanlineAlpha = new BizHawk.WinForms.Controls.LabelEx(); + this.tbFilterScanlineAlpha = new BizHawk.Client.EmuHawk.TransparentTrackBar(); + this.cbAutoPrescale = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.grpFinalFilter = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpFinalFilter = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.rbFinalFilterNone = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbFinalFilterBilinear = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbFinalFilterBicubic = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.cbLetterbox = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.grpAspectRatio = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpAspectRatio = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.rbARSquare = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.lblAspectRatioNonSquare = new BizHawk.WinForms.Controls.LabelEx(); + this.rbARBySystem = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.flpCustomSize = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.rbARCustomSize = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.txtARCustomWidth = new BizHawk.WinForms.Controls.SzTextBoxEx(); + this.lblARCustomSizeSeparator = new BizHawk.WinForms.Controls.LabelEx(); + this.txtARCustomHeight = new BizHawk.WinForms.Controls.SzTextBoxEx(); + this.flpCustomAR = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.rbARCustomRatio = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.txtARCustomRatioH = new BizHawk.WinForms.Controls.SzTextBoxEx(); + this.lblARCustomRatioSeparator = new BizHawk.WinForms.Controls.LabelEx(); + this.txtARCustomRatioV = new BizHawk.WinForms.Controls.SzTextBoxEx(); + this.cbScaleByInteger = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.grpCrop = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpCrop = new BizHawk.WinForms.Controls.LocSingleRowFLP(); + this.lblCropLeft = new BizHawk.WinForms.Controls.LabelEx(); + this.txtCropLeft = new BizHawk.WinForms.Controls.SzTextBoxEx(); + this.lblCropTop = new BizHawk.WinForms.Controls.LabelEx(); + this.txtCropTop = new BizHawk.WinForms.Controls.SzTextBoxEx(); + this.lblCropRight = new BizHawk.WinForms.Controls.LabelEx(); + this.txtCropRight = new BizHawk.WinForms.Controls.SzTextBoxEx(); + this.lblCropBottom = new BizHawk.WinForms.Controls.LabelEx(); + this.txtCropBottom = new BizHawk.WinForms.Controls.SzTextBoxEx(); + this.btnDefaults = new BizHawk.WinForms.Controls.LocSzButtonEx(); + this.tpDispMethod = new BizHawk.WinForms.Controls.TabPageEx(); + this.flpTpDispMethod = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.grpDispMethod = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpDispMethod = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.flpD3DSection = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.rbDispMethodD3D = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.lblDispMethodD3D = new BizHawk.WinForms.Controls.LocLabelEx(); + this.flpD3DAltVSync = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.cbD3DAltVSync = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblD3DAltVSync = new BizHawk.WinForms.Controls.SzLabelEx(); + this.rbDispMethodGDIPlus = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.lblDispMethodGDIPlus = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblDispMethodRestartWarning = new BizHawk.WinForms.Controls.LabelEx(); + this.tpMisc = new BizHawk.WinForms.Controls.TabPageEx(); + this.grpDispFeatures = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpDispFeatures = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.rbDispFeaturesFull = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbDispFeaturesMinimal = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbDispFeaturesNothing = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.tpWindow = new BizHawk.WinForms.Controls.TabPageEx(); + this.flpTpWindow = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.flpWindowFSGroups = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.grpWindowed = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpWindowed = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.flpWindowedFrameType = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.lblWindowedFrameTypeDesc = new BizHawk.WinForms.Controls.LabelEx(); + this.lblWindowedFrameTypeReadout = new BizHawk.WinForms.Controls.LabelEx(); + this.tbWindowedFrameType = new BizHawk.Client.EmuHawk.TransparentTrackBar(); + this.cbWindowedStatusBar = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbWindowedCaption = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbWindowedMenu = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.grpFS = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpFS = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.flpFSCheckBoxes = new BizHawk.WinForms.Controls.SzRowsToBottomFLP(); + this.cbFSStatusBar = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbFSAutohideMouse = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbFSMenu = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbFSWinHacks = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblFSWinHacks = new BizHawk.WinForms.Controls.SzLabelEx(); + this.cbDoubleClickFS = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lnkDocs = new BizHawk.WinForms.Controls.LocLinkLabelEx(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.flpDialogButtons = new BizHawk.WinForms.Controls.LocSzSingleRowFLP(); + this.tcDialog.SuspendLayout(); + this.tpScaling.SuspendLayout(); + this.flpTpScaling.SuspendLayout(); + this.flpUserPrescale.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudUserPrescale)).BeginInit(); + this.grpFilter.SuspendLayout(); + this.tlpGrpFilter.SuspendLayout(); + this.flpFilterUser.SuspendLayout(); + this.flpFilterScanlineAlpha.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbFilterScanlineAlpha)).BeginInit(); + this.grpFinalFilter.SuspendLayout(); + this.flpGrpFinalFilter.SuspendLayout(); + this.grpAspectRatio.SuspendLayout(); + this.flpGrpAspectRatio.SuspendLayout(); + this.flpCustomSize.SuspendLayout(); + this.flpCustomAR.SuspendLayout(); + this.grpCrop.SuspendLayout(); + this.flpGrpCrop.SuspendLayout(); + this.tpDispMethod.SuspendLayout(); + this.flpTpDispMethod.SuspendLayout(); + this.grpDispMethod.SuspendLayout(); + this.flpGrpDispMethod.SuspendLayout(); + this.flpD3DSection.SuspendLayout(); + this.flpD3DAltVSync.SuspendLayout(); + this.tpMisc.SuspendLayout(); + this.grpDispFeatures.SuspendLayout(); + this.flpGrpDispFeatures.SuspendLayout(); + this.tpWindow.SuspendLayout(); + this.flpTpWindow.SuspendLayout(); + this.flpWindowFSGroups.SuspendLayout(); + this.grpWindowed.SuspendLayout(); + this.flpWindowed.SuspendLayout(); + this.flpWindowedFrameType.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbWindowedFrameType)).BeginInit(); + this.grpFS.SuspendLayout(); + this.flpGrpFS.SuspendLayout(); + this.flpFSCheckBoxes.SuspendLayout(); + this.flpDialogButtons.SuspendLayout(); + this.SuspendLayout(); + // + // btnDialogCancel + // + this.btnDialogCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnDialogCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnDialogCancel.Name = "btnDialogCancel"; + this.btnDialogCancel.Size = new System.Drawing.Size(75, 23); + this.btnDialogCancel.Text = "Cancel"; + // + // btnDialogOK + // + this.btnDialogOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnDialogOK.Name = "btnDialogOK"; + this.btnDialogOK.Size = new System.Drawing.Size(75, 23); + this.btnDialogOK.Text = "OK"; + this.btnDialogOK.Click += new System.EventHandler(this.btnDialogOK_Click); + // + // rbDispMethodOpenGL + // + this.rbDispMethodOpenGL.Checked = true; + this.rbDispMethodOpenGL.Name = "rbDispMethodOpenGL"; + this.rbDispMethodOpenGL.Text = "OpenGL"; + // + // lblDispMethodOpenGL + // + this.lblDispMethodOpenGL.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblDispMethodOpenGL.Location = new System.Drawing.Point(3, 115); + this.lblDispMethodOpenGL.Name = "lblDispMethodOpenGL"; + this.lblDispMethodOpenGL.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblDispMethodOpenGL.Text = " • May malfunction on some systems.\r\n • May have increased performance for OpenGL" + + "-based emulation cores.\r\n • May have reduced performance on some systems.\r\n"; + // + // tcDialog + // + this.tcDialog.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.tcDialog.Controls.Add(this.tpScaling); + this.tcDialog.Controls.Add(this.tpDispMethod); + this.tcDialog.Controls.Add(this.tpMisc); + this.tcDialog.Controls.Add(this.tpWindow); + this.tcDialog.Location = new System.Drawing.Point(4, 4); + this.tcDialog.Name = "tcDialog"; + this.tcDialog.SelectedIndex = 0; + this.tcDialog.Size = new System.Drawing.Size(524, 345); + this.tcDialog.TabIndex = 17; + // + // tpScaling + // + this.tpScaling.Controls.Add(this.flpTpScaling); + this.tpScaling.Name = "tpScaling"; + this.tpScaling.Padding = new System.Windows.Forms.Padding(3); + this.tpScaling.Text = "Scaling & Filtering"; + // + // flpTpScaling + // + this.flpTpScaling.Controls.Add(this.flpUserPrescale); + this.flpTpScaling.Controls.Add(this.grpFilter); + this.flpTpScaling.Controls.Add(this.cbAutoPrescale); + this.flpTpScaling.Controls.Add(this.grpFinalFilter); + this.flpTpScaling.Controls.Add(this.cbLetterbox); + this.flpTpScaling.Controls.Add(this.grpAspectRatio); + this.flpTpScaling.Controls.Add(this.cbScaleByInteger); + this.flpTpScaling.Controls.Add(this.grpCrop); + this.flpTpScaling.Controls.Add(this.btnDefaults); + this.flpTpScaling.MinimumSize = new System.Drawing.Size(24, 24); + this.flpTpScaling.Name = "flpTpScaling"; + this.flpTpScaling.Size = new System.Drawing.Size(516, 319); + // + // flpUserPrescale + // + this.flpUserPrescale.Controls.Add(this.lblUserPrescale); + this.flpUserPrescale.Controls.Add(this.nudUserPrescale); + this.flpUserPrescale.Controls.Add(this.lblUserPrescaleUnits); + this.flpUserPrescale.Name = "flpUserPrescale"; + // + // lblUserPrescale + // + this.lblUserPrescale.Name = "lblUserPrescale"; + this.lblUserPrescale.Text = "User Prescale:"; + // + // nudUserPrescale + // + this.nudUserPrescale.Maximum = new decimal(new int[] { + 16, + 0, + 0, + 0}); + this.nudUserPrescale.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.nudUserPrescale.Name = "nudUserPrescale"; + this.nudUserPrescale.Size = new System.Drawing.Size(45, 20); + this.nudUserPrescale.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // lblUserPrescaleUnits + // + this.lblUserPrescaleUnits.Name = "lblUserPrescaleUnits"; + this.lblUserPrescaleUnits.Text = "X"; + // + // grpFilter + // + this.grpFilter.Controls.Add(this.tlpGrpFilter); + this.grpFilter.Name = "grpFilter"; + this.grpFilter.Size = new System.Drawing.Size(176, 170); + this.grpFilter.Text = "Scaling Filter"; + // + // tlpGrpFilter + // + this.tlpGrpFilter.ColumnCount = 2; + this.tlpGrpFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpGrpFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpGrpFilter.Controls.Add(this.rbFilterNone, 0, 0); + this.tlpGrpFilter.Controls.Add(this.rbFilterUser, 0, 3); + this.tlpGrpFilter.Controls.Add(this.rbFilterHq2x, 0, 1); + this.tlpGrpFilter.Controls.Add(this.rbFilterScanline, 0, 2); + this.tlpGrpFilter.Controls.Add(this.flpFilterUser, 1, 3); + this.tlpGrpFilter.Controls.Add(this.flpFilterScanlineAlpha, 1, 2); + this.tlpGrpFilter.Location = new System.Drawing.Point(2, 15); + this.tlpGrpFilter.Name = "tlpGrpFilter"; + this.tlpGrpFilter.RowCount = 4; + this.tlpGrpFilter.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpGrpFilter.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpGrpFilter.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpGrpFilter.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpGrpFilter.Size = new System.Drawing.Size(173, 155); + this.tlpGrpFilter.TabIndex = 1; + // + // rbFilterNone + // + this.rbFilterNone.Name = "rbFilterNone"; + this.rbFilterNone.Text = "None"; + // + // rbFilterUser + // + this.rbFilterUser.Name = "rbFilterUser"; + this.rbFilterUser.Text = "User"; + // + // rbFilterHq2x + // + this.rbFilterHq2x.Name = "rbFilterHq2x"; + this.rbFilterHq2x.Text = "Hq2x"; + // + // rbFilterScanline + // + this.rbFilterScanline.Name = "rbFilterScanline"; + this.rbFilterScanline.Text = "Scanlines"; + // + // flpFilterUser + // + this.flpFilterUser.Controls.Add(this.btnFilterUser); + this.flpFilterUser.Controls.Add(this.lblFilterUser); + this.flpFilterUser.Name = "flpFilterUser"; + // + // btnFilterUser + // + this.btnFilterUser.Name = "btnFilterUser"; + this.btnFilterUser.Size = new System.Drawing.Size(75, 23); + this.btnFilterUser.Text = "Select"; + this.btnFilterUser.Click += new System.EventHandler(this.btnFilterUser_Click); + // + // lblFilterUser + // + this.lblFilterUser.Name = "lblFilterUser"; + this.lblFilterUser.Text = "Will contain user filter name"; + // + // flpFilterScanlineAlpha + // + this.flpFilterScanlineAlpha.Controls.Add(this.lblFilterScanlineAlpha); + this.flpFilterScanlineAlpha.Controls.Add(this.tbFilterScanlineAlpha); + this.flpFilterScanlineAlpha.Name = "flpFilterScanlineAlpha"; + // + // lblFilterScanlineAlpha + // + this.lblFilterScanlineAlpha.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblFilterScanlineAlpha.Name = "lblFilterScanlineAlpha"; + this.lblFilterScanlineAlpha.Text = "%"; + // + // tbFilterScanlineAlpha + // + this.tbFilterScanlineAlpha.LargeChange = 32; + this.tbFilterScanlineAlpha.Location = new System.Drawing.Point(3, 16); + this.tbFilterScanlineAlpha.Maximum = 256; + this.tbFilterScanlineAlpha.Name = "tbFilterScanlineAlpha"; + this.tbFilterScanlineAlpha.Size = new System.Drawing.Size(70, 45); + this.tbFilterScanlineAlpha.TabIndex = 3; + this.tbFilterScanlineAlpha.TickFrequency = 32; + this.tbFilterScanlineAlpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft; + this.tbFilterScanlineAlpha.Scroll += new System.EventHandler(this.tbFilterScanlineAlpha_Scroll); + this.tbFilterScanlineAlpha.ValueChanged += new System.EventHandler(this.tbFilterScanlineAlpha_Scroll); + // + // cbAutoPrescale + // + this.cbAutoPrescale.Name = "cbAutoPrescale"; + this.cbAutoPrescale.Text = "Auto Prescale"; + // + // grpFinalFilter + // + this.grpFinalFilter.Controls.Add(this.flpGrpFinalFilter); + this.grpFinalFilter.Name = "grpFinalFilter"; + this.grpFinalFilter.Size = new System.Drawing.Size(158, 88); + this.grpFinalFilter.Text = "Final Filter"; + // + // flpGrpFinalFilter + // + this.flpGrpFinalFilter.Controls.Add(this.rbFinalFilterNone); + this.flpGrpFinalFilter.Controls.Add(this.rbFinalFilterBilinear); + this.flpGrpFinalFilter.Controls.Add(this.rbFinalFilterBicubic); + this.flpGrpFinalFilter.Location = new System.Drawing.Point(6, 15); + this.flpGrpFinalFilter.Name = "flpGrpFinalFilter"; + // + // rbFinalFilterNone + // + this.rbFinalFilterNone.Name = "rbFinalFilterNone"; + this.rbFinalFilterNone.Text = "None"; + // + // rbFinalFilterBilinear + // + this.rbFinalFilterBilinear.Name = "rbFinalFilterBilinear"; + this.rbFinalFilterBilinear.Text = "Bilinear"; + // + // rbFinalFilterBicubic + // + this.rbFinalFilterBicubic.Name = "rbFinalFilterBicubic"; + this.rbFinalFilterBicubic.Text = "Bicubic (shader. buggy?)"; + // + // cbLetterbox + // + this.cbLetterbox.Name = "cbLetterbox"; + this.cbLetterbox.Text = "Maintain aspect ratio (letterbox)"; + this.cbLetterbox.CheckedChanged += new System.EventHandler(this.cbLetterbox_CheckedChanged); + // + // grpAspectRatio + // + this.grpAspectRatio.Controls.Add(this.flpGrpAspectRatio); + this.grpAspectRatio.Name = "grpAspectRatio"; + this.grpAspectRatio.Size = new System.Drawing.Size(295, 128); + this.grpAspectRatio.Text = "Aspect Ratio Selection"; + // + // flpGrpAspectRatio + // + this.flpGrpAspectRatio.Controls.Add(this.rbARSquare); + this.flpGrpAspectRatio.Controls.Add(this.lblAspectRatioNonSquare); + this.flpGrpAspectRatio.Controls.Add(this.rbARBySystem); + this.flpGrpAspectRatio.Controls.Add(this.flpCustomSize); + this.flpGrpAspectRatio.Controls.Add(this.flpCustomAR); + this.flpGrpAspectRatio.Location = new System.Drawing.Point(6, 15); + this.flpGrpAspectRatio.Name = "flpGrpAspectRatio"; + // + // rbARSquare + // + this.rbARSquare.Name = "rbARSquare"; + this.rbARSquare.Text = "Use 1:1 pixel size (for crispness or debugging)"; + this.rbARSquare.CheckedChanged += new System.EventHandler(this.rbARSquare_CheckedChanged); + // + // lblAspectRatioNonSquare + // + this.lblAspectRatioNonSquare.Name = "lblAspectRatioNonSquare"; + this.lblAspectRatioNonSquare.Text = "Allow pixel distortion (e.g. 2x1 pixels, for better AR fit):"; + // + // rbARBySystem + // + this.rbARBySystem.Name = "rbARBySystem"; + this.rbARBySystem.Text = "Use system\'s recommendation"; + this.rbARBySystem.CheckedChanged += new System.EventHandler(this.rbARBySystem_CheckedChanged); + // + // flpCustomSize + // + this.flpCustomSize.Controls.Add(this.rbARCustomSize); + this.flpCustomSize.Controls.Add(this.txtARCustomWidth); + this.flpCustomSize.Controls.Add(this.lblARCustomSizeSeparator); + this.flpCustomSize.Controls.Add(this.txtARCustomHeight); + this.flpCustomSize.Name = "flpCustomSize"; + // + // rbARCustomSize + // + this.rbARCustomSize.Name = "rbARCustomSize"; + this.rbARCustomSize.Text = "Use custom size:"; + // + // txtARCustomWidth + // + this.txtARCustomWidth.Name = "txtARCustomWidth"; + this.txtARCustomWidth.Size = new System.Drawing.Size(72, 20); + // + // lblARCustomSizeSeparator + // + this.lblARCustomSizeSeparator.Name = "lblARCustomSizeSeparator"; + this.lblARCustomSizeSeparator.Text = "x"; + // + // txtARCustomHeight + // + this.txtARCustomHeight.Name = "txtARCustomHeight"; + this.txtARCustomHeight.Size = new System.Drawing.Size(72, 20); + // + // flpCustomAR + // + this.flpCustomAR.Controls.Add(this.rbARCustomRatio); + this.flpCustomAR.Controls.Add(this.txtARCustomRatioH); + this.flpCustomAR.Controls.Add(this.lblARCustomRatioSeparator); + this.flpCustomAR.Controls.Add(this.txtARCustomRatioV); + this.flpCustomAR.Name = "flpCustomAR"; + // + // rbARCustomRatio + // + this.rbARCustomRatio.Name = "rbARCustomRatio"; + this.rbARCustomRatio.Text = "Use custom AR:"; + // + // txtARCustomRatioH + // + this.txtARCustomRatioH.Name = "txtARCustomRatioH"; + this.txtARCustomRatioH.Size = new System.Drawing.Size(72, 20); + // + // lblARCustomRatioSeparator + // + this.lblARCustomRatioSeparator.Name = "lblARCustomRatioSeparator"; + this.lblARCustomRatioSeparator.Text = ":"; + // + // txtARCustomRatioV + // + this.txtARCustomRatioV.Name = "txtARCustomRatioV"; + this.txtARCustomRatioV.Size = new System.Drawing.Size(72, 20); + // + // cbScaleByInteger + // + this.cbScaleByInteger.Name = "cbScaleByInteger"; + this.cbScaleByInteger.Text = "Expand pixels by integers only (e.g. no 1.3333x)"; + this.cbScaleByInteger.CheckedChanged += new System.EventHandler(this.cbScaleByInteger_CheckedChanged); + // + // grpCrop + // + this.grpCrop.Controls.Add(this.flpGrpCrop); + this.grpCrop.Name = "grpCrop"; + this.grpCrop.Size = new System.Drawing.Size(329, 43); + this.grpCrop.Text = "Cropping"; + // + // flpGrpCrop + // + this.flpGrpCrop.Controls.Add(this.lblCropLeft); + this.flpGrpCrop.Controls.Add(this.txtCropLeft); + this.flpGrpCrop.Controls.Add(this.lblCropTop); + this.flpGrpCrop.Controls.Add(this.txtCropTop); + this.flpGrpCrop.Controls.Add(this.lblCropRight); + this.flpGrpCrop.Controls.Add(this.txtCropRight); + this.flpGrpCrop.Controls.Add(this.lblCropBottom); + this.flpGrpCrop.Controls.Add(this.txtCropBottom); + this.flpGrpCrop.Location = new System.Drawing.Point(6, 15); + this.flpGrpCrop.Name = "flpGrpCrop"; + // + // lblCropLeft + // + this.lblCropLeft.Name = "lblCropLeft"; + this.lblCropLeft.Text = "Left:"; + // + // txtCropLeft + // + this.txtCropLeft.Name = "txtCropLeft"; + this.txtCropLeft.Size = new System.Drawing.Size(34, 20); + this.txtCropLeft.Text = "8000"; + // + // lblCropTop + // + this.lblCropTop.Name = "lblCropTop"; + this.lblCropTop.Text = "Top:"; + // + // txtCropTop + // + this.txtCropTop.Name = "txtCropTop"; + this.txtCropTop.Size = new System.Drawing.Size(34, 20); + this.txtCropTop.Text = "8000"; + // + // lblCropRight + // + this.lblCropRight.Name = "lblCropRight"; + this.lblCropRight.Text = "Right:"; + // + // txtCropRight + // + this.txtCropRight.Name = "txtCropRight"; + this.txtCropRight.Size = new System.Drawing.Size(34, 20); + this.txtCropRight.Text = "8000"; + // + // lblCropBottom + // + this.lblCropBottom.Name = "lblCropBottom"; + this.lblCropBottom.Text = "Bottom:"; + // + // txtCropBottom + // + this.txtCropBottom.Name = "txtCropBottom"; + this.txtCropBottom.Size = new System.Drawing.Size(34, 20); + this.txtCropBottom.Text = "8000"; + // + // btnDefaults + // + this.btnDefaults.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.btnDefaults.Location = new System.Drawing.Point(439, 232); + this.btnDefaults.Name = "btnDefaults"; + this.btnDefaults.Size = new System.Drawing.Size(75, 23); + this.btnDefaults.Text = "Defaults"; + this.toolTip1.SetToolTip(this.btnDefaults, "Unless I forgot to update the button\'s code when I changed a default"); + this.btnDefaults.Click += new System.EventHandler(this.btnDefaults_Click); + // + // tpDispMethod + // + this.tpDispMethod.Controls.Add(this.flpTpDispMethod); + this.tpDispMethod.Name = "tpDispMethod"; + this.tpDispMethod.Text = "Display Method"; + // + // flpTpDispMethod + // + this.flpTpDispMethod.Controls.Add(this.grpDispMethod); + this.flpTpDispMethod.Controls.Add(this.lblDispMethodRestartWarning); + this.flpTpDispMethod.Name = "flpTpDispMethod"; + // + // grpDispMethod + // + this.grpDispMethod.Controls.Add(this.flpGrpDispMethod); + this.grpDispMethod.Name = "grpDispMethod"; + this.grpDispMethod.Size = new System.Drawing.Size(419, 241); + // + // flpGrpDispMethod + // + this.flpGrpDispMethod.Controls.Add(this.flpD3DSection); + this.flpGrpDispMethod.Controls.Add(this.rbDispMethodOpenGL); + this.flpGrpDispMethod.Controls.Add(this.lblDispMethodOpenGL); + this.flpGrpDispMethod.Controls.Add(this.rbDispMethodGDIPlus); + this.flpGrpDispMethod.Controls.Add(this.lblDispMethodGDIPlus); + this.flpGrpDispMethod.Location = new System.Drawing.Point(6, 11); + this.flpGrpDispMethod.Name = "flpGrpDispMethod"; + // + // flpD3DSection + // + this.flpD3DSection.Controls.Add(this.rbDispMethodD3D); + this.flpD3DSection.Controls.Add(this.lblDispMethodD3D); + this.flpD3DSection.Controls.Add(this.flpD3DAltVSync); + this.flpD3DSection.Name = "flpD3DSection"; + // + // rbDispMethodD3D + // + this.rbDispMethodD3D.Checked = true; + this.rbDispMethodD3D.Name = "rbDispMethodD3D"; + this.rbDispMethodD3D.Text = "Direct3D9"; + // + // lblDispMethodD3D + // + this.lblDispMethodD3D.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblDispMethodD3D.Location = new System.Drawing.Point(3, 23); + this.lblDispMethodD3D.Name = "lblDispMethodD3D"; + this.lblDispMethodD3D.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblDispMethodD3D.Text = " • Best compatibility\r\n • May have trouble with OpenGL-based cores (N64)\r\n"; + // + // flpD3DAltVSync + // + this.flpD3DAltVSync.Controls.Add(this.cbD3DAltVSync); + this.flpD3DAltVSync.Controls.Add(this.lblD3DAltVSync); + this.flpD3DAltVSync.Name = "flpD3DAltVSync"; + this.flpD3DAltVSync.Padding = new System.Windows.Forms.Padding(32, 0, 0, 0); + // + // cbD3DAltVSync + // + this.cbD3DAltVSync.Name = "cbD3DAltVSync"; + // + // lblD3DAltVSync + // + this.lblD3DAltVSync.Name = "lblD3DAltVSync"; + this.lblD3DAltVSync.Size = new System.Drawing.Size(359, 43); + this.lblD3DAltVSync.Text = resources.GetString("lblD3DAltVSync.Text"); + this.lblD3DAltVSync.Click += new System.EventHandler(this.lblD3DAltVSync_Click); + this.lblD3DAltVSync.DoubleClick += new System.EventHandler(this.lblD3DAltVSync_Click); + // + // rbDispMethodGDIPlus + // + this.rbDispMethodGDIPlus.Checked = true; + this.rbDispMethodGDIPlus.Name = "rbDispMethodGDIPlus"; + this.rbDispMethodGDIPlus.Text = "GDI+"; + // + // lblDispMethodGDIPlus + // + this.lblDispMethodGDIPlus.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblDispMethodGDIPlus.Location = new System.Drawing.Point(3, 177); + this.lblDispMethodGDIPlus.Name = "lblDispMethodGDIPlus"; + this.lblDispMethodGDIPlus.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblDispMethodGDIPlus.Text = " • Slow; Mainly for compatibility purposes\r\n • Missing many features\r\n • Works be" + + "tter over Remote Desktop, etc.\r\n"; + // + // lblDispMethodRestartWarning + // + this.lblDispMethodRestartWarning.Name = "lblDispMethodRestartWarning"; + this.lblDispMethodRestartWarning.Text = "Changes require restart of program to take effect.\r\n"; + // + // tpMisc + // + this.tpMisc.Controls.Add(this.grpDispFeatures); + this.tpMisc.Name = "tpMisc"; + this.tpMisc.Text = "Misc"; + // + // grpDispFeatures + // + this.grpDispFeatures.Controls.Add(this.flpGrpDispFeatures); + this.grpDispFeatures.Name = "grpDispFeatures"; + this.grpDispFeatures.Size = new System.Drawing.Size(217, 87); + this.grpDispFeatures.Text = "Display Features (for speeding up replays)"; + // + // flpGrpDispFeatures + // + this.flpGrpDispFeatures.Controls.Add(this.rbDispFeaturesFull); + this.flpGrpDispFeatures.Controls.Add(this.rbDispFeaturesMinimal); + this.flpGrpDispFeatures.Controls.Add(this.rbDispFeaturesNothing); + this.flpGrpDispFeatures.Location = new System.Drawing.Point(6, 15); + this.flpGrpDispFeatures.Name = "flpGrpDispFeatures"; + // + // rbDispFeaturesFull + // + this.rbDispFeaturesFull.Name = "rbDispFeaturesFull"; + this.rbDispFeaturesFull.Text = "Full - Display Everything"; + // + // rbDispFeaturesMinimal + // + this.rbDispFeaturesMinimal.Enabled = false; + this.rbDispFeaturesMinimal.Name = "rbDispFeaturesMinimal"; + this.rbDispFeaturesMinimal.Text = "Minimal - Display HUD Only (TBD)"; + // + // rbDispFeaturesNothing + // + this.rbDispFeaturesNothing.Name = "rbDispFeaturesNothing"; + this.rbDispFeaturesNothing.Text = "Absolute Zero - Display Nothing"; + // + // tpWindow + // + this.tpWindow.Controls.Add(this.flpTpWindow); + this.tpWindow.Name = "tpWindow"; + this.tpWindow.Padding = new System.Windows.Forms.Padding(3); + this.tpWindow.Text = "Window"; + // + // flpTpWindow + // + this.flpTpWindow.Controls.Add(this.flpWindowFSGroups); + this.flpTpWindow.Controls.Add(this.cbDoubleClickFS); + this.flpTpWindow.Name = "flpTpWindow"; + // + // flpWindowFSGroups + // + this.flpWindowFSGroups.Controls.Add(this.grpWindowed); + this.flpWindowFSGroups.Controls.Add(this.grpFS); + this.flpWindowFSGroups.Name = "flpWindowFSGroups"; + // + // grpWindowed + // + this.grpWindowed.Controls.Add(this.flpWindowed); + this.grpWindowed.Name = "grpWindowed"; + this.grpWindowed.Size = new System.Drawing.Size(121, 168); + this.grpWindowed.Text = "Windowed"; + // + // flpWindowed + // + this.flpWindowed.Controls.Add(this.flpWindowedFrameType); + this.flpWindowed.Controls.Add(this.tbWindowedFrameType); + this.flpWindowed.Controls.Add(this.cbWindowedStatusBar); + this.flpWindowed.Controls.Add(this.cbWindowedCaption); + this.flpWindowed.Controls.Add(this.cbWindowedMenu); + this.flpWindowed.Location = new System.Drawing.Point(6, 15); + this.flpWindowed.Name = "flpWindowed"; + // + // flpWindowedFrameType + // + this.flpWindowedFrameType.Controls.Add(this.lblWindowedFrameTypeDesc); + this.flpWindowedFrameType.Controls.Add(this.lblWindowedFrameTypeReadout); + this.flpWindowedFrameType.Name = "flpWindowedFrameType"; + // + // lblWindowedFrameTypeDesc + // + this.lblWindowedFrameTypeDesc.Name = "lblWindowedFrameTypeDesc"; + this.lblWindowedFrameTypeDesc.Text = "Frame:"; + // + // lblWindowedFrameTypeReadout + // + this.lblWindowedFrameTypeReadout.Name = "lblWindowedFrameTypeReadout"; + this.lblWindowedFrameTypeReadout.Text = "(frame type)"; + // + // tbWindowedFrameType + // + this.tbWindowedFrameType.LargeChange = 1; + this.tbWindowedFrameType.Location = new System.Drawing.Point(3, 27); + this.tbWindowedFrameType.Maximum = 2; + this.tbWindowedFrameType.Name = "tbWindowedFrameType"; + this.tbWindowedFrameType.Size = new System.Drawing.Size(99, 45); + this.tbWindowedFrameType.TabIndex = 21; + this.tbWindowedFrameType.Value = 1; + this.tbWindowedFrameType.ValueChanged += new System.EventHandler(this.tbWidowedFrameType_ValueChanged); + // + // cbWindowedStatusBar + // + this.cbWindowedStatusBar.Name = "cbWindowedStatusBar"; + this.cbWindowedStatusBar.Text = "Status Bar"; + // + // cbWindowedCaption + // + this.cbWindowedCaption.Name = "cbWindowedCaption"; + this.cbWindowedCaption.Text = "Caption"; + // + // cbWindowedMenu + // + this.cbWindowedMenu.Name = "cbWindowedMenu"; + this.cbWindowedMenu.Text = "Menu"; + // + // grpFS + // + this.grpFS.Controls.Add(this.flpGrpFS); + this.grpFS.Name = "grpFS"; + this.grpFS.Size = new System.Drawing.Size(344, 168); + this.grpFS.Text = "Fullscreen"; + // + // flpGrpFS + // + this.flpGrpFS.Controls.Add(this.flpFSCheckBoxes); + this.flpGrpFS.Controls.Add(this.lblFSWinHacks); + this.flpGrpFS.Location = new System.Drawing.Point(6, 15); + this.flpGrpFS.Name = "flpGrpFS"; + // + // flpFSCheckBoxes + // + this.flpFSCheckBoxes.Controls.Add(this.cbFSStatusBar); + this.flpFSCheckBoxes.Controls.Add(this.cbFSAutohideMouse); + this.flpFSCheckBoxes.Controls.Add(this.cbFSMenu); + this.flpFSCheckBoxes.Controls.Add(this.cbFSWinHacks); + this.flpFSCheckBoxes.MinimumSize = new System.Drawing.Size(24, 24); + this.flpFSCheckBoxes.Name = "flpFSCheckBoxes"; + this.flpFSCheckBoxes.Size = new System.Drawing.Size(228, 72); + // + // cbFSStatusBar + // + this.cbFSStatusBar.Name = "cbFSStatusBar"; + this.cbFSStatusBar.Text = "Status Bar"; + // + // cbFSAutohideMouse + // + this.cbFSAutohideMouse.Name = "cbFSAutohideMouse"; + this.cbFSAutohideMouse.Text = "Auto-Hide Mouse Cursor"; + // + // cbFSMenu + // + this.cbFSMenu.Name = "cbFSMenu"; + this.cbFSMenu.Text = "Menu"; + // + // cbFSWinHacks + // + this.cbFSWinHacks.Name = "cbFSWinHacks"; + this.cbFSWinHacks.Text = "Enable Windows Fullscreen Hacks"; + // + // lblFSWinHacks + // + this.lblFSWinHacks.Name = "lblFSWinHacks"; + this.lblFSWinHacks.Size = new System.Drawing.Size(329, 80); + this.lblFSWinHacks.Text = resources.GetString("lblFSWinHacks.Text"); + // + // cbDoubleClickFS + // + this.cbDoubleClickFS.Name = "cbDoubleClickFS"; + this.cbDoubleClickFS.Text = "Allow Double-Click Fullscreen (hold shift to force fullscreen to toggle in case u" + + "sing zapper, etc.)"; + // + // lnkDocs + // + this.lnkDocs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.lnkDocs.Location = new System.Drawing.Point(11, 359); + this.lnkDocs.Name = "lnkDocs"; + this.lnkDocs.Text = "Documentation"; + this.lnkDocs.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkDocs_LinkClicked); + // + // flpDialogButtons + // + this.flpDialogButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.flpDialogButtons.Controls.Add(this.btnDialogOK); + this.flpDialogButtons.Controls.Add(this.btnDialogCancel); + this.flpDialogButtons.Location = new System.Drawing.Point(362, 351); + this.flpDialogButtons.Name = "flpDialogButtons"; + this.flpDialogButtons.Size = new System.Drawing.Size(162, 29); + // + // DisplayConfig + // + this.AcceptButton = this.btnDialogOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btnDialogCancel; + this.ClientSize = new System.Drawing.Size(530, 385); + this.Controls.Add(this.flpDialogButtons); + this.Controls.Add(this.lnkDocs); + this.Controls.Add(this.tcDialog); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DisplayConfig"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Display Configuration"; + this.tcDialog.ResumeLayout(false); + this.tpScaling.ResumeLayout(false); + this.flpTpScaling.ResumeLayout(false); + this.flpTpScaling.PerformLayout(); + this.flpUserPrescale.ResumeLayout(false); + this.flpUserPrescale.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudUserPrescale)).EndInit(); + this.grpFilter.ResumeLayout(false); + this.tlpGrpFilter.ResumeLayout(false); + this.tlpGrpFilter.PerformLayout(); + this.flpFilterUser.ResumeLayout(false); + this.flpFilterUser.PerformLayout(); + this.flpFilterScanlineAlpha.ResumeLayout(false); + this.flpFilterScanlineAlpha.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbFilterScanlineAlpha)).EndInit(); + this.grpFinalFilter.ResumeLayout(false); + this.grpFinalFilter.PerformLayout(); + this.flpGrpFinalFilter.ResumeLayout(false); + this.flpGrpFinalFilter.PerformLayout(); + this.grpAspectRatio.ResumeLayout(false); + this.grpAspectRatio.PerformLayout(); + this.flpGrpAspectRatio.ResumeLayout(false); + this.flpGrpAspectRatio.PerformLayout(); + this.flpCustomSize.ResumeLayout(false); + this.flpCustomSize.PerformLayout(); + this.flpCustomAR.ResumeLayout(false); + this.flpCustomAR.PerformLayout(); + this.grpCrop.ResumeLayout(false); + this.grpCrop.PerformLayout(); + this.flpGrpCrop.ResumeLayout(false); + this.flpGrpCrop.PerformLayout(); + this.tpDispMethod.ResumeLayout(false); + this.tpDispMethod.PerformLayout(); + this.flpTpDispMethod.ResumeLayout(false); + this.flpTpDispMethod.PerformLayout(); + this.grpDispMethod.ResumeLayout(false); + this.grpDispMethod.PerformLayout(); + this.flpGrpDispMethod.ResumeLayout(false); + this.flpGrpDispMethod.PerformLayout(); + this.flpD3DSection.ResumeLayout(false); + this.flpD3DSection.PerformLayout(); + this.flpD3DAltVSync.ResumeLayout(false); + this.flpD3DAltVSync.PerformLayout(); + this.tpMisc.ResumeLayout(false); + this.grpDispFeatures.ResumeLayout(false); + this.grpDispFeatures.PerformLayout(); + this.flpGrpDispFeatures.ResumeLayout(false); + this.flpGrpDispFeatures.PerformLayout(); + this.tpWindow.ResumeLayout(false); + this.tpWindow.PerformLayout(); + this.flpTpWindow.ResumeLayout(false); + this.flpTpWindow.PerformLayout(); + this.flpWindowFSGroups.ResumeLayout(false); + this.grpWindowed.ResumeLayout(false); + this.grpWindowed.PerformLayout(); + this.flpWindowed.ResumeLayout(false); + this.flpWindowed.PerformLayout(); + this.flpWindowedFrameType.ResumeLayout(false); + this.flpWindowedFrameType.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbWindowedFrameType)).EndInit(); + this.grpFS.ResumeLayout(false); + this.grpFS.PerformLayout(); + this.flpGrpFS.ResumeLayout(false); + this.flpFSCheckBoxes.ResumeLayout(false); + this.flpFSCheckBoxes.PerformLayout(); + this.flpDialogButtons.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + } #endregion - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Button btnOk; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.RadioButton rbNone; - private System.Windows.Forms.RadioButton rbScanlines; - private System.Windows.Forms.RadioButton rbHq2x; - private BizHawk.Client.EmuHawk.TransparentTrackBar tbScanlineIntensity; - private System.Windows.Forms.CheckBox checkLetterbox; - private System.Windows.Forms.CheckBox checkPadInteger; - private System.Windows.Forms.GroupBox grpFinalFilter; - private System.Windows.Forms.RadioButton rbFinalFilterBicubic; - private System.Windows.Forms.RadioButton rbFinalFilterNone; - private System.Windows.Forms.RadioButton rbFinalFilterBilinear; - private System.Windows.Forms.Button btnSelectUserFilter; - private System.Windows.Forms.RadioButton rbUser; - private System.Windows.Forms.Label lblUserFilterName; - private System.Windows.Forms.RadioButton rbUseRaw; - private System.Windows.Forms.RadioButton rbUseSystem; - private System.Windows.Forms.GroupBox grpARSelection; - private System.Windows.Forms.Label lblScanlines; - private System.Windows.Forms.TextBox txtCustomARHeight; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox txtCustomARWidth; - private System.Windows.Forms.RadioButton rbUseCustom; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.RadioButton rbOpenGL; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tpAR; - private System.Windows.Forms.TabPage tpDispMethod; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.RadioButton rbGDIPlus; - private System.Windows.Forms.TabPage tpMisc; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.RadioButton rbD3D9; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.CheckBox cbStatusBarWindowed; - private System.Windows.Forms.Label label9; - private BizHawk.Client.EmuHawk.TransparentTrackBar trackbarFrameSizeWindowed; - private System.Windows.Forms.CheckBox cbMenuWindowed; - private System.Windows.Forms.CheckBox cbCaptionWindowed; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.CheckBox cbStatusBarFullscreen; - private System.Windows.Forms.CheckBox cbMenuFullscreen; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label lblFrameTypeWindowed; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.NumericUpDown nudPrescale; - private System.Windows.Forms.CheckBox cbFSAutohideMouse; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.RadioButton rbDisplayAbsoluteZero; - private System.Windows.Forms.RadioButton rbDisplayMinimal; - private System.Windows.Forms.RadioButton rbDisplayFull; - private System.Windows.Forms.CheckBox cbAllowDoubleclickFullscreen; - private System.Windows.Forms.LinkLabel linkLabel1; - private System.Windows.Forms.RadioButton rbUseCustomRatio; - private System.Windows.Forms.TextBox txtCustomARY; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.TextBox txtCustomARX; - private System.Windows.Forms.CheckBox cbAutoPrescale; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.CheckBox cbAlternateVsync; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.CheckBox cbFullscreenHacks; - private System.Windows.Forms.Button btnDefaults; + private BizHawk.WinForms.Controls.SzButtonEx btnDialogCancel; + private BizHawk.WinForms.Controls.SzButtonEx btnDialogOK; + private BizHawk.WinForms.Controls.RadioButtonEx rbDispMethodOpenGL; + private BizHawk.WinForms.Controls.LocLabelEx lblDispMethodOpenGL; + private System.Windows.Forms.TabControl tcDialog; + private BizHawk.WinForms.Controls.TabPageEx tpScaling; + private BizHawk.WinForms.Controls.TabPageEx tpDispMethod; + private BizHawk.WinForms.Controls.LabelEx lblDispMethodRestartWarning; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpDispMethod; + private BizHawk.WinForms.Controls.LocLabelEx lblDispMethodGDIPlus; + private BizHawk.WinForms.Controls.RadioButtonEx rbDispMethodGDIPlus; + private BizHawk.WinForms.Controls.TabPageEx tpMisc; + private BizHawk.WinForms.Controls.TabPageEx tpWindow; + private BizHawk.WinForms.Controls.CheckBoxEx cbWindowedStatusBar; + private BizHawk.WinForms.Controls.LabelEx lblWindowedFrameTypeDesc; + private BizHawk.Client.EmuHawk.TransparentTrackBar tbWindowedFrameType; + private BizHawk.WinForms.Controls.CheckBoxEx cbWindowedMenu; + private BizHawk.WinForms.Controls.CheckBoxEx cbWindowedCaption; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpFS; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpWindowed; + private BizHawk.WinForms.Controls.LabelEx lblWindowedFrameTypeReadout; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpDispFeatures; + private BizHawk.WinForms.Controls.RadioButtonEx rbDispFeaturesNothing; + private BizHawk.WinForms.Controls.RadioButtonEx rbDispFeaturesMinimal; + private BizHawk.WinForms.Controls.RadioButtonEx rbDispFeaturesFull; + private BizHawk.WinForms.Controls.CheckBoxEx cbDoubleClickFS; + private BizHawk.WinForms.Controls.LocLinkLabelEx lnkDocs; private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.TextBox txtCropBottom; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.TextBox txtCropRight; - private System.Windows.Forms.TextBox txtCropTop; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.TextBox txtCropLeft; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpDispFeatures; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpWindowed; + private BizHawk.WinForms.Controls.SingleRowFLP flpWindowedFrameType; + private BizHawk.WinForms.Controls.SingleColumnFLP flpTpWindow; + private BizHawk.WinForms.Controls.SingleRowFLP flpWindowFSGroups; + private BizHawk.WinForms.Controls.LocSzSingleRowFLP flpDialogButtons; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpFS; + private BizHawk.WinForms.Controls.SingleColumnFLP flpTpDispMethod; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpDispMethod; + private BizHawk.WinForms.Controls.SzColumnsToRightFLP flpTpScaling; + private BizHawk.WinForms.Controls.SingleRowFLP flpUserPrescale; + private BizHawk.WinForms.Controls.LabelEx lblUserPrescale; + private BizHawk.WinForms.Controls.SzNUDEx nudUserPrescale; + private BizHawk.WinForms.Controls.LabelEx lblUserPrescaleUnits; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpFilter; + private System.Windows.Forms.TableLayoutPanel tlpGrpFilter; + private BizHawk.WinForms.Controls.RadioButtonEx rbFilterNone; + private BizHawk.WinForms.Controls.RadioButtonEx rbFilterUser; + private BizHawk.WinForms.Controls.RadioButtonEx rbFilterHq2x; + private BizHawk.WinForms.Controls.RadioButtonEx rbFilterScanline; + private BizHawk.WinForms.Controls.SingleColumnFLP flpFilterUser; + private BizHawk.WinForms.Controls.SzButtonEx btnFilterUser; + private BizHawk.WinForms.Controls.LabelEx lblFilterUser; + private BizHawk.WinForms.Controls.SingleColumnFLP flpFilterScanlineAlpha; + private BizHawk.WinForms.Controls.LabelEx lblFilterScanlineAlpha; + private TransparentTrackBar tbFilterScanlineAlpha; + private BizHawk.WinForms.Controls.CheckBoxEx cbAutoPrescale; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpFinalFilter; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpFinalFilter; + private BizHawk.WinForms.Controls.RadioButtonEx rbFinalFilterNone; + private BizHawk.WinForms.Controls.RadioButtonEx rbFinalFilterBilinear; + private BizHawk.WinForms.Controls.RadioButtonEx rbFinalFilterBicubic; + private BizHawk.WinForms.Controls.CheckBoxEx cbLetterbox; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpAspectRatio; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpAspectRatio; + private BizHawk.WinForms.Controls.RadioButtonEx rbARSquare; + private BizHawk.WinForms.Controls.LabelEx lblAspectRatioNonSquare; + private BizHawk.WinForms.Controls.RadioButtonEx rbARBySystem; + private BizHawk.WinForms.Controls.SingleRowFLP flpCustomSize; + private BizHawk.WinForms.Controls.RadioButtonEx rbARCustomSize; + private BizHawk.WinForms.Controls.SzTextBoxEx txtARCustomWidth; + private BizHawk.WinForms.Controls.LabelEx lblARCustomSizeSeparator; + private BizHawk.WinForms.Controls.SzTextBoxEx txtARCustomHeight; + private BizHawk.WinForms.Controls.SingleRowFLP flpCustomAR; + private BizHawk.WinForms.Controls.RadioButtonEx rbARCustomRatio; + private BizHawk.WinForms.Controls.SzTextBoxEx txtARCustomRatioH; + private BizHawk.WinForms.Controls.LabelEx lblARCustomRatioSeparator; + private BizHawk.WinForms.Controls.SzTextBoxEx txtARCustomRatioV; + private BizHawk.WinForms.Controls.CheckBoxEx cbScaleByInteger; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpCrop; + private BizHawk.WinForms.Controls.LocSingleRowFLP flpGrpCrop; + private BizHawk.WinForms.Controls.LabelEx lblCropLeft; + private BizHawk.WinForms.Controls.SzTextBoxEx txtCropLeft; + private BizHawk.WinForms.Controls.LabelEx lblCropTop; + private BizHawk.WinForms.Controls.SzTextBoxEx txtCropTop; + private BizHawk.WinForms.Controls.LabelEx lblCropRight; + private BizHawk.WinForms.Controls.SzTextBoxEx txtCropRight; + private BizHawk.WinForms.Controls.LabelEx lblCropBottom; + private BizHawk.WinForms.Controls.SzTextBoxEx txtCropBottom; + private BizHawk.WinForms.Controls.LocSzButtonEx btnDefaults; + private BizHawk.WinForms.Controls.SzRowsToBottomFLP flpFSCheckBoxes; + private BizHawk.WinForms.Controls.CheckBoxEx cbFSStatusBar; + private BizHawk.WinForms.Controls.CheckBoxEx cbFSAutohideMouse; + private BizHawk.WinForms.Controls.CheckBoxEx cbFSMenu; + private BizHawk.WinForms.Controls.CheckBoxEx cbFSWinHacks; + private BizHawk.WinForms.Controls.SzLabelEx lblFSWinHacks; + private BizHawk.WinForms.Controls.SingleColumnFLP flpD3DSection; + private BizHawk.WinForms.Controls.RadioButtonEx rbDispMethodD3D; + private BizHawk.WinForms.Controls.LocLabelEx lblDispMethodD3D; + private BizHawk.WinForms.Controls.SingleRowFLP flpD3DAltVSync; + private BizHawk.WinForms.Controls.CheckBoxEx cbD3DAltVSync; + private BizHawk.WinForms.Controls.SzLabelEx lblD3DAltVSync; } -} \ No newline at end of file +} diff --git a/BizHawk.Client.EmuHawk/config/DisplayConfig.cs b/BizHawk.Client.EmuHawk/config/DisplayConfig.cs index 2774b5a254..5861a51434 100644 --- a/BizHawk.Client.EmuHawk/config/DisplayConfig.cs +++ b/BizHawk.Client.EmuHawk/config/DisplayConfig.cs @@ -20,10 +20,10 @@ namespace BizHawk.Client.EmuHawk _config = config; InitializeComponent(); - rbNone.Checked = _config.TargetDisplayFilter == 0; - rbHq2x.Checked = _config.TargetDisplayFilter == 1; - rbScanlines.Checked = _config.TargetDisplayFilter == 2; - rbUser.Checked = _config.TargetDisplayFilter == 3; + rbFilterNone.Checked = _config.TargetDisplayFilter == 0; + rbFilterHq2x.Checked = _config.TargetDisplayFilter == 1; + rbFilterScanline.Checked = _config.TargetDisplayFilter == 2; + rbFilterUser.Checked = _config.TargetDisplayFilter == 3; _pathSelection = _config.DispUserFilterPath ?? ""; RefreshState(); @@ -32,52 +32,52 @@ namespace BizHawk.Client.EmuHawk rbFinalFilterBilinear.Checked = _config.DispFinalFilter == 1; rbFinalFilterBicubic.Checked = _config.DispFinalFilter == 2; - tbScanlineIntensity.Value = _config.TargetScanlineFilterIntensity; - checkLetterbox.Checked = _config.DispFixAspectRatio; - checkPadInteger.Checked = _config.DispFixScaleInteger; - cbFullscreenHacks.Checked = _config.DispFullscreenHacks; + tbFilterScanlineAlpha.Value = _config.TargetScanlineFilterIntensity; + cbLetterbox.Checked = _config.DispFixAspectRatio; + cbScaleByInteger.Checked = _config.DispFixScaleInteger; + cbFSWinHacks.Checked = _config.DispFullscreenHacks; cbAutoPrescale.Checked = _config.DispAutoPrescale; - cbAlternateVsync.Checked = _config.DispAlternateVsync; + cbD3DAltVSync.Checked = _config.DispAlternateVsync; - if (_config.DispSpeedupFeatures == 2) rbDisplayFull.Checked = true; - if (_config.DispSpeedupFeatures == 1) rbDisplayMinimal.Checked = true; - if (_config.DispSpeedupFeatures == 0) rbDisplayAbsoluteZero.Checked = true; + if (_config.DispSpeedupFeatures == 2) rbDispFeaturesFull.Checked = true; + if (_config.DispSpeedupFeatures == 1) rbDispFeaturesMinimal.Checked = true; + if (_config.DispSpeedupFeatures == 0) rbDispFeaturesNothing.Checked = true; - rbOpenGL.Checked = _config.DispMethod == EDispMethod.OpenGL; - rbGDIPlus.Checked = _config.DispMethod == EDispMethod.GdiPlus; - rbD3D9.Checked = _config.DispMethod == EDispMethod.SlimDX9; + rbDispMethodOpenGL.Checked = _config.DispMethod == EDispMethod.OpenGL; + rbDispMethodGDIPlus.Checked = _config.DispMethod == EDispMethod.GdiPlus; + rbDispMethodD3D.Checked = _config.DispMethod == EDispMethod.SlimDX9; - cbStatusBarWindowed.Checked = _config.DispChromeStatusBarWindowed; - cbCaptionWindowed.Checked = _config.DispChromeCaptionWindowed; - cbMenuWindowed.Checked = _config.DispChromeMenuWindowed; - cbStatusBarFullscreen.Checked = _config.DispChromeStatusBarFullscreen; - cbMenuFullscreen.Checked = _config.DispChromeMenuFullscreen; - trackbarFrameSizeWindowed.Value = _config.DispChromeFrameWindowed; + cbWindowedStatusBar.Checked = _config.DispChromeStatusBarWindowed; + cbWindowedCaption.Checked = _config.DispChromeCaptionWindowed; + cbWindowedMenu.Checked = _config.DispChromeMenuWindowed; + cbFSStatusBar.Checked = _config.DispChromeStatusBarFullscreen; + cbFSMenu.Checked = _config.DispChromeMenuFullscreen; + tbWindowedFrameType.Value = _config.DispChromeFrameWindowed; cbFSAutohideMouse.Checked = _config.DispChromeFullscreenAutohideMouse; SyncTrackBar(); - cbAllowDoubleclickFullscreen.Checked = _config.DispChromeAllowDoubleClickFullscreen; + cbDoubleClickFS.Checked = _config.DispChromeAllowDoubleClickFullscreen; - nudPrescale.Value = _config.DispPrescale; + nudUserPrescale.Value = _config.DispPrescale; if (_config.DispManagerAR == EDispManagerAR.None) - rbUseRaw.Checked = true; + rbARSquare.Checked = true; else if (_config.DispManagerAR == EDispManagerAR.System) - rbUseSystem.Checked = true; + rbARBySystem.Checked = true; else if (_config.DispManagerAR == EDispManagerAR.Custom) - rbUseCustom.Checked = true; + rbARCustomSize.Checked = true; else if (_config.DispManagerAR == EDispManagerAR.CustomRatio) - rbUseCustomRatio.Checked = true; + rbARCustomRatio.Checked = true; if(_config.DispCustomUserARWidth != -1) - txtCustomARWidth.Text = _config.DispCustomUserARWidth.ToString(); + txtARCustomWidth.Text = _config.DispCustomUserARWidth.ToString(); if (_config.DispCustomUserARHeight != -1) - txtCustomARHeight.Text = _config.DispCustomUserARHeight.ToString(); + txtARCustomHeight.Text = _config.DispCustomUserARHeight.ToString(); if (_config.DispCustomUserArx != -1) - txtCustomARX.Text = _config.DispCustomUserArx.ToString(); + txtARCustomRatioH.Text = _config.DispCustomUserArx.ToString(); if (_config.DispCustomUserAry != -1) - txtCustomARY.Text = _config.DispCustomUserAry.ToString(); + txtARCustomRatioV.Text = _config.DispCustomUserAry.ToString(); txtCropLeft.Text = _config.DispCropLeft.ToString(); txtCropTop.Text = _config.DispCropTop.ToString(); @@ -86,26 +86,18 @@ namespace BizHawk.Client.EmuHawk RefreshAspectRatioOptions(); - if (OSTailoredCode.IsUnixHost) - { - // Disable SlimDX on Unix - rbD3D9.Enabled = false; - rbD3D9.AutoCheck = false; - cbAlternateVsync.Enabled = false; - label13.Enabled = false; - label8.Enabled = false; - } + if (OSTailoredCode.IsUnixHost) flpD3DSection.Enabled = false; // Disable SlimDX on Unix } - private void btnOk_Click(object sender, EventArgs e) + private void btnDialogOK_Click(object sender, EventArgs e) { - if (rbNone.Checked) + if (rbFilterNone.Checked) _config.TargetDisplayFilter = 0; - if (rbHq2x.Checked) + if (rbFilterHq2x.Checked) _config.TargetDisplayFilter = 1; - if (rbScanlines.Checked) + if (rbFilterScanline.Checked) _config.TargetDisplayFilter = 2; - if (rbUser.Checked) + if (rbFilterUser.Checked) _config.TargetDisplayFilter = 3; if (rbFinalFilterNone.Checked) @@ -115,41 +107,41 @@ namespace BizHawk.Client.EmuHawk if (rbFinalFilterBicubic.Checked) _config.DispFinalFilter = 2; - _config.DispPrescale = (int)nudPrescale.Value; + _config.DispPrescale = (int)nudUserPrescale.Value; - _config.TargetScanlineFilterIntensity = tbScanlineIntensity.Value; - _config.DispFixAspectRatio = checkLetterbox.Checked; - _config.DispFixScaleInteger = checkPadInteger.Checked; - _config.DispFullscreenHacks = cbFullscreenHacks.Checked; + _config.TargetScanlineFilterIntensity = tbFilterScanlineAlpha.Value; + _config.DispFixAspectRatio = cbLetterbox.Checked; + _config.DispFixScaleInteger = cbScaleByInteger.Checked; + _config.DispFullscreenHacks = cbFSWinHacks.Checked; _config.DispAutoPrescale = cbAutoPrescale.Checked; - _config.DispAlternateVsync = cbAlternateVsync.Checked; + _config.DispAlternateVsync = cbD3DAltVSync.Checked; - _config.DispChromeStatusBarWindowed = cbStatusBarWindowed.Checked; - _config.DispChromeCaptionWindowed = cbCaptionWindowed.Checked; - _config.DispChromeMenuWindowed = cbMenuWindowed.Checked; - _config.DispChromeStatusBarFullscreen = cbStatusBarFullscreen.Checked; - _config.DispChromeMenuFullscreen = cbMenuFullscreen.Checked; - _config.DispChromeFrameWindowed = trackbarFrameSizeWindowed.Value; + _config.DispChromeStatusBarWindowed = cbWindowedStatusBar.Checked; + _config.DispChromeCaptionWindowed = cbWindowedCaption.Checked; + _config.DispChromeMenuWindowed = cbWindowedMenu.Checked; + _config.DispChromeStatusBarFullscreen = cbFSStatusBar.Checked; + _config.DispChromeMenuFullscreen = cbFSMenu.Checked; + _config.DispChromeFrameWindowed = tbWindowedFrameType.Value; _config.DispChromeFullscreenAutohideMouse = cbFSAutohideMouse.Checked; - _config.DispChromeAllowDoubleClickFullscreen = cbAllowDoubleclickFullscreen.Checked; + _config.DispChromeAllowDoubleClickFullscreen = cbDoubleClickFS.Checked; - if (rbDisplayFull.Checked) _config.DispSpeedupFeatures = 2; - if (rbDisplayMinimal.Checked) _config.DispSpeedupFeatures = 1; - if (rbDisplayAbsoluteZero.Checked) _config.DispSpeedupFeatures = 0; + if (rbDispFeaturesFull.Checked) _config.DispSpeedupFeatures = 2; + if (rbDispFeaturesMinimal.Checked) _config.DispSpeedupFeatures = 1; + if (rbDispFeaturesNothing.Checked) _config.DispSpeedupFeatures = 0; - if (rbUseRaw.Checked) + if (rbARSquare.Checked) _config.DispManagerAR = EDispManagerAR.None; - else if (rbUseSystem.Checked) + else if (rbARBySystem.Checked) _config.DispManagerAR = EDispManagerAR.System; - else if (rbUseCustom.Checked) + else if (rbARCustomSize.Checked) _config.DispManagerAR = EDispManagerAR.Custom; - else if (rbUseCustomRatio.Checked) + else if (rbARCustomRatio.Checked) _config.DispManagerAR = EDispManagerAR.CustomRatio; - if (string.IsNullOrWhiteSpace(txtCustomARWidth.Text)) + if (string.IsNullOrWhiteSpace(txtARCustomWidth.Text)) { - if (int.TryParse(txtCustomARWidth.Text, out int dispCustomUserARWidth)) + if (int.TryParse(txtARCustomWidth.Text, out int dispCustomUserARWidth)) { _config.DispCustomUserARWidth = dispCustomUserARWidth; } @@ -159,9 +151,9 @@ namespace BizHawk.Client.EmuHawk _config.DispCustomUserARWidth = -1; } - if (string.IsNullOrWhiteSpace(txtCustomARHeight.Text)) + if (string.IsNullOrWhiteSpace(txtARCustomHeight.Text)) { - if (int.TryParse(txtCustomARHeight.Text, out int dispCustomUserARHeight)) + if (int.TryParse(txtARCustomHeight.Text, out int dispCustomUserARHeight)) { _config.DispCustomUserARHeight = dispCustomUserARHeight; } @@ -171,9 +163,9 @@ namespace BizHawk.Client.EmuHawk _config.DispCustomUserARHeight = -1; } - if (string.IsNullOrWhiteSpace(txtCustomARX.Text)) + if (string.IsNullOrWhiteSpace(txtARCustomRatioH.Text)) { - if (float.TryParse(txtCustomARX.Text, out float dispCustomUserArx)) + if (float.TryParse(txtARCustomRatioH.Text, out float dispCustomUserArx)) { _config.DispCustomUserArx = dispCustomUserArx; } @@ -183,9 +175,9 @@ namespace BizHawk.Client.EmuHawk _config.DispCustomUserArx = -1; } - if (string.IsNullOrWhiteSpace(txtCustomARY.Text)) + if (string.IsNullOrWhiteSpace(txtARCustomRatioV.Text)) { - if (float.TryParse(txtCustomARY.Text, out float dispCustomUserAry)) + if (float.TryParse(txtARCustomRatioV.Text, out float dispCustomUserAry)) { _config.DispCustomUserAry = dispCustomUserAry; } @@ -196,11 +188,11 @@ namespace BizHawk.Client.EmuHawk } var oldDisplayMethod = _config.DispMethod; - if(rbOpenGL.Checked) + if(rbDispMethodOpenGL.Checked) _config.DispMethod = EDispMethod.OpenGL; - if(rbGDIPlus.Checked) + if(rbDispMethodGDIPlus.Checked) _config.DispMethod = EDispMethod.GdiPlus; - if(rbD3D9.Checked) + if(rbDispMethodD3D.Checked) _config.DispMethod = EDispMethod.SlimDX9; if (int.TryParse(txtCropLeft.Text, out int dispCropLeft)) @@ -236,10 +228,10 @@ namespace BizHawk.Client.EmuHawk private void RefreshState() { - lblUserFilterName.Text = Path.GetFileNameWithoutExtension(_pathSelection); + lblFilterUser.Text = Path.GetFileNameWithoutExtension(_pathSelection); } - private void btnSelectUserFilter_Click(object sender, EventArgs e) + private void btnFilterUser_Click(object sender, EventArgs e) { using var ofd = new OpenFileDialog { @@ -248,7 +240,7 @@ namespace BizHawk.Client.EmuHawk }; if (ofd.ShowDialog() == DialogResult.OK) { - rbUser.Checked = true; + rbFilterUser.Checked = true; var choice = Path.GetFullPath(ofd.FileName); //test the preset @@ -284,81 +276,81 @@ namespace BizHawk.Client.EmuHawk } } - private void checkLetterbox_CheckedChanged(object sender, EventArgs e) + private void cbLetterbox_CheckedChanged(object sender, EventArgs e) { RefreshAspectRatioOptions(); } - private void checkPadInteger_CheckedChanged(object sender, EventArgs e) + private void cbScaleByInteger_CheckedChanged(object sender, EventArgs e) { RefreshAspectRatioOptions(); } - private void rbUseRaw_CheckedChanged(object sender, EventArgs e) + private void rbARSquare_CheckedChanged(object sender, EventArgs e) { RefreshAspectRatioOptions(); } - private void rbUseSystem_CheckedChanged(object sender, EventArgs e) + private void rbARBySystem_CheckedChanged(object sender, EventArgs e) { RefreshAspectRatioOptions(); } void RefreshAspectRatioOptions() { - grpARSelection.Enabled = checkLetterbox.Checked; - checkPadInteger.Enabled = checkLetterbox.Checked; + grpAspectRatio.Enabled = cbLetterbox.Checked; + cbScaleByInteger.Enabled = cbLetterbox.Checked; } - public void tbScanlineIntensity_Scroll(object sender, EventArgs e) + public void tbFilterScanlineAlpha_Scroll(object sender, EventArgs e) { - _config.TargetScanlineFilterIntensity = tbScanlineIntensity.Value; + _config.TargetScanlineFilterIntensity = tbFilterScanlineAlpha.Value; int scanlines = _config.TargetScanlineFilterIntensity; float percentage = (float) scanlines / 256 * 100; - lblScanlines.Text = $"{percentage:F2}%"; + lblFilterScanlineAlpha.Text = $"{percentage:F2}%"; } - private void TrackBarFrameSizeWindowed_ValueChanged(object sender, EventArgs e) + private void tbWidowedFrameType_ValueChanged(object sender, EventArgs e) { SyncTrackBar(); } private void SyncTrackBar() { - if (trackbarFrameSizeWindowed.Value == 0) + if (tbWindowedFrameType.Value == 0) { - lblFrameTypeWindowed.Text = "None"; + lblWindowedFrameTypeReadout.Text = "None"; } - if (trackbarFrameSizeWindowed.Value == 1) + if (tbWindowedFrameType.Value == 1) { - lblFrameTypeWindowed.Text = "Thin"; + lblWindowedFrameTypeReadout.Text = "Thin"; } - if (trackbarFrameSizeWindowed.Value == 2) + if (tbWindowedFrameType.Value == 2) { - lblFrameTypeWindowed.Text = "Thick"; + lblWindowedFrameTypeReadout.Text = "Thick"; } } - private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + private void lnkDocs_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { System.Diagnostics.Process.Start("http://tasvideos.org/Bizhawk/DisplayConfig.html"); } - private void label13_Click(object sender, EventArgs e) + private void lblD3DAltVSync_Click(object sender, EventArgs e) { - cbAlternateVsync.Checked ^= true; + cbD3DAltVSync.Checked ^= true; } private void btnDefaults_Click(object sender, EventArgs e) { - nudPrescale.Value = 1; - rbNone.Checked = true; + nudUserPrescale.Value = 1; + rbFilterNone.Checked = true; cbAutoPrescale.Checked = true; rbFinalFilterBilinear.Checked = true; - checkLetterbox.Checked = true; - rbUseSystem.Checked = true; + cbLetterbox.Checked = true; + rbARBySystem.Checked = true; } } } diff --git a/BizHawk.Client.EmuHawk/config/DisplayConfig.resx b/BizHawk.Client.EmuHawk/config/DisplayConfig.resx index b5f9f6fbec..b5fa8c42c3 100644 --- a/BizHawk.Client.EmuHawk/config/DisplayConfig.resx +++ b/BizHawk.Client.EmuHawk/config/DisplayConfig.resx @@ -120,10 +120,10 @@ 17, 17 - + Alternate VSync Method: Some GPUs have problems VSyncing. It seems to manifest on full-screen windows. There will be hiccups when throttling to VSync. Use this to try and solve it (busy loop; burns major CPU) - + For Windows operating systems >= Vista, with some video cards, the monitors may flicker when going 'windowed fullscreen' while the system disobeys us and goes actual fullscreen instead. This hack prevents that, but may increase frame latency (since in Microsoft's new and disimproved operating systems, windowed mode things may have higher latency) diff --git a/BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs b/BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs index 0c700e63c6..5fa9be43ac 100644 --- a/BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs @@ -28,605 +28,595 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.OkBtn = new System.Windows.Forms.Button(); - this.CancelBtn = new System.Windows.Forms.Button(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.HandleAlternateKeyboardLayoutsCheckBox = new System.Windows.Forms.CheckBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.StartPausedCheckbox = new System.Windows.Forms.CheckBox(); - this.label14 = new System.Windows.Forms.Label(); - this.StartFullScreenCheckbox = new System.Windows.Forms.CheckBox(); - this.label3 = new System.Windows.Forms.Label(); - this.SingleInstanceModeCheckbox = new System.Windows.Forms.CheckBox(); - this.NeverAskSaveCheckbox = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); - this.AcceptBackgroundInputCheckbox = new System.Windows.Forms.CheckBox(); - this.AcceptBackgroundInputControllerOnlyCheckBox = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); - this.RunInBackgroundCheckbox = new System.Windows.Forms.CheckBox(); - this.SaveWindowPositionCheckbox = new System.Windows.Forms.CheckBox(); - this.EnableContextMenuCheckbox = new System.Windows.Forms.CheckBox(); - this.PauseWhenMenuActivatedCheckbox = new System.Windows.Forms.CheckBox(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.AutosaveSRAMtextBox = new System.Windows.Forms.NumericUpDown(); - this.AutosaveSRAMradioButton1 = new System.Windows.Forms.RadioButton(); - this.label8 = new System.Windows.Forms.Label(); - this.AutosaveSRAMradioButton2 = new System.Windows.Forms.RadioButton(); - this.AutosaveSRAMradioButton3 = new System.Windows.Forms.RadioButton(); - this.AutosaveSRAMCheckbox = new System.Windows.Forms.CheckBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.label7 = new System.Windows.Forms.Label(); - this.LuaInterfaceRadio = new System.Windows.Forms.RadioButton(); - this.NLuaRadio = new System.Windows.Forms.RadioButton(); - this.label6 = new System.Windows.Forms.Label(); - this.cbMoviesInAWE = new System.Windows.Forms.CheckBox(); - this.label5 = new System.Windows.Forms.Label(); - this.cbMoviesOnDisk = new System.Windows.Forms.CheckBox(); - this.LuaDuringTurboCheckbox = new System.Windows.Forms.CheckBox(); - this.label12 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.FrameAdvSkipLagCheckbox = new System.Windows.Forms.CheckBox(); - this.BackupSRamCheckbox = new System.Windows.Forms.CheckBox(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.tabPage3.SuspendLayout(); - this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.AutosaveSRAMtextBox)).BeginInit(); - this.panel1.SuspendLayout(); - this.SuspendLayout(); - // - // 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(280, 425); - this.OkBtn.Name = "OkBtn"; - this.OkBtn.Size = new System.Drawing.Size(60, 23); - this.OkBtn.TabIndex = 0; - 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(346, 425); - this.CancelBtn.Name = "CancelBtn"; - this.CancelBtn.Size = new System.Drawing.Size(60, 23); - this.CancelBtn.TabIndex = 1; - this.CancelBtn.Text = "&Cancel"; - this.CancelBtn.UseVisualStyleBackColor = true; - this.CancelBtn.Click += new System.EventHandler(this.CancelBtn_Click); - // - // 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.tabPage3); - this.tabControl1.Location = new System.Drawing.Point(12, 12); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(394, 402); - this.tabControl1.TabIndex = 2; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.HandleAlternateKeyboardLayoutsCheckBox); - this.tabPage1.Controls.Add(this.groupBox1); - this.tabPage1.Controls.Add(this.NeverAskSaveCheckbox); - this.tabPage1.Controls.Add(this.label2); - this.tabPage1.Controls.Add(this.AcceptBackgroundInputCheckbox); - this.tabPage1.Controls.Add(this.AcceptBackgroundInputControllerOnlyCheckBox); - this.tabPage1.Controls.Add(this.label1); - this.tabPage1.Controls.Add(this.RunInBackgroundCheckbox); - this.tabPage1.Controls.Add(this.SaveWindowPositionCheckbox); - this.tabPage1.Controls.Add(this.EnableContextMenuCheckbox); - this.tabPage1.Controls.Add(this.PauseWhenMenuActivatedCheckbox); - 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(386, 376); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "General"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // HandleAlternateKeyboardLayoutsCheckBox - // - this.HandleAlternateKeyboardLayoutsCheckBox.AutoSize = true; - this.HandleAlternateKeyboardLayoutsCheckBox.Location = new System.Drawing.Point(6, 175); - this.HandleAlternateKeyboardLayoutsCheckBox.Name = "HandleAlternateKeyboardLayoutsCheckBox"; - this.HandleAlternateKeyboardLayoutsCheckBox.Size = new System.Drawing.Size(320, 17); - this.HandleAlternateKeyboardLayoutsCheckBox.TabIndex = 11; - this.HandleAlternateKeyboardLayoutsCheckBox.Text = "Handle alternate keyboard layouts (e.g. Dvorak) [experimental]"; - this.HandleAlternateKeyboardLayoutsCheckBox.UseVisualStyleBackColor = true; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.StartPausedCheckbox); - this.groupBox1.Controls.Add(this.label14); - this.groupBox1.Controls.Add(this.StartFullScreenCheckbox); - this.groupBox1.Controls.Add(this.label3); - this.groupBox1.Controls.Add(this.SingleInstanceModeCheckbox); - this.groupBox1.Location = new System.Drawing.Point(6, 205); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(369, 140); - this.groupBox1.TabIndex = 13; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Startup Options"; - // - // StartPausedCheckbox - // - this.StartPausedCheckbox.AutoSize = true; - this.StartPausedCheckbox.Location = new System.Drawing.Point(6, 19); - this.StartPausedCheckbox.Name = "StartPausedCheckbox"; - this.StartPausedCheckbox.Size = new System.Drawing.Size(86, 17); - this.StartPausedCheckbox.TabIndex = 2; - this.StartPausedCheckbox.Text = "Start paused"; - this.StartPausedCheckbox.UseVisualStyleBackColor = true; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(26, 99); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(306, 13); - this.label14.TabIndex = 12; - this.label14.Text = "Note: Requires closing and reopening EmuHawk to take effect."; - // - // StartFullScreenCheckbox - // - this.StartFullScreenCheckbox.AutoSize = true; - this.StartFullScreenCheckbox.Location = new System.Drawing.Point(6, 42); - this.StartFullScreenCheckbox.Name = "StartFullScreenCheckbox"; - this.StartFullScreenCheckbox.Size = new System.Drawing.Size(110, 17); - this.StartFullScreenCheckbox.TabIndex = 3; - this.StartFullScreenCheckbox.Text = "Start in Fullscreen"; - this.StartFullScreenCheckbox.UseVisualStyleBackColor = true; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(26, 85); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(275, 13); - this.label3.TabIndex = 11; - this.label3.Text = "Enable to force only one instance of EmuHawk at a time."; - // - // SingleInstanceModeCheckbox - // - this.SingleInstanceModeCheckbox.AutoSize = true; - this.SingleInstanceModeCheckbox.Location = new System.Drawing.Point(6, 65); - this.SingleInstanceModeCheckbox.Name = "SingleInstanceModeCheckbox"; - this.SingleInstanceModeCheckbox.Size = new System.Drawing.Size(127, 17); - this.SingleInstanceModeCheckbox.TabIndex = 10; - this.SingleInstanceModeCheckbox.Text = "Single instance mode"; - this.SingleInstanceModeCheckbox.UseVisualStyleBackColor = true; - // - // NeverAskSaveCheckbox - // - this.NeverAskSaveCheckbox.AutoSize = true; - this.NeverAskSaveCheckbox.Location = new System.Drawing.Point(6, 72); - this.NeverAskSaveCheckbox.Name = "NeverAskSaveCheckbox"; - this.NeverAskSaveCheckbox.Size = new System.Drawing.Size(184, 17); - this.NeverAskSaveCheckbox.TabIndex = 5; - this.NeverAskSaveCheckbox.Text = "Never be asked to save changes"; - this.NeverAskSaveCheckbox.UseVisualStyleBackColor = true; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(26, 155); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(349, 13); - this.label2.TabIndex = 10; - this.label2.Text = "When this is set, the client will receive user input even when focus is lost"; - // - // AcceptBackgroundInputCheckbox - // - this.AcceptBackgroundInputCheckbox.AutoSize = true; - this.AcceptBackgroundInputCheckbox.Location = new System.Drawing.Point(6, 135); - this.AcceptBackgroundInputCheckbox.Name = "AcceptBackgroundInputCheckbox"; - this.AcceptBackgroundInputCheckbox.Size = new System.Drawing.Size(146, 17); - this.AcceptBackgroundInputCheckbox.TabIndex = 8; - this.AcceptBackgroundInputCheckbox.Text = "Accept background input"; - this.AcceptBackgroundInputCheckbox.UseVisualStyleBackColor = true; - this.AcceptBackgroundInputCheckbox.CheckedChanged += new System.EventHandler(this.AcceptBackgroundInputCheckbox_CheckedChanged); - // - // AcceptBackgroundInputControllerOnlyCheckBox - // - this.AcceptBackgroundInputControllerOnlyCheckBox.AutoSize = true; - this.AcceptBackgroundInputControllerOnlyCheckBox.Enabled = false; - this.AcceptBackgroundInputControllerOnlyCheckBox.Location = new System.Drawing.Point(156, 135); - this.AcceptBackgroundInputControllerOnlyCheckBox.Name = "AcceptBackgroundInputControllerOnlyCheckBox"; - this.AcceptBackgroundInputControllerOnlyCheckBox.Size = new System.Drawing.Size(117, 17); - this.AcceptBackgroundInputControllerOnlyCheckBox.TabIndex = 9; - this.AcceptBackgroundInputControllerOnlyCheckBox.Text = "From controller only"; - this.AcceptBackgroundInputControllerOnlyCheckBox.UseVisualStyleBackColor = true; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(26, 115); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(315, 13); - this.label1.TabIndex = 7; - this.label1.Text = "When this is set, the client will continue to run when it loses focus"; - // - // RunInBackgroundCheckbox - // - this.RunInBackgroundCheckbox.AutoSize = true; - this.RunInBackgroundCheckbox.Location = new System.Drawing.Point(6, 95); - this.RunInBackgroundCheckbox.Name = "RunInBackgroundCheckbox"; - this.RunInBackgroundCheckbox.Size = new System.Drawing.Size(117, 17); - this.RunInBackgroundCheckbox.TabIndex = 6; - this.RunInBackgroundCheckbox.Text = "Run in background"; - this.RunInBackgroundCheckbox.UseVisualStyleBackColor = true; - // - // SaveWindowPositionCheckbox - // - this.SaveWindowPositionCheckbox.AutoSize = true; - this.SaveWindowPositionCheckbox.Location = new System.Drawing.Point(6, 49); - this.SaveWindowPositionCheckbox.Name = "SaveWindowPositionCheckbox"; - this.SaveWindowPositionCheckbox.Size = new System.Drawing.Size(133, 17); - this.SaveWindowPositionCheckbox.TabIndex = 4; - this.SaveWindowPositionCheckbox.Text = "Save Window Position"; - this.SaveWindowPositionCheckbox.UseVisualStyleBackColor = true; - // - // EnableContextMenuCheckbox - // - this.EnableContextMenuCheckbox.AutoSize = true; - this.EnableContextMenuCheckbox.Location = new System.Drawing.Point(6, 26); - this.EnableContextMenuCheckbox.Name = "EnableContextMenuCheckbox"; - this.EnableContextMenuCheckbox.Size = new System.Drawing.Size(128, 17); - this.EnableContextMenuCheckbox.TabIndex = 1; - this.EnableContextMenuCheckbox.Text = "Enable Context Menu"; - this.EnableContextMenuCheckbox.UseVisualStyleBackColor = true; - // - // PauseWhenMenuActivatedCheckbox - // - this.PauseWhenMenuActivatedCheckbox.AutoSize = true; - this.PauseWhenMenuActivatedCheckbox.Location = new System.Drawing.Point(6, 3); - this.PauseWhenMenuActivatedCheckbox.Name = "PauseWhenMenuActivatedCheckbox"; - this.PauseWhenMenuActivatedCheckbox.Size = new System.Drawing.Size(161, 17); - this.PauseWhenMenuActivatedCheckbox.TabIndex = 0; - this.PauseWhenMenuActivatedCheckbox.Text = "Pause when menu activated"; - this.PauseWhenMenuActivatedCheckbox.UseVisualStyleBackColor = true; - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.groupBox2); - this.tabPage3.Controls.Add(this.AutosaveSRAMCheckbox); - this.tabPage3.Controls.Add(this.panel1); - this.tabPage3.Controls.Add(this.label6); - this.tabPage3.Controls.Add(this.cbMoviesInAWE); - this.tabPage3.Controls.Add(this.label5); - this.tabPage3.Controls.Add(this.cbMoviesOnDisk); - this.tabPage3.Controls.Add(this.LuaDuringTurboCheckbox); - this.tabPage3.Controls.Add(this.label12); - this.tabPage3.Controls.Add(this.label13); - this.tabPage3.Controls.Add(this.FrameAdvSkipLagCheckbox); - this.tabPage3.Controls.Add(this.BackupSRamCheckbox); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(386, 376); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Advanced"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.label10); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.AutosaveSRAMtextBox); - this.groupBox2.Controls.Add(this.AutosaveSRAMradioButton1); - this.groupBox2.Controls.Add(this.label8); - this.groupBox2.Controls.Add(this.AutosaveSRAMradioButton2); - this.groupBox2.Controls.Add(this.AutosaveSRAMradioButton3); - this.groupBox2.Location = new System.Drawing.Point(27, 32); - this.groupBox2.Margin = new System.Windows.Forms.Padding(0); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(265, 60); - this.groupBox2.TabIndex = 5; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "AutoSaveRAM"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(9, 34); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(33, 13); - this.label10.TabIndex = 1; - this.label10.Text = "every"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(6, 16); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(225, 13); - this.label9.TabIndex = 0; - this.label9.Text = "Save SaveRAM to .AutoSaveRAM.SaveRAM"; - // - // AutosaveSRAMtextBox - // - this.AutosaveSRAMtextBox.Location = new System.Drawing.Point(151, 33); - this.AutosaveSRAMtextBox.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); - this.AutosaveSRAMtextBox.Name = "AutosaveSRAMtextBox"; - this.AutosaveSRAMtextBox.Size = new System.Drawing.Size(50, 20); - this.AutosaveSRAMtextBox.TabIndex = 5; - // - // AutosaveSRAMradioButton1 - // - this.AutosaveSRAMradioButton1.AutoSize = true; - this.AutosaveSRAMradioButton1.Location = new System.Drawing.Point(48, 33); - this.AutosaveSRAMradioButton1.Name = "AutosaveSRAMradioButton1"; - this.AutosaveSRAMradioButton1.Size = new System.Drawing.Size(36, 17); - this.AutosaveSRAMradioButton1.TabIndex = 2; - this.AutosaveSRAMradioButton1.TabStop = true; - this.AutosaveSRAMradioButton1.Text = "5s"; - this.AutosaveSRAMradioButton1.UseVisualStyleBackColor = true; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(202, 35); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(12, 13); - this.label8.TabIndex = 6; - this.label8.Text = "s"; - // - // AutosaveSRAMradioButton2 - // - this.AutosaveSRAMradioButton2.AutoSize = true; - this.AutosaveSRAMradioButton2.Location = new System.Drawing.Point(90, 34); - this.AutosaveSRAMradioButton2.Name = "AutosaveSRAMradioButton2"; - this.AutosaveSRAMradioButton2.Size = new System.Drawing.Size(39, 17); - this.AutosaveSRAMradioButton2.TabIndex = 3; - this.AutosaveSRAMradioButton2.TabStop = true; - this.AutosaveSRAMradioButton2.Text = "5m"; - this.AutosaveSRAMradioButton2.UseVisualStyleBackColor = true; - // - // AutosaveSRAMradioButton3 - // - this.AutosaveSRAMradioButton3.AutoSize = true; - this.AutosaveSRAMradioButton3.Location = new System.Drawing.Point(131, 35); - this.AutosaveSRAMradioButton3.Name = "AutosaveSRAMradioButton3"; - this.AutosaveSRAMradioButton3.Size = new System.Drawing.Size(14, 13); - this.AutosaveSRAMradioButton3.TabIndex = 4; - this.AutosaveSRAMradioButton3.TabStop = true; - this.AutosaveSRAMradioButton3.UseVisualStyleBackColor = true; - this.AutosaveSRAMradioButton3.CheckedChanged += new System.EventHandler(this.AutosaveSRAMRadioButton3_CheckedChanged); - // - // AutosaveSRAMCheckbox - // - this.AutosaveSRAMCheckbox.AutoSize = true; - this.AutosaveSRAMCheckbox.Location = new System.Drawing.Point(6, 35); - this.AutosaveSRAMCheckbox.Name = "AutosaveSRAMCheckbox"; - this.AutosaveSRAMCheckbox.Size = new System.Drawing.Size(15, 14); - this.AutosaveSRAMCheckbox.TabIndex = 4; - this.AutosaveSRAMCheckbox.UseVisualStyleBackColor = true; - this.AutosaveSRAMCheckbox.CheckedChanged += new System.EventHandler(this.AutosaveSRAMCheckbox_CheckedChanged); - // - // panel1 - // - this.panel1.Controls.Add(this.label7); - this.panel1.Controls.Add(this.LuaInterfaceRadio); - this.panel1.Controls.Add(this.NLuaRadio); - this.panel1.Location = new System.Drawing.Point(6, 312); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(377, 61); - this.panel1.TabIndex = 20; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(3, 1); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(50, 13); - this.label7.TabIndex = 0; - this.label7.Text = "Lua Core"; - // - // LuaInterfaceRadio - // - this.LuaInterfaceRadio.AutoSize = true; - this.LuaInterfaceRadio.Location = new System.Drawing.Point(4, 36); - this.LuaInterfaceRadio.Name = "LuaInterfaceRadio"; - this.LuaInterfaceRadio.Size = new System.Drawing.Size(338, 17); - this.LuaInterfaceRadio.TabIndex = 2; - this.LuaInterfaceRadio.TabStop = true; - this.LuaInterfaceRadio.Text = "Lua+LuaInterface - Faster but memory leaks, use at your own risk!"; - this.LuaInterfaceRadio.UseVisualStyleBackColor = true; - // - // NLuaRadio - // - this.NLuaRadio.AutoSize = true; - this.NLuaRadio.Location = new System.Drawing.Point(4, 17); - this.NLuaRadio.Name = "NLuaRadio"; - this.NLuaRadio.Size = new System.Drawing.Size(194, 17); - this.NLuaRadio.TabIndex = 1; - this.NLuaRadio.TabStop = true; - this.NLuaRadio.Text = "NLua+KopiLua - Reliable but slower"; - this.NLuaRadio.UseVisualStyleBackColor = true; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(27, 243); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(296, 39); - this.label6.TabIndex = 19; - this.label6.Text = "Will reduce many Out Of Memory crashes during long movies.\r\nThis is experimental;" + - " it may require admin permissions.\r\nYou must restart the program after changing " + - "this."; - // - // cbMoviesInAWE - // - this.cbMoviesInAWE.AutoSize = true; - this.cbMoviesInAWE.Location = new System.Drawing.Point(6, 223); - this.cbMoviesInAWE.Name = "cbMoviesInAWE"; - this.cbMoviesInAWE.Size = new System.Drawing.Size(262, 17); - this.cbMoviesInAWE.TabIndex = 18; - this.cbMoviesInAWE.Text = "Store movie working data in extended > 1GB Ram"; - this.cbMoviesInAWE.UseVisualStyleBackColor = true; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(27, 194); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(299, 26); - this.label5.TabIndex = 17; - this.label5.Text = "Will prevent many Out Of Memory crashes during long movies.\r\nYou must restart the" + - " program after changing this."; - // - // cbMoviesOnDisk - // - this.cbMoviesOnDisk.AutoSize = true; - this.cbMoviesOnDisk.Location = new System.Drawing.Point(6, 174); - this.cbMoviesOnDisk.Name = "cbMoviesOnDisk"; - this.cbMoviesOnDisk.Size = new System.Drawing.Size(259, 17); - this.cbMoviesOnDisk.TabIndex = 16; - this.cbMoviesOnDisk.Text = "Store movie working data on disk instead of RAM"; - this.cbMoviesOnDisk.UseVisualStyleBackColor = true; - // - // LuaDuringTurboCheckbox - // - this.LuaDuringTurboCheckbox.AutoSize = true; - this.LuaDuringTurboCheckbox.Location = new System.Drawing.Point(6, 151); - this.LuaDuringTurboCheckbox.Name = "LuaDuringTurboCheckbox"; - this.LuaDuringTurboCheckbox.Size = new System.Drawing.Size(166, 17); - this.LuaDuringTurboCheckbox.TabIndex = 15; - this.LuaDuringTurboCheckbox.Text = "Run lua scripts when turboing"; - this.LuaDuringTurboCheckbox.UseVisualStyleBackColor = true; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(24, 135); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(231, 13); - this.label12.TabIndex = 14; - this.label12.Text = "frames in which no input was polled (lag frames)"; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(24, 149); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(268, 13); - this.label13.TabIndex = 13; - this.label13.Text = "When enabled, the frame advance button will skip over"; - // - // FrameAdvSkipLagCheckbox - // - this.FrameAdvSkipLagCheckbox.AutoSize = true; - this.FrameAdvSkipLagCheckbox.Location = new System.Drawing.Point(6, 102); - this.FrameAdvSkipLagCheckbox.Name = "FrameAdvSkipLagCheckbox"; - this.FrameAdvSkipLagCheckbox.Size = new System.Drawing.Size(241, 17); - this.FrameAdvSkipLagCheckbox.TabIndex = 12; - this.FrameAdvSkipLagCheckbox.Text = "Frame advance button skips non-input frames"; - this.FrameAdvSkipLagCheckbox.UseVisualStyleBackColor = true; - // - // BackupSRamCheckbox - // - this.BackupSRamCheckbox.AutoSize = true; - this.BackupSRamCheckbox.Location = new System.Drawing.Point(6, 12); - this.BackupSRamCheckbox.Name = "BackupSRamCheckbox"; - this.BackupSRamCheckbox.Size = new System.Drawing.Size(203, 17); - this.BackupSRamCheckbox.TabIndex = 3; - this.BackupSRamCheckbox.Text = "Backup SaveRAM to .SaveRAM.bak"; - this.BackupSRamCheckbox.UseVisualStyleBackColor = true; - // - // EmuHawkOptions - // - 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(418, 455); - this.Controls.Add(this.tabControl1); - this.Controls.Add(this.CancelBtn); - this.Controls.Add(this.OkBtn); - this.Name = "EmuHawkOptions"; - this.ShowIcon = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Customization Options"; - this.Load += new System.EventHandler(this.GuiOptions_Load); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.tabPage3.ResumeLayout(false); - this.tabPage3.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.AutosaveSRAMtextBox)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.ResumeLayout(false); - + this.components = new System.ComponentModel.Container(); + this.btnDialogOK = new BizHawk.WinForms.Controls.LocSzButtonEx(); + this.btnDialogCancel = new BizHawk.WinForms.Controls.LocSzButtonEx(); + this.tcDialog = new System.Windows.Forms.TabControl(); + this.tpGeneral = new BizHawk.WinForms.Controls.TabPageEx(); + this.flpTpGeneral = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.cbMenusPauseEmulation = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbEnableContextMenu = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbSaveWindowPosition = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbNeverAskForSave = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.flpNoFocusEmulate = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.cbNoFocusEmulate = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblNoFocusEmulate = new BizHawk.WinForms.Controls.LocLabelEx(); + this.flpNoFocusInput = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.flpNoFocusInputCheckBoxes = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.cbNoFocusInput = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbNoFocusInputGamepadOnly = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblNoFocusInput = new BizHawk.WinForms.Controls.LocLabelEx(); + this.cbNonQWERTY = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.grpStartup = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpStartup = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.cbStartPaused = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.cbStartInFS = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.flpSingleInstance = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.cbSingleInstance = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblSingleInstanceDesc = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblSingleInstanceRestartWarning = new BizHawk.WinForms.Controls.LocLabelEx(); + this.tpAdvanced = new BizHawk.WinForms.Controls.TabPageEx(); + this.flpTpAdvanced = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.cbBackupSaveRAM = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.flpAutoSaveRAM = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.cbAutoSaveRAM = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.grpAutoSaveRAM = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpAutoSaveRAM = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.lblAutoSaveRAM = new BizHawk.WinForms.Controls.LabelEx(); + this.flpAutoSaveRAMFreq = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.lblAutoSaveRAMFreqDesc = new BizHawk.WinForms.Controls.LabelEx(); + this.cbAutoSaveRAMFreq5s = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.AutoSaveRAMFreq5min = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.flpAutoSaveRAMFreqCustom = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.rbAutoSaveRAMFreqCustom = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.nudAutoSaveRAMFreqCustom = new BizHawk.WinForms.Controls.SzNUDEx(); + this.lblAutoSaveRAMFreqCustomUnits = new BizHawk.WinForms.Controls.LabelEx(); + this.flpFrameAdvPastLag = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.cbFrameAdvPastLag = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblFrameAdvPastLag1 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblFrameAdvPastLag2 = new BizHawk.WinForms.Controls.LocLabelEx(); + this.cbRunLuaDuringTurbo = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.flpMoviesOnDisk = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.cbMoviesOnDisk = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblMoviesOnDisk = new BizHawk.WinForms.Controls.LocLabelEx(); + this.flpMoviesInAWE = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.cbMoviesInAWE = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblMoviesInAWE = new BizHawk.WinForms.Controls.LocLabelEx(); + this.grpLuaEngine = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpLuaEngine = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.rbKopiLua = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbLuaInterface = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.flpDialogButtons = new BizHawk.WinForms.Controls.LocSzSingleRowFLP(); + this.tcDialog.SuspendLayout(); + this.tpGeneral.SuspendLayout(); + this.flpTpGeneral.SuspendLayout(); + this.flpNoFocusEmulate.SuspendLayout(); + this.flpNoFocusInput.SuspendLayout(); + this.flpNoFocusInputCheckBoxes.SuspendLayout(); + this.grpStartup.SuspendLayout(); + this.flpGrpStartup.SuspendLayout(); + this.flpSingleInstance.SuspendLayout(); + this.tpAdvanced.SuspendLayout(); + this.flpTpAdvanced.SuspendLayout(); + this.flpAutoSaveRAM.SuspendLayout(); + this.grpAutoSaveRAM.SuspendLayout(); + this.flpGrpAutoSaveRAM.SuspendLayout(); + this.flpAutoSaveRAMFreq.SuspendLayout(); + this.flpAutoSaveRAMFreqCustom.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudAutoSaveRAMFreqCustom)).BeginInit(); + this.flpFrameAdvPastLag.SuspendLayout(); + this.flpMoviesOnDisk.SuspendLayout(); + this.flpMoviesInAWE.SuspendLayout(); + this.grpLuaEngine.SuspendLayout(); + this.flpGrpLuaEngine.SuspendLayout(); + this.flpDialogButtons.SuspendLayout(); + this.SuspendLayout(); + // + // btnDialogOK + // + this.btnDialogOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnDialogOK.Location = new System.Drawing.Point(3, 3); + this.btnDialogOK.Name = "btnDialogOK"; + this.btnDialogOK.Size = new System.Drawing.Size(60, 23); + this.btnDialogOK.Text = "&OK"; + this.btnDialogOK.Click += new System.EventHandler(this.btnDialogOK_Click); + // + // btnDialogCancel + // + this.btnDialogCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnDialogCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnDialogCancel.Location = new System.Drawing.Point(69, 3); + this.btnDialogCancel.Name = "btnDialogCancel"; + this.btnDialogCancel.Size = new System.Drawing.Size(60, 23); + this.btnDialogCancel.Text = "&Cancel"; + this.btnDialogCancel.Click += new System.EventHandler(this.btnDialogCancel_Click); + // + // tcDialog + // + this.tcDialog.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.tcDialog.Controls.Add(this.tpGeneral); + this.tcDialog.Controls.Add(this.tpAdvanced); + this.tcDialog.Location = new System.Drawing.Point(4, 4); + this.tcDialog.Name = "tcDialog"; + this.tcDialog.SelectedIndex = 0; + this.tcDialog.Size = new System.Drawing.Size(379, 363); + this.tcDialog.TabIndex = 0; + // + // tpGeneral + // + this.tpGeneral.Controls.Add(this.flpTpGeneral); + this.tpGeneral.Name = "tpGeneral"; + this.tpGeneral.Padding = new System.Windows.Forms.Padding(3); + this.tpGeneral.Text = "General"; + // + // flpTpGeneral + // + this.flpTpGeneral.Controls.Add(this.cbMenusPauseEmulation); + this.flpTpGeneral.Controls.Add(this.cbEnableContextMenu); + this.flpTpGeneral.Controls.Add(this.cbSaveWindowPosition); + this.flpTpGeneral.Controls.Add(this.cbNeverAskForSave); + this.flpTpGeneral.Controls.Add(this.flpNoFocusEmulate); + this.flpTpGeneral.Controls.Add(this.flpNoFocusInput); + this.flpTpGeneral.Controls.Add(this.cbNonQWERTY); + this.flpTpGeneral.Controls.Add(this.grpStartup); + this.flpTpGeneral.Name = "flpTpGeneral"; + // + // cbMenusPauseEmulation + // + this.cbMenusPauseEmulation.Name = "cbMenusPauseEmulation"; + this.cbMenusPauseEmulation.Text = "Pause when menu activated"; + // + // cbEnableContextMenu + // + this.cbEnableContextMenu.Name = "cbEnableContextMenu"; + this.cbEnableContextMenu.Text = "Enable Context Menu"; + // + // cbSaveWindowPosition + // + this.cbSaveWindowPosition.Name = "cbSaveWindowPosition"; + this.cbSaveWindowPosition.Text = "Save Window Position"; + // + // cbNeverAskForSave + // + this.cbNeverAskForSave.Name = "cbNeverAskForSave"; + this.cbNeverAskForSave.Text = "Never be asked to save changes"; + // + // flpNoFocusEmulate + // + this.flpNoFocusEmulate.Controls.Add(this.cbNoFocusEmulate); + this.flpNoFocusEmulate.Controls.Add(this.lblNoFocusEmulate); + this.flpNoFocusEmulate.Name = "flpNoFocusEmulate"; + // + // cbNoFocusEmulate + // + this.cbNoFocusEmulate.Name = "cbNoFocusEmulate"; + this.cbNoFocusEmulate.Text = "Run in background"; + // + // lblNoFocusEmulate + // + this.lblNoFocusEmulate.Location = new System.Drawing.Point(3, 23); + this.lblNoFocusEmulate.Name = "lblNoFocusEmulate"; + this.lblNoFocusEmulate.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblNoFocusEmulate.Text = "When this is set, the client will continue to run when it loses focus"; + // + // flpNoFocusInput + // + this.flpNoFocusInput.Controls.Add(this.flpNoFocusInputCheckBoxes); + this.flpNoFocusInput.Controls.Add(this.lblNoFocusInput); + this.flpNoFocusInput.Name = "flpNoFocusInput"; + // + // flpNoFocusInputCheckBoxes + // + this.flpNoFocusInputCheckBoxes.Controls.Add(this.cbNoFocusInput); + this.flpNoFocusInputCheckBoxes.Controls.Add(this.cbNoFocusInputGamepadOnly); + this.flpNoFocusInputCheckBoxes.Name = "flpNoFocusInputCheckBoxes"; + // + // cbNoFocusInput + // + this.cbNoFocusInput.Name = "cbNoFocusInput"; + this.cbNoFocusInput.Text = "Accept background input"; + this.cbNoFocusInput.CheckedChanged += new System.EventHandler(this.cbNoFocusInput_CheckedChanged); + // + // cbNoFocusInputGamepadOnly + // + this.cbNoFocusInputGamepadOnly.Enabled = false; + this.cbNoFocusInputGamepadOnly.Name = "cbNoFocusInputGamepadOnly"; + this.cbNoFocusInputGamepadOnly.Text = "From controller only"; + // + // lblNoFocusInput + // + this.lblNoFocusInput.Location = new System.Drawing.Point(3, 24); + this.lblNoFocusInput.Name = "lblNoFocusInput"; + this.lblNoFocusInput.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblNoFocusInput.Text = "When this is set, the client will receive user input even when focus is lost"; + // + // cbNonQWERTY + // + this.cbNonQWERTY.Name = "cbNonQWERTY"; + this.cbNonQWERTY.Text = "Handle alternate keyboard layouts (e.g. Dvorak) [experimental]"; + // + // grpStartup + // + this.grpStartup.Controls.Add(this.flpGrpStartup); + this.grpStartup.Name = "grpStartup"; + this.grpStartup.Size = new System.Drawing.Size(334, 118); + this.grpStartup.Text = "Startup Options"; + // + // flpGrpStartup + // + this.flpGrpStartup.Controls.Add(this.cbStartPaused); + this.flpGrpStartup.Controls.Add(this.cbStartInFS); + this.flpGrpStartup.Controls.Add(this.flpSingleInstance); + this.flpGrpStartup.Location = new System.Drawing.Point(3, 16); + this.flpGrpStartup.Name = "flpGrpStartup"; + // + // cbStartPaused + // + this.cbStartPaused.Name = "cbStartPaused"; + this.cbStartPaused.Text = "Start paused"; + // + // cbStartInFS + // + this.cbStartInFS.Name = "cbStartInFS"; + this.cbStartInFS.Text = "Start in Fullscreen"; + // + // flpSingleInstance + // + this.flpSingleInstance.Controls.Add(this.cbSingleInstance); + this.flpSingleInstance.Controls.Add(this.lblSingleInstanceDesc); + this.flpSingleInstance.Controls.Add(this.lblSingleInstanceRestartWarning); + this.flpSingleInstance.Name = "flpSingleInstance"; + // + // cbSingleInstance + // + this.cbSingleInstance.Name = "cbSingleInstance"; + this.cbSingleInstance.Text = "Single instance mode"; + // + // lblSingleInstanceDesc + // + this.lblSingleInstanceDesc.Location = new System.Drawing.Point(3, 23); + this.lblSingleInstanceDesc.Name = "lblSingleInstanceDesc"; + this.lblSingleInstanceDesc.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblSingleInstanceDesc.Text = "Enable to force only one instance of EmuHawk at a time."; + // + // lblSingleInstanceRestartWarning + // + this.lblSingleInstanceRestartWarning.Location = new System.Drawing.Point(3, 36); + this.lblSingleInstanceRestartWarning.Name = "lblSingleInstanceRestartWarning"; + this.lblSingleInstanceRestartWarning.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblSingleInstanceRestartWarning.Text = "Note: Requires closing and reopening EmuHawk to take effect."; + // + // tpAdvanced + // + this.tpAdvanced.Controls.Add(this.flpTpAdvanced); + this.tpAdvanced.Name = "tpAdvanced"; + this.tpAdvanced.Text = "Advanced"; + // + // flpTpAdvanced + // + this.flpTpAdvanced.Controls.Add(this.cbBackupSaveRAM); + this.flpTpAdvanced.Controls.Add(this.flpAutoSaveRAM); + this.flpTpAdvanced.Controls.Add(this.flpFrameAdvPastLag); + this.flpTpAdvanced.Controls.Add(this.cbRunLuaDuringTurbo); + this.flpTpAdvanced.Controls.Add(this.flpMoviesOnDisk); + this.flpTpAdvanced.Controls.Add(this.flpMoviesInAWE); + this.flpTpAdvanced.Controls.Add(this.grpLuaEngine); + this.flpTpAdvanced.Name = "flpTpAdvanced"; + // + // cbBackupSaveRAM + // + this.cbBackupSaveRAM.Name = "cbBackupSaveRAM"; + this.cbBackupSaveRAM.Text = "Backup SaveRAM to .SaveRAM.bak"; + // + // flpAutoSaveRAM + // + this.flpAutoSaveRAM.Controls.Add(this.cbAutoSaveRAM); + this.flpAutoSaveRAM.Controls.Add(this.grpAutoSaveRAM); + this.flpAutoSaveRAM.Name = "flpAutoSaveRAM"; + // + // cbAutoSaveRAM + // + this.cbAutoSaveRAM.Name = "cbAutoSaveRAM"; + this.cbAutoSaveRAM.CheckedChanged += new System.EventHandler(this.cbAutoSaveRAM_CheckedChanged); + // + // grpAutoSaveRAM + // + this.grpAutoSaveRAM.Controls.Add(this.flpGrpAutoSaveRAM); + this.grpAutoSaveRAM.Name = "grpAutoSaveRAM"; + this.grpAutoSaveRAM.Size = new System.Drawing.Size(238, 52); + this.grpAutoSaveRAM.Text = "AutoSaveRAM"; + // + // flpGrpAutoSaveRAM + // + this.flpGrpAutoSaveRAM.Controls.Add(this.lblAutoSaveRAM); + this.flpGrpAutoSaveRAM.Controls.Add(this.flpAutoSaveRAMFreq); + this.flpGrpAutoSaveRAM.Location = new System.Drawing.Point(3, 12); + this.flpGrpAutoSaveRAM.Name = "flpGrpAutoSaveRAM"; + // + // lblAutoSaveRAM + // + this.lblAutoSaveRAM.Name = "lblAutoSaveRAM"; + this.lblAutoSaveRAM.Text = "Save SaveRAM to .AutoSaveRAM.SaveRAM"; + // + // flpAutoSaveRAMFreq + // + this.flpAutoSaveRAMFreq.Controls.Add(this.lblAutoSaveRAMFreqDesc); + this.flpAutoSaveRAMFreq.Controls.Add(this.cbAutoSaveRAMFreq5s); + this.flpAutoSaveRAMFreq.Controls.Add(this.AutoSaveRAMFreq5min); + this.flpAutoSaveRAMFreq.Controls.Add(this.flpAutoSaveRAMFreqCustom); + this.flpAutoSaveRAMFreq.Name = "flpAutoSaveRAMFreq"; + // + // lblAutoSaveRAMFreqDesc + // + this.lblAutoSaveRAMFreqDesc.Name = "lblAutoSaveRAMFreqDesc"; + this.lblAutoSaveRAMFreqDesc.Text = "every"; + // + // cbAutoSaveRAMFreq5s + // + this.cbAutoSaveRAMFreq5s.Name = "cbAutoSaveRAMFreq5s"; + this.cbAutoSaveRAMFreq5s.Text = "5s"; + // + // AutoSaveRAMFreq5min + // + this.AutoSaveRAMFreq5min.Name = "AutoSaveRAMFreq5min"; + this.AutoSaveRAMFreq5min.Text = "5m"; + // + // flpAutoSaveRAMFreqCustom + // + this.flpAutoSaveRAMFreqCustom.Controls.Add(this.rbAutoSaveRAMFreqCustom); + this.flpAutoSaveRAMFreqCustom.Controls.Add(this.nudAutoSaveRAMFreqCustom); + this.flpAutoSaveRAMFreqCustom.Controls.Add(this.lblAutoSaveRAMFreqCustomUnits); + this.flpAutoSaveRAMFreqCustom.Name = "flpAutoSaveRAMFreqCustom"; + // + // rbAutoSaveRAMFreqCustom + // + this.rbAutoSaveRAMFreqCustom.Name = "rbAutoSaveRAMFreqCustom"; + this.rbAutoSaveRAMFreqCustom.CheckedChanged += new System.EventHandler(this.rbAutoSaveRAMFreqCustom_CheckedChanged); + // + // nudAutoSaveRAMFreqCustom + // + this.nudAutoSaveRAMFreqCustom.Maximum = new decimal(new int[] { + 100000, + 0, + 0, + 0}); + this.nudAutoSaveRAMFreqCustom.Name = "nudAutoSaveRAMFreqCustom"; + this.nudAutoSaveRAMFreqCustom.Size = new System.Drawing.Size(50, 20); + // + // lblAutoSaveRAMFreqCustomUnits + // + this.lblAutoSaveRAMFreqCustomUnits.Name = "lblAutoSaveRAMFreqCustomUnits"; + this.lblAutoSaveRAMFreqCustomUnits.Text = "s"; + // + // flpFrameAdvPastLag + // + this.flpFrameAdvPastLag.Controls.Add(this.cbFrameAdvPastLag); + this.flpFrameAdvPastLag.Controls.Add(this.lblFrameAdvPastLag1); + this.flpFrameAdvPastLag.Controls.Add(this.lblFrameAdvPastLag2); + this.flpFrameAdvPastLag.Name = "flpFrameAdvPastLag"; + // + // cbFrameAdvPastLag + // + this.cbFrameAdvPastLag.Name = "cbFrameAdvPastLag"; + this.cbFrameAdvPastLag.Text = "Frame advance button skips non-input frames"; + // + // lblFrameAdvPastLag1 + // + this.lblFrameAdvPastLag1.Location = new System.Drawing.Point(3, 23); + this.lblFrameAdvPastLag1.Name = "lblFrameAdvPastLag1"; + this.lblFrameAdvPastLag1.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblFrameAdvPastLag1.Text = "When enabled, the frame advance button will skip over"; + // + // lblFrameAdvPastLag2 + // + this.lblFrameAdvPastLag2.Location = new System.Drawing.Point(3, 36); + this.lblFrameAdvPastLag2.Name = "lblFrameAdvPastLag2"; + this.lblFrameAdvPastLag2.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblFrameAdvPastLag2.Text = "frames in which no input was polled (lag frames)"; + // + // cbRunLuaDuringTurbo + // + this.cbRunLuaDuringTurbo.Name = "cbRunLuaDuringTurbo"; + this.cbRunLuaDuringTurbo.Text = "Run lua scripts when turboing"; + // + // flpMoviesOnDisk + // + this.flpMoviesOnDisk.Controls.Add(this.cbMoviesOnDisk); + this.flpMoviesOnDisk.Controls.Add(this.lblMoviesOnDisk); + this.flpMoviesOnDisk.Name = "flpMoviesOnDisk"; + // + // cbMoviesOnDisk + // + this.cbMoviesOnDisk.Name = "cbMoviesOnDisk"; + this.cbMoviesOnDisk.Text = "Store movie working data on disk instead of RAM"; + // + // lblMoviesOnDisk + // + this.lblMoviesOnDisk.Location = new System.Drawing.Point(3, 23); + this.lblMoviesOnDisk.Name = "lblMoviesOnDisk"; + this.lblMoviesOnDisk.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblMoviesOnDisk.Text = "Will prevent many Out Of Memory crashes during long movies.\r\nYou must restart the" + + " program after changing this."; + // + // flpMoviesInAWE + // + this.flpMoviesInAWE.Controls.Add(this.cbMoviesInAWE); + this.flpMoviesInAWE.Controls.Add(this.lblMoviesInAWE); + this.flpMoviesInAWE.Name = "flpMoviesInAWE"; + // + // cbMoviesInAWE + // + this.cbMoviesInAWE.Name = "cbMoviesInAWE"; + this.cbMoviesInAWE.Text = "Store movie working data in extended > 1GB Ram"; + // + // lblMoviesInAWE + // + this.lblMoviesInAWE.Location = new System.Drawing.Point(3, 23); + this.lblMoviesInAWE.Name = "lblMoviesInAWE"; + this.lblMoviesInAWE.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblMoviesInAWE.Text = "Will reduce many Out Of Memory crashes during long movies.\r\nThis is experimental;" + + " it may require admin permissions.\r\nYou must restart the program after changing " + + "this."; + // + // grpLuaEngine + // + this.grpLuaEngine.Controls.Add(this.flpGrpLuaEngine); + this.grpLuaEngine.Name = "grpLuaEngine"; + this.grpLuaEngine.Size = new System.Drawing.Size(355, 67); + this.grpLuaEngine.Text = "Lua Engine"; + // + // flpGrpLuaEngine + // + this.flpGrpLuaEngine.Controls.Add(this.rbKopiLua); + this.flpGrpLuaEngine.Controls.Add(this.rbLuaInterface); + this.flpGrpLuaEngine.Location = new System.Drawing.Point(7, 16); + this.flpGrpLuaEngine.Name = "flpGrpLuaEngine"; + // + // rbKopiLua + // + this.rbKopiLua.Name = "rbKopiLua"; + this.rbKopiLua.Text = "NLua+KopiLua - Reliable but slower"; + // + // rbLuaInterface + // + this.rbLuaInterface.Name = "rbLuaInterface"; + this.rbLuaInterface.Text = "Lua+LuaInterface - Faster but memory leaks, use at your own risk!"; + // + // flpDialogButtons + // + this.flpDialogButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.flpDialogButtons.Controls.Add(this.btnDialogOK); + this.flpDialogButtons.Controls.Add(this.btnDialogCancel); + this.flpDialogButtons.Location = new System.Drawing.Point(247, 370); + this.flpDialogButtons.MinimumSize = new System.Drawing.Size(24, 24); + this.flpDialogButtons.Name = "flpDialogButtons"; + this.flpDialogButtons.Size = new System.Drawing.Size(132, 29); + // + // EmuHawkOptions + // + this.AcceptButton = this.btnDialogOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btnDialogCancel; + this.ClientSize = new System.Drawing.Size(385, 405); + this.Controls.Add(this.flpDialogButtons); + this.Controls.Add(this.tcDialog); + this.MinimumSize = new System.Drawing.Size(401, 444); + this.Name = "EmuHawkOptions"; + this.ShowIcon = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Customization Options"; + this.Load += new System.EventHandler(this.GuiOptions_Load); + this.tcDialog.ResumeLayout(false); + this.tpGeneral.ResumeLayout(false); + this.tpGeneral.PerformLayout(); + this.flpTpGeneral.ResumeLayout(false); + this.flpTpGeneral.PerformLayout(); + this.flpNoFocusEmulate.ResumeLayout(false); + this.flpNoFocusEmulate.PerformLayout(); + this.flpNoFocusInput.ResumeLayout(false); + this.flpNoFocusInput.PerformLayout(); + this.flpNoFocusInputCheckBoxes.ResumeLayout(false); + this.flpNoFocusInputCheckBoxes.PerformLayout(); + this.grpStartup.ResumeLayout(false); + this.grpStartup.PerformLayout(); + this.flpGrpStartup.ResumeLayout(false); + this.flpGrpStartup.PerformLayout(); + this.flpSingleInstance.ResumeLayout(false); + this.flpSingleInstance.PerformLayout(); + this.tpAdvanced.ResumeLayout(false); + this.tpAdvanced.PerformLayout(); + this.flpTpAdvanced.ResumeLayout(false); + this.flpTpAdvanced.PerformLayout(); + this.flpAutoSaveRAM.ResumeLayout(false); + this.flpAutoSaveRAM.PerformLayout(); + this.grpAutoSaveRAM.ResumeLayout(false); + this.grpAutoSaveRAM.PerformLayout(); + this.flpGrpAutoSaveRAM.ResumeLayout(false); + this.flpGrpAutoSaveRAM.PerformLayout(); + this.flpAutoSaveRAMFreq.ResumeLayout(false); + this.flpAutoSaveRAMFreq.PerformLayout(); + this.flpAutoSaveRAMFreqCustom.ResumeLayout(false); + this.flpAutoSaveRAMFreqCustom.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudAutoSaveRAMFreqCustom)).EndInit(); + this.flpFrameAdvPastLag.ResumeLayout(false); + this.flpFrameAdvPastLag.PerformLayout(); + this.flpMoviesOnDisk.ResumeLayout(false); + this.flpMoviesOnDisk.PerformLayout(); + this.flpMoviesInAWE.ResumeLayout(false); + this.flpMoviesInAWE.PerformLayout(); + this.grpLuaEngine.ResumeLayout(false); + this.grpLuaEngine.PerformLayout(); + this.flpGrpLuaEngine.ResumeLayout(false); + this.flpGrpLuaEngine.PerformLayout(); + this.flpDialogButtons.ResumeLayout(false); + this.ResumeLayout(false); + } #endregion - private System.Windows.Forms.Button OkBtn; - private System.Windows.Forms.Button CancelBtn; - private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.CheckBox StartPausedCheckbox; - private System.Windows.Forms.CheckBox PauseWhenMenuActivatedCheckbox; - private System.Windows.Forms.CheckBox EnableContextMenuCheckbox; - private System.Windows.Forms.CheckBox SaveWindowPositionCheckbox; - private System.Windows.Forms.CheckBox RunInBackgroundCheckbox; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.CheckBox AcceptBackgroundInputCheckbox; - private System.Windows.Forms.CheckBox AcceptBackgroundInputControllerOnlyCheckBox; - private System.Windows.Forms.CheckBox NeverAskSaveCheckbox; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.CheckBox SingleInstanceModeCheckbox; - private System.Windows.Forms.TabPage tabPage3; + private BizHawk.WinForms.Controls.LocSzButtonEx btnDialogOK; + private BizHawk.WinForms.Controls.LocSzButtonEx btnDialogCancel; + private System.Windows.Forms.TabControl tcDialog; + private BizHawk.WinForms.Controls.TabPageEx tpGeneral; + private BizHawk.WinForms.Controls.CheckBoxEx cbStartPaused; + private BizHawk.WinForms.Controls.CheckBoxEx cbMenusPauseEmulation; + private BizHawk.WinForms.Controls.CheckBoxEx cbEnableContextMenu; + private BizHawk.WinForms.Controls.CheckBoxEx cbSaveWindowPosition; + private BizHawk.WinForms.Controls.CheckBoxEx cbNoFocusEmulate; + private BizHawk.WinForms.Controls.LocLabelEx lblNoFocusEmulate; + private BizHawk.WinForms.Controls.LocLabelEx lblNoFocusInput; + private BizHawk.WinForms.Controls.CheckBoxEx cbNoFocusInput; + private BizHawk.WinForms.Controls.CheckBoxEx cbNoFocusInputGamepadOnly; + private BizHawk.WinForms.Controls.CheckBoxEx cbNeverAskForSave; + private BizHawk.WinForms.Controls.LocLabelEx lblSingleInstanceDesc; + private BizHawk.WinForms.Controls.CheckBoxEx cbSingleInstance; + private BizHawk.WinForms.Controls.TabPageEx tpAdvanced; private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.CheckBox BackupSRamCheckbox; - private System.Windows.Forms.CheckBox FrameAdvSkipLagCheckbox; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.CheckBox StartFullScreenCheckbox; - private System.Windows.Forms.CheckBox LuaDuringTurboCheckbox; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.CheckBox cbMoviesOnDisk; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox cbMoviesInAWE; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.RadioButton LuaInterfaceRadio; - private System.Windows.Forms.RadioButton NLuaRadio; - private System.Windows.Forms.CheckBox AutosaveSRAMCheckbox; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.RadioButton AutosaveSRAMradioButton3; - private System.Windows.Forms.RadioButton AutosaveSRAMradioButton2; - private System.Windows.Forms.RadioButton AutosaveSRAMradioButton1; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.NumericUpDown AutosaveSRAMtextBox; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.CheckBox HandleAlternateKeyboardLayoutsCheckBox; + private BizHawk.WinForms.Controls.CheckBoxEx cbBackupSaveRAM; + private BizHawk.WinForms.Controls.CheckBoxEx cbFrameAdvPastLag; + private BizHawk.WinForms.Controls.LocLabelEx lblFrameAdvPastLag2; + private BizHawk.WinForms.Controls.LocLabelEx lblFrameAdvPastLag1; + private BizHawk.WinForms.Controls.LocLabelEx lblSingleInstanceRestartWarning; + private BizHawk.WinForms.Controls.CheckBoxEx cbStartInFS; + private BizHawk.WinForms.Controls.CheckBoxEx cbRunLuaDuringTurbo; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpStartup; + private BizHawk.WinForms.Controls.LocLabelEx lblMoviesOnDisk; + private BizHawk.WinForms.Controls.CheckBoxEx cbMoviesOnDisk; + private BizHawk.WinForms.Controls.LocLabelEx lblMoviesInAWE; + private BizHawk.WinForms.Controls.CheckBoxEx cbMoviesInAWE; + private BizHawk.WinForms.Controls.RadioButtonEx rbLuaInterface; + private BizHawk.WinForms.Controls.RadioButtonEx rbKopiLua; + private BizHawk.WinForms.Controls.CheckBoxEx cbAutoSaveRAM; + private BizHawk.WinForms.Controls.RadioButtonEx AutoSaveRAMFreq5min; + private BizHawk.WinForms.Controls.RadioButtonEx cbAutoSaveRAMFreq5s; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpAutoSaveRAM; + private BizHawk.WinForms.Controls.LabelEx lblAutoSaveRAMFreqDesc; + private BizHawk.WinForms.Controls.LabelEx lblAutoSaveRAM; + private BizHawk.WinForms.Controls.CheckBoxEx cbNonQWERTY; + private BizHawk.WinForms.Controls.SingleColumnFLP flpTpGeneral; + private BizHawk.WinForms.Controls.SingleColumnFLP flpNoFocusEmulate; + private BizHawk.WinForms.Controls.SingleColumnFLP flpNoFocusInput; + private BizHawk.WinForms.Controls.SingleRowFLP flpNoFocusInputCheckBoxes; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpStartup; + private BizHawk.WinForms.Controls.SingleColumnFLP flpSingleInstance; + private BizHawk.WinForms.Controls.SingleColumnFLP flpTpAdvanced; + private BizHawk.WinForms.Controls.SingleRowFLP flpAutoSaveRAM; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpAutoSaveRAM; + private BizHawk.WinForms.Controls.SingleRowFLP flpAutoSaveRAMFreq; + private BizHawk.WinForms.Controls.SingleRowFLP flpAutoSaveRAMFreqCustom; + private BizHawk.WinForms.Controls.RadioButtonEx rbAutoSaveRAMFreqCustom; + private BizHawk.WinForms.Controls.SzNUDEx nudAutoSaveRAMFreqCustom; + private BizHawk.WinForms.Controls.LabelEx lblAutoSaveRAMFreqCustomUnits; + private BizHawk.WinForms.Controls.SingleColumnFLP flpFrameAdvPastLag; + private BizHawk.WinForms.Controls.SingleColumnFLP flpMoviesOnDisk; + private BizHawk.WinForms.Controls.SingleColumnFLP flpMoviesInAWE; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpLuaEngine; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpLuaEngine; + private BizHawk.WinForms.Controls.LocSzSingleRowFLP flpDialogButtons; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs b/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs index 7b5d96d7cb..2c043fbd66 100644 --- a/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs +++ b/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs @@ -20,109 +20,109 @@ namespace BizHawk.Client.EmuHawk { get { - if (AutosaveSRAMradioButton1.Checked) + if (cbAutoSaveRAMFreq5s.Checked) { return 5; } - if (AutosaveSRAMradioButton2.Checked) + if (AutoSaveRAMFreq5min.Checked) { return 5 * 60; } - return (int)AutosaveSRAMtextBox.Value; + return (int)nudAutoSaveRAMFreqCustom.Value; } set { switch (value) { case 5: - AutosaveSRAMradioButton1.Checked = true; - AutosaveSRAMtextBox.Enabled = false; + cbAutoSaveRAMFreq5s.Checked = true; + nudAutoSaveRAMFreqCustom.Enabled = false; break; case 5 * 60: - AutosaveSRAMradioButton2.Checked = true; - AutosaveSRAMtextBox.Enabled = false; + AutoSaveRAMFreq5min.Checked = true; + nudAutoSaveRAMFreqCustom.Enabled = false; break; default: - AutosaveSRAMradioButton3.Checked = true; - AutosaveSRAMtextBox.Enabled = true; + rbAutoSaveRAMFreqCustom.Checked = true; + nudAutoSaveRAMFreqCustom.Enabled = true; break; } - AutosaveSRAMtextBox.Value = value; + nudAutoSaveRAMFreqCustom.Value = value; } } private void GuiOptions_Load(object sender, EventArgs e) { - StartFullScreenCheckbox.Checked = _config.StartFullscreen; - StartPausedCheckbox.Checked = _config.StartPaused; - PauseWhenMenuActivatedCheckbox.Checked = _config.PauseWhenMenuActivated; - EnableContextMenuCheckbox.Checked = _config.ShowContextMenu; - SaveWindowPositionCheckbox.Checked = _config.SaveWindowPosition; - RunInBackgroundCheckbox.Checked = _config.RunInBackground; - AcceptBackgroundInputCheckbox.Checked = _config.AcceptBackgroundInput; - AcceptBackgroundInputControllerOnlyCheckBox.Checked = _config.AcceptBackgroundInputControllerOnly; - HandleAlternateKeyboardLayoutsCheckBox.Checked = _config.HandleAlternateKeyboardLayouts; - NeverAskSaveCheckbox.Checked = _config.SuppressAskSave; - SingleInstanceModeCheckbox.Checked = _config.SingleInstanceMode; + cbStartInFS.Checked = _config.StartFullscreen; + cbStartPaused.Checked = _config.StartPaused; + cbMenusPauseEmulation.Checked = _config.PauseWhenMenuActivated; + cbEnableContextMenu.Checked = _config.ShowContextMenu; + cbSaveWindowPosition.Checked = _config.SaveWindowPosition; + cbNoFocusEmulate.Checked = _config.RunInBackground; + cbNoFocusInput.Checked = _config.AcceptBackgroundInput; + cbNoFocusInputGamepadOnly.Checked = _config.AcceptBackgroundInputControllerOnly; + cbNonQWERTY.Checked = _config.HandleAlternateKeyboardLayouts; + cbNeverAskForSave.Checked = _config.SuppressAskSave; + cbSingleInstance.Checked = _config.SingleInstanceMode; - BackupSRamCheckbox.Checked = _config.BackupSaveram; - AutosaveSRAMCheckbox.Checked = _config.AutosaveSaveRAM; - groupBox2.Enabled = AutosaveSRAMCheckbox.Checked; + cbBackupSaveRAM.Checked = _config.BackupSaveram; + cbAutoSaveRAM.Checked = _config.AutosaveSaveRAM; + grpAutoSaveRAM.Enabled = cbAutoSaveRAM.Checked; AutosaveSaveRAMSeconds = _config.FlushSaveRamFrames / 60; - FrameAdvSkipLagCheckbox.Checked = _config.SkipLagFrame; - LuaDuringTurboCheckbox.Checked = _config.RunLuaDuringTurbo; + cbFrameAdvPastLag.Checked = _config.SkipLagFrame; + cbRunLuaDuringTurbo.Checked = _config.RunLuaDuringTurbo; cbMoviesOnDisk.Checked = _config.MoviesOnDisk; cbMoviesInAWE.Checked = _config.MoviesInAwe; switch (_config.LuaEngine) { case ELuaEngine.LuaPlusLuaInterface: - LuaInterfaceRadio.Checked = true; + rbLuaInterface.Checked = true; break; case ELuaEngine.NLuaPlusKopiLua: - NLuaRadio.Checked = true; + rbKopiLua.Checked = true; break; default: throw new ArgumentOutOfRangeException(); } } - private void OkBtn_Click(object sender, EventArgs e) + private void btnDialogOK_Click(object sender, EventArgs e) { - _config.StartFullscreen = StartFullScreenCheckbox.Checked; - _config.StartPaused = StartPausedCheckbox.Checked; - _config.PauseWhenMenuActivated = PauseWhenMenuActivatedCheckbox.Checked; - _config.ShowContextMenu = EnableContextMenuCheckbox.Checked; - _config.SaveWindowPosition = SaveWindowPositionCheckbox.Checked; - _config.RunInBackground = RunInBackgroundCheckbox.Checked; - _config.AcceptBackgroundInput = AcceptBackgroundInputCheckbox.Checked; - _config.AcceptBackgroundInputControllerOnly = AcceptBackgroundInputControllerOnlyCheckBox.Checked; - _config.HandleAlternateKeyboardLayouts = HandleAlternateKeyboardLayoutsCheckBox.Checked; - _config.SuppressAskSave = NeverAskSaveCheckbox.Checked; - _config.SingleInstanceMode = SingleInstanceModeCheckbox.Checked; + _config.StartFullscreen = cbStartInFS.Checked; + _config.StartPaused = cbStartPaused.Checked; + _config.PauseWhenMenuActivated = cbMenusPauseEmulation.Checked; + _config.ShowContextMenu = cbEnableContextMenu.Checked; + _config.SaveWindowPosition = cbSaveWindowPosition.Checked; + _config.RunInBackground = cbNoFocusEmulate.Checked; + _config.AcceptBackgroundInput = cbNoFocusInput.Checked; + _config.AcceptBackgroundInputControllerOnly = cbNoFocusInputGamepadOnly.Checked; + _config.HandleAlternateKeyboardLayouts = cbNonQWERTY.Checked; + _config.SuppressAskSave = cbNeverAskForSave.Checked; + _config.SingleInstanceMode = cbSingleInstance.Checked; - _config.BackupSaveram = BackupSRamCheckbox.Checked; - _config.AutosaveSaveRAM = AutosaveSRAMCheckbox.Checked; + _config.BackupSaveram = cbBackupSaveRAM.Checked; + _config.AutosaveSaveRAM = cbAutoSaveRAM.Checked; _config.FlushSaveRamFrames = AutosaveSaveRAMSeconds * 60; if (_mainForm.AutoFlushSaveRamIn > _config.FlushSaveRamFrames) { _mainForm.AutoFlushSaveRamIn = _config.FlushSaveRamFrames; } - _config.SkipLagFrame = FrameAdvSkipLagCheckbox.Checked; - _config.RunLuaDuringTurbo = LuaDuringTurboCheckbox.Checked; + _config.SkipLagFrame = cbFrameAdvPastLag.Checked; + _config.RunLuaDuringTurbo = cbRunLuaDuringTurbo.Checked; _config.MoviesOnDisk = cbMoviesOnDisk.Checked; _config.MoviesInAwe = cbMoviesInAWE.Checked; var prevLuaEngine = _config.LuaEngine; - if (LuaInterfaceRadio.Checked) + if (rbLuaInterface.Checked) { _config.LuaEngine = ELuaEngine.LuaPlusLuaInterface; } - else if (NLuaRadio.Checked) + else if (rbKopiLua.Checked) { _config.LuaEngine = ELuaEngine.NLuaPlusKopiLua; } @@ -137,26 +137,26 @@ namespace BizHawk.Client.EmuHawk DialogResult = DialogResult.OK; } - private void CancelBtn_Click(object sender, EventArgs e) + private void btnDialogCancel_Click(object sender, EventArgs e) { Close(); DialogResult = DialogResult.Cancel; _mainForm.AddOnScreenMessage("Customizing aborted."); } - private void AcceptBackgroundInputCheckbox_CheckedChanged(object sender, EventArgs e) + private void cbNoFocusInput_CheckedChanged(object sender, EventArgs e) { - AcceptBackgroundInputControllerOnlyCheckBox.Enabled = AcceptBackgroundInputCheckbox.Checked; + cbNoFocusInputGamepadOnly.Enabled = cbNoFocusInput.Checked; } - private void AutosaveSRAMCheckbox_CheckedChanged(object sender, EventArgs e) + private void cbAutoSaveRAM_CheckedChanged(object sender, EventArgs e) { - groupBox2.Enabled = AutosaveSRAMCheckbox.Checked; + grpAutoSaveRAM.Enabled = cbAutoSaveRAM.Checked; } - private void AutosaveSRAMRadioButton3_CheckedChanged(object sender, EventArgs e) + private void rbAutoSaveRAMFreqCustom_CheckedChanged(object sender, EventArgs e) { - AutosaveSRAMtextBox.Enabled = AutosaveSRAMradioButton3.Checked; + nudAutoSaveRAMFreqCustom.Enabled = rbAutoSaveRAMFreqCustom.Checked; } } } diff --git a/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs index 6c53cb8612..f24210546f 100644 --- a/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs @@ -2,24 +2,6 @@ { partial class SoundConfig { - /// - /// 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 /// @@ -28,344 +10,340 @@ /// private void InitializeComponent() { - this.Cancel = new System.Windows.Forms.Button(); - this.OK = new System.Windows.Forms.Button(); - this.cbEnableNormal = new System.Windows.Forms.CheckBox(); - this.grpSoundVol = new System.Windows.Forms.GroupBox(); - this.nudRWFF = new System.Windows.Forms.NumericUpDown(); - this.cbEnableRWFF = new System.Windows.Forms.CheckBox(); - this.tbRWFF = new System.Windows.Forms.TrackBar(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.tbNormal = new System.Windows.Forms.TrackBar(); - this.nudNormal = new System.Windows.Forms.NumericUpDown(); - this.listBoxSoundDevices = new System.Windows.Forms.ListBox(); - this.SoundDeviceLabel = new System.Windows.Forms.Label(); - this.BufferSizeLabel = new System.Windows.Forms.Label(); - this.BufferSizeNumeric = new System.Windows.Forms.NumericUpDown(); - this.BufferSizeUnitsLabel = new System.Windows.Forms.Label(); - this.grpOutputMethod = new System.Windows.Forms.GroupBox(); - this.rbOutputMethodOpenAL = new System.Windows.Forms.RadioButton(); - this.rbOutputMethodXAudio2 = new System.Windows.Forms.RadioButton(); - this.rbOutputMethodDirectSound = new System.Windows.Forms.RadioButton(); - this.cbMuteFrameAdvance = new System.Windows.Forms.CheckBox(); - this.cbEnableMaster = new System.Windows.Forms.CheckBox(); - this.label3 = new System.Windows.Forms.Label(); - this.grpSoundVol.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudRWFF)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbRWFF)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbNormal)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudNormal)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.BufferSizeNumeric)).BeginInit(); - this.grpOutputMethod.SuspendLayout(); + this.btnDialogCancel = new BizHawk.WinForms.Controls.SzButtonEx(); + this.btnDialogOK = new BizHawk.WinForms.Controls.SzButtonEx(); + this.cbFullSpeedEnable = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.grpVolume = new BizHawk.WinForms.Controls.LocSzGroupBoxEx(); + this.flpGrpVolume = new BizHawk.WinForms.Controls.LocSingleRowFLP(); + this.flpFullSpeed = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.lblFullSpeedVolume = new BizHawk.WinForms.Controls.LabelEx(); + this.tbFullSpeedVolume = new System.Windows.Forms.TrackBar(); + this.nudFullSpeedVolume = new BizHawk.WinForms.Controls.SzNUDEx(); + this.flpRWFF = new BizHawk.WinForms.Controls.SingleColumnFLP(); + this.cbRewindFFWEnable = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblRewindFFWVolume = new BizHawk.WinForms.Controls.LabelEx(); + this.tbRewindFFWVolume = new System.Windows.Forms.TrackBar(); + this.nudRewindFFWVolume = new BizHawk.WinForms.Controls.SzNUDEx(); + this.listDevices = new System.Windows.Forms.ListBox(); + this.lblDevices = new BizHawk.WinForms.Controls.LocLabelEx(); + this.lblBufferSizeDesc = new BizHawk.WinForms.Controls.LabelEx(); + this.nudBufferSize = new BizHawk.WinForms.Controls.SzNUDEx(); + this.lblBufferSizeUnits = new BizHawk.WinForms.Controls.LabelEx(); + this.flpDialogButtons = new BizHawk.WinForms.Controls.LocSzSingleRowFLP(); + this.flpBufferSize = new BizHawk.WinForms.Controls.SingleRowFLP(); + this.flpFlowRHS = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.flpFlowRHSTop = new BizHawk.WinForms.Controls.SzColumnsToRightFLP(); + this.cbMasterEnable = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.lblMasterEnable = new BizHawk.WinForms.Controls.LocSzLabelEx(); + this.cbMuteFrameAdvance = new BizHawk.WinForms.Controls.CheckBoxEx(); + this.grpSoundMethod = new BizHawk.WinForms.Controls.SzGroupBoxEx(); + this.flpGrpSoundMethod = new BizHawk.WinForms.Controls.LocSingleColumnFLP(); + this.rbSoundMethodDirectSound = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbSoundMethodXAudio2 = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.rbSoundMethodOpenAL = new BizHawk.WinForms.Controls.RadioButtonEx(); + this.grpVolume.SuspendLayout(); + this.flpGrpVolume.SuspendLayout(); + this.flpFullSpeed.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbFullSpeedVolume)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudFullSpeedVolume)).BeginInit(); + this.flpRWFF.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbRewindFFWVolume)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudRewindFFWVolume)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudBufferSize)).BeginInit(); + this.flpDialogButtons.SuspendLayout(); + this.flpBufferSize.SuspendLayout(); + this.flpFlowRHS.SuspendLayout(); + this.flpFlowRHSTop.SuspendLayout(); + this.grpSoundMethod.SuspendLayout(); + this.flpGrpSoundMethod.SuspendLayout(); this.SuspendLayout(); // - // Cancel + // btnDialogCancel // - 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(317, 244); - 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); + this.btnDialogCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnDialogCancel.Name = "btnDialogCancel"; + this.btnDialogCancel.Size = new System.Drawing.Size(75, 23); + this.btnDialogCancel.Text = "&Cancel"; + this.btnDialogCancel.Click += new System.EventHandler(this.btnDialogCancel_Click); // - // OK + // btnDialogOK // - this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.OK.Location = new System.Drawing.Point(236, 244); - 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); + this.btnDialogOK.Name = "btnDialogOK"; + this.btnDialogOK.Size = new System.Drawing.Size(75, 23); + this.btnDialogOK.Text = "&OK"; + this.btnDialogOK.Click += new System.EventHandler(this.btnDialogOK_Click); // - // cbEnableNormal + // cbFullSpeedEnable // - this.cbEnableNormal.AutoSize = true; - this.cbEnableNormal.Location = new System.Drawing.Point(6, 20); - this.cbEnableNormal.Name = "cbEnableNormal"; - this.cbEnableNormal.Size = new System.Drawing.Size(48, 17); - this.cbEnableNormal.TabIndex = 0; - this.cbEnableNormal.Text = "Ena."; - this.cbEnableNormal.UseVisualStyleBackColor = true; - this.cbEnableNormal.CheckedChanged += new System.EventHandler(this.UpdateSoundDialog); + this.cbFullSpeedEnable.Name = "cbFullSpeedEnable"; + this.cbFullSpeedEnable.Text = "Ena."; + this.cbFullSpeedEnable.CheckedChanged += new System.EventHandler(this.cbMasterOrFullSpeed_CheckedChanged); // - // grpSoundVol + // grpVolume // - this.grpSoundVol.Controls.Add(this.nudRWFF); - this.grpSoundVol.Controls.Add(this.cbEnableRWFF); - this.grpSoundVol.Controls.Add(this.tbRWFF); - this.grpSoundVol.Controls.Add(this.label2); - this.grpSoundVol.Controls.Add(this.label1); - this.grpSoundVol.Controls.Add(this.tbNormal); - this.grpSoundVol.Controls.Add(this.nudNormal); - this.grpSoundVol.Controls.Add(this.cbEnableNormal); - this.grpSoundVol.Location = new System.Drawing.Point(12, 12); - this.grpSoundVol.Name = "grpSoundVol"; - this.grpSoundVol.Size = new System.Drawing.Size(117, 255); - this.grpSoundVol.TabIndex = 2; - this.grpSoundVol.TabStop = false; - this.grpSoundVol.Text = "Volume"; + this.grpVolume.Controls.Add(this.flpGrpVolume); + this.grpVolume.Location = new System.Drawing.Point(4, 4); + this.grpVolume.Name = "grpVolume"; + this.grpVolume.Size = new System.Drawing.Size(111, 246); + this.grpVolume.Text = "Volume"; // - // nudRWFF + // flpGrpVolume // - this.nudRWFF.Location = new System.Drawing.Point(58, 223); - this.nudRWFF.Name = "nudRWFF"; - this.nudRWFF.Size = new System.Drawing.Size(45, 20); - this.nudRWFF.TabIndex = 7; - this.nudRWFF.Value = new decimal(new int[] { + this.flpGrpVolume.Controls.Add(this.flpFullSpeed); + this.flpGrpVolume.Controls.Add(this.flpRWFF); + this.flpGrpVolume.Location = new System.Drawing.Point(0, 12); + this.flpGrpVolume.Name = "flpGrpVolume"; + // + // flpFullSpeed + // + this.flpFullSpeed.Controls.Add(this.cbFullSpeedEnable); + this.flpFullSpeed.Controls.Add(this.lblFullSpeedVolume); + this.flpFullSpeed.Controls.Add(this.tbFullSpeedVolume); + this.flpFullSpeed.Controls.Add(this.nudFullSpeedVolume); + this.flpFullSpeed.Name = "flpFullSpeed"; + // + // lblFullSpeedVolume + // + this.lblFullSpeedVolume.Name = "lblFullSpeedVolume"; + this.lblFullSpeedVolume.Text = "Normal"; + // + // tbFullSpeedVolume + // + this.tbFullSpeedVolume.LargeChange = 10; + this.tbFullSpeedVolume.Location = new System.Drawing.Point(3, 39); + this.tbFullSpeedVolume.Maximum = 100; + this.tbFullSpeedVolume.Name = "tbFullSpeedVolume"; + this.tbFullSpeedVolume.Orientation = System.Windows.Forms.Orientation.Vertical; + this.tbFullSpeedVolume.Size = new System.Drawing.Size(45, 164); + this.tbFullSpeedVolume.TabIndex = 2; + this.tbFullSpeedVolume.TickFrequency = 10; + this.tbFullSpeedVolume.Scroll += new System.EventHandler(this.tbFullSpeedVolume_Scroll); + // + // nudFullSpeedVolume + // + this.nudFullSpeedVolume.Name = "nudFullSpeedVolume"; + this.nudFullSpeedVolume.Size = new System.Drawing.Size(45, 20); + this.nudFullSpeedVolume.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.nudFullSpeedVolume.ValueChanged += new System.EventHandler(this.nudFullSpeedVolume_ValueChanged); + // + // flpRWFF + // + this.flpRWFF.Controls.Add(this.cbRewindFFWEnable); + this.flpRWFF.Controls.Add(this.lblRewindFFWVolume); + this.flpRWFF.Controls.Add(this.tbRewindFFWVolume); + this.flpRWFF.Controls.Add(this.nudRewindFFWVolume); + this.flpRWFF.Name = "flpRWFF"; + // + // cbRewindFFWEnable + // + this.cbRewindFFWEnable.Name = "cbRewindFFWEnable"; + this.cbRewindFFWEnable.Text = "Ena."; + // + // lblRewindFFWVolume + // + this.lblRewindFFWVolume.Name = "lblRewindFFWVolume"; + this.lblRewindFFWVolume.Text = "RW && FF"; + // + // tbRewindFFWVolume + // + this.tbRewindFFWVolume.LargeChange = 10; + this.tbRewindFFWVolume.Location = new System.Drawing.Point(3, 39); + this.tbRewindFFWVolume.Maximum = 100; + this.tbRewindFFWVolume.Name = "tbRewindFFWVolume"; + this.tbRewindFFWVolume.Orientation = System.Windows.Forms.Orientation.Vertical; + this.tbRewindFFWVolume.Size = new System.Drawing.Size(45, 164); + this.tbRewindFFWVolume.TabIndex = 6; + this.tbRewindFFWVolume.TickFrequency = 10; + this.tbRewindFFWVolume.Scroll += new System.EventHandler(this.tbRewindFFWVolume_Scroll); + // + // nudRewindFFWVolume + // + this.nudRewindFFWVolume.Name = "nudRewindFFWVolume"; + this.nudRewindFFWVolume.Size = new System.Drawing.Size(45, 20); + this.nudRewindFFWVolume.Value = new decimal(new int[] { 100, 0, 0, 0}); // - // cbEnableRWFF + // listDevices // - this.cbEnableRWFF.AutoSize = true; - this.cbEnableRWFF.Location = new System.Drawing.Point(58, 20); - this.cbEnableRWFF.Name = "cbEnableRWFF"; - this.cbEnableRWFF.Size = new System.Drawing.Size(48, 17); - this.cbEnableRWFF.TabIndex = 4; - this.cbEnableRWFF.Text = "Ena."; - this.cbEnableRWFF.UseVisualStyleBackColor = true; + this.listDevices.FormattingEnabled = true; + this.listDevices.Location = new System.Drawing.Point(3, 110); + this.listDevices.Name = "listDevices"; + this.listDevices.Size = new System.Drawing.Size(254, 95); + this.listDevices.TabIndex = 8; // - // tbRWFF + // lblDevices // - this.tbRWFF.LargeChange = 10; - this.tbRWFF.Location = new System.Drawing.Point(64, 53); - this.tbRWFF.Maximum = 100; - this.tbRWFF.Name = "tbRWFF"; - this.tbRWFF.Orientation = System.Windows.Forms.Orientation.Vertical; - this.tbRWFF.Size = new System.Drawing.Size(42, 164); - this.tbRWFF.TabIndex = 6; - this.tbRWFF.TickFrequency = 10; - this.tbRWFF.Scroll += new System.EventHandler(this.TbRwff_Scroll); + this.lblDevices.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblDevices.Location = new System.Drawing.Point(3, 94); + this.lblDevices.Name = "lblDevices"; + this.lblDevices.Text = "Sound Device:"; // - // label2 + // lblBufferSizeDesc // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(56, 42); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(50, 13); - this.label2.TabIndex = 5; - this.label2.Text = "RW && FF"; + this.lblBufferSizeDesc.Name = "lblBufferSizeDesc"; + this.lblBufferSizeDesc.Text = "Buffer Size:"; // - // label1 + // nudBufferSize // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 42); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(40, 13); - this.label1.TabIndex = 1; - this.label1.Text = "Normal"; - // - // tbNormal - // - this.tbNormal.LargeChange = 10; - this.tbNormal.Location = new System.Drawing.Point(8, 53); - this.tbNormal.Maximum = 100; - this.tbNormal.Name = "tbNormal"; - this.tbNormal.Orientation = System.Windows.Forms.Orientation.Vertical; - this.tbNormal.Size = new System.Drawing.Size(42, 164); - this.tbNormal.TabIndex = 2; - this.tbNormal.TickFrequency = 10; - this.tbNormal.Scroll += new System.EventHandler(this.TrackBar1_Scroll); - // - // nudNormal - // - this.nudNormal.Location = new System.Drawing.Point(5, 223); - this.nudNormal.Name = "nudNormal"; - this.nudNormal.Size = new System.Drawing.Size(45, 20); - this.nudNormal.TabIndex = 3; - this.nudNormal.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.nudNormal.ValueChanged += new System.EventHandler(this.SoundVolNumeric_ValueChanged); - // - // listBoxSoundDevices - // - this.listBoxSoundDevices.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.listBoxSoundDevices.FormattingEnabled = true; - this.listBoxSoundDevices.Location = new System.Drawing.Point(138, 110); - this.listBoxSoundDevices.Name = "listBoxSoundDevices"; - this.listBoxSoundDevices.Size = new System.Drawing.Size(254, 95); - this.listBoxSoundDevices.TabIndex = 8; - // - // SoundDeviceLabel - // - this.SoundDeviceLabel.AutoSize = true; - this.SoundDeviceLabel.Location = new System.Drawing.Point(135, 89); - this.SoundDeviceLabel.Name = "SoundDeviceLabel"; - this.SoundDeviceLabel.Size = new System.Drawing.Size(78, 13); - this.SoundDeviceLabel.TabIndex = 7; - this.SoundDeviceLabel.Text = "Sound Device:"; - // - // BufferSizeLabel - // - this.BufferSizeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.BufferSizeLabel.AutoSize = true; - this.BufferSizeLabel.Location = new System.Drawing.Point(135, 210); - this.BufferSizeLabel.Name = "BufferSizeLabel"; - this.BufferSizeLabel.Size = new System.Drawing.Size(61, 13); - this.BufferSizeLabel.TabIndex = 9; - this.BufferSizeLabel.Text = "Buffer Size:"; - // - // BufferSizeNumeric - // - this.BufferSizeNumeric.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.BufferSizeNumeric.Location = new System.Drawing.Point(202, 208); - this.BufferSizeNumeric.Maximum = new decimal(new int[] { + this.nudBufferSize.Maximum = new decimal(new int[] { 250, 0, 0, 0}); - this.BufferSizeNumeric.Minimum = new decimal(new int[] { + this.nudBufferSize.Minimum = new decimal(new int[] { 30, 0, 0, 0}); - this.BufferSizeNumeric.Name = "BufferSizeNumeric"; - this.BufferSizeNumeric.Size = new System.Drawing.Size(59, 20); - this.BufferSizeNumeric.TabIndex = 10; - this.BufferSizeNumeric.Value = new decimal(new int[] { + this.nudBufferSize.Name = "nudBufferSize"; + this.nudBufferSize.Size = new System.Drawing.Size(59, 20); + this.nudBufferSize.Value = new decimal(new int[] { 100, 0, 0, 0}); // - // BufferSizeUnitsLabel + // lblBufferSizeUnits // - this.BufferSizeUnitsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.BufferSizeUnitsLabel.AutoSize = true; - this.BufferSizeUnitsLabel.Location = new System.Drawing.Point(267, 210); - this.BufferSizeUnitsLabel.Name = "BufferSizeUnitsLabel"; - this.BufferSizeUnitsLabel.Size = new System.Drawing.Size(63, 13); - this.BufferSizeUnitsLabel.TabIndex = 11; - this.BufferSizeUnitsLabel.Text = "milliseconds"; + this.lblBufferSizeUnits.Name = "lblBufferSizeUnits"; + this.lblBufferSizeUnits.Text = "milliseconds"; // - // grpOutputMethod + // flpDialogButtons // - this.grpOutputMethod.Controls.Add(this.rbOutputMethodOpenAL); - this.grpOutputMethod.Controls.Add(this.rbOutputMethodXAudio2); - this.grpOutputMethod.Controls.Add(this.rbOutputMethodDirectSound); - this.grpOutputMethod.Location = new System.Drawing.Point(292, 12); - this.grpOutputMethod.Name = "grpOutputMethod"; - this.grpOutputMethod.Size = new System.Drawing.Size(100, 90); - this.grpOutputMethod.TabIndex = 12; - this.grpOutputMethod.TabStop = false; - this.grpOutputMethod.Text = "Output Method"; + this.flpDialogButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.flpDialogButtons.Controls.Add(this.btnDialogOK); + this.flpDialogButtons.Controls.Add(this.btnDialogCancel); + this.flpDialogButtons.Location = new System.Drawing.Point(216, 241); + this.flpDialogButtons.MinimumSize = new System.Drawing.Size(24, 24); + this.flpDialogButtons.Name = "flpDialogButtons"; + this.flpDialogButtons.Size = new System.Drawing.Size(162, 29); // - // rbOutputMethodOpenAL + // flpBufferSize // - this.rbOutputMethodOpenAL.AutoSize = true; - this.rbOutputMethodOpenAL.Location = new System.Drawing.Point(6, 65); - this.rbOutputMethodOpenAL.Name = "rbOutputMethodOpenAL"; - this.rbOutputMethodOpenAL.Size = new System.Drawing.Size(64, 17); - this.rbOutputMethodOpenAL.TabIndex = 2; - this.rbOutputMethodOpenAL.TabStop = true; - this.rbOutputMethodOpenAL.Text = "OpenAL"; - this.rbOutputMethodOpenAL.UseVisualStyleBackColor = true; - this.rbOutputMethodOpenAL.CheckedChanged += new System.EventHandler(this.OutputMethodRadioButtons_CheckedChanged); + this.flpBufferSize.Controls.Add(this.lblBufferSizeDesc); + this.flpBufferSize.Controls.Add(this.nudBufferSize); + this.flpBufferSize.Controls.Add(this.lblBufferSizeUnits); + this.flpBufferSize.Name = "flpBufferSize"; // - // rbOutputMethodXAudio2 + // flpFlowRHS // - this.rbOutputMethodXAudio2.AutoSize = true; - this.rbOutputMethodXAudio2.Location = new System.Drawing.Point(6, 42); - this.rbOutputMethodXAudio2.Name = "rbOutputMethodXAudio2"; - this.rbOutputMethodXAudio2.Size = new System.Drawing.Size(65, 17); - this.rbOutputMethodXAudio2.TabIndex = 1; - this.rbOutputMethodXAudio2.TabStop = true; - this.rbOutputMethodXAudio2.Text = "XAudio2"; - this.rbOutputMethodXAudio2.UseVisualStyleBackColor = true; - this.rbOutputMethodXAudio2.CheckedChanged += new System.EventHandler(this.OutputMethodRadioButtons_CheckedChanged); + this.flpFlowRHS.Controls.Add(this.flpFlowRHSTop); + this.flpFlowRHS.Controls.Add(this.lblDevices); + this.flpFlowRHS.Controls.Add(this.listDevices); + this.flpFlowRHS.Controls.Add(this.flpBufferSize); + this.flpFlowRHS.Location = new System.Drawing.Point(118, 4); + this.flpFlowRHS.Name = "flpFlowRHS"; // - // rbOutputMethodDirectSound + // flpFlowRHSTop // - this.rbOutputMethodDirectSound.AutoSize = true; - this.rbOutputMethodDirectSound.Location = new System.Drawing.Point(6, 19); - this.rbOutputMethodDirectSound.Name = "rbOutputMethodDirectSound"; - this.rbOutputMethodDirectSound.Size = new System.Drawing.Size(84, 17); - this.rbOutputMethodDirectSound.TabIndex = 0; - this.rbOutputMethodDirectSound.TabStop = true; - this.rbOutputMethodDirectSound.Text = "DirectSound"; - this.rbOutputMethodDirectSound.UseVisualStyleBackColor = true; - this.rbOutputMethodDirectSound.CheckedChanged += new System.EventHandler(this.OutputMethodRadioButtons_CheckedChanged); + this.flpFlowRHSTop.Controls.Add(this.cbMasterEnable); + this.flpFlowRHSTop.Controls.Add(this.lblMasterEnable); + this.flpFlowRHSTop.Controls.Add(this.cbMuteFrameAdvance); + this.flpFlowRHSTop.Controls.Add(this.grpSoundMethod); + this.flpFlowRHSTop.MinimumSize = new System.Drawing.Size(24, 24); + this.flpFlowRHSTop.Name = "flpFlowRHSTop"; + this.flpFlowRHSTop.Size = new System.Drawing.Size(245, 94); + // + // cbMasterEnable + // + this.cbMasterEnable.Name = "cbMasterEnable"; + this.cbMasterEnable.Text = "Sound Master Enable"; + this.cbMasterEnable.CheckedChanged += new System.EventHandler(this.cbMasterOrFullSpeed_CheckedChanged); + // + // lblMasterEnable + // + this.lblMasterEnable.Location = new System.Drawing.Point(3, 23); + this.lblMasterEnable.Name = "lblMasterEnable"; + this.lblMasterEnable.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0); + this.lblMasterEnable.Size = new System.Drawing.Size(131, 26); + this.lblMasterEnable.Text = "Controls whether cores even generate audio."; // // cbMuteFrameAdvance // - this.cbMuteFrameAdvance.AutoSize = true; - this.cbMuteFrameAdvance.Location = new System.Drawing.Point(139, 68); this.cbMuteFrameAdvance.Name = "cbMuteFrameAdvance"; - this.cbMuteFrameAdvance.Size = new System.Drawing.Size(128, 17); - this.cbMuteFrameAdvance.TabIndex = 6; this.cbMuteFrameAdvance.Text = "Mute Frame Advance"; - this.cbMuteFrameAdvance.UseVisualStyleBackColor = true; // - // cbEnableMaster + // grpSoundMethod // - this.cbEnableMaster.AutoSize = true; - this.cbEnableMaster.Location = new System.Drawing.Point(139, 16); - this.cbEnableMaster.Name = "cbEnableMaster"; - this.cbEnableMaster.Size = new System.Drawing.Size(128, 17); - this.cbEnableMaster.TabIndex = 4; - this.cbEnableMaster.Text = "Sound Master Enable"; - this.cbEnableMaster.UseVisualStyleBackColor = true; - this.cbEnableMaster.CheckedChanged += new System.EventHandler(this.UpdateSoundDialog); + this.grpSoundMethod.Controls.Add(this.flpGrpSoundMethod); + this.grpSoundMethod.Name = "grpSoundMethod"; + this.grpSoundMethod.Size = new System.Drawing.Size(100, 90); + this.grpSoundMethod.Text = "Output Method"; // - // label3 + // flpGrpSoundMethod // - this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label3.Location = new System.Drawing.Point(161, 35); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(126, 26); - this.label3.TabIndex = 5; - this.label3.Text = "Controls whether cores even generate audio."; + this.flpGrpSoundMethod.Controls.Add(this.rbSoundMethodDirectSound); + this.flpGrpSoundMethod.Controls.Add(this.rbSoundMethodXAudio2); + this.flpGrpSoundMethod.Controls.Add(this.rbSoundMethodOpenAL); + this.flpGrpSoundMethod.Location = new System.Drawing.Point(6, 13); + this.flpGrpSoundMethod.Name = "flpGrpSoundMethod"; + // + // rbSoundMethodDirectSound + // + this.rbSoundMethodDirectSound.Name = "rbSoundMethodDirectSound"; + this.rbSoundMethodDirectSound.Text = "DirectSound"; + this.rbSoundMethodDirectSound.CheckedChanged += new System.EventHandler(this.rbSoundMethodAllRadios_CheckedChanged); + // + // rbSoundMethodXAudio2 + // + this.rbSoundMethodXAudio2.Name = "rbSoundMethodXAudio2"; + this.rbSoundMethodXAudio2.Text = "XAudio2"; + this.rbSoundMethodXAudio2.CheckedChanged += new System.EventHandler(this.rbSoundMethodAllRadios_CheckedChanged); + // + // rbSoundMethodOpenAL + // + this.rbSoundMethodOpenAL.Name = "rbSoundMethodOpenAL"; + this.rbSoundMethodOpenAL.Text = "OpenAL"; + this.rbSoundMethodOpenAL.CheckedChanged += new System.EventHandler(this.rbSoundMethodAllRadios_CheckedChanged); // // SoundConfig // - this.AcceptButton = this.OK; + this.AcceptButton = this.btnDialogOK; 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(404, 279); - this.Controls.Add(this.label3); - this.Controls.Add(this.cbEnableMaster); - this.Controls.Add(this.cbMuteFrameAdvance); - this.Controls.Add(this.grpOutputMethod); - this.Controls.Add(this.BufferSizeUnitsLabel); - this.Controls.Add(this.BufferSizeNumeric); - this.Controls.Add(this.BufferSizeLabel); - this.Controls.Add(this.SoundDeviceLabel); - this.Controls.Add(this.listBoxSoundDevices); - this.Controls.Add(this.grpSoundVol); - this.Controls.Add(this.OK); - this.Controls.Add(this.Cancel); + this.CancelButton = this.btnDialogCancel; + this.ClientSize = new System.Drawing.Size(382, 274); + this.Controls.Add(this.grpVolume); + this.Controls.Add(this.flpDialogButtons); + this.Controls.Add(this.flpFlowRHS); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MinimumSize = new System.Drawing.Size(279, 259); + this.MinimumSize = new System.Drawing.Size(398, 313); this.Name = "SoundConfig"; this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Sound Configuration"; this.Load += new System.EventHandler(this.SoundConfig_Load); - this.grpSoundVol.ResumeLayout(false); - this.grpSoundVol.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudRWFF)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbRWFF)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.tbNormal)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudNormal)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.BufferSizeNumeric)).EndInit(); - this.grpOutputMethod.ResumeLayout(false); - this.grpOutputMethod.PerformLayout(); + this.grpVolume.ResumeLayout(false); + this.grpVolume.PerformLayout(); + this.flpGrpVolume.ResumeLayout(false); + this.flpGrpVolume.PerformLayout(); + this.flpFullSpeed.ResumeLayout(false); + this.flpFullSpeed.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbFullSpeedVolume)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudFullSpeedVolume)).EndInit(); + this.flpRWFF.ResumeLayout(false); + this.flpRWFF.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tbRewindFFWVolume)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudRewindFFWVolume)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudBufferSize)).EndInit(); + this.flpDialogButtons.ResumeLayout(false); + this.flpBufferSize.ResumeLayout(false); + this.flpBufferSize.PerformLayout(); + this.flpFlowRHS.ResumeLayout(false); + this.flpFlowRHS.PerformLayout(); + this.flpFlowRHSTop.ResumeLayout(false); + this.flpFlowRHSTop.PerformLayout(); + this.grpSoundMethod.ResumeLayout(false); + this.grpSoundMethod.PerformLayout(); + this.flpGrpSoundMethod.ResumeLayout(false); + this.flpGrpSoundMethod.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -373,28 +351,36 @@ #endregion - private System.Windows.Forms.Button Cancel; - private System.Windows.Forms.Button OK; - private System.Windows.Forms.CheckBox cbEnableNormal; - private System.Windows.Forms.GroupBox grpSoundVol; - private System.Windows.Forms.NumericUpDown nudNormal; - private System.Windows.Forms.TrackBar tbNormal; - private System.Windows.Forms.ListBox listBoxSoundDevices; - private System.Windows.Forms.Label SoundDeviceLabel; - private System.Windows.Forms.Label BufferSizeLabel; - private System.Windows.Forms.NumericUpDown BufferSizeNumeric; - private System.Windows.Forms.Label BufferSizeUnitsLabel; - private System.Windows.Forms.GroupBox grpOutputMethod; - private System.Windows.Forms.RadioButton rbOutputMethodXAudio2; - private System.Windows.Forms.RadioButton rbOutputMethodDirectSound; - private System.Windows.Forms.RadioButton rbOutputMethodOpenAL; - private System.Windows.Forms.NumericUpDown nudRWFF; - private System.Windows.Forms.CheckBox cbEnableRWFF; - private System.Windows.Forms.TrackBar tbRWFF; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.CheckBox cbMuteFrameAdvance; - private System.Windows.Forms.CheckBox cbEnableMaster; - private System.Windows.Forms.Label label3; + private BizHawk.WinForms.Controls.SingleColumnFLP flpFullSpeed; + private BizHawk.WinForms.Controls.SingleRowFLP flpBufferSize; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpFlowRHS; + private BizHawk.WinForms.Controls.LocSzSingleRowFLP flpDialogButtons; + private BizHawk.WinForms.Controls.SingleColumnFLP flpRWFF; + private BizHawk.WinForms.Controls.SzButtonEx btnDialogCancel; + private BizHawk.WinForms.Controls.SzButtonEx btnDialogOK; + private BizHawk.WinForms.Controls.CheckBoxEx cbFullSpeedEnable; + private BizHawk.WinForms.Controls.LocSzGroupBoxEx grpVolume; + private BizHawk.WinForms.Controls.SzNUDEx nudFullSpeedVolume; + private System.Windows.Forms.TrackBar tbFullSpeedVolume; + private System.Windows.Forms.ListBox listDevices; + private BizHawk.WinForms.Controls.LocLabelEx lblDevices; + private BizHawk.WinForms.Controls.LabelEx lblBufferSizeDesc; + private BizHawk.WinForms.Controls.SzNUDEx nudBufferSize; + private BizHawk.WinForms.Controls.LabelEx lblBufferSizeUnits; + private BizHawk.WinForms.Controls.SzNUDEx nudRewindFFWVolume; + private BizHawk.WinForms.Controls.CheckBoxEx cbRewindFFWEnable; + private System.Windows.Forms.TrackBar tbRewindFFWVolume; + private BizHawk.WinForms.Controls.LabelEx lblRewindFFWVolume; + private BizHawk.WinForms.Controls.LabelEx lblFullSpeedVolume; + private BizHawk.WinForms.Controls.LocSingleRowFLP flpGrpVolume; + private BizHawk.WinForms.Controls.SzColumnsToRightFLP flpFlowRHSTop; + private BizHawk.WinForms.Controls.CheckBoxEx cbMasterEnable; + private BizHawk.WinForms.Controls.LocSzLabelEx lblMasterEnable; + private BizHawk.WinForms.Controls.CheckBoxEx cbMuteFrameAdvance; + private BizHawk.WinForms.Controls.SzGroupBoxEx grpSoundMethod; + private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpSoundMethod; + private BizHawk.WinForms.Controls.RadioButtonEx rbSoundMethodDirectSound; + private BizHawk.WinForms.Controls.RadioButtonEx rbSoundMethodXAudio2; + private BizHawk.WinForms.Controls.RadioButtonEx rbSoundMethodOpenAL; } -} \ No newline at end of file +} diff --git a/BizHawk.Client.EmuHawk/config/SoundConfig.cs b/BizHawk.Client.EmuHawk/config/SoundConfig.cs index bb8e62a204..9f37a1b018 100644 --- a/BizHawk.Client.EmuHawk/config/SoundConfig.cs +++ b/BizHawk.Client.EmuHawk/config/SoundConfig.cs @@ -5,6 +5,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Common; +using BizHawk.WinForms.Controls; namespace BizHawk.Client.EmuHawk { @@ -23,51 +24,51 @@ namespace BizHawk.Client.EmuHawk { _programmaticallyChangingValue = true; - cbEnableMaster.Checked = _config.SoundEnabled; - cbEnableNormal.Checked = _config.SoundEnabledNormal; - cbEnableRWFF.Checked = _config.SoundEnabledRWFF; + cbMasterEnable.Checked = _config.SoundEnabled; + cbFullSpeedEnable.Checked = _config.SoundEnabledNormal; + cbRewindFFWEnable.Checked = _config.SoundEnabledRWFF; cbMuteFrameAdvance.Checked = _config.MuteFrameAdvance; if (OSTailoredCode.IsUnixHost) { // Disable DirectSound and XAudio2 on Mono - rbOutputMethodDirectSound.Enabled = false; - rbOutputMethodXAudio2.Enabled = false; + rbSoundMethodDirectSound.Enabled = false; + rbSoundMethodXAudio2.Enabled = false; } - rbOutputMethodDirectSound.Checked = _config.SoundOutputMethod == ESoundOutputMethod.DirectSound; - rbOutputMethodXAudio2.Checked = _config.SoundOutputMethod == ESoundOutputMethod.XAudio2; - rbOutputMethodOpenAL.Checked = _config.SoundOutputMethod == ESoundOutputMethod.OpenAL; - BufferSizeNumeric.Value = _config.SoundBufferSizeMs; - tbNormal.Value = _config.SoundVolume; - nudNormal.Value = _config.SoundVolume; - tbRWFF.Value = _config.SoundVolumeRWFF; - nudRWFF.Value = _config.SoundVolumeRWFF; + rbSoundMethodDirectSound.Checked = _config.SoundOutputMethod == ESoundOutputMethod.DirectSound; + rbSoundMethodXAudio2.Checked = _config.SoundOutputMethod == ESoundOutputMethod.XAudio2; + rbSoundMethodOpenAL.Checked = _config.SoundOutputMethod == ESoundOutputMethod.OpenAL; + nudBufferSize.Value = _config.SoundBufferSizeMs; + tbFullSpeedVolume.Value = _config.SoundVolume; + nudFullSpeedVolume.Value = _config.SoundVolume; + tbRewindFFWVolume.Value = _config.SoundVolumeRWFF; + nudRewindFFWVolume.Value = _config.SoundVolumeRWFF; UpdateSoundDialog(); _programmaticallyChangingValue = false; } - private void Ok_Click(object sender, EventArgs e) + private void btnDialogOK_Click(object sender, EventArgs e) { - if (rbOutputMethodDirectSound.Checked && (int)BufferSizeNumeric.Value < 60) + if (rbSoundMethodDirectSound.Checked && (int)nudBufferSize.Value < 60) { MessageBox.Show("Buffer size must be at least 60 milliseconds for DirectSound.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } var oldOutputMethod = _config.SoundOutputMethod; var oldDevice = _config.SoundDevice; - _config.SoundEnabled = cbEnableMaster.Checked; - _config.SoundEnabledNormal = cbEnableNormal.Checked; - _config.SoundEnabledRWFF = cbEnableRWFF.Checked; + _config.SoundEnabled = cbMasterEnable.Checked; + _config.SoundEnabledNormal = cbFullSpeedEnable.Checked; + _config.SoundEnabledRWFF = cbRewindFFWEnable.Checked; _config.MuteFrameAdvance = cbMuteFrameAdvance.Checked; - if (rbOutputMethodDirectSound.Checked) _config.SoundOutputMethod = ESoundOutputMethod.DirectSound; - if (rbOutputMethodXAudio2.Checked) _config.SoundOutputMethod = ESoundOutputMethod.XAudio2; - if (rbOutputMethodOpenAL.Checked) _config.SoundOutputMethod = ESoundOutputMethod.OpenAL; - _config.SoundBufferSizeMs = (int)BufferSizeNumeric.Value; - _config.SoundVolume = tbNormal.Value; - _config.SoundVolumeRWFF = tbRWFF.Value; - _config.SoundDevice = (string)listBoxSoundDevices.SelectedItem ?? ""; + if (rbSoundMethodDirectSound.Checked) _config.SoundOutputMethod = ESoundOutputMethod.DirectSound; + if (rbSoundMethodXAudio2.Checked) _config.SoundOutputMethod = ESoundOutputMethod.XAudio2; + if (rbSoundMethodOpenAL.Checked) _config.SoundOutputMethod = ESoundOutputMethod.OpenAL; + _config.SoundBufferSizeMs = (int)nudBufferSize.Value; + _config.SoundVolume = tbFullSpeedVolume.Value; + _config.SoundVolumeRWFF = tbRewindFFWVolume.Value; + _config.SoundDevice = (string)listDevices.SelectedItem ?? ""; GlobalWin.Sound.StopSound(); if (_config.SoundOutputMethod != oldOutputMethod || _config.SoundDevice != oldDevice) @@ -79,7 +80,7 @@ namespace BizHawk.Client.EmuHawk DialogResult = DialogResult.OK; } - private void Cancel_Click(object sender, EventArgs e) + private void btnDialogCancel_Click(object sender, EventArgs e) { Close(); } @@ -89,27 +90,27 @@ namespace BizHawk.Client.EmuHawk IEnumerable deviceNames = Enumerable.Empty(); if (!OSTailoredCode.IsUnixHost) { - if (rbOutputMethodDirectSound.Checked) deviceNames = DirectSoundSoundOutput.GetDeviceNames(); - if (rbOutputMethodXAudio2.Checked) deviceNames = XAudio2SoundOutput.GetDeviceNames(); + if (rbSoundMethodDirectSound.Checked) deviceNames = DirectSoundSoundOutput.GetDeviceNames(); + if (rbSoundMethodXAudio2.Checked) deviceNames = XAudio2SoundOutput.GetDeviceNames(); } - if (rbOutputMethodOpenAL.Checked) deviceNames = OpenALSoundOutput.GetDeviceNames(); + if (rbSoundMethodOpenAL.Checked) deviceNames = OpenALSoundOutput.GetDeviceNames(); - listBoxSoundDevices.Items.Clear(); - listBoxSoundDevices.Items.Add(""); - listBoxSoundDevices.SelectedIndex = 0; + listDevices.Items.Clear(); + listDevices.Items.Add(""); + listDevices.SelectedIndex = 0; foreach (var name in deviceNames) { - listBoxSoundDevices.Items.Add(name); + listDevices.Items.Add(name); if (name == _config.SoundDevice) { - listBoxSoundDevices.SelectedItem = name; + listDevices.SelectedItem = name; } } } - private void OutputMethodRadioButtons_CheckedChanged(object sender, EventArgs e) + private void rbSoundMethodAllRadios_CheckedChanged(object sender, EventArgs e) { - if (!((RadioButton)sender).Checked) + if (!((RadioButtonEx)sender).Checked) { return; } @@ -117,34 +118,34 @@ namespace BizHawk.Client.EmuHawk PopulateDeviceList(); } - private void TrackBar1_Scroll(object sender, EventArgs e) + private void tbFullSpeedVolume_Scroll(object sender, EventArgs e) { - nudNormal.Value = tbNormal.Value; + nudFullSpeedVolume.Value = tbFullSpeedVolume.Value; } - private void TbRwff_Scroll(object sender, EventArgs e) + private void tbRewindFFWVolume_Scroll(object sender, EventArgs e) { - nudRWFF.Value = tbRWFF.Value; + nudRewindFFWVolume.Value = tbRewindFFWVolume.Value; } - private void SoundVolNumeric_ValueChanged(object sender, EventArgs e) + private void nudFullSpeedVolume_ValueChanged(object sender, EventArgs e) { - tbNormal.Value = (int)nudNormal.Value; + tbFullSpeedVolume.Value = (int)nudFullSpeedVolume.Value; // If the user is changing the volume, automatically turn on/off sound accordingly if (!_programmaticallyChangingValue) { - cbEnableNormal.Checked = tbNormal.Value != 0; + cbFullSpeedEnable.Checked = tbFullSpeedVolume.Value != 0; } } private void UpdateSoundDialog() { - cbEnableRWFF.Enabled = cbEnableNormal.Checked; - grpSoundVol.Enabled = cbEnableMaster.Checked; + cbRewindFFWEnable.Enabled = cbFullSpeedEnable.Checked; + grpVolume.Enabled = cbMasterEnable.Checked; } - private void UpdateSoundDialog(object sender, EventArgs e) + private void cbMasterOrFullSpeed_CheckedChanged(object sender, EventArgs e) { UpdateSoundDialog(); }