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

PCE Sound debugger - autoload and other standard options on tools, dialog fixes that I do to all tools, add to toolbox

This commit is contained in:
adelikat 2014-07-14 16:01:35 +00:00
parent 9c9c15afc2
commit 5d743cdf88
7 changed files with 192 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,6 +431,10 @@ namespace BizHawk.Client.Common
public ToolDialogSettings PceCdlSettings = new ToolDialogSettings();
public RecentFiles RecentPceCdlFiles = new RecentFiles(8);
// PCE Sound Debugger settings
public ToolDialogSettings PceSoundDebuggerSettings = new ToolDialogSettings();
public bool PceSoundDebuggerAutoload = false;
#region Cheats Dialog
public ToolDialogSettings CheatsSettings = new ToolDialogSettings();

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

@ -401,6 +401,11 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<PCECDL>();
}
if (Global.Config.PceSoundDebuggerAutoload && Global.Emulator is PCEngine)
{
GlobalWin.Tools.Load<PCESoundDebugger>();
}
if (Global.Config.GenVdpAutoLoad && Global.Emulator is GPGX)
{
GlobalWin.Tools.Load<GenVDPViewer>();

98
BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs generated
View File

@ -64,6 +64,7 @@
"-",
"-",
"-"}, -1);
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PCESoundDebugger));
this.btnExport = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lvPsgWaveforms = new System.Windows.Forms.ListView();
@ -74,13 +75,20 @@
this.lvChEn = new System.Windows.Forms.ListView();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.lvChannels = new System.Windows.Forms.ListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.SoundMenuStrip = new MenuStripEx();
this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.TopMostMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.SoundMenuStrip.SuspendLayout();
this.SuspendLayout();
//
// btnExport
@ -96,13 +104,12 @@
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.lvPsgWaveforms);
this.groupBox1.Controls.Add(this.btnReset);
this.groupBox1.Controls.Add(this.btnExport);
this.groupBox1.Location = new System.Drawing.Point(12, 187);
this.groupBox1.Location = new System.Drawing.Point(12, 232);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(603, 340);
this.groupBox1.TabIndex = 1;
@ -155,7 +162,7 @@
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.lvChEn);
this.groupBox2.Location = new System.Drawing.Point(621, 6);
this.groupBox2.Location = new System.Drawing.Point(621, 51);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(165, 175);
this.groupBox2.TabIndex = 2;
@ -193,7 +200,7 @@
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.lvChannels);
this.groupBox3.Location = new System.Drawing.Point(12, 4);
this.groupBox3.Location = new System.Drawing.Point(12, 49);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(603, 177);
this.groupBox3.TabIndex = 3;
@ -228,10 +235,9 @@
this.lvChannels.UseCompatibleStateImageBehavior = false;
this.lvChannels.View = System.Windows.Forms.View.Details;
//
// columnHeader1
// columnHeader5
//
this.columnHeader1.Text = "Status";
this.columnHeader1.Width = 259;
this.columnHeader5.Text = "Channel";
//
// columnHeader3
//
@ -241,25 +247,83 @@
//
this.columnHeader4.Text = "Pitch";
//
// columnHeader5
// columnHeader1
//
this.columnHeader5.Text = "Channel";
this.columnHeader1.Text = "Status";
this.columnHeader1.Width = 259;
//
// SoundMenuStrip
//
this.SoundMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.OptionsSubMenu});
this.SoundMenuStrip.Location = new System.Drawing.Point(0, 0);
this.SoundMenuStrip.Name = "SoundMenuStrip";
this.SoundMenuStrip.Size = new System.Drawing.Size(787, 24);
this.SoundMenuStrip.TabIndex = 4;
this.SoundMenuStrip.Text = "menuStrip1";
//
// OptionsSubMenu
//
this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.AutoloadMenuItem,
this.SaveWindowPositionMenuItem,
this.TopMostMenuItem,
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);
//
// TopMostMenuItem
//
this.TopMostMenuItem.Name = "TopMostMenuItem";
this.TopMostMenuItem.Size = new System.Drawing.Size(191, 22);
this.TopMostMenuItem.Text = "Always on Top";
this.TopMostMenuItem.Click += new System.EventHandler(this.TopMostMenuItem_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);
//
// PCESoundDebugger
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(787, 535);
this.ClientSize = new System.Drawing.Size(787, 580);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.SoundMenuStrip);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.SoundMenuStrip;
this.Name = "PCESoundDebugger";
this.Text = "PCESoundDebugger";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Sound Debugger";
this.Load += new System.EventHandler(this.PCESoundDebugger_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.SoundMenuStrip.ResumeLayout(false);
this.SoundMenuStrip.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
@ -279,5 +343,11 @@
private System.Windows.Forms.ColumnHeader columnHeader3;
private System.Windows.Forms.ColumnHeader columnHeader4;
private System.Windows.Forms.ColumnHeader columnHeader1;
private MenuStripEx SoundMenuStrip;
private System.Windows.Forms.ToolStripMenuItem OptionsSubMenu;
private System.Windows.Forms.ToolStripMenuItem AutoloadMenuItem;
private System.Windows.Forms.ToolStripMenuItem SaveWindowPositionMenuItem;
private System.Windows.Forms.ToolStripMenuItem TopMostMenuItem;
private System.Windows.Forms.ToolStripMenuItem FloatingWindowMenuItem;
}
}

43
BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs
View File

@ -35,6 +35,9 @@ namespace BizHawk.Client.EmuHawk
{
for (int i = 0; i < lvChEn.Items.Count; i++)
lvChEn.Items[i].Checked = true;
RefreshFloatingWindowControl();
base.OnShown(e);
}
public void UpdateValues()
@ -280,7 +283,45 @@ namespace BizHawk.Client.EmuHawk
private void PCESoundDebugger_Load(object sender, EventArgs e)
{
TopMost = Global.Config.PceSoundDebuggerSettings.TopMost;
if (Global.Config.PceSoundDebuggerSettings.UseWindowPosition)
{
Location = Global.Config.PceSoundDebuggerSettings.WindowPosition;
}
}
private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e)
{
AutoloadMenuItem.Checked = Global.Config.PceSoundDebuggerAutoload;
SaveWindowPositionMenuItem.Checked = Global.Config.PceSoundDebuggerSettings.SaveWindowPosition;
TopMostMenuItem.Checked = Global.Config.PceSoundDebuggerSettings.TopMost;
FloatingWindowMenuItem.Checked = Global.Config.PceSoundDebuggerSettings.FloatingWindow;
}
private void AutoloadMenuItem_Click(object sender, EventArgs e)
{
Global.Config.PceSoundDebuggerAutoload ^= true;
}
private void SaveWindowPositionMenuItem_Click(object sender, EventArgs e)
{
Global.Config.PceSoundDebuggerSettings.SaveWindowPosition ^= true;
}
private void TopMostMenuItem_Click(object sender, EventArgs e)
{
TopMost = Global.Config.PceSoundDebuggerSettings.TopMost ^= true;
}
private void FloatingWindowMenuItem_Click(object sender, EventArgs e)
{
Global.Config.PceSoundDebuggerSettings.FloatingWindow ^= true;
RefreshFloatingWindowControl();
}
private void RefreshFloatingWindowControl()
{
Owner = Global.Config.PceSoundDebuggerSettings.FloatingWindow ? null : GlobalWin.MainForm;
}
}
}

28
BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.resx
View File

@ -117,4 +117,32 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="SoundMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEpWMf/m5ub/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPUgo/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADJBI/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEpWMf8AAAAAAAAAAAAAAAAyOSD/eWId/3hjHf95Yx3/eWId/wAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARU4t/wAAAAB5ZR//eWUg/4fJpv+Bx5//ecKV/yt8
Ov94ZB//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlFKP8AAAAAeWch/5zSuP+Z0rX/kc6u/zyN
U/95w5b/emYi/wAAAAAAAAAASk4x/wAAAAAAAAAAAAAAAAAAAAAyPiP/emgk/67cxv+038v/rtvH/1in
c/+Rzq//gcef/3poJP8yOSD/PU4t/wAAAAAAAAAAAAAAAAAAAABFTjH/OUUo/3tqJ//C59X/zOvb/3/B
kv+u28b/mdK2/4fJpv96ayf/AAAAAAAAAAAAAAAAAAAAAFNWOP9TVjj/AAAAAAAAAAB7bSr/zOrb/9vz
5//M69v/tN/L/53SuP98bSr/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAr9zH/yJq
Lv/M69v/wubV/67cxv97byz/AAAAAAAAAAA9Ti3/SlYx/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANvz
5/+v28f/fHAt/3xwLf98cC3/8vLy/zI5IP85QSj/AAAAAAAAAAAAAAAAAAAAAEpWMf9KTjH/RU4t/z1I
KP98cC3/fHAt//Pz8/85RSj/8/Pz/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAPUgt/wAAAAAAAAAAAAAAAEVOMf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAEpOMf8AAAAAAAAAAAAAAABTVjj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAABOVjj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAA+f8AAP3/AAD9/wAA3B8AAOgPAADoDQAA4AMAAMAPAAAwHwAA8DMAAPAPAAAAfwAA938AAPd/
AAD3/////////w==
</value>
</data>
</root>

35
BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs generated
View File

@ -50,10 +50,11 @@
this.PceTileToolbarItem = new System.Windows.Forms.ToolStripButton();
this.PceCdlToolbarItem = new System.Windows.Forms.ToolStripButton();
this.PceBgViewerToolbarItem = new System.Windows.Forms.ToolStripButton();
this.PceSoundDebuggerButton = new System.Windows.Forms.ToolStripButton();
this.GbaGpuViewerToolBarItem = new System.Windows.Forms.ToolStripButton();
this.GenesisVdpToolBarItem = new System.Windows.Forms.ToolStripButton();
this.GenesisGameGenieToolBarItem = new System.Windows.Forms.ToolStripButton();
this.SmsVdpToolbarItem = new System.Windows.Forms.ToolStripButton();
this.GenesisVdpToolBarItem = new System.Windows.Forms.ToolStripButton();
this.ToolBoxStrip.SuspendLayout();
this.SuspendLayout();
//
@ -88,6 +89,7 @@
this.PceTileToolbarItem,
this.PceCdlToolbarItem,
this.PceBgViewerToolbarItem,
this.PceSoundDebuggerButton,
this.GbaGpuViewerToolBarItem,
this.GenesisVdpToolBarItem,
this.GenesisGameGenieToolBarItem,
@ -293,6 +295,16 @@
this.PceBgViewerToolbarItem.ToolTipText = "PC Engine Background Viewer";
this.PceBgViewerToolbarItem.Click += new System.EventHandler(this.PceBgViewerToolbarItem_Click);
//
// PceSoundDebuggerButton
//
this.PceSoundDebuggerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pcejin1;
this.PceSoundDebuggerButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.PceSoundDebuggerButton.Name = "PceSoundDebuggerButton";
this.PceSoundDebuggerButton.Size = new System.Drawing.Size(47, 20);
this.PceSoundDebuggerButton.Text = "Snd";
this.PceSoundDebuggerButton.ToolTipText = "Sound Debugger";
this.PceSoundDebuggerButton.Click += new System.EventHandler(this.PceSoundDebuggerButton_Click);
//
// GbaGpuViewerToolBarItem
//
this.GbaGpuViewerToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.gba_icon;
@ -303,6 +315,16 @@
this.GbaGpuViewerToolBarItem.ToolTipText = "Gameboy Advance Gpu Viewer";
this.GbaGpuViewerToolBarItem.Click += new System.EventHandler(this.GbaGpuViewerToolBarItem_Click);
//
// GenesisVdpToolBarItem
//
this.GenesisVdpToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GenesisControllerIcon;
this.GenesisVdpToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.GenesisVdpToolBarItem.Name = "GenesisVdpToolBarItem";
this.GenesisVdpToolBarItem.Size = new System.Drawing.Size(49, 20);
this.GenesisVdpToolBarItem.Text = "VDP";
this.GenesisVdpToolBarItem.ToolTipText = "Genesis VDP/Tile Viewer";
this.GenesisVdpToolBarItem.Click += new System.EventHandler(this.GenesisVdpToolBarItem_Click);
//
// GenesisGameGenieToolBarItem
//
this.GenesisGameGenieToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GenesisControllerIcon;
@ -323,16 +345,6 @@
this.SmsVdpToolbarItem.ToolTipText = "SMS VDP Viewer";
this.SmsVdpToolbarItem.Click += new System.EventHandler(this.SmsVdpToolbarItem_Click);
//
// GenesisVdpToolBarItem
//
this.GenesisVdpToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GenesisControllerIcon;
this.GenesisVdpToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.GenesisVdpToolBarItem.Name = "GenesisVdpToolBarItem";
this.GenesisVdpToolBarItem.Size = new System.Drawing.Size(49, 20);
this.GenesisVdpToolBarItem.Text = "VDP";
this.GenesisVdpToolBarItem.ToolTipText = "Genesis VDP/Tile Viewer";
this.GenesisVdpToolBarItem.Click += new System.EventHandler(this.GenesisVdpToolBarItem_Click);
//
// ToolBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -378,6 +390,7 @@
private System.Windows.Forms.ToolStripButton SmsVdpToolbarItem;
private System.Windows.Forms.ToolStripButton PceTileToolbarItem;
private System.Windows.Forms.ToolStripButton GenesisVdpToolBarItem;
private System.Windows.Forms.ToolStripButton PceSoundDebuggerButton;
}
}

5
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -215,6 +215,11 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<PceBgViewer>();
}
private void PceSoundDebuggerButton_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<PCESoundDebugger>();
}
private void GbaGpuViewerToolBarItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<GBAGPUView>();