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

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

@ -29,6 +29,7 @@
private void InitializeComponent()
{
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();
@ -177,9 +178,9 @@
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.ShowIcon = false;
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "GBA GPU Viewer";

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
}
}