From 7e512890036d04df53db7a8d396970913ee13572 Mon Sep 17 00:00:00 2001 From: goyuken Date: Mon, 22 Dec 2014 21:38:57 +0000 Subject: [PATCH] pce cdl: change settings system --- BizHawk.Client.Common/config/Config.cs | 4 - BizHawk.Client.EmuHawk/MainForm.cs | 5 - BizHawk.Client.EmuHawk/config/GuiOptions.cs | 2 - .../tools/PCE/PCECDL.Designer.cs | 87 +++----------- BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs | 112 ++++-------------- 5 files changed, 35 insertions(+), 175 deletions(-) diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs index 346ff9a349..c08761e890 100644 --- a/BizHawk.Client.Common/config/Config.cs +++ b/BizHawk.Client.Common/config/Config.cs @@ -418,10 +418,6 @@ namespace BizHawk.Client.Common public bool SNESGraphicsUseUserBackdropColor = false; public int SNESGraphicsUserBackdropColor = -1; - // PCE CDL settings - public ToolDialogSettings PceCdlSettings = new ToolDialogSettings(); - public RecentFiles RecentPceCdlFiles = new RecentFiles(8); - // PCE Sound Debugger settings public ToolDialogSettings PceSoundDebuggerSettings = new ToolDialogSettings(); public bool PceSoundDebuggerAutoload = false; diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 8b4732159b..ab4405f549 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -397,11 +397,6 @@ namespace BizHawk.Client.EmuHawk OpenLuaConsole(); } - if (Global.Config.RecentPceCdlFiles.AutoLoad) - { - GlobalWin.Tools.Load(); - } - if (Global.Config.PceSoundDebuggerAutoload) { GlobalWin.Tools.Load(); diff --git a/BizHawk.Client.EmuHawk/config/GuiOptions.cs b/BizHawk.Client.EmuHawk/config/GuiOptions.cs index 9de9c96926..829b70b639 100644 --- a/BizHawk.Client.EmuHawk/config/GuiOptions.cs +++ b/BizHawk.Client.EmuHawk/config/GuiOptions.cs @@ -48,7 +48,6 @@ namespace BizHawk.Client.EmuHawk RecentMoviesNumeric.Value = Global.Config.RecentMovies.MAX_RECENT_FILES; RecentCheatsNumeric.Value = Global.Config.RecentCheats.MAX_RECENT_FILES; RecentTblNumeric.Value = Global.Config.RecentTables.MAX_RECENT_FILES; - RecentPceCDLNumeric.Value = Global.Config.RecentPceCdlFiles.MAX_RECENT_FILES; RecentLuaScriptNumeric.Value = Global.Config.RecentLua.MAX_RECENT_FILES; RecentLuaSessionsNumeric.Value = Global.Config.RecentLuaSession.MAX_RECENT_FILES; RecentWatchesNumeric.Value = Global.Config.RecentWatches.MAX_RECENT_FILES; @@ -78,7 +77,6 @@ namespace BizHawk.Client.EmuHawk Global.Config.RecentMovies.MAX_RECENT_FILES = (int)RecentMoviesNumeric.Value; Global.Config.RecentCheats.MAX_RECENT_FILES = (int)RecentCheatsNumeric.Value; Global.Config.RecentTables.MAX_RECENT_FILES = (int)RecentTblNumeric.Value; - Global.Config.RecentPceCdlFiles.MAX_RECENT_FILES = (int)RecentPceCDLNumeric.Value; Global.Config.RecentLua.MAX_RECENT_FILES = (int)RecentLuaScriptNumeric.Value; Global.Config.RecentLuaSession.MAX_RECENT_FILES = (int)RecentLuaSessionsNumeric.Value; Global.Config.RecentWatches.MAX_RECENT_FILES = (int)RecentWatchesNumeric.Value; diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs index 7d4e93faab..edab26816e 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs @@ -44,12 +44,6 @@ this.DisassembleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CdlTextbox = new System.Windows.Forms.TextBox(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -70,8 +64,7 @@ // this.menuStrip1.ClickThrough = true; this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FileSubMenu, - this.OptionsSubMenu}); + this.FileSubMenu}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(292, 24); @@ -93,7 +86,7 @@ this.toolStripSeparator1, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 20); + this.FileSubMenu.Size = new System.Drawing.Size(35, 20); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -102,7 +95,7 @@ this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.NewMenuItem.Name = "NewMenuItem"; this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.NewMenuItem.Size = new System.Drawing.Size(195, 22); + this.NewMenuItem.Size = new System.Drawing.Size(193, 22); this.NewMenuItem.Text = "&New"; this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click); // @@ -111,7 +104,7 @@ this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenMenuItem.Name = "OpenMenuItem"; this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); + this.OpenMenuItem.Size = new System.Drawing.Size(193, 22); this.OpenMenuItem.Text = "&Open..."; this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); // @@ -120,7 +113,7 @@ this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMenuItem.Name = "SaveMenuItem"; this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); + this.SaveMenuItem.Size = new System.Drawing.Size(193, 22); this.SaveMenuItem.Text = "&Save"; this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); // @@ -129,14 +122,14 @@ this.SaveAsMenuItem.Name = "SaveAsMenuItem"; this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); + this.SaveAsMenuItem.Size = new System.Drawing.Size(193, 22); this.SaveAsMenuItem.Text = "&Save As..."; this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); // // AppendMenuItem // this.AppendMenuItem.Name = "AppendMenuItem"; - this.AppendMenuItem.Size = new System.Drawing.Size(195, 22); + this.AppendMenuItem.Size = new System.Drawing.Size(193, 22); this.AppendMenuItem.Text = "&Append File..."; this.AppendMenuItem.Click += new System.EventHandler(this.AppendMenuItem_Click); // @@ -146,94 +139,48 @@ this.noneToolStripMenuItem}); this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); + this.RecentSubMenu.Size = new System.Drawing.Size(193, 22); this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); // // noneToolStripMenuItem // this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.noneToolStripMenuItem.Size = new System.Drawing.Size(99, 22); this.noneToolStripMenuItem.Text = "None"; // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(192, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(190, 6); // // ClearMenuItem // this.ClearMenuItem.Name = "ClearMenuItem"; - this.ClearMenuItem.Size = new System.Drawing.Size(195, 22); + this.ClearMenuItem.Size = new System.Drawing.Size(193, 22); this.ClearMenuItem.Text = "&Clear"; this.ClearMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); // // DisassembleMenuItem // this.DisassembleMenuItem.Name = "DisassembleMenuItem"; - this.DisassembleMenuItem.Size = new System.Drawing.Size(195, 22); + this.DisassembleMenuItem.Size = new System.Drawing.Size(193, 22); this.DisassembleMenuItem.Text = "&Disassemble..."; this.DisassembleMenuItem.Click += new System.EventHandler(this.DisassembleMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(190, 6); // // ExitMenuItem // this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.ExitMenuItem.Size = new System.Drawing.Size(195, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(193, 22); this.ExitMenuItem.Text = "&Close"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // - // OptionsSubMenu - // - this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SaveWindowPositionMenuItem, - this.AlwaysOnTopMenuItem, - this.FloatingWindowMenuItem, - this.toolStripSeparator3, - this.RestoreDefaultSettingsMenuItem}); - this.OptionsSubMenu.Name = "OptionsSubMenu"; - this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); - this.OptionsSubMenu.Text = "&Options"; - this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); - // - // SaveWindowPositionMenuItem - // - this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); - this.SaveWindowPositionMenuItem.Text = "Save Window Position"; - this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); - // - // AlwaysOnTopMenuItem - // - this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; - this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(199, 22); - this.AlwaysOnTopMenuItem.Text = "&Always On Top"; - this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); - // - // FloatingWindowMenuItem - // - this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; - this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); - this.FloatingWindowMenuItem.Text = "&Floating Window"; - this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(196, 6); - // - // RestoreDefaultSettingsMenuItem - // - this.RestoreDefaultSettingsMenuItem.Name = "RestoreDefaultSettingsMenuItem"; - this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(199, 22); - this.RestoreDefaultSettingsMenuItem.Text = "Restore Default Settings"; - this.RestoreDefaultSettingsMenuItem.Click += new System.EventHandler(this.RestoreDefaultSettingsMenuItem_Click); - // // CdlTextbox // this.CdlTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -289,12 +236,6 @@ private System.Windows.Forms.ToolStripMenuItem RecentSubMenu; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem OptionsSubMenu; - private System.Windows.Forms.ToolStripMenuItem SaveWindowPositionMenuItem; - private System.Windows.Forms.ToolStripMenuItem AlwaysOnTopMenuItem; - private System.Windows.Forms.ToolStripMenuItem FloatingWindowMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - private System.Windows.Forms.ToolStripMenuItem RestoreDefaultSettingsMenuItem; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs index 298d6baf13..f82832de4c 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs @@ -14,37 +14,36 @@ using BizHawk.Client.EmuHawk.ToolExtensions; namespace BizHawk.Client.EmuHawk { - public partial class PCECDL : Form, IToolForm + public partial class PCECDL : Form, IToolFormAutoConfig { [RequiredService] private PCEngine _emu { get; set; } private CodeDataLog _cdl; + private RecentFiles _recent_fld = new RecentFiles(); + [ConfigPersist] + private RecentFiles _recent + { + get + { return _recent_fld; } + set + { + _recent_fld = value; + if (_recent_fld.AutoLoad) + { + LoadFile(_recent.MostRecent); + _currentFileName = _recent.MostRecent; + } + } + } + private MemoryDomainList MemoryDomains { get { return _emu.MemoryDomains; } } private string _currentFileName = string.Empty; - private int _defaultWidth; - private int _defaultHeight; - public PCECDL() { InitializeComponent(); - TopMost = Global.Config.PceCdlSettings.TopMost; - - Closing += (o, e) => SaveConfigSettings(); - } - - private void RefreshFloatingWindowControl() - { - // TODO: FIXME - // Owner = Global.Config.SmsVdpSettings.FloatingWindow ? null : GlobalWin.MainForm; - } - - protected override void OnShown(EventArgs e) - { - RefreshFloatingWindowControl(); - base.OnShown(e); } public void UpdateValues() @@ -129,31 +128,6 @@ namespace BizHawk.Client.EmuHawk } } - private void SaveConfigSettings() - { - Global.Config.PceCdlSettings.Wndx = Location.X; - Global.Config.PceCdlSettings.Wndy = Location.Y; - Global.Config.PceCdlSettings.Width = Right - Left; - Global.Config.PceCdlSettings.Height = Bottom - Top; - } - - private void LoadConfigSettings() - { - // Size and Positioning - _defaultWidth = Size.Width; - _defaultHeight = Size.Height; - - if (Global.Config.PceCdlSettings.UseWindowPosition) - { - Location = Global.Config.PceCdlSettings.WindowPosition; - } - - if (Global.Config.PceCdlSettings.UseWindowSize) - { - Size = Global.Config.PceCdlSettings.WindowSize; - } - } - #region Events #region File @@ -171,8 +145,7 @@ namespace BizHawk.Client.EmuHawk private void RecentSubMenu_DropDownOpened(object sender, EventArgs e) { RecentSubMenu.DropDownItems.Clear(); - RecentSubMenu.DropDownItems.AddRange( - Global.Config.RecentPceCdlFiles.RecentMenu(LoadFile, true)); + RecentSubMenu.DropDownItems.AddRange(_recent.RecentMenu(LoadFile, true)); } private void NewMenuItem_Click(object sender, EventArgs e) @@ -206,7 +179,7 @@ namespace BizHawk.Client.EmuHawk _cdl = newCDL; _emu.Cpu.CDL = _cdl; UpdateDisplay(); - Global.Config.RecentPceCdlFiles.Add(file.FullName); + _recent.Add(file.FullName); _currentFileName = file.FullName; } } @@ -239,7 +212,7 @@ namespace BizHawk.Client.EmuHawk using (var fs = new FileStream(file.FullName, FileMode.Create, FileAccess.Write)) { _cdl.Save(fs); - Global.Config.RecentPceCdlFiles.Add(file.FullName); + _recent.Add(file.FullName); _currentFileName = file.FullName; } } @@ -311,53 +284,10 @@ namespace BizHawk.Client.EmuHawk #endregion - #region Options - - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) - { - SaveWindowPositionMenuItem.Checked = Global.Config.PceCdlSettings.SaveWindowPosition; - TopMost = AlwaysOnTopMenuItem.Checked = Global.Config.PceCdlSettings.TopMost; - FloatingWindowMenuItem.Checked = Global.Config.PceCdlSettings.FloatingWindow; - } - - private void SaveWindowPositionMenuItem_Click(object sender, EventArgs e) - { - Global.Config.PceCdlSettings.SaveWindowPosition ^= true; - } - - private void AlwaysOnTopMenuItem_Click(object sender, EventArgs e) - { - Global.Config.PceCdlSettings.TopMost ^= true; - } - - private void FloatingWindowMenuItem_Click(object sender, EventArgs e) - { - Global.Config.PceCdlSettings.FloatingWindow ^= true; - RefreshFloatingWindowControl(); - } - - private void RestoreDefaultSettingsMenuItem_Click(object sender, EventArgs e) - { - Size = new Size(_defaultWidth, _defaultHeight); - - Global.Config.PceCdlSettings.SaveWindowPosition = true; - Global.Config.PceCdlSettings.TopMost = TopMost = false; - Global.Config.PceCdlSettings.FloatingWindow = false; - } - - #endregion - #region Dialog Events private void PCECDL_Load(object sender, EventArgs e) { - LoadConfigSettings(); - - if (Global.Config.RecentPceCdlFiles.AutoLoad) - { - LoadFile(Global.Config.RecentPceCdlFiles.MostRecent); - _currentFileName = Global.Config.RecentPceCdlFiles.MostRecent; - } } private void LoggingActiveCheckbox_CheckedChanged(object sender, EventArgs e)