From 4a3e2113afe6f7c26b9257f9e63e1e1c5355b001 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 24 Jul 2020 12:29:26 -0500 Subject: [PATCH] convert RamSearch to IToolFormAutoConfig --- .../tools/Watch/RamSearch.Designer.cs | 48 +------------ .../tools/Watch/RamSearch.cs | 69 ++----------------- 2 files changed, 5 insertions(+), 112 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs index 03e3075507..9807c3d282 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs @@ -99,13 +99,6 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator9 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.ExcludeRamWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.UseUndoHistoryMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator11 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.AutoloadDialogMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.SaveWinPositionMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.AlwaysOnTopMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.FloatingWindowMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator3 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.RestoreDefaultsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.MemDomainLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.MessageLabel = new BizHawk.WinForms.Controls.LocLabelEx(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); @@ -532,14 +525,7 @@ namespace BizHawk.Client.EmuHawk this.AutoSearchAccountForLagMenuItem, this.toolStripSeparator9, this.ExcludeRamWatchMenuItem, - this.UseUndoHistoryMenuItem, - this.toolStripSeparator11, - this.AutoloadDialogMenuItem, - this.SaveWinPositionMenuItem, - this.AlwaysOnTopMenuItem, - this.FloatingWindowMenuItem, - this.toolStripSeparator3, - this.RestoreDefaultsMenuItem}); + this.UseUndoHistoryMenuItem}); this.SettingsMenuItem.Text = "&Settings"; this.SettingsMenuItem.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened); // @@ -568,31 +554,6 @@ namespace BizHawk.Client.EmuHawk this.UseUndoHistoryMenuItem.Text = "&Use Undo History"; this.UseUndoHistoryMenuItem.Click += new System.EventHandler(this.UseUndoHistoryMenuItem_Click); // - // AutoloadDialogMenuItem - // - this.AutoloadDialogMenuItem.Text = "Auto&load"; - this.AutoloadDialogMenuItem.Click += new System.EventHandler(this.AutoloadDialogMenuItem_Click); - // - // SaveWinPositionMenuItem - // - this.SaveWinPositionMenuItem.Text = "&Save Window Position"; - this.SaveWinPositionMenuItem.Click += new System.EventHandler(this.SaveWinPositionMenuItem_Click); - // - // AlwaysOnTopMenuItem - // - this.AlwaysOnTopMenuItem.Text = "Always On &Top"; - this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); - // - // FloatingWindowMenuItem - // - this.FloatingWindowMenuItem.Text = "&Floating Window"; - this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); - // - // RestoreDefaultsMenuItem - // - this.RestoreDefaultsMenuItem.Text = "&Restore Default Settings"; - this.RestoreDefaultsMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click); - // // MemDomainLabel // this.MemDomainLabel.Location = new System.Drawing.Point(135, 49); @@ -1120,8 +1081,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx exitToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SettingsMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx RestoreDefaultsMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveWinPositionMenuItem; private BizHawk.WinForms.Controls.LocLabelEx MemDomainLabel; private BizHawk.WinForms.Controls.LocLabelEx MessageLabel; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RecentSubMenu; @@ -1151,17 +1110,13 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolTip toolTip1; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RedoMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ViewInHexEditorContextMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx AutoloadDialogMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator11; private BizHawk.WinForms.Controls.ToolStripMenuItemEx UnfreezeAllContextMenuItem; private BizHawk.WinForms.Controls.ToolStripSeparatorEx ContextMenuSeparator3; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx AlwaysOnTopMenuItem; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator13; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ClearUndoMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx UseUndoHistoryMenuItem; private BizHawk.WinForms.Controls.ToolStripSeparatorEx ContextMenuSeparator2; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ClearPreviewContextMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator3; private BizHawk.WinForms.Controls.ToolStripMenuItemEx newSearchToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator7; private BizHawk.WinForms.Controls.ToolStripMenuItemEx OptionsSubMenuMenuItem; @@ -1229,7 +1184,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.LocLabelEx label2; private System.Windows.Forms.ComboBox DisplayTypeDropdown; private BizHawk.WinForms.Controls.ToolStripMenuItemEx GoToAddressMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx FloatingWindowMenuItem; private System.Windows.Forms.ToolStripButton ErrorIconButton; private BizHawk.WinForms.Controls.ToolStripMenuItemEx Previous_LastChangeMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx AutoSearchAccountForLagMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 9ef370ecf0..d4a7abb71a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk /// /// A form designed to search through ram values /// - public partial class RamSearch : ToolFormBase, IToolForm + public partial class RamSearch : ToolFormBase, IToolFormAutoConfig { private const int MaxDetailedSize = 1024 * 1024; // 1mb, semi-arbitrary decision, sets the size to check for and automatically switch to fast mode for the user private const int MaxSupportedSize = 1024 * 1024 * 64; // 64mb, semi-arbitrary decision, sets the maximum size RAM Search will support (as it will crash beyond this) @@ -32,8 +32,6 @@ namespace BizHawk.Client.EmuHawk private RamSearchEngine _searches; private SearchEngineSettings _settings; - private int _defaultWidth; - private int _defaultHeight; private string _sortedColumn; private bool _sortReverse; private bool _forcePreviewClear; @@ -142,8 +140,6 @@ namespace BizHawk.Client.EmuHawk Settings = new RamSearchSettings(); } - TopMost = Settings.TopMost; - RamSearchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback)); _settings = new SearchEngineSettings(MemoryDomains); @@ -239,21 +235,6 @@ namespace BizHawk.Client.EmuHawk private void LoadConfigSettings() { - _defaultWidth = Size.Width; - _defaultHeight = Size.Height; - - if (Settings.UseWindowPosition && IsOnScreen(Settings.TopLeft)) - { - Location = Settings.WindowPosition; - } - - if (Settings.UseWindowSize) - { - Size = Settings.WindowSize; - } - - TopMost = Settings.TopMost; - WatchListView.AllColumns.Clear(); SetColumns(); } @@ -343,14 +324,6 @@ namespace BizHawk.Client.EmuHawk private void SaveConfigSettings() { Settings.Columns = WatchListView.AllColumns; - - if (WindowState == FormWindowState.Normal) - { - Settings.Wndx = Location.X; - Settings.Wndy = Location.Y; - Settings.Width = Right - Left; - Settings.Height = Bottom - Top; - } } public void NewSearch() @@ -963,7 +936,7 @@ namespace BizHawk.Client.EmuHawk } } - public class RamSearchSettings : ToolDialogSettings + public class RamSearchSettings { public RamSearchSettings() { @@ -1309,13 +1282,9 @@ namespace BizHawk.Client.EmuHawk private void SettingsSubMenu_DropDownOpened(object sender, EventArgs e) { - AutoloadDialogMenuItem.Checked = Settings.AutoLoad; - SaveWinPositionMenuItem.Checked = Settings.SaveWindowPosition; ExcludeRamWatchMenuItem.Checked = Settings.AlwaysExcludeRamWatch; UseUndoHistoryMenuItem.Checked = _searches.UndoEnabled; PreviewModeMenuItem.Checked = Settings.PreviewMode; - AlwaysOnTopMenuItem.Checked = Settings.TopMost; - FloatingWindowMenuItem.Checked = Settings.FloatingWindow; AutoSearchMenuItem.Checked = _autoSearch; AutoSearchAccountForLagMenuItem.Checked = Settings.AutoSearchTakeLagFramesIntoAccount; } @@ -1353,35 +1322,13 @@ namespace BizHawk.Client.EmuHawk _searches.UndoEnabled ^= true; } - private void AutoloadDialogMenuItem_Click(object sender, EventArgs e) - { - Settings.AutoLoad ^= true; - } - - private void SaveWinPositionMenuItem_Click(object sender, EventArgs e) - { - Settings.SaveWindowPosition ^= true; - } - - private void AlwaysOnTopMenuItem_Click(object sender, EventArgs e) - { - TopMost = Settings.TopMost ^= true; - } - - private void FloatingWindowMenuItem_Click(object sender, EventArgs e) - { - Settings.FloatingWindow ^= true; - RefreshFloatingWindowControl(Settings.FloatingWindow); - } - - private void RestoreDefaultsMenuItem_Click(object sender, EventArgs e) + [RestoreDefaults] + private void RestoreDefaultsMenuItem() { var recentFiles = Settings.RecentSearches; // We don't want to wipe recent files when restoring Settings = new RamSearchSettings { RecentSearches = recentFiles }; - Size = new Size(_defaultWidth, _defaultHeight); - RamSearchMenu.Items.Remove( RamSearchMenu.Items .OfType() @@ -1395,8 +1342,6 @@ namespace BizHawk.Client.EmuHawk SetToFastMode(); } - RefreshFloatingWindowControl(Settings.FloatingWindow); - WatchListView.AllColumns.Clear(); SetColumns(); } @@ -1743,12 +1688,6 @@ namespace BizHawk.Client.EmuHawk } } - protected override void OnShown(EventArgs e) - { - RefreshFloatingWindowControl(Settings.FloatingWindow); - base.OnShown(e); - } - // Stupid designer protected void DragEnterWrapper(object sender, DragEventArgs e) {