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

Add GBA Gpu Viewer to toolbox, and add snazzy gba icon

This commit is contained in:
adelikat 2013-12-22 15:39:11 +00:00
parent edd9e65e9e
commit 5fff62d52b
9 changed files with 6088 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -1288,6 +1288,7 @@
<Content Include="config\ControllerImages\SaturnController.jpg" />
<None Include="images\addWatch.ico" />
<None Include="images\alt_about_image.gif" />
<None Include="images\gba-icon.png" />
<Content Include="images\logo.ico" />
<None Include="images\Paste.png" />
<None Include="images\reboot.png" />

10
BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs generated
View File

@ -470,6 +470,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap gba_icon {
get {
object obj = ResourceManager.GetObject("gba_icon", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
BizHawk.Client.EmuHawk/Properties/Resources.resx
View File

@ -885,4 +885,7 @@
<data name="pcejin1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\pcejin1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="gba_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\gba-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
BizHawk.Client.EmuHawk/images/Gameboy Advance (black) icon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 345 KiB

BIN
BizHawk.Client.EmuHawk/images/gba-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

321
BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs generated
View File

@ -28,168 +28,169 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.listBoxWidgets = new System.Windows.Forms.ListBox();
this.panel1 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.buttonShowWidget = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.buttonRefresh = new System.Windows.Forms.Button();
this.hScrollBar1 = new System.Windows.Forms.HScrollBar();
this.radioButtonManual = new System.Windows.Forms.RadioButton();
this.radioButtonScanline = new System.Windows.Forms.RadioButton();
this.radioButtonFrame = new System.Windows.Forms.RadioButton();
this.labelClipboard = new System.Windows.Forms.Label();
this.timerMessage = new System.Windows.Forms.Timer(this.components);
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// listBoxWidgets
//
this.listBoxWidgets.Location = new System.Drawing.Point(12, 25);
this.listBoxWidgets.Name = "listBoxWidgets";
this.listBoxWidgets.Size = new System.Drawing.Size(137, 160);
this.listBoxWidgets.TabIndex = 0;
this.listBoxWidgets.DoubleClick += new System.EventHandler(this.listBoxWidgets_DoubleClick);
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GBAGPUView));
this.listBoxWidgets = new System.Windows.Forms.ListBox();
this.panel1 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.buttonShowWidget = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.buttonRefresh = new System.Windows.Forms.Button();
this.hScrollBar1 = new System.Windows.Forms.HScrollBar();
this.radioButtonManual = new System.Windows.Forms.RadioButton();
this.radioButtonScanline = new System.Windows.Forms.RadioButton();
this.radioButtonFrame = new System.Windows.Forms.RadioButton();
this.labelClipboard = new System.Windows.Forms.Label();
this.timerMessage = new System.Windows.Forms.Timer(this.components);
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// listBoxWidgets
//
this.listBoxWidgets.Location = new System.Drawing.Point(12, 25);
this.listBoxWidgets.Name = "listBoxWidgets";
this.listBoxWidgets.Size = new System.Drawing.Size(137, 160);
this.listBoxWidgets.TabIndex = 0;
this.listBoxWidgets.DoubleClick += new System.EventHandler(this.listBoxWidgets_DoubleClick);
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.AutoScroll = true;
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Location = new System.Drawing.Point(155, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(481, 405);
this.panel1.TabIndex = 1;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 9);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(92, 13);
this.label1.TabIndex = 2;
this.label1.Text = "Available widgets:";
//
// buttonShowWidget
//
this.buttonShowWidget.Location = new System.Drawing.Point(29, 191);
this.buttonShowWidget.Name = "buttonShowWidget";
this.buttonShowWidget.Size = new System.Drawing.Size(75, 23);
this.buttonShowWidget.TabIndex = 3;
this.buttonShowWidget.Text = "Show >>";
this.buttonShowWidget.UseVisualStyleBackColor = true;
this.buttonShowWidget.Click += new System.EventHandler(this.buttonShowWidget_Click);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.buttonRefresh);
this.groupBox1.Controls.Add(this.hScrollBar1);
this.groupBox1.Controls.Add(this.radioButtonManual);
this.groupBox1.Controls.Add(this.radioButtonScanline);
this.groupBox1.Controls.Add(this.radioButtonFrame);
this.groupBox1.Location = new System.Drawing.Point(15, 220);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(134, 133);
this.groupBox1.TabIndex = 4;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Refresh";
//
// buttonRefresh
//
this.buttonRefresh.Location = new System.Drawing.Point(6, 104);
this.buttonRefresh.Name = "buttonRefresh";
this.buttonRefresh.Size = new System.Drawing.Size(75, 23);
this.buttonRefresh.TabIndex = 4;
this.buttonRefresh.Text = "Refresh";
this.buttonRefresh.UseVisualStyleBackColor = true;
this.buttonRefresh.Click += new System.EventHandler(this.buttonRefresh_Click);
//
// hScrollBar1
//
this.hScrollBar1.LargeChange = 20;
this.hScrollBar1.Location = new System.Drawing.Point(3, 62);
this.hScrollBar1.Maximum = 246;
this.hScrollBar1.Name = "hScrollBar1";
this.hScrollBar1.Size = new System.Drawing.Size(128, 16);
this.hScrollBar1.TabIndex = 3;
this.hScrollBar1.ValueChanged += new System.EventHandler(this.hScrollBar1_ValueChanged);
//
// radioButtonManual
//
this.radioButtonManual.AutoSize = true;
this.radioButtonManual.Location = new System.Drawing.Point(6, 81);
this.radioButtonManual.Name = "radioButtonManual";
this.radioButtonManual.Size = new System.Drawing.Size(60, 17);
this.radioButtonManual.TabIndex = 2;
this.radioButtonManual.TabStop = true;
this.radioButtonManual.Text = "Manual";
this.radioButtonManual.UseVisualStyleBackColor = true;
this.radioButtonManual.CheckedChanged += new System.EventHandler(this.radioButtonManual_CheckedChanged);
//
// radioButtonScanline
//
this.radioButtonScanline.AutoSize = true;
this.radioButtonScanline.Location = new System.Drawing.Point(6, 42);
this.radioButtonScanline.Name = "radioButtonScanline";
this.radioButtonScanline.Size = new System.Drawing.Size(66, 17);
this.radioButtonScanline.TabIndex = 1;
this.radioButtonScanline.Text = "Scanline";
this.radioButtonScanline.UseVisualStyleBackColor = true;
this.radioButtonScanline.CheckedChanged += new System.EventHandler(this.radioButtonScanline_CheckedChanged);
//
// radioButtonFrame
//
this.radioButtonFrame.AutoSize = true;
this.radioButtonFrame.Location = new System.Drawing.Point(6, 19);
this.radioButtonFrame.Name = "radioButtonFrame";
this.radioButtonFrame.Size = new System.Drawing.Size(54, 17);
this.radioButtonFrame.TabIndex = 0;
this.radioButtonFrame.Text = "Frame";
this.radioButtonFrame.UseVisualStyleBackColor = true;
this.radioButtonFrame.CheckedChanged += new System.EventHandler(this.radioButtonFrame_CheckedChanged);
//
// labelClipboard
//
this.labelClipboard.AutoSize = true;
this.labelClipboard.Location = new System.Drawing.Point(9, 356);
this.labelClipboard.MaximumSize = new System.Drawing.Size(145, 0);
this.labelClipboard.Name = "labelClipboard";
this.labelClipboard.Size = new System.Drawing.Size(117, 26);
this.labelClipboard.TabIndex = 5;
this.labelClipboard.Text = "CTRL + C: Copy under mouse to clipboard.";
//
// timerMessage
//
this.timerMessage.Interval = 5000;
this.timerMessage.Tick += new System.EventHandler(this.timerMessage_Tick);
//
// GBAGPUView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(636, 405);
this.Controls.Add(this.labelClipboard);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.buttonShowWidget);
this.Controls.Add(this.label1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.listBoxWidgets);
this.KeyPreview = true;
this.Name = "GBAGPUView";
this.ShowIcon = false;
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "GBA GPU Viewer";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.GBAGPUView_FormClosed);
this.Load += new System.EventHandler(this.GBAGPUView_Load);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GBAGPUView_KeyDown);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
this.panel1.AutoScroll = true;
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Location = new System.Drawing.Point(155, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(481, 405);
this.panel1.TabIndex = 1;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 9);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(92, 13);
this.label1.TabIndex = 2;
this.label1.Text = "Available widgets:";
//
// buttonShowWidget
//
this.buttonShowWidget.Location = new System.Drawing.Point(29, 191);
this.buttonShowWidget.Name = "buttonShowWidget";
this.buttonShowWidget.Size = new System.Drawing.Size(75, 23);
this.buttonShowWidget.TabIndex = 3;
this.buttonShowWidget.Text = "Show >>";
this.buttonShowWidget.UseVisualStyleBackColor = true;
this.buttonShowWidget.Click += new System.EventHandler(this.buttonShowWidget_Click);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.buttonRefresh);
this.groupBox1.Controls.Add(this.hScrollBar1);
this.groupBox1.Controls.Add(this.radioButtonManual);
this.groupBox1.Controls.Add(this.radioButtonScanline);
this.groupBox1.Controls.Add(this.radioButtonFrame);
this.groupBox1.Location = new System.Drawing.Point(15, 220);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(134, 133);
this.groupBox1.TabIndex = 4;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Refresh";
//
// buttonRefresh
//
this.buttonRefresh.Location = new System.Drawing.Point(6, 104);
this.buttonRefresh.Name = "buttonRefresh";
this.buttonRefresh.Size = new System.Drawing.Size(75, 23);
this.buttonRefresh.TabIndex = 4;
this.buttonRefresh.Text = "Refresh";
this.buttonRefresh.UseVisualStyleBackColor = true;
this.buttonRefresh.Click += new System.EventHandler(this.buttonRefresh_Click);
//
// hScrollBar1
//
this.hScrollBar1.LargeChange = 20;
this.hScrollBar1.Location = new System.Drawing.Point(3, 62);
this.hScrollBar1.Maximum = 246;
this.hScrollBar1.Name = "hScrollBar1";
this.hScrollBar1.Size = new System.Drawing.Size(128, 16);
this.hScrollBar1.TabIndex = 3;
this.hScrollBar1.ValueChanged += new System.EventHandler(this.hScrollBar1_ValueChanged);
//
// radioButtonManual
//
this.radioButtonManual.AutoSize = true;
this.radioButtonManual.Location = new System.Drawing.Point(6, 81);
this.radioButtonManual.Name = "radioButtonManual";
this.radioButtonManual.Size = new System.Drawing.Size(60, 17);
this.radioButtonManual.TabIndex = 2;
this.radioButtonManual.TabStop = true;
this.radioButtonManual.Text = "Manual";
this.radioButtonManual.UseVisualStyleBackColor = true;
this.radioButtonManual.CheckedChanged += new System.EventHandler(this.radioButtonManual_CheckedChanged);
//
// radioButtonScanline
//
this.radioButtonScanline.AutoSize = true;
this.radioButtonScanline.Location = new System.Drawing.Point(6, 42);
this.radioButtonScanline.Name = "radioButtonScanline";
this.radioButtonScanline.Size = new System.Drawing.Size(66, 17);
this.radioButtonScanline.TabIndex = 1;
this.radioButtonScanline.Text = "Scanline";
this.radioButtonScanline.UseVisualStyleBackColor = true;
this.radioButtonScanline.CheckedChanged += new System.EventHandler(this.radioButtonScanline_CheckedChanged);
//
// radioButtonFrame
//
this.radioButtonFrame.AutoSize = true;
this.radioButtonFrame.Location = new System.Drawing.Point(6, 19);
this.radioButtonFrame.Name = "radioButtonFrame";
this.radioButtonFrame.Size = new System.Drawing.Size(54, 17);
this.radioButtonFrame.TabIndex = 0;
this.radioButtonFrame.Text = "Frame";
this.radioButtonFrame.UseVisualStyleBackColor = true;
this.radioButtonFrame.CheckedChanged += new System.EventHandler(this.radioButtonFrame_CheckedChanged);
//
// labelClipboard
//
this.labelClipboard.AutoSize = true;
this.labelClipboard.Location = new System.Drawing.Point(9, 356);
this.labelClipboard.MaximumSize = new System.Drawing.Size(145, 0);
this.labelClipboard.Name = "labelClipboard";
this.labelClipboard.Size = new System.Drawing.Size(117, 26);
this.labelClipboard.TabIndex = 5;
this.labelClipboard.Text = "CTRL + C: Copy under mouse to clipboard.";
//
// timerMessage
//
this.timerMessage.Interval = 5000;
this.timerMessage.Tick += new System.EventHandler(this.timerMessage_Tick);
//
// GBAGPUView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(636, 405);
this.Controls.Add(this.labelClipboard);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.buttonShowWidget);
this.Controls.Add(this.label1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.listBoxWidgets);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true;
this.Name = "GBAGPUView";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "GBA GPU Viewer";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.GBAGPUView_FormClosed);
this.Load += new System.EventHandler(this.GBAGPUView_Load);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GBAGPUView_KeyDown);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}

5891
BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.resx
View File

File diff suppressed because it is too large Load Diff

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

@ -48,6 +48,7 @@
this.GbGpuViewerToolBarItem = new System.Windows.Forms.ToolStripButton();
this.GBGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
this.PceBgViewerToolbarItem = new System.Windows.Forms.ToolStripButton();
this.GbaGpuViewerToolBarItem = new System.Windows.Forms.ToolStripButton();
this.ToolBoxStrip.SuspendLayout();
this.SuspendLayout();
//
@ -79,7 +80,8 @@
this.GGGameGenieToolbarItem,
this.GbGpuViewerToolBarItem,
this.GBGameGenieToolbarItem,
this.PceBgViewerToolbarItem});
this.PceBgViewerToolbarItem,
this.GbaGpuViewerToolBarItem});
this.ToolBoxStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
this.ToolBoxStrip.Location = new System.Drawing.Point(2, 2);
this.ToolBoxStrip.Name = "ToolBoxStrip";
@ -261,6 +263,16 @@
this.PceBgViewerToolbarItem.ToolTipText = "PC Engine Background Viewer";
this.PceBgViewerToolbarItem.Click += new System.EventHandler(this.PceBgViewerToolbarItem_Click);
//
// GbaGpuViewerToolBarItem
//
this.GbaGpuViewerToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.gba_icon;
this.GbaGpuViewerToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.GbaGpuViewerToolBarItem.Name = "GbaGpuViewerToolBarItem";
this.GbaGpuViewerToolBarItem.Size = new System.Drawing.Size(49, 20);
this.GbaGpuViewerToolBarItem.Text = "Gpu";
this.GbaGpuViewerToolBarItem.ToolTipText = "Gameboy Advance Gpu Viewer";
this.GbaGpuViewerToolBarItem.Click += new System.EventHandler(this.GbaGpuViewerToolBarItem_Click);
//
// ToolBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -300,6 +312,7 @@
private System.Windows.Forms.ToolStripButton PceBgViewerToolbarItem;
private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem;
private System.Windows.Forms.ToolStripButton GbGpuViewerToolBarItem;
private System.Windows.Forms.ToolStripButton GbaGpuViewerToolBarItem;
}
}

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

@ -8,6 +8,7 @@ using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Calculators;
using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.Nintendo.GBA;
using BizHawk.Emulation.Cores.PCEngine;
namespace BizHawk.Client.EmuHawk
@ -65,6 +66,8 @@ namespace BizHawk.Client.EmuHawk
GbGpuViewerToolBarItem.Visible =
Global.Game.System == "GB";
GbaGpuViewerToolBarItem.Visible = Global.Emulator is GBA;
foreach (var button in ToolBoxItems)
{
if (button.Visible)
@ -199,6 +202,11 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<PCEBGViewer>();
}
private void GbaGpuViewerToolBarItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<GBAGPUView>();
}
#endregion
}
}