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

Move update notification setting to profile config.

This commit is contained in:
jdpurcell 2015-01-04 17:54:13 +00:00
parent 8b60878a57
commit cd9c9d62d9
4 changed files with 110 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BizHawk.Client.EmuHawk/config/GuiOptions.Designer.cs generated
View File

@ -56,7 +56,6 @@
this.label4 = new System.Windows.Forms.Label();
this.LogWindowAsConsoleCheckbox = new System.Windows.Forms.CheckBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.AutoCheckForUpdates = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage3.SuspendLayout();
@ -100,7 +99,6 @@
//
// tabPage1
//
this.tabPage1.Controls.Add(this.AutoCheckForUpdates);
this.tabPage1.Controls.Add(this.StartFullScreenCheckbox);
this.tabPage1.Controls.Add(this.label14);
this.tabPage1.Controls.Add(this.label3);
@ -340,16 +338,6 @@
this.LogWindowAsConsoleCheckbox.Text = "Create the log window as a console window";
this.LogWindowAsConsoleCheckbox.UseVisualStyleBackColor = true;
//
// AutoCheckForUpdates
//
this.AutoCheckForUpdates.AutoSize = true;
this.AutoCheckForUpdates.Location = new System.Drawing.Point(6, 266);
this.AutoCheckForUpdates.Name = "AutoCheckForUpdates";
this.AutoCheckForUpdates.Size = new System.Drawing.Size(288, 17);
this.AutoCheckForUpdates.TabIndex = 13;
this.AutoCheckForUpdates.Text = "Automatically check for and notify me of newer versions";
this.AutoCheckForUpdates.UseVisualStyleBackColor = true;
//
// EmuHawkOptions
//
this.AcceptButton = this.OkBtn;
@ -403,6 +391,5 @@
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.CheckBox StartFullScreenCheckbox;
private System.Windows.Forms.CheckBox AutoCheckForUpdates;
}
}

11
BizHawk.Client.EmuHawk/config/GuiOptions.cs
View File

@ -29,8 +29,6 @@ namespace BizHawk.Client.EmuHawk
AcceptBackgroundInputCheckbox.Checked = Global.Config.AcceptBackgroundInput;
NeverAskSaveCheckbox.Checked = Global.Config.SupressAskSave;
SingleInstanceModeCheckbox.Checked = Global.Config.SingleInstanceMode;
AutoCheckForUpdates.Visible = VersionInfo.DeveloperBuild;
AutoCheckForUpdates.Checked = Global.Config.Update_AutoCheckEnabled;
BackupSRamCheckbox.Checked = Global.Config.BackupSaveram;
FrameAdvSkipLagCheckbox.Checked = Global.Config.SkipLagFrame;
@ -47,8 +45,6 @@ namespace BizHawk.Client.EmuHawk
private void OkBtn_Click(object sender, EventArgs e)
{
bool oldUpdateAutoCheckEnabled = Global.Config.Update_AutoCheckEnabled;
Global.Config.StartFullscreen = StartFullScreenCheckbox.Checked;
Global.Config.StartPaused = StartPausedCheckbox.Checked;
Global.Config.PauseWhenMenuActivated = PauseWhenMenuActivatedCheckbox.Checked;
@ -58,18 +54,11 @@ namespace BizHawk.Client.EmuHawk
Global.Config.AcceptBackgroundInput = AcceptBackgroundInputCheckbox.Checked;
Global.Config.SupressAskSave = NeverAskSaveCheckbox.Checked;
Global.Config.SingleInstanceMode = SingleInstanceModeCheckbox.Checked;
Global.Config.Update_AutoCheckEnabled = AutoCheckForUpdates.Checked;
Global.Config.BackupSaveram = BackupSRamCheckbox.Checked;
Global.Config.SkipLagFrame = FrameAdvSkipLagCheckbox.Checked;
Global.Config.WIN32_CONSOLE = LogWindowAsConsoleCheckbox.Checked;
if (Global.Config.Update_AutoCheckEnabled != oldUpdateAutoCheckEnabled)
{
if (!Global.Config.Update_AutoCheckEnabled) UpdateChecker.ResetHistory();
UpdateChecker.BeginCheck(); // Call even if auto checking is disabled to trigger event (it won't actually check)
}
Close();
DialogResult = DialogResult.OK;
GlobalWin.OSD.AddMessage("Custom configurations saved.");

169
BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs generated
View File

@ -36,17 +36,19 @@
this.SaveLargeScreenshotStatesCheckBox = new System.Windows.Forms.CheckBox();
this.AllowUDLRCheckBox = new System.Windows.Forms.CheckBox();
this.ProfileDialogHelpTexBox = new System.Windows.Forms.RichTextBox();
this.label1 = new System.Windows.Forms.Label();
this.GeneralOptionsLabel = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.comboBox2 = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
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(247, 337);
this.OkBtn.Location = new System.Drawing.Point(290, 337);
this.OkBtn.Name = "OkBtn";
this.OkBtn.Size = new System.Drawing.Size(60, 23);
this.OkBtn.TabIndex = 0;
@ -58,7 +60,7 @@
//
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(313, 337);
this.CancelBtn.Location = new System.Drawing.Point(356, 337);
this.CancelBtn.Name = "CancelBtn";
this.CancelBtn.Size = new System.Drawing.Size(60, 23);
this.CancelBtn.TabIndex = 1;
@ -76,18 +78,18 @@
"N64 Tool-assisted Speedruns",
"Longplays",
"Custom Profile"});
this.ProfileSelectComboBox.Location = new System.Drawing.Point(22, 20);
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 = 2;
this.ProfileSelectComboBox.TabIndex = 4;
//
// SaveScreenshotStatesCheckBox
//
this.SaveScreenshotStatesCheckBox.AutoSize = true;
this.SaveScreenshotStatesCheckBox.Location = new System.Drawing.Point(12, 67);
this.SaveScreenshotStatesCheckBox.Location = new System.Drawing.Point(12, 103);
this.SaveScreenshotStatesCheckBox.Name = "SaveScreenshotStatesCheckBox";
this.SaveScreenshotStatesCheckBox.Size = new System.Drawing.Size(166, 17);
this.SaveScreenshotStatesCheckBox.TabIndex = 4;
this.SaveScreenshotStatesCheckBox.TabIndex = 6;
this.SaveScreenshotStatesCheckBox.Text = "Save Screenshot With States";
this.SaveScreenshotStatesCheckBox.UseVisualStyleBackColor = true;
this.SaveScreenshotStatesCheckBox.Visible = false;
@ -96,10 +98,10 @@
// SaveLargeScreenshotStatesCheckBox
//
this.SaveLargeScreenshotStatesCheckBox.AutoSize = true;
this.SaveLargeScreenshotStatesCheckBox.Location = new System.Drawing.Point(12, 90);
this.SaveLargeScreenshotStatesCheckBox.Location = new System.Drawing.Point(12, 126);
this.SaveLargeScreenshotStatesCheckBox.Name = "SaveLargeScreenshotStatesCheckBox";
this.SaveLargeScreenshotStatesCheckBox.Size = new System.Drawing.Size(196, 17);
this.SaveLargeScreenshotStatesCheckBox.TabIndex = 5;
this.SaveLargeScreenshotStatesCheckBox.TabIndex = 7;
this.SaveLargeScreenshotStatesCheckBox.Text = "Save Large Screenshot With States";
this.SaveLargeScreenshotStatesCheckBox.UseVisualStyleBackColor = true;
this.SaveLargeScreenshotStatesCheckBox.Visible = false;
@ -108,10 +110,10 @@
// AllowUDLRCheckBox
//
this.AllowUDLRCheckBox.AutoSize = true;
this.AllowUDLRCheckBox.Location = new System.Drawing.Point(12, 113);
this.AllowUDLRCheckBox.Location = new System.Drawing.Point(12, 149);
this.AllowUDLRCheckBox.Name = "AllowUDLRCheckBox";
this.AllowUDLRCheckBox.Size = new System.Drawing.Size(111, 17);
this.AllowUDLRCheckBox.TabIndex = 6;
this.AllowUDLRCheckBox.TabIndex = 8;
this.AllowUDLRCheckBox.Text = "Allow U+D or L+R";
this.AllowUDLRCheckBox.UseVisualStyleBackColor = true;
this.AllowUDLRCheckBox.Visible = false;
@ -119,68 +121,89 @@
//
// ProfileDialogHelpTexBox
//
this.ProfileDialogHelpTexBox.Location = new System.Drawing.Point(184, 12);
this.ProfileDialogHelpTexBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | 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, 154);
this.ProfileDialogHelpTexBox.TabIndex = 8;
this.ProfileDialogHelpTexBox.TabIndex = 2;
this.ProfileDialogHelpTexBox.Text = resources.GetString("ProfileDialogHelpTexBox.Text");
//
// label1
// ProfileOptionsLabel
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(21, 6);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(75, 13);
this.label1.TabIndex = 9;
this.label1.Text = "Profile Options";
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";
//
// GeneralOptionsLabel
// CustomProfileOptionsLabel
//
this.GeneralOptionsLabel.AutoSize = true;
this.GeneralOptionsLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.GeneralOptionsLabel.Location = new System.Drawing.Point(9, 51);
this.GeneralOptionsLabel.Name = "GeneralOptionsLabel";
this.GeneralOptionsLabel.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.GeneralOptionsLabel.Size = new System.Drawing.Size(83, 13);
this.GeneralOptionsLabel.TabIndex = 10;
this.GeneralOptionsLabel.Text = "General Options";
this.GeneralOptionsLabel.Visible = false;
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, 85);
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;
//
// label3
// N64CoreSettingsLabel
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(13, 195);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(93, 13);
this.label3.TabIndex = 11;
this.label3.Text = "N64 Core Settings";
this.label3.Visible = false;
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, 188);
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;
//
// comboBox2
// N64CoreTypeComboBox
//
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.FormattingEnabled = true;
this.comboBox2.Items.AddRange(new object[] {
this.N64CoreTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.N64CoreTypeComboBox.FormattingEnabled = true;
this.N64CoreTypeComboBox.Items.AddRange(new object[] {
"Pure Interpreter",
"Interpreter",
"Dynarec"});
this.comboBox2.Location = new System.Drawing.Point(109, 211);
this.comboBox2.Name = "comboBox2";
this.comboBox2.Size = new System.Drawing.Size(99, 21);
this.comboBox2.TabIndex = 12;
this.comboBox2.Visible = false;
this.N64CoreTypeComboBox.Location = new System.Drawing.Point(79, 206);
this.N64CoreTypeComboBox.Name = "N64CoreTypeComboBox";
this.N64CoreTypeComboBox.Size = new System.Drawing.Size(99, 21);
this.N64CoreTypeComboBox.TabIndex = 11;
this.N64CoreTypeComboBox.Visible = false;
//
// label4
// N64CoreTypeLabel
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(19, 214);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(56, 13);
this.label4.TabIndex = 13;
this.label4.Text = "Core Type";
this.label4.Visible = false;
this.N64CoreTypeLabel.AutoSize = true;
this.N64CoreTypeLabel.Location = new System.Drawing.Point(9, 209);
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.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, 250);
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.AutoSize = true;
this.AutoCheckForUpdates.Location = new System.Drawing.Point(12, 268);
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
//
@ -188,12 +211,14 @@
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(385, 372);
this.Controls.Add(this.label4);
this.Controls.Add(this.comboBox2);
this.Controls.Add(this.label3);
this.Controls.Add(this.GeneralOptionsLabel);
this.Controls.Add(this.label1);
this.ClientSize = new System.Drawing.Size(428, 372);
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);
@ -220,10 +245,12 @@
private System.Windows.Forms.CheckBox SaveLargeScreenshotStatesCheckBox;
private System.Windows.Forms.CheckBox AllowUDLRCheckBox;
private System.Windows.Forms.RichTextBox ProfileDialogHelpTexBox;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label GeneralOptionsLabel;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.ComboBox comboBox2;
private System.Windows.Forms.Label label4;
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;
}
}

14
BizHawk.Client.EmuHawk/config/ProfileConfig.cs
View File

@ -46,6 +46,8 @@ namespace BizHawk.Client.EmuHawk
ProfileSelectComboBox.SelectedItem = "N64 Tool-assisted Speedruns";
break;
}
AutoCheckForUpdates.Checked = Global.Config.Update_AutoCheckEnabled;
}
private void OkBtn_Click(object sender, EventArgs e)
@ -304,6 +306,14 @@ namespace BizHawk.Client.EmuHawk
break;
}
bool oldUpdateAutoCheckEnabled = Global.Config.Update_AutoCheckEnabled;
Global.Config.Update_AutoCheckEnabled = AutoCheckForUpdates.Checked;
if (Global.Config.Update_AutoCheckEnabled != oldUpdateAutoCheckEnabled)
{
if (!Global.Config.Update_AutoCheckEnabled) UpdateChecker.ResetHistory();
UpdateChecker.BeginCheck(); // Call even if auto checking is disabled to trigger event (it won't actually check)
}
DialogResult = DialogResult.OK;
Close();
}
@ -323,7 +333,7 @@ namespace BizHawk.Client.EmuHawk
SaveScreenshotStatesCheckBox.Visible = true;
SaveLargeScreenshotStatesCheckBox.Visible = true;
AllowUDLRCheckBox.Visible = true;
GeneralOptionsLabel.Visible = true;
CustomProfileOptionsLabel.Visible = true;
}
else
{
@ -333,7 +343,7 @@ namespace BizHawk.Client.EmuHawk
SaveScreenshotStatesCheckBox.Visible = false;
SaveLargeScreenshotStatesCheckBox.Visible = false;
AllowUDLRCheckBox.Visible = false;
GeneralOptionsLabel.Visible = false;
CustomProfileOptionsLabel.Visible = false;
}
}