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

move icon references in designer files to the main files before the designer eats them

This commit is contained in:
adelikat 2020-06-25 16:32:29 -05:00
parent 09a6f54735
commit af2649d9a0
40 changed files with 261 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/BizBox.Designer.cs generated
View File

@ -57,7 +57,6 @@
//
// pictureBox1
//
this.pictureBox1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.corphawk;
this.pictureBox1.Location = new System.Drawing.Point(12, 10);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(164, 164);
@ -123,7 +122,6 @@
this.btnCopyHash.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCopyHash.AutoSize = true;
this.btnCopyHash.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.btnCopyHash.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.btnCopyHash.Location = new System.Drawing.Point(12, 505);
this.btnCopyHash.Name = "btnCopyHash";
this.btnCopyHash.Size = new System.Drawing.Size(22, 22);

9
src/BizHawk.Client.EmuHawk/BizBox.cs
View File

@ -1,9 +1,10 @@
using BizHawk.Emulation.Common;
using System;
using System;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Windows.Forms;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk
{
@ -12,7 +13,9 @@ namespace BizHawk.Client.EmuHawk
public BizBox()
{
InitializeComponent();
Icon = Properties.Resources.logo;
Icon = Resources.logo;
pictureBox1.Image = Resources.corphawk;
btnCopyHash.Image = Resources.Duplicate;
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

7
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs generated
View File

@ -215,7 +215,6 @@
this.tbbGroup.CheckOnClick = true;
this.tbbGroup.CheckState = System.Windows.Forms.CheckState.Checked;
this.tbbGroup.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tbbGroup.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.tbbGroup.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbbGroup.Name = "tbbGroup";
this.tbbGroup.Size = new System.Drawing.Size(44, 22);
@ -230,7 +229,6 @@
// tbbScan
//
this.tbbScan.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tbbScan.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.tbbScan.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbbScan.Name = "tbbScan";
this.tbbScan.Size = new System.Drawing.Size(36, 22);
@ -240,7 +238,6 @@
// tbbOrganize
//
this.tbbOrganize.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tbbOrganize.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.tbbOrganize.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbbOrganize.Name = "tbbOrganize";
this.tbbOrganize.Size = new System.Drawing.Size(58, 22);
@ -250,7 +247,6 @@
// tbbImport
//
this.tbbImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tbbImport.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.tbbImport.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbbImport.Name = "tbbImport";
this.tbbImport.Size = new System.Drawing.Size(47, 22);
@ -261,7 +257,6 @@
//
this.tbbClose.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.tbbClose.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tbbClose.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.tbbClose.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbbClose.Margin = new System.Windows.Forms.Padding(0, 1, 2, 2);
this.tbbClose.Name = "tbbClose";
@ -281,7 +276,6 @@
this.tbbCloseReload.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.tbbCloseReload.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tbbCloseReload.Enabled = false;
this.tbbCloseReload.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.tbbCloseReload.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbbCloseReload.Name = "tbbCloseReload";
this.tbbCloseReload.Size = new System.Drawing.Size(129, 22);
@ -293,7 +287,6 @@
// tbbOpenFolder
//
this.tbbOpenFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tbbOpenFolder.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.tbbOpenFolder.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbbOpenFolder.Name = "tbbOpenFolder";
this.tbbOpenFolder.Size = new System.Drawing.Size(128, 22);

11
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -9,6 +9,7 @@ using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Emulation.Common;
// notes: eventually, we intend to have a "firmware acquisition interface" exposed to the emulator cores.
@ -99,8 +100,16 @@ namespace BizHawk.Client.EmuHawk
_config = config;
InitializeComponent();
tbbGroup.Image
= tbbScan.Image
= tbbOrganize.Image
= tbbImport.Image
= tbbClose.Image
= tbbCloseReload.Image
= tbbOpenFolder.Image = Resources.placeholder_bitmap;
// prep ImageList for ListView with 3 item states for {idUnsure, idMissing, idOk}
imageList1.Images.AddRange(new[] { Properties.Resources.RetroQuestion, Properties.Resources.ExclamationRed, Properties.Resources.GreenCheck });
imageList1.Images.AddRange(new[] { Resources.RetroQuestion, Resources.ExclamationRed, Resources.GreenCheck });
_listViewSorter = new ListViewSorter(-1);

1
src/BizHawk.Client.EmuHawk/config/InputCompositeWidget.Designer.cs generated
View File

@ -38,7 +38,6 @@
//
// btnSpecial
//
this.btnSpecial.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.arrow_black_down;
this.btnSpecial.Location = new System.Drawing.Point(472, 0);
this.btnSpecial.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
this.btnSpecial.Name = "btnSpecial";

2
src/BizHawk.Client.EmuHawk/config/InputCompositeWidget.cs
View File

@ -8,9 +8,9 @@ namespace BizHawk.Client.EmuHawk
public InputCompositeWidget()
{
InitializeComponent();
btnSpecial.Image = Properties.Resources.arrow_black_down;
_dropdownMenu = new ContextMenuStrip();
_dropdownMenu.ItemClicked += DropdownMenu_ItemClicked;
_dropdownMenu.PreviewKeyDown += DropdownMenu_PreviewKeyDown;
foreach (var spec in InputWidget.SpecialBindings)

1
src/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.Designer.cs generated
View File

@ -91,7 +91,6 @@
// HelpBtn
//
this.HelpBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.HelpBtn.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help;
this.HelpBtn.Location = new System.Drawing.Point(12, 177);
this.HelpBtn.Name = "HelpBtn";
this.HelpBtn.Size = new System.Drawing.Size(23, 23);

1
src/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs
View File

@ -21,6 +21,7 @@ namespace BizHawk.Client.EmuHawk
_mainForm = mainForm;
_syncSettings = syncSettings;
InitializeComponent();
HelpBtn.Image = Properties.Resources.Help;
if (hasMapperProperties)
{

1
src/BizHawk.Client.EmuHawk/config/PathConfig.Designer.cs generated
View File

@ -97,7 +97,6 @@
// SpecialCommandsBtn
//
this.SpecialCommandsBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SpecialCommandsBtn.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help;
this.SpecialCommandsBtn.Location = new System.Drawing.Point(641, 14);
this.SpecialCommandsBtn.Name = "SpecialCommandsBtn";
this.SpecialCommandsBtn.Size = new System.Drawing.Size(26, 23);

1
src/BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -48,6 +48,7 @@ namespace BizHawk.Client.EmuHawk
_config = config;
_currentSystemId = currentSystemId;
InitializeComponent();
SpecialCommandsBtn.Image = Properties.Resources.Help;
}
private void LoadSettings()

3
src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs generated
View File

@ -86,7 +86,6 @@
// BrowseMovies
//
this.BrowseMovies.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.BrowseMovies.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.BrowseMovies.Location = new System.Drawing.Point(12, 364);
this.BrowseMovies.Name = "BrowseMovies";
this.BrowseMovies.Size = new System.Drawing.Size(31, 23);
@ -200,7 +199,6 @@
// Scan
//
this.Scan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.Scan.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Scan;
this.Scan.Location = new System.Drawing.Point(49, 364);
this.Scan.Name = "Scan";
this.Scan.Size = new System.Drawing.Size(27, 23);
@ -230,7 +228,6 @@
//
// editToolStripMenuItem
//
this.editToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS;
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
this.editToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.editToolStripMenuItem.Text = "&Edit";

3
src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -44,6 +44,9 @@ namespace BizHawk.Client.EmuHawk
_movieSession = movieSession;
InitializeComponent();
Icon = Properties.Resources.TAStudio_MultiSize;
BrowseMovies.Image = Properties.Resources.OpenFile;
Scan.Image = Properties.Resources.Scan;
editToolStripMenuItem.Image = Properties.Resources.CutHS;
MovieView.RetrieveVirtualItem += MovieView_QueryItemText;
MovieView.VirtualMode = true;
_sortReverse = false;

1
src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs generated
View File

@ -68,7 +68,6 @@
// BrowseBtn
//
this.BrowseBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BrowseBtn.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.BrowseBtn.Location = new System.Drawing.Point(423, 13);
this.BrowseBtn.Name = "BrowseBtn";
this.BrowseBtn.Size = new System.Drawing.Size(25, 23);

1
src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -34,6 +34,7 @@ namespace BizHawk.Client.EmuHawk
_firmwareManager = firmwareManager;
InitializeComponent();
Icon = Properties.Resources.TAStudio_MultiSize;
BrowseBtn.Image = Properties.Resources.OpenFile;
if (!_emulator.HasSavestates())
{

10
src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs generated
View File

@ -171,7 +171,6 @@
//
// NewMenuItem
//
this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewMenuItem.Name = "NewMenuItem";
this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.NewMenuItem.Size = new System.Drawing.Size(195, 22);
@ -180,7 +179,6 @@
//
// OpenMenuItem
//
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenMenuItem.Size = new System.Drawing.Size(195, 22);
@ -189,7 +187,6 @@
//
// SaveMenuItem
//
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(195, 22);
@ -209,7 +206,6 @@
//
this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator2});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(195, 22);
this.RecentSubMenu.Text = "Recent";
@ -313,7 +309,6 @@
//
// RunBtn
//
this.RunBtn.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
this.RunBtn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.RunBtn.Location = new System.Drawing.Point(6, 56);
this.RunBtn.Name = "RunBtn";
@ -337,7 +332,6 @@
// BotStatusButton
//
this.BotStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.BotStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.BotStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.BotStatusButton.Name = "BotStatusButton";
this.BotStatusButton.RightToLeftAutoMirrorImage = true;
@ -402,7 +396,6 @@
//
// btnCopyBestInput
//
this.btnCopyBestInput.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.btnCopyBestInput.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCopyBestInput.Location = new System.Drawing.Point(12, 94);
this.btnCopyBestInput.Name = "btnCopyBestInput";
@ -417,7 +410,6 @@
// PlayBestButton
//
this.PlayBestButton.Enabled = false;
this.PlayBestButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
this.PlayBestButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.PlayBestButton.Location = new System.Drawing.Point(12, 46);
this.PlayBestButton.Name = "PlayBestButton";
@ -430,7 +422,6 @@
// ClearBestButton
//
this.ClearBestButton.Enabled = false;
this.ClearBestButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
this.ClearBestButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.ClearBestButton.Location = new System.Drawing.Point(12, 70);
this.ClearBestButton.Name = "ClearBestButton";
@ -1058,7 +1049,6 @@
//
// StopBtn
//
this.StopBtn.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
this.StopBtn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.StopBtn.Location = new System.Drawing.Point(6, 56);
this.StopBtn.Name = "StopBtn";

13
src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -10,6 +10,7 @@ using BizHawk.Client.EmuHawk.ToolExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
namespace BizHawk.Client.EmuHawk
{
@ -81,7 +82,17 @@ namespace BizHawk.Client.EmuHawk
public BasicBot()
{
InitializeComponent();
Icon = Properties.Resources.basicbot;
Icon = Resources.basicbot;
NewMenuItem.Image = Resources.NewFile;
OpenMenuItem.Image = Resources.OpenFile;
SaveMenuItem.Image = Resources.SaveAs;
RecentSubMenu.Image = Resources.Recent;
RunBtn.Image = Resources.Play;
BotStatusButton.Image = Resources.placeholder_bitmap;
btnCopyBestInput.Image = Resources.Duplicate;
PlayBestButton.Image = Resources.Play;
ClearBestButton.Image = Resources.Close;
StopBtn.Image = Resources.Stop;
Text = DialogTitle;
Settings = new BasicBotSettings();

12
src/BizHawk.Client.EmuHawk/tools/CDL.cs
View File

@ -5,6 +5,7 @@ using System.Windows.Forms;
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Client.EmuHawk.ToolExtensions;
// TODO - select which memorydomains go out to the CDL file. will this cause a problem when re-importing it?
@ -14,7 +15,6 @@ using BizHawk.Client.EmuHawk.ToolExtensions;
// TODO - consider setting colors for columns in CDL
// TODO - option to print domain name in caption instead of 0x01 etc.
// TODO - context menu should have copy option too
namespace BizHawk.Client.EmuHawk
{
public partial class CDL : ToolFormBase, IToolFormAutoConfig
@ -59,8 +59,16 @@ namespace BizHawk.Client.EmuHawk
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
SetStyle(ControlStyles.UserPaint, true);
SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
InitializeComponent();
Icon = Properties.Resources.cdlogger_MultiSize;
NewMenuItem.Image = Resources.NewFile;
OpenMenuItem.Image = Resources.OpenFile;
SaveMenuItem.Image = Resources.SaveAs;
RecentSubMenu.Image = Resources.Recent;
tsbLoggingActive.Image = Resources.placeholder_bitmap;
tsbViewUpdate.Image = Resources.placeholder_bitmap;
tsbExportText.Image = Resources.LoadConfig;
Icon = Resources.cdlogger_MultiSize;
tsbViewStyle.SelectedIndex = 0;

7
src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs generated
View File

@ -92,7 +92,6 @@
//
// NewMenuItem
//
this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewMenuItem.Name = "NewMenuItem";
this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.NewMenuItem.Size = new System.Drawing.Size(193, 22);
@ -101,7 +100,6 @@
//
// OpenMenuItem
//
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenMenuItem.Size = new System.Drawing.Size(193, 22);
@ -110,7 +108,6 @@
//
// SaveMenuItem
//
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(193, 22);
@ -137,7 +134,6 @@
//
this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.noneToolStripMenuItem});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(193, 22);
this.RecentSubMenu.Text = "Recent";
@ -215,7 +211,6 @@
//
this.tsbLoggingActive.CheckOnClick = true;
this.tsbLoggingActive.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tsbLoggingActive.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.tsbLoggingActive.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbLoggingActive.Name = "tsbLoggingActive";
this.tsbLoggingActive.Size = new System.Drawing.Size(41, 22);
@ -233,7 +228,6 @@
this.tsbViewUpdate.CheckOnClick = true;
this.tsbViewUpdate.CheckState = System.Windows.Forms.CheckState.Checked;
this.tsbViewUpdate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tsbViewUpdate.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.tsbViewUpdate.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbViewUpdate.Name = "tsbViewUpdate";
this.tsbViewUpdate.Size = new System.Drawing.Size(46, 22);
@ -257,7 +251,6 @@
//
// tsbExportText
//
this.tsbExportText.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig;
this.tsbExportText.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbExportText.Name = "tsbExportText";
this.tsbExportText.Size = new System.Drawing.Size(87, 22);

21
src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs generated
View File

@ -129,7 +129,6 @@
//
// ToggleContextMenuItem
//
this.ToggleContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1;
this.ToggleContextMenuItem.Name = "ToggleContextMenuItem";
this.ToggleContextMenuItem.ShortcutKeyDisplayString = "Enter";
this.ToggleContextMenuItem.Size = new System.Drawing.Size(169, 22);
@ -138,7 +137,6 @@
//
// RemoveContextMenuItem
//
this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveContextMenuItem.Name = "RemoveContextMenuItem";
this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Delete";
this.RemoveContextMenuItem.Size = new System.Drawing.Size(169, 22);
@ -147,7 +145,6 @@
//
// DisableAllContextMenuItem
//
this.DisableAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
this.DisableAllContextMenuItem.Name = "DisableAllContextMenuItem";
this.DisableAllContextMenuItem.Size = new System.Drawing.Size(169, 22);
this.DisableAllContextMenuItem.Text = "&Disable All";
@ -191,7 +188,6 @@
//
// NewMenuItem
//
this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewMenuItem.Name = "NewMenuItem";
this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.NewMenuItem.Size = new System.Drawing.Size(195, 22);
@ -200,7 +196,6 @@
//
// OpenMenuItem
//
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenMenuItem.Size = new System.Drawing.Size(195, 22);
@ -209,7 +204,6 @@
//
// SaveMenuItem
//
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(195, 22);
@ -235,7 +229,6 @@
//
this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator4});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(195, 22);
this.RecentSubMenu.Text = "Recent";
@ -280,7 +273,6 @@
//
// RemoveCheatMenuItem
//
this.RemoveCheatMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveCheatMenuItem.Name = "RemoveCheatMenuItem";
this.RemoveCheatMenuItem.ShortcutKeyDisplayString = "Delete";
this.RemoveCheatMenuItem.Size = new System.Drawing.Size(233, 22);
@ -289,7 +281,6 @@
//
// InsertSeparatorMenuItem
//
this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem";
this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(233, 22);
@ -303,7 +294,6 @@
//
// MoveUpMenuItem
//
this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.MoveUpMenuItem.Name = "MoveUpMenuItem";
this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U)));
this.MoveUpMenuItem.Size = new System.Drawing.Size(233, 22);
@ -312,7 +302,6 @@
//
// MoveDownMenuItem
//
this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.MoveDownMenuItem.Name = "MoveDownMenuItem";
this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
this.MoveDownMenuItem.Size = new System.Drawing.Size(233, 22);
@ -334,7 +323,6 @@
//
// ToggleMenuItem
//
this.ToggleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1;
this.ToggleMenuItem.Name = "ToggleMenuItem";
this.ToggleMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Enter)));
this.ToggleMenuItem.ShortcutKeyDisplayString = "Ctrl + Enter";
@ -344,7 +332,6 @@
//
// DisableAllCheatsMenuItem
//
this.DisableAllCheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
this.DisableAllCheatsMenuItem.Name = "DisableAllCheatsMenuItem";
this.DisableAllCheatsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Back)));
this.DisableAllCheatsMenuItem.ShortcutKeyDisplayString = "Ctrl + Backspace";
@ -472,7 +459,6 @@
// NewToolBarItem
//
this.NewToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.NewToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NewToolBarItem.Name = "NewToolBarItem";
this.NewToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -482,7 +468,6 @@
// OpenToolBarItem
//
this.OpenToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.OpenToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.OpenToolBarItem.Name = "OpenToolBarItem";
this.OpenToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -492,7 +477,6 @@
// SaveToolBarItem
//
this.SaveToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.SaveToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.SaveToolBarItem.Name = "SaveToolBarItem";
this.SaveToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -507,7 +491,6 @@
// RemoveToolbarItem
//
this.RemoveToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.RemoveToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.RemoveToolbarItem.Name = "RemoveToolbarItem";
this.RemoveToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -517,7 +500,6 @@
// SeparatorToolbarItem
//
this.SeparatorToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.SeparatorToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.SeparatorToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.SeparatorToolbarItem.Name = "SeparatorToolbarItem";
this.SeparatorToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -532,7 +514,6 @@
// MoveUpToolbarItem
//
this.MoveUpToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.MoveUpToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.MoveUpToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.MoveUpToolbarItem.Name = "MoveUpToolbarItem";
this.MoveUpToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -542,7 +523,6 @@
// MoveDownToolbarItem
//
this.MoveDownToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.MoveDownToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.MoveDownToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.MoveDownToolbarItem.Name = "MoveDownToolbarItem";
this.MoveDownToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -557,7 +537,6 @@
// LoadGameGenieToolbarItem
//
this.LoadGameGenieToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.LoadGameGenieToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.LoadGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.LoadGameGenieToolbarItem.Name = "LoadGameGenieToolbarItem";
this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(75, 22);

24
src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
View File

@ -8,6 +8,7 @@ using System.Windows.Forms;
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Client.EmuHawk.ToolExtensions;
namespace BizHawk.Client.EmuHawk
@ -33,7 +34,28 @@ namespace BizHawk.Client.EmuHawk
public Cheats()
{
InitializeComponent();
Icon = Properties.Resources.Freeze_MultiSize;
Icon = Resources.Freeze_MultiSize;
ToggleContextMenuItem.Image = Resources.Refresh1;
RemoveContextMenuItem.Image = Resources.Delete;
DisableAllContextMenuItem.Image = Resources.Stop;
NewMenuItem.Image = Resources.NewFile;
OpenMenuItem.Image = Resources.OpenFile;
SaveMenuItem.Image = Resources.SaveAs;
RecentSubMenu.Image = Resources.Recent;
RemoveCheatMenuItem.Image = Resources.Delete;
InsertSeparatorMenuItem.Image = Resources.InsertSeparator;
MoveUpMenuItem.Image = Resources.MoveUp;
MoveDownMenuItem.Image = Resources.MoveDown;
ToggleMenuItem.Image = Resources.Refresh1;
DisableAllCheatsMenuItem.Image = Resources.Stop;
NewToolBarItem.Image = Resources.NewFile;
OpenToolBarItem.Image = Resources.OpenFile;
SaveToolBarItem.Image = Resources.SaveAs;
RemoveToolbarItem.Image = Resources.Delete;
SeparatorToolbarItem.Image = Resources.InsertSeparator;
MoveUpToolbarItem.Image = Resources.MoveUp;
MoveDownToolbarItem.Image = Resources.MoveDown;
LoadGameGenieToolbarItem.Image = Resources.placeholder_bitmap;
Settings = new CheatsSettings();
Closing += (o, e) =>

5
src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.Designer.cs generated
View File

@ -46,7 +46,6 @@
// AddBreakpointButton
//
this.AddBreakpointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.AddBreakpointButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
this.AddBreakpointButton.Location = new System.Drawing.Point(0, 387);
this.AddBreakpointButton.Name = "AddBreakpointButton";
this.AddBreakpointButton.Size = new System.Drawing.Size(23, 23);
@ -67,7 +66,6 @@
// ToggleButton
//
this.ToggleButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.ToggleButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh;
this.ToggleButton.Location = new System.Drawing.Point(311, 387);
this.ToggleButton.Name = "ToggleButton";
this.ToggleButton.Size = new System.Drawing.Size(23, 23);
@ -79,7 +77,6 @@
// RemoveBreakpointButton
//
this.RemoveBreakpointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.RemoveBreakpointButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveBreakpointButton.Location = new System.Drawing.Point(340, 387);
this.RemoveBreakpointButton.Name = "RemoveBreakpointButton";
this.RemoveBreakpointButton.Size = new System.Drawing.Size(23, 23);
@ -91,7 +88,6 @@
// DuplicateBreakpointButton
//
this.DuplicateBreakpointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.DuplicateBreakpointButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.DuplicateBreakpointButton.Location = new System.Drawing.Point(282, 387);
this.DuplicateBreakpointButton.Name = "DuplicateBreakpointButton";
this.DuplicateBreakpointButton.Size = new System.Drawing.Size(23, 23);
@ -103,7 +99,6 @@
// EditBreakpointButton
//
this.EditBreakpointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.EditBreakpointButton.BackgroundImage = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
this.EditBreakpointButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.EditBreakpointButton.Location = new System.Drawing.Point(253, 387);
this.EditBreakpointButton.Name = "EditBreakpointButton";

6
src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
View File

@ -4,6 +4,7 @@ using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Common.NumberExtensions;
using BizHawk.Emulation.Common;
@ -22,6 +23,11 @@ namespace BizHawk.Client.EmuHawk
public BreakpointControl()
{
InitializeComponent();
AddBreakpointButton.Image = Resources.add;
ToggleButton.Image = Resources.Refresh;
RemoveBreakpointButton.Image = Resources.Delete;
DuplicateBreakpointButton.Image = Resources.Duplicate;
EditBreakpointButton.BackgroundImage = Resources.pencil;
BreakpointView.RetrieveVirtualItem += BreakPointView_QueryItemText;
BreakpointView.VirtualMode = true;
_breakpoints.Callback = BreakpointCallback;

13
src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs generated
View File

@ -130,7 +130,6 @@
//
// SaveMenuItem
//
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(229, 22);
@ -225,7 +224,6 @@
//
// CopyMenuItem
//
this.CopyMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.CopyMenuItem.Name = "CopyMenuItem";
this.CopyMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
this.CopyMenuItem.Size = new System.Drawing.Size(147, 22);
@ -242,7 +240,6 @@
//
// PasteMenuItem
//
this.PasteMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Paste;
this.PasteMenuItem.Name = "PasteMenuItem";
this.PasteMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
this.PasteMenuItem.Size = new System.Drawing.Size(147, 22);
@ -362,7 +359,6 @@
//
// AddToRamWatchMenuItem
//
this.AddToRamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS;
this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem";
this.AddToRamWatchMenuItem.ShortcutKeyDisplayString = "Ctrl+W";
this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(221, 22);
@ -371,7 +367,6 @@
//
// FreezeAddressMenuItem
//
this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem";
this.FreezeAddressMenuItem.ShortcutKeyDisplayString = "Space";
this.FreezeAddressMenuItem.Size = new System.Drawing.Size(221, 22);
@ -380,7 +375,6 @@
//
// UnfreezeAllMenuItem
//
this.UnfreezeAllMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze;
this.UnfreezeAllMenuItem.Name = "UnfreezeAllMenuItem";
this.UnfreezeAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Delete)));
this.UnfreezeAllMenuItem.Size = new System.Drawing.Size(221, 22);
@ -389,7 +383,6 @@
//
// PokeAddressMenuItem
//
this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeAddressMenuItem.Name = "PokeAddressMenuItem";
this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
this.PokeAddressMenuItem.Size = new System.Drawing.Size(221, 22);
@ -467,7 +460,6 @@
//
// CopyContextItem
//
this.CopyContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.CopyContextItem.Name = "CopyContextItem";
this.CopyContextItem.ShortcutKeyDisplayString = "Ctrl+C";
this.CopyContextItem.Size = new System.Drawing.Size(221, 22);
@ -483,7 +475,6 @@
//
// PasteContextItem
//
this.PasteContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Paste;
this.PasteContextItem.Name = "PasteContextItem";
this.PasteContextItem.ShortcutKeyDisplayString = "Ctrl+V";
this.PasteContextItem.Size = new System.Drawing.Size(221, 22);
@ -492,7 +483,6 @@
//
// FreezeContextItem
//
this.FreezeContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeContextItem.Name = "FreezeContextItem";
this.FreezeContextItem.ShortcutKeyDisplayString = "Space";
this.FreezeContextItem.Size = new System.Drawing.Size(221, 22);
@ -501,7 +491,6 @@
//
// AddToRamWatchContextItem
//
this.AddToRamWatchContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS;
this.AddToRamWatchContextItem.Name = "AddToRamWatchContextItem";
this.AddToRamWatchContextItem.ShortcutKeyDisplayString = "Ctrl+W";
this.AddToRamWatchContextItem.Size = new System.Drawing.Size(221, 22);
@ -510,7 +499,6 @@
//
// UnfreezeAllContextItem
//
this.UnfreezeAllContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze;
this.UnfreezeAllContextItem.Name = "UnfreezeAllContextItem";
this.UnfreezeAllContextItem.ShortcutKeyDisplayString = "Shift+Del";
this.UnfreezeAllContextItem.Size = new System.Drawing.Size(221, 22);
@ -519,7 +507,6 @@
//
// PokeContextItem
//
this.PokeContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeContextItem.Name = "PokeContextItem";
this.PokeContextItem.ShortcutKeyDisplayString = "Ctrl+P";
this.PokeContextItem.Size = new System.Drawing.Size(221, 22);

25
src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -14,6 +14,7 @@ using BizHawk.Common.StringExtensions;
using BizHawk.Common.IOExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Client.EmuHawk.ToolExtensions;
namespace BizHawk.Client.EmuHawk
@ -121,7 +122,21 @@ namespace BizHawk.Client.EmuHawk
_fontHeight = fontSize1.Height;
InitializeComponent();
Icon = Properties.Resources.poke_MultiSize;
Icon = Resources.poke_MultiSize;
SaveMenuItem.Image = Resources.SaveAs;
CopyMenuItem.Image = Resources.Duplicate;
PasteMenuItem.Image = Resources.Paste;
AddToRamWatchMenuItem.Image = Resources.FindHS;
FreezeAddressMenuItem.Image = Resources.Freeze;
UnfreezeAllMenuItem.Image = Resources.Unfreeze;
PokeAddressMenuItem.Image = Resources.poke;
CopyContextItem.Image = Resources.Duplicate;
PasteContextItem.Image = Resources.Paste;
FreezeContextItem.Image = Resources.Freeze;
AddToRamWatchContextItem.Image = Resources.FindHS;
UnfreezeAllContextItem.Image = Resources.Unfreeze;
PokeContextItem.Image = Resources.poke;
AddressesLabel.BackColor = Color.Transparent;
SetHeader();
Closing += (o, e) => CloseHexFind();
@ -1513,12 +1528,12 @@ namespace BizHawk.Client.EmuHawk
if (_highlightedAddress.HasValue && IsFrozen(_highlightedAddress.Value))
{
FreezeAddressMenuItem.Image = Properties.Resources.Unfreeze;
FreezeAddressMenuItem.Image = Resources.Unfreeze;
FreezeAddressMenuItem.Text = "Un&freeze Address";
}
else
{
FreezeAddressMenuItem.Image = Properties.Resources.Freeze;
FreezeAddressMenuItem.Image = Resources.Freeze;
FreezeAddressMenuItem.Text = "&Freeze Address";
}
@ -1980,12 +1995,12 @@ namespace BizHawk.Client.EmuHawk
if (_highlightedAddress.HasValue && IsFrozen(_highlightedAddress.Value))
{
FreezeContextItem.Text = "Un&freeze";
FreezeContextItem.Image = Properties.Resources.Unfreeze;
FreezeContextItem.Image = Resources.Unfreeze;
}
else
{
FreezeContextItem.Text = "&Freeze";
FreezeContextItem.Image = Properties.Resources.Freeze;
FreezeContextItem.Image = Resources.Freeze;
}

1
src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.Designer.cs generated
View File

@ -34,7 +34,6 @@
//
// luaPictureBox
//
this.luaPictureBox.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.luaPictureBox;
this.luaPictureBox.Location = new System.Drawing.Point(0, 0);
this.luaPictureBox.Margin = new System.Windows.Forms.Padding(0);
this.luaPictureBox.Name = "luaPictureBox";

1
src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs
View File

@ -16,6 +16,7 @@ namespace BizHawk.Client.EmuHawk
public LuaCanvas(int width, int height, int? x = null, int? y = null)
{
InitializeComponent();
luaPictureBox.Image = Properties.Resources.luaPictureBox;
luaPictureBox.Width = width;
luaPictureBox.Height = height;
luaPictureBox.Image = new Bitmap(width, height);

36
src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs generated
View File

@ -136,7 +136,6 @@
//
// ToggleScriptContextItem
//
this.ToggleScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1;
this.ToggleScriptContextItem.Name = "ToggleScriptContextItem";
this.ToggleScriptContextItem.Size = new System.Drawing.Size(203, 22);
this.ToggleScriptContextItem.Text = "&Toggle";
@ -144,7 +143,6 @@
//
// PauseScriptContextItem
//
this.PauseScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
this.PauseScriptContextItem.Name = "PauseScriptContextItem";
this.PauseScriptContextItem.Size = new System.Drawing.Size(203, 22);
this.PauseScriptContextItem.Text = "Pause or Resume";
@ -152,7 +150,6 @@
//
// EditScriptContextItem
//
this.EditScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS;
this.EditScriptContextItem.Name = "EditScriptContextItem";
this.EditScriptContextItem.Size = new System.Drawing.Size(203, 22);
this.EditScriptContextItem.Text = "&Edit";
@ -160,7 +157,6 @@
//
// RemoveScriptContextItem
//
this.RemoveScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
this.RemoveScriptContextItem.Name = "RemoveScriptContextItem";
this.RemoveScriptContextItem.Size = new System.Drawing.Size(203, 22);
this.RemoveScriptContextItem.Text = "&Remove";
@ -168,7 +164,6 @@
//
// InsertSeperatorContextItem
//
this.InsertSeperatorContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.InsertSeperatorContextItem.Name = "InsertSeperatorContextItem";
this.InsertSeperatorContextItem.Size = new System.Drawing.Size(203, 22);
this.InsertSeperatorContextItem.Text = "Insert Seperator";
@ -181,7 +176,6 @@
//
// StopAllScriptsContextItem
//
this.StopAllScriptsContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
this.StopAllScriptsContextItem.Name = "StopAllScriptsContextItem";
this.StopAllScriptsContextItem.Size = new System.Drawing.Size(203, 22);
this.StopAllScriptsContextItem.Text = "Stop All Scripts";
@ -189,7 +183,6 @@
//
// ClearRegisteredFunctionsContextItem
//
this.ClearRegisteredFunctionsContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.ClearRegisteredFunctionsContextItem.Name = "ClearRegisteredFunctionsContextItem";
this.ClearRegisteredFunctionsContextItem.Size = new System.Drawing.Size(203, 22);
this.ClearRegisteredFunctionsContextItem.Text = "Clear Registered Functions";
@ -228,7 +221,6 @@
//
// NewSessionMenuItem
//
this.NewSessionMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewSessionMenuItem.Name = "NewSessionMenuItem";
this.NewSessionMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.N)));
@ -238,7 +230,6 @@
//
// OpenSessionMenuItem
//
this.OpenSessionMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenSessionMenuItem.Name = "OpenSessionMenuItem";
this.OpenSessionMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.O)));
@ -248,7 +239,6 @@
//
// SaveSessionMenuItem
//
this.SaveSessionMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveSessionMenuItem.Name = "SaveSessionMenuItem";
this.SaveSessionMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveSessionMenuItem.Size = new System.Drawing.Size(232, 22);
@ -287,7 +277,6 @@
//
this.RecentScriptsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator3});
this.RecentScriptsSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentScriptsSubMenu.Name = "RecentScriptsSubMenu";
this.RecentScriptsSubMenu.Size = new System.Drawing.Size(232, 22);
this.RecentScriptsSubMenu.Text = "Recent Scripts";
@ -337,7 +326,6 @@
//
// NewScriptMenuItem
//
this.NewScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewScriptMenuItem.Name = "NewScriptMenuItem";
this.NewScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.NewScriptMenuItem.Size = new System.Drawing.Size(212, 22);
@ -346,7 +334,6 @@
//
// OpenScriptMenuItem
//
this.OpenScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenScriptMenuItem.Name = "OpenScriptMenuItem";
this.OpenScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenScriptMenuItem.Size = new System.Drawing.Size(212, 22);
@ -355,7 +342,6 @@
//
// RefreshScriptMenuItem
//
this.RefreshScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1;
this.RefreshScriptMenuItem.Name = "RefreshScriptMenuItem";
this.RefreshScriptMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5;
this.RefreshScriptMenuItem.Size = new System.Drawing.Size(212, 22);
@ -364,7 +350,6 @@
//
// ToggleScriptMenuItem
//
this.ToggleScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.checkbox;
this.ToggleScriptMenuItem.Name = "ToggleScriptMenuItem";
this.ToggleScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T)));
this.ToggleScriptMenuItem.Size = new System.Drawing.Size(212, 22);
@ -373,7 +358,6 @@
//
// PauseScriptMenuItem
//
this.PauseScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
this.PauseScriptMenuItem.Name = "PauseScriptMenuItem";
this.PauseScriptMenuItem.Size = new System.Drawing.Size(212, 22);
this.PauseScriptMenuItem.Text = "Pause or Resume";
@ -381,7 +365,6 @@
//
// EditScriptMenuItem
//
this.EditScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS;
this.EditScriptMenuItem.Name = "EditScriptMenuItem";
this.EditScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
this.EditScriptMenuItem.Size = new System.Drawing.Size(212, 22);
@ -390,7 +373,6 @@
//
// RemoveScriptMenuItem
//
this.RemoveScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveScriptMenuItem.Name = "RemoveScriptMenuItem";
this.RemoveScriptMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete;
this.RemoveScriptMenuItem.Size = new System.Drawing.Size(212, 22);
@ -411,7 +393,6 @@
//
// InsertSeparatorMenuItem
//
this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem";
this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(212, 22);
@ -420,7 +401,6 @@
//
// MoveUpMenuItem
//
this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.MoveUpMenuItem.Name = "MoveUpMenuItem";
this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U)));
this.MoveUpMenuItem.Size = new System.Drawing.Size(212, 22);
@ -429,7 +409,6 @@
//
// MoveDownMenuItem
//
this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.MoveDownMenuItem.Name = "MoveDownMenuItem";
this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
this.MoveDownMenuItem.Size = new System.Drawing.Size(212, 22);
@ -451,7 +430,6 @@
//
// StopAllScriptsMenuItem
//
this.StopAllScriptsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
this.StopAllScriptsMenuItem.Name = "StopAllScriptsMenuItem";
this.StopAllScriptsMenuItem.Size = new System.Drawing.Size(212, 22);
this.StopAllScriptsMenuItem.Text = "Stop All Scripts";
@ -516,7 +494,6 @@
//
// RegisterSublimeText2MenuItem
//
this.RegisterSublimeText2MenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GreenCheck;
this.RegisterSublimeText2MenuItem.Name = "RegisterSublimeText2MenuItem";
this.RegisterSublimeText2MenuItem.Size = new System.Drawing.Size(144, 22);
this.RegisterSublimeText2MenuItem.Text = "&Sublime Text 2";
@ -617,7 +594,6 @@
//
// ClearRegisteredFunctionsLogContextItem
//
this.ClearRegisteredFunctionsLogContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.ClearRegisteredFunctionsLogContextItem.Name = "ClearRegisteredFunctionsLogContextItem";
this.ClearRegisteredFunctionsLogContextItem.Size = new System.Drawing.Size(203, 22);
this.ClearRegisteredFunctionsLogContextItem.Text = "Clear Registered Functions";
@ -694,7 +670,6 @@
// NewScriptToolbarItem
//
this.NewScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.NewScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NewScriptToolbarItem.Name = "NewScriptToolbarItem";
this.NewScriptToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -704,7 +679,6 @@
// OpenScriptToolbarItem
//
this.OpenScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.OpenScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.OpenScriptToolbarItem.Name = "OpenScriptToolbarItem";
this.OpenScriptToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -714,7 +688,6 @@
// ToggleScriptToolbarItem
//
this.ToggleScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.ToggleScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.checkbox;
this.ToggleScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ToggleScriptToolbarItem.Name = "ToggleScriptToolbarItem";
this.ToggleScriptToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -724,7 +697,6 @@
// RefreshScriptToolbarItem
//
this.RefreshScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.RefreshScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1;
this.RefreshScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.RefreshScriptToolbarItem.Name = "RefreshScriptToolbarItem";
this.RefreshScriptToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -734,7 +706,6 @@
// PauseToolbarItem
//
this.PauseToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.PauseToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
this.PauseToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.PauseToolbarItem.Name = "PauseToolbarItem";
this.PauseToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -744,7 +715,6 @@
// EditToolbarItem
//
this.EditToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.EditToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS;
this.EditToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.EditToolbarItem.Name = "EditToolbarItem";
this.EditToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -754,7 +724,6 @@
// RemoveScriptToolbarItem
//
this.RemoveScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.RemoveScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.RemoveScriptToolbarItem.Name = "RemoveScriptToolbarItem";
this.RemoveScriptToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -764,7 +733,6 @@
// DuplicateToolbarButton
//
this.DuplicateToolbarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.DuplicateToolbarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.DuplicateToolbarButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.DuplicateToolbarButton.Name = "DuplicateToolbarButton";
this.DuplicateToolbarButton.Size = new System.Drawing.Size(23, 22);
@ -779,7 +747,6 @@
// MoveUpToolbarItem
//
this.MoveUpToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.MoveUpToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.MoveUpToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.MoveUpToolbarItem.Name = "MoveUpToolbarItem";
this.MoveUpToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -789,7 +756,6 @@
// toolStripButtonMoveDown
//
this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButtonMoveDown.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.toolStripButtonMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonMoveDown.Name = "toolStripButtonMoveDown";
this.toolStripButtonMoveDown.Size = new System.Drawing.Size(23, 22);
@ -799,7 +765,6 @@
// InsertSeparatorToolbarItem
//
this.InsertSeparatorToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.InsertSeparatorToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.InsertSeparatorToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.InsertSeparatorToolbarItem.Name = "InsertSeparatorToolbarItem";
this.InsertSeparatorToolbarItem.Size = new System.Drawing.Size(23, 22);
@ -814,7 +779,6 @@
// EraseToolbarItem
//
this.EraseToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.EraseToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Erase;
this.EraseToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.EraseToolbarItem.Name = "EraseToolbarItem";
this.EraseToolbarItem.Size = new System.Drawing.Size(23, 22);

39
src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -9,6 +9,7 @@ using System.Text.RegularExpressions;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Client.EmuHawk.ToolExtensions;
using BizHawk.Common;
using BizHawk.Common.CollectionExtensions;
@ -73,7 +74,43 @@ namespace BizHawk.Client.EmuHawk
_lastColumnSorted = "";
InitializeComponent();
Icon = Properties.Resources.textdoc_MultiSize;
ToggleScriptContextItem.Image = Resources.Refresh1;
PauseScriptContextItem.Image = Resources.Pause;
EditScriptContextItem.Image = Resources.CutHS;
RemoveScriptContextItem.Image = Resources.Close;
InsertSeperatorContextItem.Image = Resources.InsertSeparator;
StopAllScriptsContextItem.Image = Resources.Stop;
ClearRegisteredFunctionsContextItem.Image = Resources.Delete;
NewSessionMenuItem.Image = Resources.NewFile;
OpenSessionMenuItem.Image = Resources.OpenFile;
SaveSessionMenuItem.Image = Resources.SaveAs;
NewScriptMenuItem.Image = Resources.NewFile;
OpenScriptMenuItem.Image = Resources.OpenFile;
RefreshScriptMenuItem.Image = Resources.Refresh1;
ToggleScriptMenuItem.Image = Resources.checkbox;
PauseScriptMenuItem.Image = Resources.Pause;
EditScriptMenuItem.Image = Resources.CutHS;
RemoveScriptMenuItem.Image = Resources.Delete;
InsertSeparatorMenuItem.Image = Resources.InsertSeparator;
MoveUpMenuItem.Image = Resources.MoveUp;
MoveDownMenuItem.Image = Resources.MoveDown;
StopAllScriptsMenuItem.Image = Resources.Stop;
RegisterSublimeText2MenuItem.Image = Resources.GreenCheck;
ClearRegisteredFunctionsLogContextItem.Image = Resources.Delete;
NewScriptToolbarItem.Image = Resources.NewFile;
OpenScriptToolbarItem.Image = Resources.OpenFile;
ToggleScriptToolbarItem.Image = Resources.checkbox;
RefreshScriptToolbarItem.Image = Resources.Refresh1;
PauseToolbarItem.Image = Resources.Pause;
EditToolbarItem.Image = Resources.CutHS;
RemoveScriptToolbarItem.Image = Resources.Delete;
DuplicateToolbarButton.Image = Resources.Duplicate;
MoveUpToolbarItem.Image = Resources.MoveUp;
toolStripButtonMoveDown.Image = Resources.MoveDown;
InsertSeparatorToolbarItem.Image = Resources.InsertSeparator;
EraseToolbarItem.Image = Resources.Erase;
RecentScriptsSubMenu.Image = Resources.Recent;
Icon = Resources.textdoc_MultiSize;
Closing += (o, e) =>
{

14
src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs generated
View File

@ -73,7 +73,6 @@
//
this.UndoBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.UndoBranchButton.Enabled = false;
this.UndoBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
this.UndoBranchButton.Location = new System.Drawing.Point(156, 247);
this.UndoBranchButton.Name = "UndoBranchButton";
this.UndoBranchButton.Size = new System.Drawing.Size(24, 24);
@ -85,7 +84,6 @@
//
this.JumpToBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.JumpToBranchButton.Enabled = false;
this.JumpToBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo;
this.JumpToBranchButton.Location = new System.Drawing.Point(126, 247);
this.JumpToBranchButton.Name = "JumpToBranchButton";
this.JumpToBranchButton.Size = new System.Drawing.Size(24, 24);
@ -98,7 +96,6 @@
//
this.UpdateBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.UpdateBranchButton.Enabled = false;
this.UpdateBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
this.UpdateBranchButton.Location = new System.Drawing.Point(96, 247);
this.UpdateBranchButton.Name = "UpdateBranchButton";
this.UpdateBranchButton.Size = new System.Drawing.Size(24, 24);
@ -110,7 +107,6 @@
// AddWithTextBranchButton
//
this.AddWithTextBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.AddWithTextBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit;
this.AddWithTextBranchButton.Location = new System.Drawing.Point(36, 247);
this.AddWithTextBranchButton.Name = "AddWithTextBranchButton";
this.AddWithTextBranchButton.Size = new System.Drawing.Size(24, 24);
@ -122,7 +118,6 @@
// AddBranchButton
//
this.AddBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.AddBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
this.AddBranchButton.Location = new System.Drawing.Point(6, 247);
this.AddBranchButton.Name = "AddBranchButton";
this.AddBranchButton.Size = new System.Drawing.Size(24, 24);
@ -135,7 +130,6 @@
//
this.LoadBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.LoadBranchButton.Enabled = false;
this.LoadBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Debugger;
this.LoadBranchButton.Location = new System.Drawing.Point(66, 247);
this.LoadBranchButton.Name = "LoadBranchButton";
this.LoadBranchButton.Size = new System.Drawing.Size(24, 24);
@ -196,7 +190,6 @@
//
// AddBranchContextMenu
//
this.AddBranchContextMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
this.AddBranchContextMenu.Name = "AddBranchContextMenu";
this.AddBranchContextMenu.Size = new System.Drawing.Size(146, 22);
this.AddBranchContextMenu.Text = "Add";
@ -204,7 +197,6 @@
//
// AddBranchWithTextContextMenuItem
//
this.AddBranchWithTextContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit;
this.AddBranchWithTextContextMenuItem.Name = "AddBranchWithTextContextMenuItem";
this.AddBranchWithTextContextMenuItem.Size = new System.Drawing.Size(146, 22);
this.AddBranchWithTextContextMenuItem.Text = "Add with Text";
@ -212,7 +204,6 @@
//
// LoadBranchContextMenuItem
//
this.LoadBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Debugger;
this.LoadBranchContextMenuItem.Name = "LoadBranchContextMenuItem";
this.LoadBranchContextMenuItem.Size = new System.Drawing.Size(146, 22);
this.LoadBranchContextMenuItem.Text = "Load";
@ -220,7 +211,6 @@
//
// UpdateBranchContextMenuItem
//
this.UpdateBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
this.UpdateBranchContextMenuItem.Name = "UpdateBranchContextMenuItem";
this.UpdateBranchContextMenuItem.Size = new System.Drawing.Size(146, 22);
this.UpdateBranchContextMenuItem.Text = "&Update";
@ -228,7 +218,6 @@
//
// EditBranchTextContextMenuItem
//
this.EditBranchTextContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
this.EditBranchTextContextMenuItem.Name = "EditBranchTextContextMenuItem";
this.EditBranchTextContextMenuItem.Size = new System.Drawing.Size(146, 22);
this.EditBranchTextContextMenuItem.Text = "Edit Text";
@ -236,7 +225,6 @@
//
// JumpToBranchContextMenuItem
//
this.JumpToBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo;
this.JumpToBranchContextMenuItem.Name = "JumpToBranchContextMenuItem";
this.JumpToBranchContextMenuItem.Size = new System.Drawing.Size(146, 22);
this.JumpToBranchContextMenuItem.Text = "Jump To";
@ -245,7 +233,6 @@
// UndoBranchToolStripMenuItem
//
this.UndoBranchToolStripMenuItem.Enabled = false;
this.UndoBranchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
this.UndoBranchToolStripMenuItem.Name = "UndoBranchToolStripMenuItem";
this.UndoBranchToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.UndoBranchToolStripMenuItem.Text = "Undo";
@ -258,7 +245,6 @@
//
// RemoveBranchContextMenuItem
//
this.RemoveBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveBranchContextMenuItem.Name = "RemoveBranchContextMenuItem";
this.RemoveBranchContextMenuItem.Size = new System.Drawing.Size(146, 22);
this.RemoveBranchContextMenuItem.Text = "Remove";

16
src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
View File

@ -4,8 +4,8 @@ using System.ComponentModel;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
namespace BizHawk.Client.EmuHawk
{
@ -46,6 +46,20 @@ namespace BizHawk.Client.EmuHawk
public BookmarksBranchesBox()
{
InitializeComponent();
UndoBranchButton.Image = Resources.undo;
JumpToBranchButton.Image = Resources.JumpTo;
UpdateBranchButton.Image = Resources.reboot;
AddWithTextBranchButton.Image = Resources.AddEdit;
AddBranchButton.Image = Resources.add;
LoadBranchButton.Image = Resources.Debugger;
AddBranchContextMenu.Image = Resources.add;
AddBranchWithTextContextMenuItem.Image = Resources.AddEdit;
LoadBranchContextMenuItem.Image = Resources.Debugger;
UpdateBranchContextMenuItem.Image = Resources.reboot;
EditBranchTextContextMenuItem.Image = Resources.pencil;
JumpToBranchContextMenuItem.Image = Resources.JumpTo;
UndoBranchToolStripMenuItem.Image = Resources.undo;
RemoveBranchContextMenuItem.Image = Resources.Delete;
SetupColumns();
BranchView.QueryItemText += QueryItemText;
BranchView.QueryItemBkColor += QueryItemBkColor;

11
src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs generated
View File

@ -64,7 +64,6 @@
//
// JumpToMarkerToolStripMenuItem
//
this.JumpToMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo;
this.JumpToMarkerToolStripMenuItem.Name = "JumpToMarkerToolStripMenuItem";
this.JumpToMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.JumpToMarkerToolStripMenuItem.Text = "Jump To";
@ -72,7 +71,6 @@
//
// ScrollToMarkerToolStripMenuItem
//
this.ScrollToMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ScrollTo;
this.ScrollToMarkerToolStripMenuItem.Name = "ScrollToMarkerToolStripMenuItem";
this.ScrollToMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.ScrollToMarkerToolStripMenuItem.Text = "Scroll To";
@ -80,7 +78,6 @@
//
// EditMarkerToolStripMenuItem
//
this.EditMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
this.EditMarkerToolStripMenuItem.Name = "EditMarkerToolStripMenuItem";
this.EditMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.EditMarkerToolStripMenuItem.Text = "Edit";
@ -88,7 +85,6 @@
//
// AddMarkerToolStripMenuItem
//
this.AddMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
this.AddMarkerToolStripMenuItem.Name = "AddMarkerToolStripMenuItem";
this.AddMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.AddMarkerToolStripMenuItem.Text = "Add";
@ -101,7 +97,6 @@
//
// RemoveMarkerToolStripMenuItem
//
this.RemoveMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveMarkerToolStripMenuItem.Name = "RemoveMarkerToolStripMenuItem";
this.RemoveMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.RemoveMarkerToolStripMenuItem.Text = "Remove";
@ -111,7 +106,6 @@
//
this.JumpToMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.JumpToMarkerButton.Enabled = false;
this.JumpToMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo;
this.JumpToMarkerButton.Location = new System.Drawing.Point(66, 247);
this.JumpToMarkerButton.Name = "JumpToMarkerButton";
this.JumpToMarkerButton.Size = new System.Drawing.Size(24, 24);
@ -124,7 +118,6 @@
//
this.EditMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.EditMarkerButton.Enabled = false;
this.EditMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
this.EditMarkerButton.Location = new System.Drawing.Point(126, 247);
this.EditMarkerButton.Name = "EditMarkerButton";
this.EditMarkerButton.Size = new System.Drawing.Size(24, 24);
@ -136,7 +129,6 @@
// AddMarkerButton
//
this.AddMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.AddMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
this.AddMarkerButton.Location = new System.Drawing.Point(6, 247);
this.AddMarkerButton.Name = "AddMarkerButton";
this.AddMarkerButton.Size = new System.Drawing.Size(24, 24);
@ -149,7 +141,6 @@
//
this.RemoveMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.RemoveMarkerButton.Enabled = false;
this.RemoveMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveMarkerButton.Location = new System.Drawing.Point(156, 247);
this.RemoveMarkerButton.Name = "RemoveMarkerButton";
this.RemoveMarkerButton.Size = new System.Drawing.Size(24, 24);
@ -162,7 +153,6 @@
//
this.ScrollToMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.ScrollToMarkerButton.Enabled = false;
this.ScrollToMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ScrollTo;
this.ScrollToMarkerButton.Location = new System.Drawing.Point(96, 247);
this.ScrollToMarkerButton.Name = "ScrollToMarkerButton";
this.ScrollToMarkerButton.Size = new System.Drawing.Size(24, 24);
@ -174,7 +164,6 @@
// AddMarkerWithTextButton
//
this.AddMarkerWithTextButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.AddMarkerWithTextButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit;
this.AddMarkerWithTextButton.Location = new System.Drawing.Point(36, 247);
this.AddMarkerWithTextButton.Name = "AddMarkerWithTextButton";
this.AddMarkerWithTextButton.Size = new System.Drawing.Size(24, 24);

12
src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
namespace BizHawk.Client.EmuHawk
{
@ -17,6 +18,17 @@ namespace BizHawk.Client.EmuHawk
public MarkerControl()
{
InitializeComponent();
JumpToMarkerToolStripMenuItem.Image = Resources.JumpTo;
ScrollToMarkerToolStripMenuItem.Image = Resources.ScrollTo;
EditMarkerToolStripMenuItem.Image = Resources.pencil;
AddMarkerToolStripMenuItem.Image = Resources.add;
RemoveMarkerToolStripMenuItem.Image = Resources.Delete;
JumpToMarkerButton.Image = Resources.JumpTo;
EditMarkerButton.Image = Resources.pencil;
AddMarkerButton.Image = Resources.add;
RemoveMarkerButton.Image = Resources.Delete;
ScrollToMarkerButton.Image = Resources.ScrollTo;
AddMarkerWithTextButton.Image = Resources.AddEdit;
SetupColumns();
MarkerView.QueryItemBkColor += MarkerView_QueryItemBkColor;
MarkerView.QueryItemText += MarkerView_QueryItemText;

4
src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs generated
View File

@ -1661,7 +1661,6 @@
this.LeftButton.BackColor = System.Drawing.Color.CornflowerBlue;
this.LeftButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.LeftButton.ForeColor = System.Drawing.Color.White;
this.LeftButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.whiteTriLeft;
this.LeftButton.Location = new System.Drawing.Point(224, 130);
this.LeftButton.Name = "LeftButton";
this.LeftButton.Size = new System.Drawing.Size(27, 53);
@ -1674,7 +1673,6 @@
this.RightButton.BackColor = System.Drawing.Color.CornflowerBlue;
this.RightButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.RightButton.ForeColor = System.Drawing.Color.White;
this.RightButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.whiteTriRight;
this.RightButton.Location = new System.Drawing.Point(307, 130);
this.RightButton.Name = "RightButton";
this.RightButton.Size = new System.Drawing.Size(27, 53);
@ -1688,7 +1686,6 @@
this.DownButton.BackColor = System.Drawing.Color.CornflowerBlue;
this.DownButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.DownButton.ForeColor = System.Drawing.Color.White;
this.DownButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.whiteTriDown;
this.DownButton.Location = new System.Drawing.Point(250, 182);
this.DownButton.Name = "DownButton";
this.DownButton.Size = new System.Drawing.Size(58, 21);
@ -1702,7 +1699,6 @@
this.UpButton.BackColor = System.Drawing.Color.CornflowerBlue;
this.UpButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.UpButton.ForeColor = System.Drawing.Color.White;
this.UpButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.whiteTriUp;
this.UpButton.Location = new System.Drawing.Point(250, 109);
this.UpButton.Name = "UpButton";
this.UpButton.Size = new System.Drawing.Size(58, 21);

8
src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
View File

@ -1,6 +1,6 @@
using System;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Emulation.Cores.Calculators;
using BizHawk.Emulation.Common;
@ -15,7 +15,11 @@ namespace BizHawk.Client.EmuHawk
public TI83KeyPad()
{
InitializeComponent();
Icon = Properties.Resources.calculator_MultiSize;
Icon = Resources.calculator_MultiSize;
LeftButton.Image = Resources.whiteTriLeft;
RightButton.Image = Resources.whiteTriRight;
DownButton.Image = Resources.whiteTriDown;
UpButton.Image = Resources.whiteTriUp;
}
[ConfigPersist]

1
src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs generated
View File

@ -148,7 +148,6 @@
//
// SaveLogMenuItem
//
this.SaveLogMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveLogMenuItem.Name = "SaveLogMenuItem";
this.SaveLogMenuItem.Size = new System.Drawing.Size(143, 22);
this.SaveLogMenuItem.Text = "&Save Log";

1
src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
View File

@ -63,6 +63,7 @@ namespace BizHawk.Client.EmuHawk
{
InitializeComponent();
Icon = Properties.Resources.pencil_MultiSize;
SaveLogMenuItem.Image = Properties.Resources.SaveAs;
TraceView.QueryItemText += TraceView_QueryItemText;

48
src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs generated
View File

@ -29,7 +29,6 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.ToolStripMenuItem SearchMenuItem;
this.TotalSearchLabel = new System.Windows.Forms.Label();
this.WatchListView = new InputRoll();
this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
@ -151,7 +150,7 @@
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.DisplayTypeDropdown = new System.Windows.Forms.ComboBox();
SearchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SearchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ListViewContextMenu.SuspendLayout();
this.RamSearchMenu.SuspendLayout();
this.CompareToBox.SuspendLayout();
@ -161,11 +160,10 @@
//
// SearchMenuItem
//
SearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
SearchMenuItem.Name = "SearchMenuItem";
SearchMenuItem.Size = new System.Drawing.Size(221, 22);
SearchMenuItem.Text = "&Search";
SearchMenuItem.Click += new System.EventHandler(this.SearchMenuItem_Click);
this.SearchMenuItem.Name = "SearchMenuItem";
this.SearchMenuItem.Size = new System.Drawing.Size(221, 22);
this.SearchMenuItem.Text = "&Search";
this.SearchMenuItem.Click += new System.EventHandler(this.SearchMenuItem_Click);
//
// TotalSearchLabel
//
@ -223,7 +221,6 @@
//
// DoSearchContextMenuItem
//
this.DoSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
this.DoSearchContextMenuItem.Name = "DoSearchContextMenuItem";
this.DoSearchContextMenuItem.Size = new System.Drawing.Size(217, 22);
this.DoSearchContextMenuItem.Text = "&Search";
@ -231,7 +228,6 @@
//
// NewSearchContextMenuItem
//
this.NewSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
this.NewSearchContextMenuItem.Name = "NewSearchContextMenuItem";
this.NewSearchContextMenuItem.Size = new System.Drawing.Size(217, 22);
this.NewSearchContextMenuItem.Text = "&Start New Search";
@ -244,7 +240,6 @@
//
// RemoveContextMenuItem
//
this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveContextMenuItem.Name = "RemoveContextMenuItem";
this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Del";
this.RemoveContextMenuItem.Size = new System.Drawing.Size(217, 22);
@ -253,7 +248,6 @@
//
// AddToRamWatchContextMenuItem
//
this.AddToRamWatchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS;
this.AddToRamWatchContextMenuItem.Name = "AddToRamWatchContextMenuItem";
this.AddToRamWatchContextMenuItem.ShortcutKeyDisplayString = "Ctrl+W";
this.AddToRamWatchContextMenuItem.Size = new System.Drawing.Size(217, 22);
@ -262,7 +256,6 @@
//
// PokeContextMenuItem
//
this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeContextMenuItem.Name = "PokeContextMenuItem";
this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P";
this.PokeContextMenuItem.Size = new System.Drawing.Size(217, 22);
@ -271,7 +264,6 @@
//
// FreezeContextMenuItem
//
this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeContextMenuItem.Name = "FreezeContextMenuItem";
this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F";
this.FreezeContextMenuItem.Size = new System.Drawing.Size(217, 22);
@ -280,7 +272,6 @@
//
// UnfreezeAllContextMenuItem
//
this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze;
this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem";
this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(217, 22);
this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All";
@ -342,7 +333,6 @@
//
// OpenMenuItem
//
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenMenuItem.Size = new System.Drawing.Size(195, 22);
@ -351,7 +341,6 @@
//
// SaveMenuItem
//
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(195, 22);
@ -376,7 +365,6 @@
//
// TruncateFromFileMenuItem
//
this.TruncateFromFileMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TruncateFromFile;
this.TruncateFromFileMenuItem.Name = "TruncateFromFileMenuItem";
this.TruncateFromFileMenuItem.Size = new System.Drawing.Size(195, 22);
this.TruncateFromFileMenuItem.Text = "&Truncate from File...";
@ -386,7 +374,6 @@
//
this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator2});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(195, 22);
this.RecentSubMenu.Text = "Recent";
@ -594,7 +581,6 @@
//
// newSearchToolStripMenuItem
//
this.newSearchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
this.newSearchToolStripMenuItem.Name = "newSearchToolStripMenuItem";
this.newSearchToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
this.newSearchToolStripMenuItem.Text = "&New Search";
@ -607,7 +593,6 @@
//
// UndoMenuItem
//
this.UndoMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
this.UndoMenuItem.Name = "UndoMenuItem";
this.UndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
this.UndoMenuItem.Size = new System.Drawing.Size(221, 22);
@ -616,7 +601,6 @@
//
// RedoMenuItem
//
this.RedoMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.redo;
this.RedoMenuItem.Name = "RedoMenuItem";
this.RedoMenuItem.ShortcutKeyDisplayString = "";
this.RedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
@ -626,7 +610,6 @@
//
// CopyValueToPrevMenuItem
//
this.CopyValueToPrevMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
this.CopyValueToPrevMenuItem.Name = "CopyValueToPrevMenuItem";
this.CopyValueToPrevMenuItem.Size = new System.Drawing.Size(221, 22);
this.CopyValueToPrevMenuItem.Text = "Copy Value to Prev";
@ -641,7 +624,6 @@
//
// RemoveMenuItem
//
this.RemoveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveMenuItem.Name = "RemoveMenuItem";
this.RemoveMenuItem.ShortcutKeyDisplayString = "Delete";
this.RemoveMenuItem.Size = new System.Drawing.Size(221, 22);
@ -663,7 +645,6 @@
//
// AddToRamWatchMenuItem
//
this.AddToRamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS;
this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem";
this.AddToRamWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(221, 22);
@ -672,7 +653,6 @@
//
// PokeAddressMenuItem
//
this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeAddressMenuItem.Name = "PokeAddressMenuItem";
this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
this.PokeAddressMenuItem.Size = new System.Drawing.Size(221, 22);
@ -681,7 +661,6 @@
//
// FreezeAddressMenuItem
//
this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem";
this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
this.FreezeAddressMenuItem.Size = new System.Drawing.Size(221, 22);
@ -830,7 +809,6 @@
this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.AutoSearchCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
this.AutoSearchCheckBox.AutoSize = true;
this.AutoSearchCheckBox.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AutoSearch;
this.AutoSearchCheckBox.Location = new System.Drawing.Point(316, 410);
this.AutoSearchCheckBox.Name = "AutoSearchCheckBox";
this.AutoSearchCheckBox.Size = new System.Drawing.Size(38, 22);
@ -1007,7 +985,6 @@
// DoSearchToolButton
//
this.DoSearchToolButton.Enabled = false;
this.DoSearchToolButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
this.DoSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.DoSearchToolButton.Name = "DoSearchToolButton";
this.DoSearchToolButton.Size = new System.Drawing.Size(65, 22);
@ -1021,7 +998,6 @@
//
// NewSearchToolButton
//
this.NewSearchToolButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
this.NewSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NewSearchToolButton.Name = "NewSearchToolButton";
this.NewSearchToolButton.Size = new System.Drawing.Size(51, 22);
@ -1037,7 +1013,6 @@
//
this.CopyValueToPrevToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.CopyValueToPrevToolBarItem.Enabled = false;
this.CopyValueToPrevToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
this.CopyValueToPrevToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.CopyValueToPrevToolBarItem.Name = "CopyValueToPrevToolBarItem";
this.CopyValueToPrevToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -1047,7 +1022,6 @@
// ClearChangeCountsToolBarItem
//
this.ClearChangeCountsToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.ClearChangeCountsToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.ClearChangeCountsToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ClearChangeCountsToolBarItem.Name = "ClearChangeCountsToolBarItem";
this.ClearChangeCountsToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -1064,7 +1038,6 @@
//
this.RemoveToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.RemoveToolBarItem.Enabled = false;
this.RemoveToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.RemoveToolBarItem.Name = "RemoveToolBarItem";
this.RemoveToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -1076,7 +1049,6 @@
//
this.AddToRamWatchToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.AddToRamWatchToolBarItem.Enabled = false;
this.AddToRamWatchToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS;
this.AddToRamWatchToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.AddToRamWatchToolBarItem.Name = "AddToRamWatchToolBarItem";
this.AddToRamWatchToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -1087,7 +1059,6 @@
//
this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.PokeAddressToolBarItem.Enabled = false;
this.PokeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem";
this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -1098,7 +1069,6 @@
//
this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.FreezeAddressToolBarItem.Enabled = false;
this.FreezeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem";
this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -1114,7 +1084,6 @@
//
this.UndoToolBarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.UndoToolBarButton.Enabled = false;
this.UndoToolBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
this.UndoToolBarButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.UndoToolBarButton.Name = "UndoToolBarButton";
this.UndoToolBarButton.Size = new System.Drawing.Size(23, 22);
@ -1125,7 +1094,6 @@
//
this.RedoToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.RedoToolBarItem.Enabled = false;
this.RedoToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.redo;
this.RedoToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.RedoToolBarItem.Name = "RedoToolBarItem";
this.RedoToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -1140,7 +1108,6 @@
// RebootToolbarButton
//
this.RebootToolbarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.RebootToolbarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
this.RebootToolbarButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.RebootToolbarButton.Name = "RebootToolbarButton";
this.RebootToolbarButton.Size = new System.Drawing.Size(23, 22);
@ -1151,7 +1118,6 @@
//
this.ErrorIconButton.BackColor = System.Drawing.Color.NavajoWhite;
this.ErrorIconButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.ErrorIconButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ExclamationRed;
this.ErrorIconButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ErrorIconButton.Name = "ErrorIconButton";
this.ErrorIconButton.Size = new System.Drawing.Size(23, 22);
@ -1272,7 +1238,6 @@
// SearchButton
//
this.SearchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SearchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
this.SearchButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.SearchButton.Location = new System.Drawing.Point(244, 409);
this.SearchButton.Name = "SearchButton";
@ -1379,7 +1344,8 @@
#endregion
private System.Windows.Forms.Label TotalSearchLabel;
InputRoll WatchListView;
private System.Windows.Forms.ToolStripMenuItem SearchMenuItem;
private InputRoll WatchListView;
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem OpenMenuItem;
private System.Windows.Forms.ToolStripMenuItem SaveAsMenuItem;

43
src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -11,6 +11,7 @@ using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Client.Common.RamSearchEngine;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Client.EmuHawk.ToolExtensions;
using BizHawk.Common.NumberExtensions;
using BizHawk.Emulation.Common;
@ -45,8 +46,44 @@ namespace BizHawk.Client.EmuHawk
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
SetStyle(ControlStyles.UserPaint, true);
SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
InitializeComponent();
Icon = Properties.Resources.search_MultiSize;
Icon = Resources.search_MultiSize;
SearchMenuItem.Image = Resources.search;
DoSearchContextMenuItem.Image = Resources.search;
NewSearchContextMenuItem.Image = Resources.restart;
RemoveContextMenuItem.Image = Resources.Delete;
AddToRamWatchContextMenuItem.Image = Resources.FindHS;
PokeContextMenuItem.Image = Resources.poke;
FreezeContextMenuItem.Image = Resources.Freeze;
UnfreezeAllContextMenuItem.Image = Resources.Unfreeze;
OpenMenuItem.Image = Resources.OpenFile;
SaveMenuItem.Image = Resources.SaveAs;
TruncateFromFileMenuItem.Image = Resources.TruncateFromFile;
RecentSubMenu.Image = Resources.Recent;
newSearchToolStripMenuItem.Image = Resources.restart;
UndoMenuItem.Image = Resources.undo;
RedoMenuItem.Image = Resources.redo;
CopyValueToPrevMenuItem.Image = Resources.Previous;
RemoveMenuItem.Image = Resources.Delete;
AddToRamWatchMenuItem.Image = Resources.FindHS;
PokeAddressMenuItem.Image = Resources.poke;
FreezeAddressMenuItem.Image = Resources.Freeze;
AutoSearchCheckBox.Image = Resources.AutoSearch;
DoSearchToolButton.Image = Resources.search;
NewSearchToolButton.Image = Resources.restart;
CopyValueToPrevToolBarItem.Image = Resources.Previous;
ClearChangeCountsToolBarItem.Image = Resources.placeholder_bitmap;
RemoveToolBarItem.Image = Resources.Delete;
AddToRamWatchToolBarItem.Image = Resources.FindHS;
PokeAddressToolBarItem.Image = Resources.poke;
FreezeAddressToolBarItem.Image = Resources.Freeze;
UndoToolBarButton.Image = Resources.undo;
RedoToolBarItem.Image = Resources.redo;
RebootToolbarButton.Image = Resources.reboot;
ErrorIconButton.Image = Resources.ExclamationRed;
SearchButton.Image = Resources.search;
WatchListView.QueryItemText += ListView_QueryItemText;
WatchListView.QueryItemBkColor += ListView_QueryItemBkColor;
Closing += (o, e) => SaveConfigSettings();
@ -1396,12 +1433,12 @@ namespace BizHawk.Client.EmuHawk
if (allCheats)
{
FreezeContextMenuItem.Text = "&Unfreeze Address";
FreezeContextMenuItem.Image = Properties.Resources.Unfreeze;
FreezeContextMenuItem.Image = Resources.Unfreeze;
}
else
{
FreezeContextMenuItem.Text = "&Freeze Address";
FreezeContextMenuItem.Image = Properties.Resources.Freeze;
FreezeContextMenuItem.Image = Resources.Freeze;
}
}

43
src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs generated
View File

@ -150,7 +150,6 @@
//
// newToolStripMenuItem
//
this.newToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch;
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
this.newToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
this.newToolStripMenuItem.Text = "&New Watch";
@ -158,7 +157,6 @@
//
// EditContextMenuItem
//
this.EditContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS;
this.EditContextMenuItem.Name = "EditContextMenuItem";
this.EditContextMenuItem.ShortcutKeyDisplayString = "Ctrl+E";
this.EditContextMenuItem.Size = new System.Drawing.Size(244, 22);
@ -167,7 +165,6 @@
//
// RemoveContextMenuItem
//
this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveContextMenuItem.Name = "RemoveContextMenuItem";
this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R";
this.RemoveContextMenuItem.Size = new System.Drawing.Size(244, 22);
@ -176,7 +173,6 @@
//
// DuplicateContextMenuItem
//
this.DuplicateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.DuplicateContextMenuItem.Name = "DuplicateContextMenuItem";
this.DuplicateContextMenuItem.ShortcutKeyDisplayString = "Ctrl+D";
this.DuplicateContextMenuItem.Size = new System.Drawing.Size(244, 22);
@ -185,7 +181,6 @@
//
// PokeContextMenuItem
//
this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeContextMenuItem.Name = "PokeContextMenuItem";
this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P";
this.PokeContextMenuItem.Size = new System.Drawing.Size(244, 22);
@ -194,7 +189,6 @@
//
// FreezeContextMenuItem
//
this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeContextMenuItem.Name = "FreezeContextMenuItem";
this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F";
this.FreezeContextMenuItem.Size = new System.Drawing.Size(244, 22);
@ -203,8 +197,7 @@
//
// UnfreezeAllContextMenuItem
//
this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze;
this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem";
this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem";
this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(244, 22);
this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All";
this.UnfreezeAllContextMenuItem.Click += new System.EventHandler(this.UnfreezeAllContextMenuItem_Click);
@ -242,7 +235,6 @@
//
// InsertSeperatorContextMenuItem
//
this.InsertSeperatorContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.InsertSeperatorContextMenuItem.Name = "InsertSeperatorContextMenuItem";
this.InsertSeperatorContextMenuItem.ShortcutKeyDisplayString = "Ctrl+I";
this.InsertSeperatorContextMenuItem.Size = new System.Drawing.Size(244, 22);
@ -251,7 +243,6 @@
//
// MoveUpContextMenuItem
//
this.MoveUpContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.MoveUpContextMenuItem.Name = "MoveUpContextMenuItem";
this.MoveUpContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Up";
this.MoveUpContextMenuItem.Size = new System.Drawing.Size(244, 22);
@ -260,7 +251,6 @@
//
// MoveDownContextMenuItem
//
this.MoveDownContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.MoveDownContextMenuItem.Name = "MoveDownContextMenuItem";
this.MoveDownContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Down";
this.MoveDownContextMenuItem.Size = new System.Drawing.Size(244, 22);
@ -269,7 +259,6 @@
//
// MoveTopContextMenuItem
//
this.MoveTopContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveTop;
this.MoveTopContextMenuItem.Name = "MoveTopContextMenuItem";
this.MoveTopContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.Up)));
@ -279,7 +268,6 @@
//
// MoveBottomContextMenuItem
//
this.MoveBottomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveBottom;
this.MoveBottomContextMenuItem.Name = "MoveBottomContextMenuItem";
this.MoveBottomContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.Down)));
@ -303,7 +291,6 @@
//
this.ErrorIconButton.BackColor = System.Drawing.Color.NavajoWhite;
this.ErrorIconButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.ErrorIconButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ExclamationRed;
this.ErrorIconButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ErrorIconButton.Name = "ErrorIconButton";
this.ErrorIconButton.Size = new System.Drawing.Size(23, 20);
@ -346,7 +333,6 @@
// newToolStripButton
//
this.newToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.newToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.newToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.newToolStripButton.Name = "newToolStripButton";
this.newToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -356,7 +342,6 @@
// openToolStripButton
//
this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.openToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.openToolStripButton.Name = "openToolStripButton";
this.openToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -366,7 +351,6 @@
// saveToolStripButton
//
this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.saveToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.saveToolStripButton.Name = "saveToolStripButton";
this.saveToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -381,7 +365,6 @@
// newWatchToolStripButton
//
this.newWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.newWatchToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch;
this.newWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.newWatchToolStripButton.Name = "newWatchToolStripButton";
this.newWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -392,7 +375,6 @@
// editWatchToolStripButton
//
this.editWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.editWatchToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS;
this.editWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.editWatchToolStripButton.Name = "editWatchToolStripButton";
this.editWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -402,7 +384,6 @@
// cutToolStripButton
//
this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.cutToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.cutToolStripButton.Name = "cutToolStripButton";
this.cutToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -413,7 +394,6 @@
// clearChangeCountsToolStripButton
//
this.clearChangeCountsToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.clearChangeCountsToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.placeholder_bitmap;
this.clearChangeCountsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.clearChangeCountsToolStripButton.Name = "clearChangeCountsToolStripButton";
this.clearChangeCountsToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -424,7 +404,6 @@
// duplicateWatchToolStripButton
//
this.duplicateWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.duplicateWatchToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.duplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.duplicateWatchToolStripButton.Name = "duplicateWatchToolStripButton";
this.duplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -434,7 +413,6 @@
// PokeAddressToolBarItem
//
this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.PokeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem";
this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -445,7 +423,6 @@
// FreezeAddressToolBarItem
//
this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.FreezeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem";
this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
@ -455,7 +432,6 @@
// seperatorToolStripButton
//
this.seperatorToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.seperatorToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.seperatorToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.seperatorToolStripButton.Name = "seperatorToolStripButton";
this.seperatorToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -471,7 +447,6 @@
// moveUpToolStripButton
//
this.moveUpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.moveUpToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.moveUpToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.moveUpToolStripButton.Name = "moveUpToolStripButton";
this.moveUpToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -481,7 +456,6 @@
// moveDownToolStripButton
//
this.moveDownToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.moveDownToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.moveDownToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.moveDownToolStripButton.Name = "moveDownToolStripButton";
this.moveDownToolStripButton.Size = new System.Drawing.Size(23, 22);
@ -524,7 +498,6 @@
//
// NewListMenuItem
//
this.NewListMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewListMenuItem.Name = "NewListMenuItem";
this.NewListMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.NewListMenuItem.Size = new System.Drawing.Size(195, 22);
@ -533,7 +506,6 @@
//
// OpenMenuItem
//
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenMenuItem.Size = new System.Drawing.Size(195, 22);
@ -542,7 +514,6 @@
//
// SaveMenuItem
//
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(195, 22);
@ -569,7 +540,6 @@
//
this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.noneToolStripMenuItem});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(195, 22);
this.RecentSubMenu.Text = "Recent";
@ -639,7 +609,6 @@
//
// NewWatchMenuItem
//
this.NewWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS;
this.NewWatchMenuItem.Name = "NewWatchMenuItem";
this.NewWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
this.NewWatchMenuItem.Size = new System.Drawing.Size(244, 22);
@ -648,7 +617,6 @@
//
// EditWatchMenuItem
//
this.EditWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS;
this.EditWatchMenuItem.Name = "EditWatchMenuItem";
this.EditWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
this.EditWatchMenuItem.Size = new System.Drawing.Size(244, 22);
@ -657,7 +625,6 @@
//
// RemoveWatchMenuItem
//
this.RemoveWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveWatchMenuItem.Name = "RemoveWatchMenuItem";
this.RemoveWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
this.RemoveWatchMenuItem.Size = new System.Drawing.Size(244, 22);
@ -666,7 +633,6 @@
//
// DuplicateWatchMenuItem
//
this.DuplicateWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate;
this.DuplicateWatchMenuItem.Name = "DuplicateWatchMenuItem";
this.DuplicateWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
this.DuplicateWatchMenuItem.Size = new System.Drawing.Size(244, 22);
@ -675,7 +641,6 @@
//
// PokeAddressMenuItem
//
this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeAddressMenuItem.Name = "PokeAddressMenuItem";
this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
this.PokeAddressMenuItem.Size = new System.Drawing.Size(244, 22);
@ -684,7 +649,6 @@
//
// FreezeAddressMenuItem
//
this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem";
this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
this.FreezeAddressMenuItem.Size = new System.Drawing.Size(244, 22);
@ -693,7 +657,6 @@
//
// InsertSeparatorMenuItem
//
this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem";
this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(244, 22);
@ -715,7 +678,6 @@
//
// MoveUpMenuItem
//
this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.MoveUpMenuItem.Name = "MoveUpMenuItem";
this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up)));
this.MoveUpMenuItem.Size = new System.Drawing.Size(244, 22);
@ -724,7 +686,6 @@
//
// MoveDownMenuItem
//
this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.MoveDownMenuItem.Name = "MoveDownMenuItem";
this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down)));
this.MoveDownMenuItem.Size = new System.Drawing.Size(244, 22);
@ -733,7 +694,6 @@
//
// MoveTopMenuItem
//
this.MoveTopMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveTop;
this.MoveTopMenuItem.Name = "MoveTopMenuItem";
this.MoveTopMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.Up)));
@ -743,7 +703,6 @@
//
// MoveBottomMenuItem
//
this.MoveBottomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveBottom;
this.MoveBottomMenuItem.Name = "MoveBottomMenuItem";
this.MoveBottomMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.Down)));

49
src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -10,6 +10,7 @@ using System.Windows.Forms;
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Client.EmuHawk.ToolExtensions;
namespace BizHawk.Client.EmuHawk
@ -35,7 +36,49 @@ namespace BizHawk.Client.EmuHawk
public RamWatch()
{
InitializeComponent();
Icon = Properties.Resources.watch_MultiSize;
newToolStripMenuItem.Image = Resources.addWatch;
EditContextMenuItem.Image = Resources.CutHS;
RemoveContextMenuItem.Image = Resources.Delete;
DuplicateContextMenuItem.Image = Resources.Duplicate;
PokeContextMenuItem.Image = Resources.poke;
FreezeContextMenuItem.Image = Resources.Freeze;
UnfreezeAllContextMenuItem.Image = Resources.Unfreeze;
InsertSeperatorContextMenuItem.Image = Resources.InsertSeparator;
MoveUpContextMenuItem.Image = Resources.MoveUp;
MoveDownContextMenuItem.Image = Resources.MoveDown;
MoveTopContextMenuItem.Image = Resources.MoveTop;
MoveBottomContextMenuItem.Image = Resources.MoveBottom;
ErrorIconButton.Image = Resources.ExclamationRed;
newToolStripButton.Image = Resources.NewFile;
openToolStripButton.Image = Resources.OpenFile;
saveToolStripButton.Image = Resources.SaveAs;
newWatchToolStripButton.Image = Resources.addWatch;
editWatchToolStripButton.Image = Resources.CutHS;
cutToolStripButton.Image = Resources.Delete;
clearChangeCountsToolStripButton.Image = Resources.placeholder_bitmap;
duplicateWatchToolStripButton.Image = Resources.Duplicate;
PokeAddressToolBarItem.Image = Resources.poke;
FreezeAddressToolBarItem.Image = Resources.Freeze;
seperatorToolStripButton.Image = Resources.InsertSeparator;
moveUpToolStripButton.Image = Resources.MoveUp;
moveDownToolStripButton.Image = Resources.MoveDown;
NewListMenuItem.Image = Resources.NewFile;
OpenMenuItem.Image = Resources.OpenFile;
SaveMenuItem.Image = Resources.SaveAs;
RecentSubMenu.Image = Resources.Recent;
NewWatchMenuItem.Image = Resources.FindHS;
EditWatchMenuItem.Image = Resources.CutHS;
RemoveWatchMenuItem.Image = Resources.Delete;
DuplicateWatchMenuItem.Image = Resources.Duplicate;
PokeAddressMenuItem.Image = Resources.poke;
FreezeAddressMenuItem.Image = Resources.Freeze;
InsertSeparatorMenuItem.Image = Resources.InsertSeparator;
MoveUpMenuItem.Image = Resources.MoveUp;
MoveDownMenuItem.Image = Resources.MoveDown;
MoveTopMenuItem.Image = Resources.MoveTop;
MoveBottomMenuItem.Image = Resources.MoveBottom;
Icon = Resources.watch_MultiSize;
Settings = new RamWatchSettings();
WatchListView.QueryItemText += WatchListView_QueryItemText;
@ -1078,12 +1121,12 @@ namespace BizHawk.Client.EmuHawk
if (allCheats)
{
FreezeContextMenuItem.Text = "&Unfreeze Address";
FreezeContextMenuItem.Image = Properties.Resources.Unfreeze;
FreezeContextMenuItem.Image = Resources.Unfreeze;
}
else
{
FreezeContextMenuItem.Text = "&Freeze Address";
FreezeContextMenuItem.Image = Properties.Resources.Freeze;
FreezeContextMenuItem.Image = Resources.Freeze;
}
UnfreezeAllContextMenuItem.Visible = MainForm.CheatList.ActiveCount > 0;