diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs index 4121a0b885..346ff9a349 100644 --- a/BizHawk.Client.Common/config/Config.cs +++ b/BizHawk.Client.Common/config/Config.cs @@ -327,13 +327,6 @@ namespace BizHawk.Client.Common public Color HexHighlightColor = Color.Pink; public Color HexHighlightFreezeColor = Color.Violet; - // Trace Logger Settings - /* - public ToolDialogSettings TraceLoggerSettings = new ToolDialogSettings(); - public bool TraceLoggerAutoLoad = false; - public int TraceLoggerMaxLines = 100000; - */ - // Video dumping settings public string VideoWriter = ""; public int JMDCompression = 3; @@ -416,10 +409,6 @@ namespace BizHawk.Client.Common public Dictionary CommonToolSettings = new Dictionary(); public Dictionary> CustomToolSettings = new Dictionary>(); - // SMS VDP Viewer Settings - public ToolDialogSettings SmsVdpSettings = new ToolDialogSettings(); - public bool SmsVdpAutoLoad = false; - // SNES Graphics Debugger Dialog Settings public bool AutoLoadSNESGraphicsDebugger = false; public bool SNESGraphicsDebuggerSaveWindowPosition = true; diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 5dbd706562..8b4732159b 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.SmsVdpAutoLoad) - { - GlobalWin.Tools.Load(); - } - if (Global.Config.RecentPceCdlFiles.AutoLoad) { GlobalWin.Tools.Load(); diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs index 2b57323a4d..298d6baf13 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs @@ -37,7 +37,8 @@ namespace BizHawk.Client.EmuHawk private void RefreshFloatingWindowControl() { - Owner = Global.Config.SmsVdpSettings.FloatingWindow ? null : GlobalWin.MainForm; + // TODO: FIXME + // Owner = Global.Config.SmsVdpSettings.FloatingWindow ? null : GlobalWin.MainForm; } protected override void OnShown(EventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs index 7fc262a3ca..efcc9c553c 100644 --- a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs @@ -39,15 +39,10 @@ this.menuStrip1 = new MenuStripEx(); this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.saveTilesScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.CloseMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoloadMenuItem = 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.savePalettesScrenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveBGScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.CloseMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -122,8 +117,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(572, 24); @@ -139,83 +133,43 @@ this.toolStripSeparator1, this.CloseMenuItem}); 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"; // // saveTilesScreenshotToolStripMenuItem // this.saveTilesScreenshotToolStripMenuItem.Name = "saveTilesScreenshotToolStripMenuItem"; - this.saveTilesScreenshotToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.saveTilesScreenshotToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.saveTilesScreenshotToolStripMenuItem.Text = "Save Tiles Screenshot..."; this.saveTilesScreenshotToolStripMenuItem.Click += new System.EventHandler(this.saveTilesScreenshotToolStripMenuItem_Click); // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(203, 6); - // - // CloseMenuItem - // - this.CloseMenuItem.Name = "CloseMenuItem"; - this.CloseMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.CloseMenuItem.Size = new System.Drawing.Size(206, 22); - this.CloseMenuItem.Text = "&Close"; - this.CloseMenuItem.Click += new System.EventHandler(this.CloseMenuItem_Click); - // - // OptionsSubMenu - // - this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.AutoloadMenuItem, - this.SaveWindowPositionMenuItem, - this.AlwaysOnTopMenuItem, - this.FloatingWindowMenuItem}); - 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); - // - // AutoloadMenuItem - // - this.AutoloadMenuItem.Name = "AutoloadMenuItem"; - this.AutoloadMenuItem.Size = new System.Drawing.Size(191, 22); - this.AutoloadMenuItem.Text = "&Autoload"; - this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click); - // - // SaveWindowPositionMenuItem - // - this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(191, 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(191, 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(191, 22); - this.FloatingWindowMenuItem.Text = "Floating Window"; - this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); - // // savePalettesScrenshotToolStripMenuItem // this.savePalettesScrenshotToolStripMenuItem.Name = "savePalettesScrenshotToolStripMenuItem"; - this.savePalettesScrenshotToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.savePalettesScrenshotToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.savePalettesScrenshotToolStripMenuItem.Text = "Save Palettes Screnshot..."; this.savePalettesScrenshotToolStripMenuItem.Click += new System.EventHandler(this.savePalettesScrenshotToolStripMenuItem_Click); // // saveBGScreenshotToolStripMenuItem // this.saveBGScreenshotToolStripMenuItem.Name = "saveBGScreenshotToolStripMenuItem"; - this.saveBGScreenshotToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.saveBGScreenshotToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.saveBGScreenshotToolStripMenuItem.Text = "Save BG Screenshot..."; this.saveBGScreenshotToolStripMenuItem.Click += new System.EventHandler(this.saveBGScreenshotToolStripMenuItem_Click); // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(200, 6); + // + // CloseMenuItem + // + this.CloseMenuItem.Name = "CloseMenuItem"; + this.CloseMenuItem.ShortcutKeyDisplayString = "Alt+F4"; + this.CloseMenuItem.Size = new System.Drawing.Size(203, 22); + this.CloseMenuItem.Text = "&Close"; + this.CloseMenuItem.Click += new System.EventHandler(this.CloseMenuItem_Click); + // // SmsVDPViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -256,11 +210,6 @@ private MenuStripEx menuStrip1; private System.Windows.Forms.ToolStripMenuItem FileSubMenu; private System.Windows.Forms.ToolStripMenuItem CloseMenuItem; - private System.Windows.Forms.ToolStripMenuItem OptionsSubMenu; - private System.Windows.Forms.ToolStripMenuItem AutoloadMenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveWindowPositionMenuItem; - private System.Windows.Forms.ToolStripMenuItem AlwaysOnTopMenuItem; - private System.Windows.Forms.ToolStripMenuItem FloatingWindowMenuItem; private System.Windows.Forms.ToolStripMenuItem saveTilesScreenshotToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem savePalettesScrenshotToolStripMenuItem; diff --git a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs index d9a7f33f1a..3596de17ab 100644 --- a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs @@ -14,7 +14,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public partial class SmsVDPViewer : Form, IToolForm + public partial class SmsVDPViewer : Form, IToolFormAutoConfig { [RequiredService] private SMS sms { get; set; } @@ -207,58 +207,13 @@ namespace BizHawk.Client.EmuHawk } } - private void RefreshFloatingWindowControl() - { - Owner = Global.Config.SmsVdpSettings.FloatingWindow ? null : GlobalWin.MainForm; - } - - protected override void OnShown(EventArgs e) - { - RefreshFloatingWindowControl(); - base.OnShown(e); - } - private void CloseMenuItem_Click(object sender, EventArgs e) { Close(); } - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) - { - AutoloadMenuItem.Checked = Global.Config.SmsVdpAutoLoad; - SaveWindowPositionMenuItem.Checked = Global.Config.SmsVdpSettings.SaveWindowPosition; - AlwaysOnTopMenuItem.Checked = Global.Config.SmsVdpSettings.TopMost; - FloatingWindowMenuItem.Checked = Global.Config.SmsVdpSettings.FloatingWindow; - } - - private void SaveWindowPositionMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SmsVdpSettings.SaveWindowPosition ^= true; - } - - private void AlwaysOnTopMenuItem_Click(object sender, EventArgs e) - { - TopMost = Global.Config.SmsVdpSettings.TopMost ^= true; - } - - private void FloatingWindowMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SmsVdpSettings.FloatingWindow ^= true; - RefreshFloatingWindowControl(); - } - private void VDPViewer_Load(object sender, EventArgs e) { - TopMost = Global.Config.SmsVdpSettings.TopMost; - if (Global.Config.SmsVdpSettings.UseWindowPosition) - { - Location = Global.Config.SmsVdpSettings.WindowPosition; - } - } - - private void AutoloadMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SmsVdpAutoLoad ^= true; } private void saveTilesScreenshotToolStripMenuItem_Click(object sender, EventArgs e)