unify tastudio dialogs:
- the only dialog that's meant to be used during emulation is undo history, so let it spawn at its old location in the middle of the screen. user will move it regardless of where we spawn it - positioning of input prompts will happen later - all config/metadata dialogs now block tastudio and spawn at the top just like open/save. user is clicking tastudio menu so it's distracting if those dialogs spawn too far away from where they're already looking. and the middle of tastudio can be indefinitely far away because it can easily occupy the entire screen (we have cores with tons of buttons, and some users like to make it as tall as the screen). so while in the middle is """consistent""", it's very annoying if you have to do a lot of consecutive edits (for example to greenzone caps, or colors). overall, top priority of smooth tas workflow, so """consistency""" with unrelated tools made for unrelated tasks is not helpful if it makes the workflow more annoying - ensuring the dialogs spawn fully on-screen will happen later removed unused tastudio menus and config params - branch hover interval was added before I replicated taseditor logic, which makes branch screenshots only appear if you keep the pointer over branch number, and not if you're just moving it around. making it configurable doesn't look useful - seek cutoff interval (how far target frame has to be to spawn seek progress bar) feels redundant because any onscreen edits won't spawn the thing anyway, and for farther seek points it's not annoying enough to change - EmptyNewMarkerNotes is not relevant to tastudio because it never copied previous marker notes like taseditor does. currently it does nothing and nobody ever requested it even tho it's in the menu, so there's no evidence anyone ever needed it - fun fact: I was sure autoadjust input to lag never worked but it mostly does! so it wasn't removed, instead I plan to fix it (it pauses on every added frame). it's also not saved. - other dialogs use InputRoll so I had to remove those options from them too (tastudio is the only one that they were meant for anyway) bump undo history to 1k. it may not be needed often but when it is, some actions are not combined (for example it adds every newly emulated frame) so you may end up unable to undo some dumb mistake than was only a few actions ago use normal control BG color for tastudio color editor. I tried it with dark theme on linux and got no difference. if this causes issues we'll see how to fix it without randomly giving one dialog unique BG color. also removed todo since labels are good now
This commit is contained in:
parent
6f0ae7128a
commit
d89035c400
|
@ -41,7 +41,7 @@ namespace BizHawk.Client.Common
|
|||
private readonly List<List<IMovieAction>> _history = new List<List<IMovieAction>>();
|
||||
private readonly ITasMovie _movie;
|
||||
|
||||
private int _maxSteps = 100;
|
||||
private int _maxSteps = 1000;
|
||||
private int _totalSteps;
|
||||
private bool _recordingBatch;
|
||||
|
||||
|
|
|
@ -372,12 +372,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
[Category("Behavior")]
|
||||
public bool AlwaysScroll { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the lowest seek interval to activate the progress bar
|
||||
/// </summary>
|
||||
[Category("Behavior")]
|
||||
public int SeekingCutoffInterval { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether pressing page up/down will cause
|
||||
/// the current selection to change
|
||||
|
|
|
@ -74,18 +74,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
return menu;
|
||||
}
|
||||
|
||||
public static void CenterOn(this Form form, Control logicalParent)
|
||||
=> form.CenterOn((logicalParent is Form ? logicalParent : logicalParent.Parent)
|
||||
.ChildPointToScreen(logicalParent) + logicalParent.HalfSize());
|
||||
|
||||
public static void CenterOn(this Form form, Point point)
|
||||
{
|
||||
// not asserting `form` is closed at this point, but we could
|
||||
point -= form.HalfSize();
|
||||
form.StartPosition = FormStartPosition.Manual;
|
||||
form.Location = point;
|
||||
}
|
||||
|
||||
public static Point ChildPointToScreen(this Control control, Control child)
|
||||
{
|
||||
return control.PointToScreen(new Point(child.Location.X, child.Location.Y));
|
||||
|
@ -143,9 +131,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
public static IEnumerable<Control> Controls(this Control control)
|
||||
=> control.Controls.Cast<Control>();
|
||||
|
||||
public static Size HalfSize(this Control c)
|
||||
=> new(c.Width / 2, c.Height / 2);
|
||||
|
||||
public static IEnumerable<TabPage> TabPages(this TabControl tabControl)
|
||||
{
|
||||
return tabControl.TabPages.Cast<TabPage>();
|
||||
|
|
|
@ -216,7 +216,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.lvCDL.Name = "lvCDL";
|
||||
this.lvCDL.RowCount = 0;
|
||||
this.lvCDL.ScrollSpeed = 0;
|
||||
this.lvCDL.SeekingCutoffInterval = 0;
|
||||
this.lvCDL.Size = new System.Drawing.Size(992, 323);
|
||||
this.lvCDL.TabIndex = 9;
|
||||
this.lvCDL.QueryItemText += new BizHawk.Client.EmuHawk.InputRoll.QueryItemTextHandler(this.LvCDL_QueryItemText);
|
||||
|
|
|
@ -104,7 +104,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.CheatListView.Name = "CheatListView";
|
||||
this.CheatListView.RowCount = 0;
|
||||
this.CheatListView.ScrollSpeed = 0;
|
||||
this.CheatListView.SeekingCutoffInterval = 0;
|
||||
this.CheatListView.Size = new System.Drawing.Size(414, 321);
|
||||
this.CheatListView.TabIndex = 1;
|
||||
this.CheatListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.CheatListView_ColumnClick);
|
||||
|
|
|
@ -217,7 +217,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.DisassemblerView.Name = "DisassemblerView";
|
||||
this.DisassemblerView.RowCount = 0;
|
||||
this.DisassemblerView.ScrollSpeed = 0;
|
||||
this.DisassemblerView.SeekingCutoffInterval = 0;
|
||||
this.DisassemblerView.Size = new System.Drawing.Size(395, 448);
|
||||
this.DisassemblerView.TabIndex = 1;
|
||||
this.DisassemblerView.SizeChanged += new System.EventHandler(this.DisassemblerView_SizeChanged);
|
||||
|
|
|
@ -656,7 +656,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.LuaListView.Name = "LuaListView";
|
||||
this.LuaListView.RowCount = 0;
|
||||
this.LuaListView.ScrollSpeed = 1;
|
||||
this.LuaListView.SeekingCutoffInterval = 0;
|
||||
this.LuaListView.Size = new System.Drawing.Size(273, 271);
|
||||
this.LuaListView.TabIndex = 0;
|
||||
this.LuaListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.LuaListView_ColumnClick);
|
||||
|
|
|
@ -157,7 +157,6 @@
|
|||
this.BranchView.Name = "BranchView";
|
||||
this.BranchView.RowCount = 0;
|
||||
this.BranchView.ScrollSpeed = 1;
|
||||
this.BranchView.SeekingCutoffInterval = 0;
|
||||
this.BranchView.Size = new System.Drawing.Size(186, 224);
|
||||
this.BranchView.TabIndex = 0;
|
||||
this.BranchView.PointedCellChanged += new BizHawk.Client.EmuHawk.InputRoll.CellChangeEventHandler(this.BranchView_PointedCellChanged);
|
||||
|
|
|
@ -38,12 +38,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
|
||||
public TAStudio Tastudio { get; set; }
|
||||
|
||||
public int HoverInterval
|
||||
{
|
||||
get => BranchView.HoverInterval;
|
||||
set => BranchView.HoverInterval = value;
|
||||
}
|
||||
|
||||
public IDialogController DialogController => Tastudio.MainForm;
|
||||
|
||||
public BookmarksBranchesBox()
|
||||
|
@ -575,6 +569,11 @@ namespace BizHawk.Client.EmuHawk
|
|||
InitialValue = branch.UserText
|
||||
};
|
||||
|
||||
var point = Cursor.Position;
|
||||
point.Offset(i.Width / -2, i.Height / -2);
|
||||
i.StartPosition = FormStartPosition.Manual;
|
||||
i.Location = point;
|
||||
|
||||
if (this.ShowDialogWithTempMute(i).IsOk())
|
||||
{
|
||||
branch.UserText = i.PromptText;
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
this.Controls.Add(this.OkBtn);
|
||||
this.Controls.Add(this.CancelBtn);
|
||||
this.Name = "GreenzoneSettings";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
|
||||
this.Text = "Default Savestate History Settings";
|
||||
this.Load += new System.EventHandler(this.GreenzoneSettings_Load);
|
||||
this.ResumeLayout(false);
|
||||
|
|
|
@ -207,7 +207,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.Controls.Add(this.CancelBtn);
|
||||
this.MinimumSize = new System.Drawing.Size(150, 311);
|
||||
this.Name = "MovieHeaderEditor";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
|
||||
this.Text = "Header Info";
|
||||
this.Load += new System.EventHandler(this.MovieHeaderEditor_Load);
|
||||
this.ResumeLayout(false);
|
||||
|
|
|
@ -195,7 +195,6 @@
|
|||
this.MarkerView.Name = "MarkerView";
|
||||
this.MarkerView.RowCount = 0;
|
||||
this.MarkerView.ScrollSpeed = 1;
|
||||
this.MarkerView.SeekingCutoffInterval = 0;
|
||||
this.MarkerView.Size = new System.Drawing.Size(186, 224);
|
||||
this.MarkerView.TabIndex = 0;
|
||||
this.MarkerView.TabStop = false;
|
||||
|
|
|
@ -175,6 +175,11 @@ namespace BizHawk.Client.EmuHawk
|
|||
""
|
||||
};
|
||||
|
||||
var point = Cursor.Position;
|
||||
point.Offset(i.Width / -2, i.Height / -2);
|
||||
i.StartPosition = FormStartPosition.Manual;
|
||||
i.Location = point;
|
||||
|
||||
if (!this.ShowDialogWithTempMute(i).IsOk()) return;
|
||||
|
||||
UpdateTextColumnWidth();
|
||||
|
@ -205,7 +210,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
}
|
||||
}
|
||||
|
||||
public void EditMarkerPopUp(TasMovieMarker marker, bool openAtMouseCursor = false)
|
||||
public void EditMarkerPopUp(TasMovieMarker marker, bool followCursor = false)
|
||||
{
|
||||
var markerFrame = marker.Frame;
|
||||
var i = new InputPrompt
|
||||
|
@ -218,11 +223,15 @@ namespace BizHawk.Client.EmuHawk
|
|||
? Markers.PreviousOrCurrent(markerFrame).Message
|
||||
: ""
|
||||
};
|
||||
if (openAtMouseCursor)
|
||||
|
||||
if (followCursor)
|
||||
{
|
||||
var point = Cursor.Position;
|
||||
point.Offset(i.Width / -2, i.Height / -2);
|
||||
i.StartPosition = FormStartPosition.Manual;
|
||||
i.Location = Cursor.Position - i.HalfSize(); // eww
|
||||
i.Location = point;
|
||||
}
|
||||
|
||||
if (!this.ShowDialogWithTempMute(i).IsOk()) return;
|
||||
|
||||
marker.Message = i.PromptText;
|
||||
|
|
|
@ -98,7 +98,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.UseInputKeysItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
|
||||
this.toolStripSeparator4 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
|
||||
this.BindMarkersToInputMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
|
||||
this.EmptyNewMarkerNotesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
|
||||
this.OldControlSchemeForBranchesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
|
||||
this.LoadBranchOnDoubleclickMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
|
||||
this.OsdInBranchScreenshotsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
|
||||
|
@ -481,8 +480,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
//
|
||||
this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.SetMaxUndoLevelsMenuItem,
|
||||
this.SetBranchCellHoverIntervalMenuItem,
|
||||
this.SetSeekingCutoffIntervalMenuItem,
|
||||
this.CopyIncludesFrameNoMenuItem,
|
||||
this.toolStripSeparator26,
|
||||
this.autosaveToolStripMenuItem,
|
||||
|
@ -495,7 +492,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.UseInputKeysItem,
|
||||
this.toolStripSeparator4,
|
||||
this.BindMarkersToInputMenuItem,
|
||||
this.EmptyNewMarkerNotesMenuItem,
|
||||
this.OldControlSchemeForBranchesMenuItem,
|
||||
this.LoadBranchOnDoubleclickMenuItem,
|
||||
this.OsdInBranchScreenshotsMenuItem,
|
||||
|
@ -512,17 +508,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels";
|
||||
this.SetMaxUndoLevelsMenuItem.Click += new System.EventHandler(this.SetMaxUndoLevelsMenuItem_Click);
|
||||
//
|
||||
// SetBranchCellHoverIntervalMenuItem
|
||||
//
|
||||
this.SetBranchCellHoverIntervalMenuItem.Text = "Set Branch Cell Hover Interval";
|
||||
this.SetBranchCellHoverIntervalMenuItem.Click += new System.EventHandler(this.SetBranchCellHoverIntervalMenuItem_Click);
|
||||
//
|
||||
// SetSeekingCutoffIntervalMenuItem
|
||||
//
|
||||
this.SetSeekingCutoffIntervalMenuItem.Text = "Set Seeking Cutoff Interval";
|
||||
this.SetSeekingCutoffIntervalMenuItem.Visible = false;
|
||||
this.SetSeekingCutoffIntervalMenuItem.Click += new System.EventHandler(this.SetSeekingCutoffIntervalMenuItem_Click);
|
||||
//
|
||||
// CopyIncludesFrameNoMenuItem
|
||||
//
|
||||
this.CopyIncludesFrameNoMenuItem.Text = "Include Frame No. When Copying Row(s)";
|
||||
|
@ -596,11 +581,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.BindMarkersToInputMenuItem.Text = "Bind Markers to Input";
|
||||
this.BindMarkersToInputMenuItem.Click += new System.EventHandler(this.BindMarkersToInputMenuItem_Click);
|
||||
//
|
||||
// EmptyNewMarkerNotesMenuItem
|
||||
//
|
||||
this.EmptyNewMarkerNotesMenuItem.Text = "Empty new Marker Notes";
|
||||
this.EmptyNewMarkerNotesMenuItem.Click += new System.EventHandler(this.EmptyNewMarkerNotesMenuItem_Click);
|
||||
//
|
||||
// OldControlSchemeForBranchesMenuItem
|
||||
//
|
||||
this.OldControlSchemeForBranchesMenuItem.Text = "Old control scheme for Branches";
|
||||
|
@ -917,7 +897,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.TasView.Rotatable = true;
|
||||
this.TasView.RowCount = 0;
|
||||
this.TasView.ScrollSpeed = 1;
|
||||
this.TasView.SeekingCutoffInterval = 0;
|
||||
this.TasView.Size = new System.Drawing.Size(289, 528);
|
||||
this.TasView.TabIndex = 1;
|
||||
this.TasView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick);
|
||||
|
@ -1132,7 +1111,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
// BookMarkControl
|
||||
//
|
||||
this.BookMarkControl.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.BookMarkControl.HoverInterval = 1;
|
||||
this.BookMarkControl.LoadedCallback = null;
|
||||
this.BookMarkControl.Location = new System.Drawing.Point(0, 0);
|
||||
this.BookMarkControl.Name = "BookMarkControl";
|
||||
|
@ -1268,7 +1246,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
private BizHawk.WinForms.Controls.ToolStripMenuItemEx AutoadjustInputMenuItem;
|
||||
private BizHawk.WinForms.Controls.ToolStripMenuItemEx UseInputKeysItem;
|
||||
private BizHawk.WinForms.Controls.ToolStripMenuItemEx BindMarkersToInputMenuItem;
|
||||
private BizHawk.WinForms.Controls.ToolStripMenuItemEx EmptyNewMarkerNotesMenuItem;
|
||||
private BizHawk.WinForms.Controls.ToolStripMenuItemEx OldControlSchemeForBranchesMenuItem;
|
||||
private BizHawk.WinForms.Controls.ToolStripMenuItemEx OsdInBranchScreenshotsMenuItem;
|
||||
private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator14;
|
||||
|
|
|
@ -903,20 +903,12 @@ namespace BizHawk.Client.EmuHawk
|
|||
|
||||
if (existingMarker != null)
|
||||
{
|
||||
MarkerControl.EditMarkerPopUp(existingMarker, openAtMouseCursor: true);
|
||||
MarkerControl.EditMarkerPopUp(existingMarker, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Settings.EmptyMarkers)
|
||||
{
|
||||
CurrentTasMovie.Markers.Add(TasView.CurrentCell.RowIndex.Value, "");
|
||||
RefreshDialog();
|
||||
}
|
||||
else
|
||||
{
|
||||
ClearLeftMouseStates();
|
||||
MarkerControl.AddMarker(TasView.CurrentCell.RowIndex.Value, false);
|
||||
}
|
||||
ClearLeftMouseStates();
|
||||
MarkerControl.AddMarker(TasView.CurrentCell.RowIndex.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -689,7 +689,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
|
||||
foreach (var index in selectedRows)
|
||||
{
|
||||
MarkerControl.AddMarker(index, false);
|
||||
MarkerControl.AddMarker(index);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -760,7 +760,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
private void ConfigSubMenu_DropDownOpened(object sender, EventArgs e)
|
||||
{
|
||||
AutopauseAtEndOfMovieMenuItem.Checked = Settings.AutoPause;
|
||||
EmptyNewMarkerNotesMenuItem.Checked = Settings.EmptyMarkers;
|
||||
AutosaveAsBk2MenuItem.Checked = Settings.AutosaveAsBk2;
|
||||
AutosaveAsBackupFileMenuItem.Checked = Settings.AutosaveAsBackupFile;
|
||||
BackupPerFileSaveMenuItem.Checked = Settings.BackupPerFileSave;
|
||||
|
@ -800,48 +799,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
}
|
||||
}
|
||||
|
||||
private void SetBranchCellHoverIntervalMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
using var prompt = new InputPrompt
|
||||
{
|
||||
TextInputType = InputPrompt.InputType.Unsigned,
|
||||
Message = "ScreenshotPopUp Delay",
|
||||
InitialValue = Settings.BranchCellHoverInterval.ToString()
|
||||
};
|
||||
|
||||
var result = MainForm.DoWithTempMute(() => prompt.ShowDialog());
|
||||
if (result.IsOk())
|
||||
{
|
||||
int val = int.Parse(prompt.PromptText);
|
||||
if (val > 0)
|
||||
{
|
||||
Settings.BranchCellHoverInterval = val;
|
||||
BookMarkControl.HoverInterval = val;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void SetSeekingCutoffIntervalMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
using var prompt = new InputPrompt
|
||||
{
|
||||
TextInputType = InputPrompt.InputType.Unsigned,
|
||||
Message = "Seeking Cutoff Interval",
|
||||
InitialValue = Settings.SeekingCutoffInterval.ToString()
|
||||
};
|
||||
|
||||
var result = MainForm.DoWithTempMute(() => prompt.ShowDialog());
|
||||
if (result.IsOk())
|
||||
{
|
||||
int val = int.Parse(prompt.PromptText);
|
||||
if (val > 0)
|
||||
{
|
||||
Settings.SeekingCutoffInterval = val;
|
||||
TasView.SeekingCutoffInterval = val;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void CopyIncludesFrameNoMenuItem_Click(object sender, EventArgs e)
|
||||
=> Settings.CopyIncludesFrameNo = !Settings.CopyIncludesFrameNo;
|
||||
|
||||
|
@ -889,9 +846,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
Settings.BindMarkersToInput = CurrentTasMovie.BindMarkersToInput = BindMarkersToInputMenuItem.Checked;
|
||||
}
|
||||
|
||||
private void EmptyNewMarkerNotesMenuItem_Click(object sender, EventArgs e)
|
||||
=> Settings.EmptyMarkers = !Settings.EmptyMarkers;
|
||||
|
||||
private void AutoPauseAtEndMenuItem_Click(object sender, EventArgs e)
|
||||
=> Settings.AutoPause = !Settings.AutoPause;
|
||||
|
||||
|
@ -953,48 +907,65 @@ namespace BizHawk.Client.EmuHawk
|
|||
|
||||
private void HeaderMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
MovieHeaderEditor form = new(CurrentTasMovie, Config) { Owner = this.Owner/*uhh*/ };
|
||||
form.CenterOn(TasView);
|
||||
form.Show();
|
||||
using MovieHeaderEditor form = new(CurrentTasMovie, Config)
|
||||
{
|
||||
Owner = Owner,
|
||||
Location = this.ChildPointToScreen(TasView)
|
||||
};
|
||||
form.ShowDialog();
|
||||
}
|
||||
|
||||
private void StateHistorySettingsMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
GreenzoneSettings form = new(
|
||||
using GreenzoneSettings form = new(
|
||||
DialogController,
|
||||
new ZwinderStateManagerSettings(CurrentTasMovie.TasStateManager.Settings),
|
||||
(s, k) => { CurrentTasMovie.TasStateManager.UpdateSettings(s, k); },
|
||||
false)
|
||||
{
|
||||
Owner = this.Owner, // uhh
|
||||
Owner = Owner,
|
||||
Location = this.ChildPointToScreen(TasView)
|
||||
};
|
||||
form.CenterOn(TasView);
|
||||
form.ShowDialog();
|
||||
}
|
||||
|
||||
private void CommentsMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var form = new EditCommentsForm(CurrentTasMovie, false);
|
||||
form.Show();
|
||||
using EditCommentsForm form = new(CurrentTasMovie, false)
|
||||
{
|
||||
Owner = Owner,
|
||||
StartPosition = FormStartPosition.Manual,
|
||||
Location = this.ChildPointToScreen(TasView)
|
||||
};
|
||||
form.ShowDialog();
|
||||
}
|
||||
|
||||
private void SubtitlesMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
using EditSubtitlesForm form = new(DialogController, CurrentTasMovie, Config!.PathEntries, readOnly: false);
|
||||
using EditSubtitlesForm form = new(
|
||||
DialogController,
|
||||
CurrentTasMovie,
|
||||
Config!.PathEntries,
|
||||
readOnly: false)
|
||||
{
|
||||
Owner = Owner,
|
||||
StartPosition = FormStartPosition.Manual,
|
||||
Location = this.ChildPointToScreen(TasView)
|
||||
};
|
||||
form.ShowDialog();
|
||||
}
|
||||
|
||||
private void DefaultStateSettingsMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
GreenzoneSettings form = new(
|
||||
using GreenzoneSettings form = new(
|
||||
DialogController,
|
||||
new ZwinderStateManagerSettings(Config.Movies.DefaultTasStateManagerSettings),
|
||||
(s, k) => { Config.Movies.DefaultTasStateManagerSettings = s; },
|
||||
true)
|
||||
{
|
||||
Owner = this.Owner, // uhh
|
||||
Owner = Owner,
|
||||
Location = this.ChildPointToScreen(TasView)
|
||||
};
|
||||
form.CenterOn(TasView);
|
||||
form.ShowDialog();
|
||||
}
|
||||
|
||||
|
@ -1112,8 +1083,13 @@ namespace BizHawk.Client.EmuHawk
|
|||
|
||||
private void ColorSettingsMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
using var colorSettings = new TAStudioColorSettingsForm(Palette, p => Settings.Palette = p);
|
||||
this.ShowDialogAsChild(colorSettings);
|
||||
using TAStudioColorSettingsForm form = new(Palette, p => Settings.Palette = p)
|
||||
{
|
||||
Owner = Owner,
|
||||
StartPosition = FormStartPosition.Manual,
|
||||
Location = this.ChildPointToScreen(TasView)
|
||||
};
|
||||
form.ShowDialog();
|
||||
}
|
||||
|
||||
private void WheelScrollSpeedMenuItem_Click(object sender, EventArgs e)
|
||||
|
|
|
@ -70,8 +70,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
ScrollSpeed = 6;
|
||||
FollowCursorAlwaysScroll = false;
|
||||
FollowCursorScrollMethod = "near";
|
||||
BranchCellHoverInterval = 1;
|
||||
SeekingCutoffInterval = 2;
|
||||
AutosaveInterval = 120000;
|
||||
AutosaveAsBk2 = false;
|
||||
AutosaveAsBackupFile = false;
|
||||
|
@ -94,12 +92,9 @@ namespace BizHawk.Client.EmuHawk
|
|||
public bool AutoPause { get; set; }
|
||||
public bool AutoRestoreLastPosition { get; set; }
|
||||
public bool FollowCursor { get; set; }
|
||||
public bool EmptyMarkers { get; set; }
|
||||
public int ScrollSpeed { get; set; }
|
||||
public bool FollowCursorAlwaysScroll { get; set; }
|
||||
public string FollowCursorScrollMethod { get; set; }
|
||||
public int BranchCellHoverInterval { get; set; }
|
||||
public int SeekingCutoffInterval { get; set; } // unused, relying on VisibleRows is smarter
|
||||
public uint AutosaveInterval { get; set; }
|
||||
public bool AutosaveAsBk2 { get; set; }
|
||||
public bool AutosaveAsBackupFile { get; set; }
|
||||
|
@ -183,8 +178,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
TasView.ScrollSpeed = Settings.ScrollSpeed;
|
||||
TasView.AlwaysScroll = Settings.FollowCursorAlwaysScroll;
|
||||
TasView.ScrollMethod = Settings.FollowCursorScrollMethod;
|
||||
TasView.SeekingCutoffInterval = Settings.SeekingCutoffInterval;
|
||||
BookMarkControl.HoverInterval = Settings.BranchCellHoverInterval;
|
||||
|
||||
_autosaveTimer = new Timer(components);
|
||||
_autosaveTimer.Tick += AutosaveTimerEventProcessor;
|
||||
|
|
|
@ -9,7 +9,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
{
|
||||
public sealed class TAStudioColorSettingsForm : Form
|
||||
{
|
||||
/// <remarks>TODO better labels</remarks>
|
||||
public TAStudioColorSettingsForm(TAStudioPalette initPalette, Action<TAStudioPalette> save)
|
||||
{
|
||||
Dictionary<string, Color> colours = new();
|
||||
|
@ -95,7 +94,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
((FlowLayoutPanel) flpButtons).FlowDirection = FlowDirection.RightToLeft; // why did I disable this
|
||||
|
||||
SuspendLayout();
|
||||
BackColor = Color.White;
|
||||
ClientSize = new(240, 320);
|
||||
Text = "Edit TAStudio Colors";
|
||||
Controls.Add(new SingleColumnFLP { Controls = { flpButtons, flpPanels } });
|
||||
|
|
|
@ -165,7 +165,6 @@
|
|||
this.HistoryView.Name = "HistoryView";
|
||||
this.HistoryView.RowCount = 0;
|
||||
this.HistoryView.ScrollSpeed = 0;
|
||||
this.HistoryView.SeekingCutoffInterval = 0;
|
||||
this.HistoryView.Size = new System.Drawing.Size(369, 213);
|
||||
this.HistoryView.TabIndex = 2;
|
||||
this.HistoryView.DoubleClick += new System.EventHandler(this.HistoryView_DoubleClick);
|
||||
|
|
|
@ -92,7 +92,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.TraceView.Name = "TraceView";
|
||||
this.TraceView.RowCount = 0;
|
||||
this.TraceView.ScrollSpeed = 0;
|
||||
this.TraceView.SeekingCutoffInterval = 0;
|
||||
this.TraceView.Size = new System.Drawing.Size(603, 414);
|
||||
this.TraceView.TabIndex = 4;
|
||||
this.TraceView.TabStop = false;
|
||||
|
|
|
@ -182,7 +182,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.WatchListView.Name = "WatchListView";
|
||||
this.WatchListView.RowCount = 0;
|
||||
this.WatchListView.ScrollSpeed = 0;
|
||||
this.WatchListView.SeekingCutoffInterval = 0;
|
||||
this.WatchListView.Size = new System.Drawing.Size(230, 366);
|
||||
this.WatchListView.TabIndex = 1;
|
||||
this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
|
||||
|
|
|
@ -674,7 +674,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
this.WatchListView.Name = "WatchListView";
|
||||
this.WatchListView.RowCount = 0;
|
||||
this.WatchListView.ScrollSpeed = 0;
|
||||
this.WatchListView.SeekingCutoffInterval = 0;
|
||||
this.WatchListView.Size = new System.Drawing.Size(363, 281);
|
||||
this.WatchListView.TabIndex = 2;
|
||||
this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
|
||||
|
|
Loading…
Reference in New Issue