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

Tastudio - remove config option to turn off input painting, there's no reasonable scenario where no painting is better, some other slight cleanups

This commit is contained in:
adelikat 2020-01-17 16:03:56 -06:00
parent 9b07813e09
commit 246efa4c86
4 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs generated
View File

@ -90,7 +90,6 @@
this.BackupPerFileSaveMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.applyPatternToPaintedInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.onlyOnAutoFireColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SingleClickFloatEditMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -618,7 +617,6 @@
this.BackupPerFileSaveMenuItem,
this.toolStripSeparator9,
this.AutoadjustInputMenuItem,
this.DrawInputByDraggingMenuItem,
this.applyPatternToPaintedInputToolStripMenuItem,
this.onlyOnAutoFireColumnsToolStripMenuItem,
this.SingleClickFloatEditMenuItem,
@ -716,13 +714,6 @@
this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(244, 22);
this.AutoadjustInputMenuItem.Text = "Auto-adjust Input according to Lag";
//
// DrawInputByDraggingMenuItem
//
this.DrawInputByDraggingMenuItem.Name = "DrawInputByDraggingMenuItem";
this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(244, 22);
this.DrawInputByDraggingMenuItem.Text = "Draw Input by dragging";
this.DrawInputByDraggingMenuItem.Click += new System.EventHandler(this.DrawInputByDraggingMenuItem_Click);
//
// applyPatternToPaintedInputToolStripMenuItem
//
this.applyPatternToPaintedInputToolStripMenuItem.CheckOnClick = true;
@ -1204,6 +1195,7 @@
//
// TasView
//
this.TasView.InputPaintingMode = true;
this.TasView.CellWidthPadding = 3;
this.TasView.GridLines = true;
this.TasView.AllowMassNavigationShortcuts = false;
@ -1653,7 +1645,6 @@
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem SetMaxUndoLevelsMenuItem;
private System.Windows.Forms.ToolStripMenuItem AutoadjustInputMenuItem;
private System.Windows.Forms.ToolStripMenuItem DrawInputByDraggingMenuItem;
private System.Windows.Forms.ToolStripMenuItem UseInputKeysItem;
private System.Windows.Forms.ToolStripMenuItem BindMarkersToInputMenuItem;
private System.Windows.Forms.ToolStripMenuItem EmptyNewMarkerNotesMenuItem;

2
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -846,8 +846,6 @@ namespace BizHawk.Client.EmuHawk
ClearLeftMouseStates();
}
DoTriggeredAutoRestoreIfNeeded();
}

22
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -889,7 +889,6 @@ namespace BizHawk.Client.EmuHawk
private void ConfigSubMenu_DropDownOpened(object sender, EventArgs e)
{
DrawInputByDraggingMenuItem.Checked = Settings.DrawInput;
AutopauseAtEndOfMovieMenuItem.Checked = Settings.AutoPause;
EmptyNewMarkerNotesMenuItem.Checked = Settings.EmptyMarkers;
AutosaveAsBk2MenuItem.Checked = Settings.AutosaveAsBk2;
@ -909,8 +908,8 @@ namespace BizHawk.Client.EmuHawk
Message = "Number of Undo Levels to keep",
InitialValue = CurrentTasMovie.ChangeLog.MaxSteps.ToString()
};
DialogResult result = prompt.ShowDialog();
if (result == DialogResult.OK)
if (prompt.ShowDialog().IsOk())
{
int val = 0;
try
@ -937,8 +936,8 @@ namespace BizHawk.Client.EmuHawk
Message = "ScreenshotPopUp Delay",
InitialValue = Settings.BranchCellHoverInterval.ToString()
};
DialogResult result = prompt.ShowDialog();
if (result == DialogResult.OK)
if (prompt.ShowDialog().IsOk())
{
int val = int.Parse(prompt.PromptText);
if (val > 0)
@ -957,8 +956,8 @@ namespace BizHawk.Client.EmuHawk
Message = "Seeking Cutoff Interval",
InitialValue = Settings.SeekingCutoffInterval.ToString()
};
DialogResult result = prompt.ShowDialog();
if (result == DialogResult.OK)
if (prompt.ShowDialog().IsOk())
{
int val = int.Parse(prompt.PromptText);
if (val > 0)
@ -977,8 +976,8 @@ namespace BizHawk.Client.EmuHawk
Message = "Autosave Interval in seconds\nSet to 0 to disable",
InitialValue = (Settings.AutosaveInterval / 1000).ToString()
};
DialogResult result = prompt.ShowDialog();
if (result == DialogResult.OK)
if (prompt.ShowDialog().IsOk())
{
uint val = uint.Parse(prompt.PromptText) * 1000;
Settings.AutosaveInterval = val;
@ -1005,11 +1004,6 @@ namespace BizHawk.Client.EmuHawk
Settings.BackupPerFileSave ^= true;
}
private void DrawInputByDraggingMenuItem_Click(object sender, EventArgs e)
{
TasView.InputPaintingMode = Settings.DrawInput ^= true;
}
private void ApplyPatternToPaintedInputMenuItem_CheckedChanged(object sender, EventArgs e)
{
onlyOnAutoFireColumnsToolStripMenuItem.Enabled = applyPatternToPaintedInputToolStripMenuItem.Checked;

3
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -60,7 +60,6 @@ namespace BizHawk.Client.EmuHawk
public TAStudioSettings()
{
RecentTas = new RecentFiles(8);
DrawInput = true;
AutoPause = true;
FollowCursor = true;
ScrollSpeed = 6;
@ -84,7 +83,6 @@ namespace BizHawk.Client.EmuHawk
}
public RecentFiles RecentTas { get; set; }
public bool DrawInput { get; set; }
public bool AutoPause { get; set; }
public bool AutoRestoreLastPosition { get; set; }
public bool FollowCursor { get; set; }
@ -272,7 +270,6 @@ namespace BizHawk.Client.EmuHawk
.Click += (o, ov) => { CurrentTasMovie.FlagChanges(); };
}
TasView.InputPaintingMode = Settings.DrawInput;
TasView.ScrollSpeed = Settings.ScrollSpeed;
TasView.AlwaysScroll = Settings.FollowCursorAlwaysScroll;
TasView.ScrollMethod = Settings.FollowCursorScrollMethod;