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

tastudio: kill zombie denoteStatesWithBGColor and co. in InputRoll, having them in Settings is enough

This commit is contained in:
feos 2016-11-17 20:25:06 +03:00
parent edf21b8bfe
commit 2a9bd175d8
7 changed files with 60 additions and 83 deletions

4
BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
View File

@ -39,10 +39,6 @@ namespace BizHawk.Client.EmuHawk
public bool HideWasLagFrames { get; set; }
private byte[] lagFrames = new byte[100]; // Large enough value that it shouldn't ever need resizing.
public bool denoteStatesWithIcons { get; set; }
public bool denoteStatesWithBGColor { get; set; }
public bool denoteMarkersWithIcons { get; set; }
public bool denoteMarkersWithBGColor { get; set; }
public bool allowRightClickSelecton { get; set; }
public bool letKeysModifySelection { get; set; }
public bool suspendHotkeys { get; set; }

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

@ -222,10 +222,6 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.BranchView.CellHeightPadding = 0;
this.BranchView.ContextMenuStrip = this.BranchesContextMenu;
this.BranchView.denoteMarkersWithBGColor = false;
this.BranchView.denoteMarkersWithIcons = false;
this.BranchView.denoteStatesWithBGColor = false;
this.BranchView.denoteStatesWithIcons = false;
this.BranchView.allowRightClickSelecton = true;
this.BranchView.FullRowSelect = true;
this.BranchView.HideWasLagFrames = false;

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

@ -192,10 +192,6 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.MarkerView.CellHeightPadding = 0;
this.MarkerView.ContextMenuStrip = this.MarkerContextMenu;
this.MarkerView.denoteMarkersWithBGColor = false;
this.MarkerView.denoteMarkersWithIcons = false;
this.MarkerView.denoteStatesWithBGColor = false;
this.MarkerView.denoteStatesWithIcons = false;
this.MarkerView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.MarkerView.FullRowSelect = true;
this.MarkerView.HideWasLagFrames = false;

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

@ -133,10 +133,10 @@ namespace BizHawk.Client.EmuHawk
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.hideWasLagFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.iconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.denoteStatesWithIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.denoteStatesWithBGColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.denoteMarkersWithIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.denoteMarkersWithBGColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DenoteStatesWithIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DenoteStatesWithBGColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DenoteMarkersWithIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DenoteMarkersWithBGColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
this.followCursorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.alwaysScrollToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -1044,46 +1044,46 @@ namespace BizHawk.Client.EmuHawk
// iconsToolStripMenuItem
//
this.iconsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.denoteStatesWithIconsToolStripMenuItem,
this.denoteStatesWithBGColorToolStripMenuItem,
this.denoteMarkersWithIconsToolStripMenuItem,
this.denoteMarkersWithBGColorToolStripMenuItem});
this.DenoteStatesWithIconsToolStripMenuItem,
this.DenoteStatesWithBGColorToolStripMenuItem,
this.DenoteMarkersWithIconsToolStripMenuItem,
this.DenoteMarkersWithBGColorToolStripMenuItem});
this.iconsToolStripMenuItem.Name = "iconsToolStripMenuItem";
this.iconsToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.iconsToolStripMenuItem.Text = "Icons";
this.iconsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.iconsToolStripMenuItem_DropDownOpened);
//
// denoteStatesWithIconsToolStripMenuItem
// DenoteStatesWithIconsToolStripMenuItem
//
this.denoteStatesWithIconsToolStripMenuItem.CheckOnClick = true;
this.denoteStatesWithIconsToolStripMenuItem.Name = "denoteStatesWithIconsToolStripMenuItem";
this.denoteStatesWithIconsToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.denoteStatesWithIconsToolStripMenuItem.Text = "Denote States With Icons";
this.denoteStatesWithIconsToolStripMenuItem.Click += new System.EventHandler(this.denoteStatesWithIconsToolStripMenuItem_Click);
this.DenoteStatesWithIconsToolStripMenuItem.CheckOnClick = true;
this.DenoteStatesWithIconsToolStripMenuItem.Name = "DenoteStatesWithIconsToolStripMenuItem";
this.DenoteStatesWithIconsToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.DenoteStatesWithIconsToolStripMenuItem.Text = "Denote States With Icons";
this.DenoteStatesWithIconsToolStripMenuItem.Click += new System.EventHandler(this.DenoteStatesWithIconsToolStripMenuItem_Click);
//
// denoteStatesWithBGColorToolStripMenuItem
// DenoteStatesWithBGColorToolStripMenuItem
//
this.denoteStatesWithBGColorToolStripMenuItem.CheckOnClick = true;
this.denoteStatesWithBGColorToolStripMenuItem.Name = "denoteStatesWithBGColorToolStripMenuItem";
this.denoteStatesWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.denoteStatesWithBGColorToolStripMenuItem.Text = "Denote States With BG Color";
this.denoteStatesWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.denoteStatesWithBGColorToolStripMenuItem_Click);
this.DenoteStatesWithBGColorToolStripMenuItem.CheckOnClick = true;
this.DenoteStatesWithBGColorToolStripMenuItem.Name = "DenoteStatesWithBGColorToolStripMenuItem";
this.DenoteStatesWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.DenoteStatesWithBGColorToolStripMenuItem.Text = "Denote States With BG Color";
this.DenoteStatesWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.DenoteStatesWithBGColorToolStripMenuItem_Click);
//
// denoteMarkersWithIconsToolStripMenuItem
// DenoteMarkersWithIconsToolStripMenuItem
//
this.denoteMarkersWithIconsToolStripMenuItem.CheckOnClick = true;
this.denoteMarkersWithIconsToolStripMenuItem.Name = "denoteMarkersWithIconsToolStripMenuItem";
this.denoteMarkersWithIconsToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.denoteMarkersWithIconsToolStripMenuItem.Text = "Denote Markers With Icons";
this.denoteMarkersWithIconsToolStripMenuItem.Click += new System.EventHandler(this.denoteMarkersWithIconsToolStripMenuItem_Click);
this.DenoteMarkersWithIconsToolStripMenuItem.CheckOnClick = true;
this.DenoteMarkersWithIconsToolStripMenuItem.Name = "DenoteMarkersWithIconsToolStripMenuItem";
this.DenoteMarkersWithIconsToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.DenoteMarkersWithIconsToolStripMenuItem.Text = "Denote Markers With Icons";
this.DenoteMarkersWithIconsToolStripMenuItem.Click += new System.EventHandler(this.DenoteMarkersWithIconsToolStripMenuItem_Click);
//
// denoteMarkersWithBGColorToolStripMenuItem
// DenoteMarkersWithBGColorToolStripMenuItem
//
this.denoteMarkersWithBGColorToolStripMenuItem.CheckOnClick = true;
this.denoteMarkersWithBGColorToolStripMenuItem.Name = "denoteMarkersWithBGColorToolStripMenuItem";
this.denoteMarkersWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.denoteMarkersWithBGColorToolStripMenuItem.Text = "Denote Markers With BG Color";
this.denoteMarkersWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.denoteMarkersWithBGColorToolStripMenuItem_Click);
this.DenoteMarkersWithBGColorToolStripMenuItem.CheckOnClick = true;
this.DenoteMarkersWithBGColorToolStripMenuItem.Name = "DenoteMarkersWithBGColorToolStripMenuItem";
this.DenoteMarkersWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.DenoteMarkersWithBGColorToolStripMenuItem.Text = "Denote Markers With BG Color";
this.DenoteMarkersWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.DenoteMarkersWithBGColorToolStripMenuItem_Click);
//
// toolStripSeparator23
//
@ -1233,10 +1233,6 @@ namespace BizHawk.Client.EmuHawk
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TasView.CellHeightPadding = 0;
this.TasView.denoteMarkersWithBGColor = false;
this.TasView.denoteMarkersWithIcons = false;
this.TasView.denoteStatesWithBGColor = false;
this.TasView.denoteStatesWithIcons = false;
this.TasView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.TasView.FullRowSelect = true;
this.TasView.HideWasLagFrames = false;
@ -1791,10 +1787,10 @@ namespace BizHawk.Client.EmuHawk
private System.Windows.Forms.SplitContainer MainVertialSplit;
private System.Windows.Forms.ToolStripMenuItem StartANewProjectFromSaveRamMenuItem;
private System.Windows.Forms.ToolStripMenuItem iconsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem denoteStatesWithIconsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem denoteStatesWithBGColorToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem denoteMarkersWithIconsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem denoteMarkersWithBGColorToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem DenoteStatesWithIconsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem DenoteStatesWithBGColorToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem DenoteMarkersWithIconsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem DenoteMarkersWithBGColorToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem NewFromSubMenu;
private System.Windows.Forms.ToolStripMenuItem NewFromNowMenuItem;
private System.Windows.Forms.ToolStripMenuItem NewFromCurrentSaveRamMenuItem;

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

@ -180,9 +180,9 @@ namespace BizHawk.Client.EmuHawk
offsetX = -3;
offsetY = 1;
if (CurrentTasMovie.Markers.IsMarker(index) && TasView.denoteMarkersWithIcons)
if (CurrentTasMovie.Markers.IsMarker(index) && Settings.DenoteMarkersWithIcons)
bitmap = icon_marker;
else if (record.HasState && TasView.denoteStatesWithIcons)
else if (record.HasState && Settings.DenoteStatesWithIcons)
{
if (record.Lagged.HasValue && record.Lagged.Value)
bitmap = icon_anchor_lag;
@ -209,7 +209,7 @@ namespace BizHawk.Client.EmuHawk
if (columnName == FrameColumnName)
{
if (Emulator.Frame != index && CurrentTasMovie.Markers.IsMarker(index) && TasView.denoteMarkersWithBGColor)
if (Emulator.Frame != index && CurrentTasMovie.Markers.IsMarker(index) && Settings.DenoteMarkersWithBGColor)
color = Marker_FrameCol;
else
color = Color.FromArgb(0x60FFFFFF);
@ -238,7 +238,7 @@ namespace BizHawk.Client.EmuHawk
}
else if (record.Lagged.HasValue)
{
if (!record.HasState && TasView.denoteStatesWithBGColor)
if (!record.HasState && Settings.DenoteStatesWithBGColor)
color = record.Lagged.Value ?
LagZone_InputLog :
GreenZone_InputLog;

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

@ -1040,10 +1040,10 @@ namespace BizHawk.Client.EmuHawk
private void iconsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{
denoteStatesWithIconsToolStripMenuItem.Checked = Settings.denoteStatesWithIcons;
denoteStatesWithBGColorToolStripMenuItem.Checked = Settings.denoteStatesWithBGColor;
denoteMarkersWithIconsToolStripMenuItem.Checked = Settings.denoteMarkersWithIcons;
denoteMarkersWithBGColorToolStripMenuItem.Checked = Settings.denoteMarkersWithBGColor;
DenoteStatesWithIconsToolStripMenuItem.Checked = Settings.DenoteStatesWithIcons;
DenoteStatesWithBGColorToolStripMenuItem.Checked = Settings.DenoteStatesWithBGColor;
DenoteMarkersWithIconsToolStripMenuItem.Checked = Settings.DenoteMarkersWithIcons;
DenoteMarkersWithBGColorToolStripMenuItem.Checked = Settings.DenoteMarkersWithBGColor;
}
private void followCursorToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
@ -1106,27 +1106,27 @@ namespace BizHawk.Client.EmuHawk
TasView.ScrollMethod = Settings.FollowCursorScrollMethod = "center";
}
private void denoteStatesWithIconsToolStripMenuItem_Click(object sender, EventArgs e)
private void DenoteStatesWithIconsToolStripMenuItem_Click(object sender, EventArgs e)
{
TasView.denoteStatesWithIcons = Settings.denoteStatesWithIcons = denoteStatesWithIconsToolStripMenuItem.Checked;
Settings.DenoteStatesWithIcons = DenoteStatesWithIconsToolStripMenuItem.Checked;
RefreshDialog();
}
private void denoteStatesWithBGColorToolStripMenuItem_Click(object sender, EventArgs e)
private void DenoteStatesWithBGColorToolStripMenuItem_Click(object sender, EventArgs e)
{
TasView.denoteStatesWithBGColor = Settings.denoteStatesWithBGColor = denoteStatesWithBGColorToolStripMenuItem.Checked;
Settings.DenoteStatesWithBGColor = DenoteStatesWithBGColorToolStripMenuItem.Checked;
RefreshDialog();
}
private void denoteMarkersWithIconsToolStripMenuItem_Click(object sender, EventArgs e)
private void DenoteMarkersWithIconsToolStripMenuItem_Click(object sender, EventArgs e)
{
TasView.denoteMarkersWithIcons = Settings.denoteMarkersWithIcons = denoteMarkersWithIconsToolStripMenuItem.Checked;
Settings.DenoteMarkersWithIcons = DenoteMarkersWithIconsToolStripMenuItem.Checked;
RefreshDialog();
}
private void denoteMarkersWithBGColorToolStripMenuItem_Click(object sender, EventArgs e)
private void DenoteMarkersWithBGColorToolStripMenuItem_Click(object sender, EventArgs e)
{
TasView.denoteMarkersWithBGColor = Settings.denoteMarkersWithBGColor = denoteMarkersWithBGColorToolStripMenuItem.Checked;
Settings.DenoteMarkersWithBGColor = DenoteMarkersWithBGColorToolStripMenuItem.Checked;
RefreshDialog();
}

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

@ -74,10 +74,10 @@ namespace BizHawk.Client.EmuHawk
BackupPerFileSave = false;
SingleClickFloatEdit = false;
// default to taseditor fashion
denoteStatesWithIcons = false;
denoteStatesWithBGColor = true;
denoteMarkersWithIcons = false;
denoteMarkersWithBGColor = true;
DenoteStatesWithIcons = false;
DenoteStatesWithBGColor = true;
DenoteMarkersWithIcons = false;
DenoteMarkersWithBGColor = true;
}
public RecentFiles RecentTas { get; set; }
@ -97,12 +97,10 @@ namespace BizHawk.Client.EmuHawk
public bool AutosaveAsBackupFile { get; set; }
public bool BackupPerFileSave { get; set; }
public bool SingleClickFloatEdit { get; set; }
public bool denoteStatesWithIcons { get; set; }
public bool denoteStatesWithBGColor { get; set; }
public bool denoteMarkersWithIcons { get; set; }
public bool denoteMarkersWithBGColor { get; set; }
public bool DenoteStatesWithIcons { get; set; }
public bool DenoteStatesWithBGColor { get; set; }
public bool DenoteMarkersWithIcons { get; set; }
public bool DenoteMarkersWithBGColor { get; set; }
public int MainVerticalSplitDistance { get; set; }
public int BranchMarkerSplitDistance { get; set; }
}
@ -315,11 +313,6 @@ namespace BizHawk.Client.EmuHawk
TasView.SeekingCutoffInterval = Settings.SeekingCutoffInterval;
BookMarkControl.HoverInterval = Settings.BranchCellHoverInterval;
TasView.denoteStatesWithIcons = Settings.denoteStatesWithIcons;
TasView.denoteStatesWithBGColor = Settings.denoteStatesWithBGColor;
TasView.denoteMarkersWithIcons = Settings.denoteMarkersWithIcons;
TasView.denoteMarkersWithBGColor = Settings.denoteMarkersWithBGColor;
_autosaveTimer.Tick += AutosaveTimerEventProcessor;
if (Settings.AutosaveInterval > 0)
{