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

Profile Config - don't show custom profile in non-developer builds, put saving logic in the ok button click event instead of drop down change event. Remove a warning in TasMovie.cs

This commit is contained in:
adelikat 2014-07-15 00:05:18 +00:00
parent bcfad7fa34
commit 0b35490b16
3 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -36,11 +36,6 @@ namespace BizHawk.Client.Common
{
get
{
if (index == 9)
{
int zzz = 0;
}
return new TasMovieRecord
{
State = StateManager[index],

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

@ -79,7 +79,6 @@
this.ProfileSelectComboBox.Name = "ProfileSelectComboBox";
this.ProfileSelectComboBox.Size = new System.Drawing.Size(156, 21);
this.ProfileSelectComboBox.TabIndex = 2;
this.ProfileSelectComboBox.SelectedIndexChanged += new System.EventHandler(this.ProfileSelectComboBox_SelectedIndexChanged);
//
// SaveScreenshotStatesCheckBox
//

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

@ -23,7 +23,6 @@ namespace BizHawk.Client.EmuHawk
// TODO:
// Save the profile selected to Global.Config (Casual is the default)
// Default the dropdown to the current profile selected instead of empty
// Put save logic in the Ok button click, not the profile selected change event!
public ProfileConfig()
{
@ -32,30 +31,15 @@ namespace BizHawk.Client.EmuHawk
private void ProfileConfig_Load(object sender, EventArgs e)
{
if (!VersionInfo.DeveloperBuild)
{
ProfileSelectComboBox.Items.Remove("Custom Profile");
}
}
private void OkBtn_Click(object sender, EventArgs e)
{
/* Saving logic goes here */
if (ProfileSelectComboBox.SelectedIndex == 3)
{
//If custom profile, check all the checkboxes
//Save to config.ini
}
DialogResult = DialogResult.OK;
Close();
}
private void CancelBtn_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
private void ProfileSelectComboBox_SelectedIndexChanged(object sender, EventArgs e)
{
if (ProfileSelectComboBox.SelectedIndex == 0) //Casual Gaming
if (ProfileSelectComboBox.SelectedIndex == 0) // Casual Gaming
{
DisplayProfileSettingBoxes(false);
Global.Config.SaveLargeScreenshotWithStates = false;
@ -109,7 +93,7 @@ namespace BizHawk.Client.EmuHawk
// NES
Global.Config.NES_InQuickNES = true;
}
else if (ProfileSelectComboBox.SelectedIndex == 2) //Long Plays
else if (ProfileSelectComboBox.SelectedIndex == 2) // Long Plays
{
DisplayProfileSettingBoxes(false);
Global.Config.SaveLargeScreenshotWithStates = false;
@ -163,7 +147,7 @@ namespace BizHawk.Client.EmuHawk
// NES
Global.Config.NES_InQuickNES = true;
}
else if (ProfileSelectComboBox.SelectedIndex == 1) //TAS
else if (ProfileSelectComboBox.SelectedIndex == 1) // TAS
{
DisplayProfileSettingBoxes(false);
@ -225,6 +209,15 @@ namespace BizHawk.Client.EmuHawk
//Disabled for now
//DisplayProfileSettingBoxes(true);
}
DialogResult = DialogResult.OK;
Close();
}
private void CancelBtn_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
private void DisplayProfileSettingBoxes(bool cProfile)