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

SMS vdp viewer: settings

This commit is contained in:
goyuken 2014-12-22 19:15:56 +00:00
parent 808e17c3f7
commit 5ac505d582
5 changed files with 23 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Client.Common/config/Config.cs
View File

@ -327,13 +327,6 @@ namespace BizHawk.Client.Common
public Color HexHighlightColor = Color.Pink; public Color HexHighlightColor = Color.Pink;
public Color HexHighlightFreezeColor = Color.Violet; public Color HexHighlightFreezeColor = Color.Violet;
// Trace Logger Settings
/*
public ToolDialogSettings TraceLoggerSettings = new ToolDialogSettings();
public bool TraceLoggerAutoLoad = false;
public int TraceLoggerMaxLines = 100000;
*/
// Video dumping settings // Video dumping settings
public string VideoWriter = ""; public string VideoWriter = "";
public int JMDCompression = 3; public int JMDCompression = 3;
@ -416,10 +409,6 @@ namespace BizHawk.Client.Common
public Dictionary<string, ToolDialogSettings> CommonToolSettings = new Dictionary<string, ToolDialogSettings>(); public Dictionary<string, ToolDialogSettings> CommonToolSettings = new Dictionary<string, ToolDialogSettings>();
public Dictionary<string, Dictionary<string, object>> CustomToolSettings = new Dictionary<string, Dictionary<string, object>>(); public Dictionary<string, Dictionary<string, object>> CustomToolSettings = new Dictionary<string, Dictionary<string, object>>();
// SMS VDP Viewer Settings
public ToolDialogSettings SmsVdpSettings = new ToolDialogSettings();
public bool SmsVdpAutoLoad = false;
// SNES Graphics Debugger Dialog Settings // SNES Graphics Debugger Dialog Settings
public bool AutoLoadSNESGraphicsDebugger = false; public bool AutoLoadSNESGraphicsDebugger = false;
public bool SNESGraphicsDebuggerSaveWindowPosition = true; public bool SNESGraphicsDebuggerSaveWindowPosition = true;

5
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -397,11 +397,6 @@ namespace BizHawk.Client.EmuHawk
OpenLuaConsole(); OpenLuaConsole();
} }
if (Global.Config.SmsVdpAutoLoad)
{
GlobalWin.Tools.Load<SmsVDPViewer>();
}
if (Global.Config.RecentPceCdlFiles.AutoLoad) if (Global.Config.RecentPceCdlFiles.AutoLoad)
{ {
GlobalWin.Tools.Load<PCECDL>(); GlobalWin.Tools.Load<PCECDL>();

3
BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs
View File

@ -37,7 +37,8 @@ namespace BizHawk.Client.EmuHawk
private void RefreshFloatingWindowControl() 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) protected override void OnShown(EventArgs e)

91
BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs generated
View File

@ -39,15 +39,10 @@
this.menuStrip1 = new MenuStripEx(); this.menuStrip1 = new MenuStripEx();
this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.saveTilesScreenshotToolStripMenuItem = 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.savePalettesScrenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveBGScreenshotToolStripMenuItem = 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.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
@ -122,8 +117,7 @@
// //
this.menuStrip1.ClickThrough = true; this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu, this.FileSubMenu});
this.OptionsSubMenu});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(572, 24); this.menuStrip1.Size = new System.Drawing.Size(572, 24);
@ -139,83 +133,43 @@
this.toolStripSeparator1, this.toolStripSeparator1,
this.CloseMenuItem}); this.CloseMenuItem});
this.FileSubMenu.Name = "FileSubMenu"; 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.Text = "&File";
// //
// saveTilesScreenshotToolStripMenuItem // saveTilesScreenshotToolStripMenuItem
// //
this.saveTilesScreenshotToolStripMenuItem.Name = "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.Text = "Save Tiles Screenshot...";
this.saveTilesScreenshotToolStripMenuItem.Click += new System.EventHandler(this.saveTilesScreenshotToolStripMenuItem_Click); 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 // savePalettesScrenshotToolStripMenuItem
// //
this.savePalettesScrenshotToolStripMenuItem.Name = "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.Text = "Save Palettes Screnshot...";
this.savePalettesScrenshotToolStripMenuItem.Click += new System.EventHandler(this.savePalettesScrenshotToolStripMenuItem_Click); this.savePalettesScrenshotToolStripMenuItem.Click += new System.EventHandler(this.savePalettesScrenshotToolStripMenuItem_Click);
// //
// saveBGScreenshotToolStripMenuItem // saveBGScreenshotToolStripMenuItem
// //
this.saveBGScreenshotToolStripMenuItem.Name = "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.Text = "Save BG Screenshot...";
this.saveBGScreenshotToolStripMenuItem.Click += new System.EventHandler(this.saveBGScreenshotToolStripMenuItem_Click); 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 // SmsVDPViewer
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -256,11 +210,6 @@
private MenuStripEx menuStrip1; private MenuStripEx menuStrip1;
private System.Windows.Forms.ToolStripMenuItem FileSubMenu; private System.Windows.Forms.ToolStripMenuItem FileSubMenu;
private System.Windows.Forms.ToolStripMenuItem CloseMenuItem; 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.ToolStripMenuItem saveTilesScreenshotToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem savePalettesScrenshotToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem savePalettesScrenshotToolStripMenuItem;

47
BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
View File

@ -14,7 +14,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
public partial class SmsVDPViewer : Form, IToolForm public partial class SmsVDPViewer : Form, IToolFormAutoConfig
{ {
[RequiredService] [RequiredService]
private SMS sms { get; set; } 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) private void CloseMenuItem_Click(object sender, EventArgs e)
{ {
Close(); 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) 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) private void saveTilesScreenshotToolStripMenuItem_Click(object sender, EventArgs e)