From e770047eef8910f930abd4a32be4063b064ce98c Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 3 Feb 2020 17:51:07 -0600 Subject: [PATCH] profile config - rip out code for the custom profile that never got implemented --- BizHawk.Client.Common/config/ConfigEnums.cs | 3 +- .../config/ProfileConfig.Designer.cs | 326 ++++++------------ .../config/ProfileConfig.cs | 57 +-- 3 files changed, 109 insertions(+), 277 deletions(-) diff --git a/BizHawk.Client.Common/config/ConfigEnums.cs b/BizHawk.Client.Common/config/ConfigEnums.cs index 90b5e3f70e..a4be9b6116 100644 --- a/BizHawk.Client.Common/config/ConfigEnums.cs +++ b/BizHawk.Client.Common/config/ConfigEnums.cs @@ -38,7 +38,6 @@ Casual = 1, Longplay = 2, Tas = 3, - N64Tas = 4, - Custom = 99 + N64Tas = 4 } } diff --git a/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs index 91ed759593..1be2898fcc 100644 --- a/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs @@ -28,222 +28,117 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProfileConfig)); - this.OkBtn = new System.Windows.Forms.Button(); - this.CancelBtn = new System.Windows.Forms.Button(); - this.ProfileSelectComboBox = new System.Windows.Forms.ComboBox(); - this.SaveScreenshotStatesCheckBox = new System.Windows.Forms.CheckBox(); - this.SaveLargeScreenshotStatesCheckBox = new System.Windows.Forms.CheckBox(); - this.AllowUDLRCheckBox = new System.Windows.Forms.CheckBox(); - this.ProfileDialogHelpTexBox = new System.Windows.Forms.RichTextBox(); - this.ProfileOptionsLabel = new System.Windows.Forms.Label(); - this.CustomProfileOptionsLabel = new System.Windows.Forms.Label(); - this.N64CoreSettingsLabel = new System.Windows.Forms.Label(); - this.N64CoreTypeComboBox = new System.Windows.Forms.ComboBox(); - this.N64CoreTypeLabel = new System.Windows.Forms.Label(); - this.OtherOptions = new System.Windows.Forms.Label(); - this.AutoCheckForUpdates = new System.Windows.Forms.CheckBox(); - 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(290, 302); - 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(356, 302); - 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); - // - // ProfileSelectComboBox - // - this.ProfileSelectComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ProfileSelectComboBox.FormattingEnabled = true; - this.ProfileSelectComboBox.Items.AddRange(new object[] { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProfileConfig)); + this.OkBtn = new System.Windows.Forms.Button(); + this.CancelBtn = new System.Windows.Forms.Button(); + this.ProfileSelectComboBox = new System.Windows.Forms.ComboBox(); + this.ProfileDialogHelpTexBox = new System.Windows.Forms.RichTextBox(); + this.ProfileOptionsLabel = new System.Windows.Forms.Label(); + this.OtherOptions = new System.Windows.Forms.Label(); + this.AutoCheckForUpdates = new System.Windows.Forms.CheckBox(); + 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(290, 231); + 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(356, 231); + 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); + // + // ProfileSelectComboBox + // + this.ProfileSelectComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ProfileSelectComboBox.FormattingEnabled = true; + this.ProfileSelectComboBox.Items.AddRange(new object[] { "Casual Gaming", "Tool-assisted Speedruns", "N64 Tool-assisted Speedruns", - "Longplays", - "Custom Profile"}); - this.ProfileSelectComboBox.Location = new System.Drawing.Point(12, 27); - this.ProfileSelectComboBox.Name = "ProfileSelectComboBox"; - this.ProfileSelectComboBox.Size = new System.Drawing.Size(156, 21); - this.ProfileSelectComboBox.TabIndex = 4; - // - // SaveScreenshotStatesCheckBox - // - this.SaveScreenshotStatesCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.SaveScreenshotStatesCheckBox.AutoSize = true; - this.SaveScreenshotStatesCheckBox.Location = new System.Drawing.Point(12, 88); - this.SaveScreenshotStatesCheckBox.Name = "SaveScreenshotStatesCheckBox"; - this.SaveScreenshotStatesCheckBox.Size = new System.Drawing.Size(166, 17); - this.SaveScreenshotStatesCheckBox.TabIndex = 6; - this.SaveScreenshotStatesCheckBox.Text = "Save Screenshot With States"; - this.SaveScreenshotStatesCheckBox.UseVisualStyleBackColor = true; - this.SaveScreenshotStatesCheckBox.Visible = false; - this.SaveScreenshotStatesCheckBox.MouseHover += new System.EventHandler(this.SaveScreenshotStatesCheckBox_MouseHover); - // - // SaveLargeScreenshotStatesCheckBox - // - this.SaveLargeScreenshotStatesCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.SaveLargeScreenshotStatesCheckBox.AutoSize = true; - this.SaveLargeScreenshotStatesCheckBox.Location = new System.Drawing.Point(12, 111); - this.SaveLargeScreenshotStatesCheckBox.Name = "SaveLargeScreenshotStatesCheckBox"; - this.SaveLargeScreenshotStatesCheckBox.Size = new System.Drawing.Size(196, 17); - this.SaveLargeScreenshotStatesCheckBox.TabIndex = 7; - this.SaveLargeScreenshotStatesCheckBox.Text = "Save Large Screenshot With States"; - this.SaveLargeScreenshotStatesCheckBox.UseVisualStyleBackColor = true; - this.SaveLargeScreenshotStatesCheckBox.Visible = false; - this.SaveLargeScreenshotStatesCheckBox.MouseHover += new System.EventHandler(this.SaveLargeScreenshotStatesCheckBox_MouseHover); - // - // AllowUDLRCheckBox - // - this.AllowUDLRCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.AllowUDLRCheckBox.AutoSize = true; - this.AllowUDLRCheckBox.Location = new System.Drawing.Point(12, 134); - this.AllowUDLRCheckBox.Name = "AllowUDLRCheckBox"; - this.AllowUDLRCheckBox.Size = new System.Drawing.Size(111, 17); - this.AllowUDLRCheckBox.TabIndex = 8; - this.AllowUDLRCheckBox.Text = "Allow U+D or L+R"; - this.AllowUDLRCheckBox.UseVisualStyleBackColor = true; - this.AllowUDLRCheckBox.Visible = false; - this.AllowUDLRCheckBox.MouseHover += new System.EventHandler(this.AllowUDLRCheckBox_MouseHover); - // - // ProfileDialogHelpTexBox - // - this.ProfileDialogHelpTexBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + "Longplays"}); + this.ProfileSelectComboBox.Location = new System.Drawing.Point(12, 27); + this.ProfileSelectComboBox.Name = "ProfileSelectComboBox"; + this.ProfileSelectComboBox.Size = new System.Drawing.Size(156, 21); + this.ProfileSelectComboBox.TabIndex = 4; + // + // ProfileDialogHelpTexBox + // + this.ProfileDialogHelpTexBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); - this.ProfileDialogHelpTexBox.Location = new System.Drawing.Point(218, 12); - this.ProfileDialogHelpTexBox.Name = "ProfileDialogHelpTexBox"; - this.ProfileDialogHelpTexBox.ReadOnly = true; - this.ProfileDialogHelpTexBox.Size = new System.Drawing.Size(198, 200); - this.ProfileDialogHelpTexBox.TabIndex = 2; - this.ProfileDialogHelpTexBox.Text = resources.GetString("ProfileDialogHelpTexBox.Text"); - // - // ProfileOptionsLabel - // - this.ProfileOptionsLabel.AutoSize = true; - this.ProfileOptionsLabel.Location = new System.Drawing.Point(9, 9); - this.ProfileOptionsLabel.Name = "ProfileOptionsLabel"; - this.ProfileOptionsLabel.Size = new System.Drawing.Size(75, 13); - this.ProfileOptionsLabel.TabIndex = 3; - this.ProfileOptionsLabel.Text = "Profile Options"; - // - // CustomProfileOptionsLabel - // - this.CustomProfileOptionsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.CustomProfileOptionsLabel.AutoSize = true; - this.CustomProfileOptionsLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.CustomProfileOptionsLabel.Location = new System.Drawing.Point(9, 70); - this.CustomProfileOptionsLabel.Name = "CustomProfileOptionsLabel"; - this.CustomProfileOptionsLabel.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.CustomProfileOptionsLabel.Size = new System.Drawing.Size(113, 13); - this.CustomProfileOptionsLabel.TabIndex = 5; - this.CustomProfileOptionsLabel.Text = "Custom Profile Options"; - this.CustomProfileOptionsLabel.Visible = false; - // - // N64CoreSettingsLabel - // - this.N64CoreSettingsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.N64CoreSettingsLabel.AutoSize = true; - this.N64CoreSettingsLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.N64CoreSettingsLabel.Location = new System.Drawing.Point(9, 173); - this.N64CoreSettingsLabel.Name = "N64CoreSettingsLabel"; - this.N64CoreSettingsLabel.Size = new System.Drawing.Size(93, 13); - this.N64CoreSettingsLabel.TabIndex = 9; - this.N64CoreSettingsLabel.Text = "N64 Core Settings"; - this.N64CoreSettingsLabel.Visible = false; - // - // N64CoreTypeComboBox - // - this.N64CoreTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.N64CoreTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.N64CoreTypeComboBox.FormattingEnabled = true; - this.N64CoreTypeComboBox.Items.AddRange(new object[] { - "Pure Interpreter", - "Interpreter", - "Dynarec"}); - this.N64CoreTypeComboBox.Location = new System.Drawing.Point(79, 191); - this.N64CoreTypeComboBox.Name = "N64CoreTypeComboBox"; - this.N64CoreTypeComboBox.Size = new System.Drawing.Size(99, 21); - this.N64CoreTypeComboBox.TabIndex = 11; - this.N64CoreTypeComboBox.Visible = false; - // - // N64CoreTypeLabel - // - this.N64CoreTypeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.N64CoreTypeLabel.AutoSize = true; - this.N64CoreTypeLabel.Location = new System.Drawing.Point(9, 194); - this.N64CoreTypeLabel.Name = "N64CoreTypeLabel"; - this.N64CoreTypeLabel.Size = new System.Drawing.Size(56, 13); - this.N64CoreTypeLabel.TabIndex = 10; - this.N64CoreTypeLabel.Text = "Core Type"; - this.N64CoreTypeLabel.Visible = false; - // - // OtherOptions - // - this.OtherOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.OtherOptions.AutoSize = true; - this.OtherOptions.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.OtherOptions.Location = new System.Drawing.Point(9, 261); - this.OtherOptions.Name = "OtherOptions"; - this.OtherOptions.Size = new System.Drawing.Size(72, 13); - this.OtherOptions.TabIndex = 12; - this.OtherOptions.Text = "Other Options"; - // - // AutoCheckForUpdates - // - this.AutoCheckForUpdates.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.AutoCheckForUpdates.AutoSize = true; - this.AutoCheckForUpdates.Location = new System.Drawing.Point(12, 279); - this.AutoCheckForUpdates.Name = "AutoCheckForUpdates"; - this.AutoCheckForUpdates.Size = new System.Drawing.Size(345, 17); - this.AutoCheckForUpdates.TabIndex = 13; - this.AutoCheckForUpdates.Text = "Automatically check for and notify me of newer versions of BizHawk"; - this.AutoCheckForUpdates.UseVisualStyleBackColor = true; - // - // ProfileConfig - // - 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(428, 337); - this.Controls.Add(this.AutoCheckForUpdates); - this.Controls.Add(this.OtherOptions); - this.Controls.Add(this.N64CoreTypeLabel); - this.Controls.Add(this.N64CoreTypeComboBox); - this.Controls.Add(this.N64CoreSettingsLabel); - this.Controls.Add(this.CustomProfileOptionsLabel); - this.Controls.Add(this.ProfileOptionsLabel); - this.Controls.Add(this.ProfileDialogHelpTexBox); - this.Controls.Add(this.AllowUDLRCheckBox); - this.Controls.Add(this.SaveLargeScreenshotStatesCheckBox); - this.Controls.Add(this.SaveScreenshotStatesCheckBox); - this.Controls.Add(this.ProfileSelectComboBox); - this.Controls.Add(this.CancelBtn); - this.Controls.Add(this.OkBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.user_blue; - this.MinimumSize = new System.Drawing.Size(315, 280); - this.Name = "ProfileConfig"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Profile Config"; - this.Load += new System.EventHandler(this.ProfileConfig_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.ProfileDialogHelpTexBox.Location = new System.Drawing.Point(218, 12); + this.ProfileDialogHelpTexBox.Name = "ProfileDialogHelpTexBox"; + this.ProfileDialogHelpTexBox.ReadOnly = true; + this.ProfileDialogHelpTexBox.Size = new System.Drawing.Size(198, 174); + this.ProfileDialogHelpTexBox.TabIndex = 2; + this.ProfileDialogHelpTexBox.Text = resources.GetString("ProfileDialogHelpTexBox.Text"); + // + // ProfileOptionsLabel + // + this.ProfileOptionsLabel.AutoSize = true; + this.ProfileOptionsLabel.Location = new System.Drawing.Point(9, 9); + this.ProfileOptionsLabel.Name = "ProfileOptionsLabel"; + this.ProfileOptionsLabel.Size = new System.Drawing.Size(75, 13); + this.ProfileOptionsLabel.TabIndex = 3; + this.ProfileOptionsLabel.Text = "Profile Options"; + // + // OtherOptions + // + this.OtherOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.OtherOptions.AutoSize = true; + this.OtherOptions.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.OtherOptions.Location = new System.Drawing.Point(9, 190); + this.OtherOptions.Name = "OtherOptions"; + this.OtherOptions.Size = new System.Drawing.Size(72, 13); + this.OtherOptions.TabIndex = 12; + this.OtherOptions.Text = "Other Options"; + // + // AutoCheckForUpdates + // + this.AutoCheckForUpdates.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.AutoCheckForUpdates.AutoSize = true; + this.AutoCheckForUpdates.Location = new System.Drawing.Point(12, 208); + this.AutoCheckForUpdates.Name = "AutoCheckForUpdates"; + this.AutoCheckForUpdates.Size = new System.Drawing.Size(345, 17); + this.AutoCheckForUpdates.TabIndex = 13; + this.AutoCheckForUpdates.Text = "Automatically check for and notify me of newer versions of BizHawk"; + this.AutoCheckForUpdates.UseVisualStyleBackColor = true; + // + // ProfileConfig + // + 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(428, 266); + this.Controls.Add(this.AutoCheckForUpdates); + this.Controls.Add(this.OtherOptions); + this.Controls.Add(this.ProfileOptionsLabel); + this.Controls.Add(this.ProfileDialogHelpTexBox); + this.Controls.Add(this.ProfileSelectComboBox); + this.Controls.Add(this.CancelBtn); + this.Controls.Add(this.OkBtn); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MinimumSize = new System.Drawing.Size(315, 280); + this.Name = "ProfileConfig"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Profile Config"; + this.Load += new System.EventHandler(this.ProfileConfig_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -252,15 +147,8 @@ private System.Windows.Forms.Button OkBtn; private System.Windows.Forms.Button CancelBtn; private System.Windows.Forms.ComboBox ProfileSelectComboBox; - private System.Windows.Forms.CheckBox SaveScreenshotStatesCheckBox; - private System.Windows.Forms.CheckBox SaveLargeScreenshotStatesCheckBox; - private System.Windows.Forms.CheckBox AllowUDLRCheckBox; private System.Windows.Forms.RichTextBox ProfileDialogHelpTexBox; private System.Windows.Forms.Label ProfileOptionsLabel; - private System.Windows.Forms.Label CustomProfileOptionsLabel; - private System.Windows.Forms.Label N64CoreSettingsLabel; - private System.Windows.Forms.ComboBox N64CoreTypeComboBox; - private System.Windows.Forms.Label N64CoreTypeLabel; private System.Windows.Forms.Label OtherOptions; private System.Windows.Forms.CheckBox AutoCheckForUpdates; } diff --git a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs index 4a42c28a50..aa47f0c3c2 100644 --- a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs +++ b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs @@ -1,5 +1,4 @@ using System; -using System.Drawing; using System.Windows.Forms; using BizHawk.Client.Common; @@ -28,19 +27,14 @@ namespace BizHawk.Client.EmuHawk _emulator = emulator; _config = config; InitializeComponent(); + Icon = Properties.Resources.user_blue; } private void ProfileConfig_Load(object sender, EventArgs e) { - if (!VersionInfo.DeveloperBuild) - { - ProfileSelectComboBox.Items.Remove("Custom Profile"); - } - switch (_config.SelectedProfile) { default: - case ClientProfile.Custom: // For now case ClientProfile.Casual: ProfileSelectComboBox.SelectedItem = "Casual Gaming"; break; @@ -80,7 +74,6 @@ namespace BizHawk.Client.EmuHawk if (_config.SelectedProfile == ClientProfile.Casual) { - DisplayProfileSettingBoxes(false); _config.NoLowResLargeScreenshotWithStates = false; _config.SaveScreenshotWithStates = false; _config.AllowUdlr = false; @@ -129,7 +122,6 @@ namespace BizHawk.Client.EmuHawk } else if (_config.SelectedProfile == ClientProfile.Longplay) { - DisplayProfileSettingBoxes(false); _config.NoLowResLargeScreenshotWithStates = false; _config.SaveScreenshotWithStates = false; _config.AllowUdlr = false; @@ -177,8 +169,6 @@ namespace BizHawk.Client.EmuHawk } else if (_config.SelectedProfile == ClientProfile.Tas) { - DisplayProfileSettingBoxes(false); - // General _config.NoLowResLargeScreenshotWithStates = false; _config.SaveScreenshotWithStates = true; @@ -228,8 +218,6 @@ namespace BizHawk.Client.EmuHawk } else if (_config.SelectedProfile == ClientProfile.N64Tas) { - DisplayProfileSettingBoxes(false); - // General _config.NoLowResLargeScreenshotWithStates = false; _config.SaveScreenshotWithStates = true; @@ -278,11 +266,6 @@ namespace BizHawk.Client.EmuHawk // NES _config.NesInQuickNes = true; } - else if (_config.SelectedProfile == ClientProfile.Custom) - { - // Disabled for now - ////DisplayProfileSettingBoxes(true); - } bool oldUpdateAutoCheckEnabled = _config.UpdateAutoCheckEnabled; _config.UpdateAutoCheckEnabled = AutoCheckForUpdates.Checked; @@ -306,44 +289,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - private void DisplayProfileSettingBoxes(bool cProfile) - { - if (cProfile) - { - ProfileDialogHelpTexBox.Location = new Point(217, 12); - ProfileDialogHelpTexBox.Size = new Size(165, 126); - SaveScreenshotStatesCheckBox.Visible = true; - SaveLargeScreenshotStatesCheckBox.Visible = true; - AllowUDLRCheckBox.Visible = true; - CustomProfileOptionsLabel.Visible = true; - } - else - { - ProfileDialogHelpTexBox.Location = new Point(184, 12); - ProfileDialogHelpTexBox.Size = new Size(198, 126); - ProfileDialogHelpTexBox.Text = "Options: \r\nCasual Gaming - All about performance! \r\n\nTool-Assisted Speedruns - Maximum Accuracy! \r\n\nLongplays - Stability is the key!"; - SaveScreenshotStatesCheckBox.Visible = false; - SaveLargeScreenshotStatesCheckBox.Visible = false; - AllowUDLRCheckBox.Visible = false; - CustomProfileOptionsLabel.Visible = false; - } - } - - private void SaveScreenshotStatesCheckBox_MouseHover(object sender, EventArgs e) - { - ProfileDialogHelpTexBox.Text = "Save Screenshot with Savestates: \r\n * Required for TASing \r\n * Not Recommended for \r\n Longplays or Casual Gaming"; - } - - private void SaveLargeScreenshotStatesCheckBox_MouseHover(object sender, EventArgs e) - { - ProfileDialogHelpTexBox.Text = "Save Large Screenshot With States: \r\n * Required for TASing \r\n * Not Recommended for \r\n Longplays or Casual Gaming"; - } - - private void AllowUDLRCheckBox_MouseHover(object sender, EventArgs e) - { - ProfileDialogHelpTexBox.Text = "All Up+Down or Left+Right: \r\n * Useful for TASing \r\n * Unchecked for Casual Gaming \r\n * Unknown for longplays"; - } - private TSetting GetSyncSettings() where TSetting : class, new() where TEmulator : IEmulator