From 31e621d64e87f9fddf095828ff1fc48797b841ae Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 22 Jun 2020 06:06:15 +1000 Subject: [PATCH] Move init of form icons to ctor (from InitializeComponent) tested the `global::` syntax on VS2019, the Designer refuses to cooperate --- src/BizHawk.Client.EmuHawk/BizBox.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/BizBox.cs | 1 + src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs | 1 + src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs | 1 + src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs | 1 - .../config/A7800/A7800ControllerSettings.Designer.cs | 1 - .../config/A7800/A7800ControllerSettings.cs | 1 + .../config/A7800/A7800FilterSettings.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs | 1 + .../config/AmstradCPC/AmstradCPCAudioSettings.Designer.cs | 1 - .../config/AmstradCPC/AmstradCPCAudioSettings.cs | 1 + .../config/AmstradCPC/AmstradCPCNonSyncSettings.Designer.cs | 1 - .../config/AmstradCPC/AmstradCPCNonSyncSettings.cs | 1 + .../config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs | 1 - .../config/AmstradCPC/AmstradCPCPokeMemory.cs | 1 + src/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs | 1 + .../config/ColecoVision/ColecoControllerSettings.Designer.cs | 1 - .../config/ColecoVision/ColecoControllerSettings.cs | 1 + .../config/GB/CGBColorChooserForm.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs | 1 + .../config/GB/ColorChooserForm.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs | 1 + src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs | 1 + src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs | 1 + src/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs | 1 + .../config/INTV/IntvControllerSettings.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs | 1 + .../config/N64/N64ControllersSetup.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs | 1 + .../config/N64/N64VideoPluginconfig.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs | 1 + .../config/NES/NesControllerSettings.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs | 1 + src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs | 1 + .../config/PSX/PSXControllerConfig.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs | 1 + src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs | 1 - .../config/SNES/SNESControllerConfig.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs | 1 + .../config/TI83/TI83PaletteConfig.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs | 1 + .../config/ZXSpectrum/ZXSpectrumAudioSettings.Designer.cs | 1 - .../config/ZXSpectrum/ZXSpectrumAudioSettings.cs | 1 + .../ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs | 1 - .../config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs | 1 + .../config/ZXSpectrum/ZXSpectrumJoystickSettings.Designer.cs | 1 - .../config/ZXSpectrum/ZXSpectrumJoystickSettings.cs | 1 + .../config/ZXSpectrum/ZXSpectrumNonSyncSettings.Designer.cs | 1 - .../config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs | 1 + .../config/ZXSpectrum/ZXSpectrumPokeMemory.Designer.cs | 1 - .../config/ZXSpectrum/ZXSpectrumPokeMemory.cs | 1 + src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs | 1 + src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs | 1 + src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs | 1 + src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs | 1 + src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs | 1 + src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs | 1 + src/BizHawk.Client.EmuHawk/tools/CDL.cs | 1 + src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs | 1 + .../tools/Debugger/GenericDebugger.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs | 1 + src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs | 1 + src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs | 1 + src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs | 1 + src/BizHawk.Client.EmuHawk/tools/GameShark.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/GameShark.cs | 1 + src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs | 1 + src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs | 1 + .../tools/Lua/LuaFunctionsForm.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs | 1 + .../tools/Lua/LuaRegisteredFunctionsList.Designer.cs | 1 - .../tools/Lua/LuaRegisteredFunctionsList.cs | 1 + src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs | 1 + .../tools/MultiDiskBundler/MultiDiskBundler.Designer.cs | 1 - .../tools/MultiDiskBundler/MultiDiskBundler.cs | 1 + src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs | 1 + src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs | 1 + .../tools/NES/NESNameTableViewer.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs | 1 + src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs | 1 + src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs | 1 + .../tools/PCE/PCESoundDebugger.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs | 1 + src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs | 1 + src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs | 1 + .../tools/TAStudio/DefaultGreenzoneSettings.Designer.cs | 1 - .../tools/TAStudio/DefaultGreenzoneSettings.cs | 1 + .../tools/TAStudio/GreenzoneSettings.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs | 1 + .../tools/TAStudio/HeaderEditor.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.cs | 1 + src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs | 1 + src/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/ToolBox.cs | 1 + src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs | 1 + .../tools/VirtualPads/VirtualpadsTool.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs | 1 + src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs | 1 + src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs | 1 + src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 1 + 131 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs b/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs index 6f97764189..79a273edbb 100644 --- a/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs @@ -192,7 +192,6 @@ this.Controls.Add(this.linkLabel1); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.OK); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.logo; this.MinimumSize = new System.Drawing.Size(453, 253); this.Name = "BizBox"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/BizBox.cs b/src/BizHawk.Client.EmuHawk/BizBox.cs index ffa969421b..dcf1398f88 100644 --- a/src/BizHawk.Client.EmuHawk/BizBox.cs +++ b/src/BizHawk.Client.EmuHawk/BizBox.cs @@ -12,6 +12,7 @@ namespace BizHawk.Client.EmuHawk public BizBox() { InitializeComponent(); + Icon = Properties.Resources.logo; } private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.Designer.cs b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.Designer.cs index 4eba94c323..a6af8bb896 100644 --- a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.Designer.cs @@ -129,7 +129,6 @@ this.Controls.Add(this.statusStrip1); this.Controls.Add(this.tabControl1); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.logo; this.MainMenuStrip = this.menuStrip1; this.Name = "CoreFeatureAnalysis"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs index 5e40681da6..d2ec2f76da 100644 --- a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs +++ b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs @@ -111,6 +111,7 @@ namespace BizHawk.Client.EmuHawk public CoreFeatureAnalysis() { InitializeComponent(); + Icon = Properties.Resources.logo; KnownCores = new Dictionary(); } diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs b/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs index ae293ac6ba..f20f81feba 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs @@ -31,6 +31,7 @@ namespace BizHawk.Client.EmuHawk.CustomControls { var icon = GetMessageBoxIcon(boxIcon); InitializeComponent(); + Icon = Properties.Resources.MsgBox_MultiSize; ControlBox = false; // Do not set in designer (causes problems with auto scaling) messageLbl.Text = message; diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs b/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs index 7f7a9a4c4e..978a2718f7 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs @@ -110,7 +110,6 @@ this.Controls.Add(this.btn2); this.Controls.Add(this.messageLbl); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.MsgBox_MultiSize; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "DialogBox"; diff --git a/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.Designer.cs index 4087816bed..ba25536615 100644 --- a/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.Designer.cs @@ -123,7 +123,6 @@ this.Controls.Add(this.Port1ComboBox); this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "A7800ControllerSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Controller Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs b/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs index 73b468c710..e2de8f72a6 100644 --- a/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs @@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.Designer.cs index 40f385bf29..d2bcd5328b 100644 --- a/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.Designer.cs @@ -99,7 +99,6 @@ this.Controls.Add(this.Port1ComboBox); this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "A7800FilterSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Filter Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs b/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs index c0732ca002..d92248fd5b 100644 --- a/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs @@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void A7800FilterSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.Designer.cs index 8cc1254764..cf4dc3139f 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.Designer.cs @@ -157,7 +157,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "AmstradCpcAudioSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Audio Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs index 7bbbb07d69..24ed37b15f 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs @@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk _settings = settings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.Designer.cs index 8df1d38753..27ff5edfb3 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.Designer.cs @@ -113,7 +113,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "AmstradCpcNonSyncSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Other Non-Sync Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.cs index 4ca4b24f08..fa95583b49 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.cs @@ -16,6 +16,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _settings = settings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs index b373c75448..f84471b815 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs @@ -139,7 +139,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "AmstradCpcPokeMemory"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Poke Memory"; diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs index e100ded8e0..a03711d0cb 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs @@ -15,6 +15,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _cpc = cpc; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void OkBtn_Click(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs index 9bcff3d2d3..4c86d6d76e 100644 --- a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs @@ -142,7 +142,6 @@ this.ClientSize = new System.Drawing.Size(323, 90); this.Controls.Add(this.flpDialog); this.Controls.Add(this.flpDialogButtons); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning_MultiSize; this.MaximizeBox = false; this.MinimumSize = new System.Drawing.Size(339, 129); this.Name = "AutofireConfig"; diff --git a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs index 56b975a9bf..cb2e6a2909 100644 --- a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs @@ -19,6 +19,7 @@ namespace BizHawk.Client.EmuHawk _autoFireController = autoFireController; _stickyXorAdapter = stickyXorAdapter; InitializeComponent(); + Icon = Properties.Resources.Lightning_MultiSize; } private void AutofireConfig_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.Designer.cs index 933d90e80c..7e48fefd38 100644 --- a/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.Designer.cs @@ -123,7 +123,6 @@ this.Controls.Add(this.Port1ComboBox); this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "ColecoControllerSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Controller Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs b/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs index 7e43d997cd..cab55d5189 100644 --- a/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs @@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = settings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void ColecoControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs b/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs index 49a0de3089..b6453b4f75 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs @@ -196,7 +196,6 @@ this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.gambatte_MultiSize; this.Name = "CGBColorChooserForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Game Boy Color Palette Config"; diff --git a/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs b/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs index 3c261888c8..c7edbb4307 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs @@ -11,6 +11,7 @@ namespace BizHawk.Client.EmuHawk private CGBColorChooserForm() { InitializeComponent(); + Icon = Properties.Resources.gambatte_MultiSize; bmpView1.ChangeBitmapSize(new Size(256, 128)); } diff --git a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs index f9f5212dd4..5127da8147 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs @@ -314,7 +314,6 @@ this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.gambatte_MultiSize; this.MinimumSize = new System.Drawing.Size(310, 264); this.Name = "ColorChooserForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs index c9790cb725..8723623fdf 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs @@ -14,6 +14,7 @@ namespace BizHawk.Client.EmuHawk private ColorChooserForm() { InitializeComponent(); + Icon = Properties.Resources.gambatte_MultiSize; } private readonly Color[] _colors = new Color[12]; diff --git a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.Designer.cs b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.Designer.cs index a1552ccef6..0dc2c0218a 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.Designer.cs @@ -125,7 +125,6 @@ this.Controls.Add(this.buttonOK); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.tabControl1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.dual_MultiSize; this.Name = "DGBPrefs"; this.Text = "Gameboy Link Settings"; this.tabControl1.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs index 633a8cdfc7..dbd530e344 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs @@ -9,6 +9,7 @@ namespace BizHawk.Client.EmuHawk private DGBPrefs() { InitializeComponent(); + Icon = Properties.Resources.dual_MultiSize; } private void PutSettings(GambatteLink.GambatteLinkSettings s, GambatteLink.GambatteLinkSyncSettings ss) diff --git a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.Designer.cs b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.Designer.cs index fde514516d..cd3bbe6bc8 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.Designer.cs @@ -76,7 +76,6 @@ this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOK); this.Controls.Add(this.gbPrefControl1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.gambatte_MultiSize; this.Name = "GBPrefs"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Game Boy Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs index b815b312e2..c20ac682da 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs @@ -8,6 +8,7 @@ namespace BizHawk.Client.EmuHawk private GBPrefs() { InitializeComponent(); + Icon = Properties.Resources.gambatte_MultiSize; } public static void DoGBPrefsDialog(MainForm mainForm, Gameboy gb) diff --git a/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs index 1998af011d..58e991f0e2 100644 --- a/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs @@ -223,7 +223,6 @@ this.Controls.Add(this.HotkeyTabControl); this.Controls.Add(this.AutoTabCheckBox); this.Controls.Add(this.label38); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys_MultiSize; this.Name = "HotkeyConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Configure Hotkeys"; diff --git a/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs b/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs index 06bb7a83d5..f0046123a1 100644 --- a/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs @@ -16,6 +16,7 @@ namespace BizHawk.Client.EmuHawk { _config = config; InitializeComponent(); + Icon = Properties.Resources.HotKeys_MultiSize; tabPage1.Focus(); } diff --git a/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.Designer.cs index 0b8b47002c..d22ebe0736 100644 --- a/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.Designer.cs @@ -123,7 +123,6 @@ this.Controls.Add(this.Port1ComboBox); this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "IntvControllerSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Controller Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs b/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs index 3550fd15a9..65d35c97b1 100644 --- a/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs @@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.Designer.cs b/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.Designer.cs index 60d6ac327d..f0909be039 100644 --- a/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.Designer.cs @@ -113,7 +113,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "N64ControllersSetup"; diff --git a/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs b/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs index 01e5b004f3..80c769245a 100644 --- a/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs +++ b/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs @@ -24,6 +24,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void N64ControllersSetup_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs index b7707c7daa..a013248b48 100644 --- a/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs @@ -4626,7 +4626,6 @@ this.Controls.Add(this.SaveButton); this.Controls.Add(this.N64plugintabcontrol); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.monitor_MultiSize; this.Name = "N64VideoPluginConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Plugin Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs b/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs index 87fdf5d6b9..149aa2beba 100644 --- a/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs @@ -67,6 +67,7 @@ namespace BizHawk.Client.EmuHawk } InitializeComponent(); + Icon = Properties.Resources.monitor_MultiSize; } private void CancelBtn_Click(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.Designer.cs index a50f431478..f1fd2cff4d 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.Designer.cs @@ -144,7 +144,6 @@ this.Controls.Add(this.checkBoxFamicom); this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "NesControllerSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "NES Controller Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs b/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs index 8c11455e12..82528f5434 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs @@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; // TODO: use combobox extension and add descriptions to enum values comboBoxFamicom.Items.AddRange(NESControlSettings.GetFamicomExpansionValues().ToArray()); diff --git a/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs index e159d235a0..c1c454ecf5 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs @@ -140,7 +140,6 @@ this.Controls.Add(this.buttonOK); this.Controls.Add(this.groupBox1); this.Controls.Add(this.propertyGrid1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.QuickNes_MultiSize; this.MinimumSize = new System.Drawing.Size(390, 285); this.Name = "QuickNesConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs b/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs index 46d8d6c3bc..bbbc2cb8d3 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs @@ -23,6 +23,7 @@ namespace BizHawk.Client.EmuHawk _config = config; _settings = settings; InitializeComponent(); + Icon = Properties.Resources.QuickNes_MultiSize; } private void QuickNesConfig_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs index b6286cc71e..2e574ea34c 100644 --- a/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs @@ -427,7 +427,6 @@ this.Controls.Add(this.btnOK); this.Controls.Add(this.groupBox1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "PSXControllerConfig"; diff --git a/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs index 2f8d074d7b..21bad69e3a 100644 --- a/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs @@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void PSXControllerConfigNew_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs index 1be2898fcc..27bbea80c8 100644 --- a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs @@ -131,7 +131,6 @@ this.Controls.Add(this.ProfileSelectComboBox); this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MinimumSize = new System.Drawing.Size(315, 280); this.Name = "ProfileConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.Designer.cs index 9bf9940384..ca6471ec1a 100644 --- a/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.Designer.cs @@ -192,7 +192,6 @@ this.Controls.Add(this.label1); this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "SNESControllerSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Controller Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs index 650f2bfae4..7378206947 100644 --- a/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs @@ -18,6 +18,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void SNESControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.Designer.cs index 0f79f80c1f..af2c3c5948 100644 --- a/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.Designer.cs @@ -121,7 +121,6 @@ this.Controls.Add(this.BackgroundPanel); this.Controls.Add(this.OkBtn); this.Controls.Add(this.CancelBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator_MultiSize; this.Name = "TI83PaletteConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Palette Config"; diff --git a/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs b/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs index 64643d3a80..ceaa242a66 100644 --- a/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs @@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _settings = settings; InitializeComponent(); + Icon = Properties.Resources.calculator_MultiSize; } private void TI83PaletteConfig_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.Designer.cs index 97c4da8953..dcd71f6d3a 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.Designer.cs @@ -179,7 +179,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "ZxSpectrumAudioSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Audio Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs index 71e58a866c..d094806e71 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs @@ -16,6 +16,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _settings = settings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs index ed7fe41a1e..6b09c85a16 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs @@ -190,7 +190,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "ZxSpectrumCoreEmulationSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Core Emulation Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs index f925a4b720..6c34c2e6ae 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs @@ -16,6 +16,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.Designer.cs index e37ec32aa7..95f2d1703b 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.Designer.cs @@ -159,7 +159,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "ZxSpectrumJoystickSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Joystick Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.cs index e352dc9d73..12c488b5ed 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.cs @@ -18,6 +18,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.Designer.cs index cf6a44746b..7f84b5417b 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.Designer.cs @@ -148,7 +148,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "ZxSpectrumNonSyncSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Other Non-Sync Settings"; diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs index 20c81da193..94a184877d 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs @@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _settings = settings; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.Designer.cs index 64a37c24a4..058dc0deb5 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.Designer.cs @@ -139,7 +139,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "ZxSpectrumPokeMemory"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Poke Memory"; diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs index 96b2160b7c..3bb963d5ef 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs @@ -16,6 +16,7 @@ namespace BizHawk.Client.EmuHawk _speccy = speccy; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void OkBtn_Click(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.Designer.cs b/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.Designer.cs index df9cc38ccd..397735db0e 100644 --- a/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.Designer.cs @@ -105,7 +105,6 @@ this.Controls.Add(this.CommentGrid); this.Controls.Add(this.OK); this.Controls.Add(this.Cancel); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio_MultiSize; this.MinimumSize = new System.Drawing.Size(188, 121); this.Name = "EditCommentsForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs b/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs index 80807d7ddb..713bfd9063 100644 --- a/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs +++ b/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs @@ -21,6 +21,7 @@ namespace BizHawk.Client.EmuHawk _sortReverse = false; InitializeComponent(); + Icon = Properties.Resources.TAStudio_MultiSize; } private void EditCommentsForm_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs index 156fa766c5..242a5372dc 100644 --- a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs @@ -197,7 +197,6 @@ this.Controls.Add(this.SubGrid); this.Controls.Add(this.OK); this.Controls.Add(this.Cancel); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio_MultiSize; this.MinimumSize = new System.Drawing.Size(188, 121); this.Name = "EditSubtitlesForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs index 8fb5cd2554..af4c4ec87d 100644 --- a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs +++ b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs @@ -19,6 +19,7 @@ namespace BizHawk.Client.EmuHawk _selectedMovie = movie; _readOnly = readOnly; InitializeComponent(); + Icon = Properties.Resources.TAStudio_MultiSize; } private void EditSubtitlesForm_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs index 04a2f4aeea..1e95eb28af 100644 --- a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs @@ -356,7 +356,6 @@ this.Controls.Add(this.BrowseMovies); this.Controls.Add(this.OK); this.Controls.Add(this.Cancel); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio_MultiSize; this.MaximizeBox = false; this.MinimizeBox = false; this.MinimumSize = new System.Drawing.Size(547, 228); diff --git a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs index cd8c680cd8..1b32f785e0 100644 --- a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs +++ b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs @@ -43,6 +43,7 @@ namespace BizHawk.Client.EmuHawk _emulator = emulator; _movieSession = movieSession; InitializeComponent(); + Icon = Properties.Resources.TAStudio_MultiSize; MovieView.RetrieveVirtualItem += MovieView_QueryItemText; MovieView.VirtualMode = true; _sortReverse = false; diff --git a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs index cfec3f96cd..9e0c3eb772 100644 --- a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs @@ -178,7 +178,6 @@ this.Controls.Add(this.groupBox1); this.Controls.Add(this.OK); this.Controls.Add(this.Cancel); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio_MultiSize; this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(1440, 201); this.MinimizeBox = false; diff --git a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs index 436b480270..196fcc3f9b 100644 --- a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs +++ b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs @@ -33,6 +33,7 @@ namespace BizHawk.Client.EmuHawk _movieSession = movieSession; _firmwareManager = firmwareManager; InitializeComponent(); + Icon = Properties.Resources.TAStudio_MultiSize; if (!_emulator.HasSavestates()) { diff --git a/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs b/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs index e3f8505b03..d7e97ebc74 100644 --- a/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs @@ -222,7 +222,6 @@ this.Controls.Add(this.Message); this.Controls.Add(this.Cancel); this.Controls.Add(this.OK); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio_MultiSize; this.MinimumSize = new System.Drawing.Size(272, 225); this.Name = "SubtitleMaker"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs b/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs index 86111383ba..c279d15ca2 100644 --- a/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs +++ b/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs @@ -13,6 +13,7 @@ namespace BizHawk.Client.EmuHawk public SubtitleMaker() { InitializeComponent(); + Icon = Properties.Resources.TAStudio_MultiSize; } public void DisableFrame() diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs index fe13d887d4..39c29a6e8c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs @@ -1171,7 +1171,6 @@ this.Controls.Add(this.ControlsBox); this.Controls.Add(this.BotStatusStrip); this.Controls.Add(this.BotMenu); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.basicbot; this.MainMenuStrip = this.BotMenu; this.Name = "BasicBot"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs index 2e13bcef37..562e9fa210 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs @@ -81,6 +81,7 @@ namespace BizHawk.Client.EmuHawk public BasicBot() { InitializeComponent(); + Icon = Properties.Resources.basicbot; Text = DialogTitle; Settings = new BasicBotSettings(); diff --git a/src/BizHawk.Client.EmuHawk/tools/CDL.cs b/src/BizHawk.Client.EmuHawk/tools/CDL.cs index f909a1d9e9..bc78846657 100644 --- a/src/BizHawk.Client.EmuHawk/tools/CDL.cs +++ b/src/BizHawk.Client.EmuHawk/tools/CDL.cs @@ -60,6 +60,7 @@ namespace BizHawk.Client.EmuHawk SetStyle(ControlStyles.UserPaint, true); SetStyle(ControlStyles.OptimizedDoubleBuffer, true); InitializeComponent(); + Icon = Properties.Resources.cdlogger_MultiSize; tsbViewStyle.SelectedIndex = 0; diff --git a/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs b/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs index e86cae874b..c10277c5a3 100644 --- a/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs @@ -295,7 +295,6 @@ this.Controls.Add(this.lvCDL); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.cdlogger_MultiSize; this.MainMenuStrip = this.menuStrip1; this.MinimumSize = new System.Drawing.Size(150, 130); this.Name = "CDL"; diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs index 94875574e0..30c806f18e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs @@ -618,7 +618,6 @@ this.Controls.Add(this.toolStrip1); this.Controls.Add(this.CheatsMenu); this.Controls.Add(this.CheatListView); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze_MultiSize; this.MinimumSize = new System.Drawing.Size(285, 384); this.Name = "Cheats"; this.Text = "Cheats"; diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index 97c2694182..d70900b06b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -33,6 +33,7 @@ namespace BizHawk.Client.EmuHawk public Cheats() { InitializeComponent(); + Icon = Properties.Resources.Freeze_MultiSize; Settings = new CheatsSettings(); Closing += (o, e) => diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs index 3aa9edc193..87a749270d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs @@ -362,7 +362,6 @@ this.Controls.Add(this.RegistersGroupBox); this.Controls.Add(this.DisassemblerBox); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug_MultiSize; this.MainMenuStrip = this.menuStrip1; this.Name = "GenericDebugger"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs index d3f795b146..ab98e0c67a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs @@ -16,6 +16,7 @@ namespace BizHawk.Client.EmuHawk public GenericDebugger() { InitializeComponent(); + Icon = Properties.Resources.Bug_MultiSize; Closing += (o, e) => DisengageDebugger(); DisassemblerView.QueryItemText += DisassemblerView_QueryItemText; diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs index e480745eff..04abefa479 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs @@ -504,7 +504,6 @@ this.Controls.Add(this.groupBox1); this.Controls.Add(this.menuStrip1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.gambatte_MultiSize; this.MainMenuStrip = this.menuStrip1; this.Name = "GbGpuView"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs index b3f107970b..db5f0d25af 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs @@ -57,6 +57,7 @@ namespace BizHawk.Client.EmuHawk public GbGpuView() { InitializeComponent(); + Icon = Properties.Resources.gambatte_MultiSize; bmpViewBG.ChangeBitmapSize(256, 256); bmpViewWin.ChangeBitmapSize(256, 256); bmpViewTiles1.ChangeBitmapSize(128, 192); diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.Designer.cs index 3f0c108852..158be816a4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.Designer.cs @@ -120,7 +120,6 @@ this.Controls.Add(this.label1); this.Controls.Add(this.paperScroll); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.gambatte_MultiSize; this.MainMenuStrip = this.menuStrip1; this.MaximizeBox = false; this.Name = "GBPrinterView"; diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs index 1646594a6c..80a2a7ff30 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs @@ -30,6 +30,7 @@ namespace BizHawk.Client.EmuHawk public GBPrinterView() { InitializeComponent(); + Icon = Properties.Resources.gambatte_MultiSize; // adjust the color of the printed output to be more papery _paperAdjustment = new ColorMatrix diff --git a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs index 82c1bee6e7..ffd39cf024 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs @@ -174,7 +174,6 @@ this.Controls.Add(this.panel1); this.Controls.Add(this.listBoxWidgets); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.gba_MultiSize.Value; this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; this.Name = "GbaGpuView"; diff --git a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs index a62f0ce539..78fbb3eca4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs @@ -33,6 +33,7 @@ namespace BizHawk.Client.EmuHawk public GbaGpuView() { InitializeComponent(); + Icon = Properties.Resources.gba_MultiSize.Value; // TODO: hook up something // we do this twice to avoid having to & 0x7fff with every color int[] tmp = GBColors.GetLut(GBColors.ColorType.vivid); diff --git a/src/BizHawk.Client.EmuHawk/tools/GameShark.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/GameShark.Designer.cs index 791aeb2853..73ceff6764 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GameShark.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GameShark.Designer.cs @@ -117,7 +117,6 @@ this.Controls.Add(this.txtCheat); this.Controls.Add(this.btnGo); this.Controls.Add(this.mnuGameShark); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.Shark_MultiSize; this.MainMenuStrip = this.mnuGameShark; this.MaximizeBox = false; this.MinimumSize = new System.Drawing.Size(230, 155); diff --git a/src/BizHawk.Client.EmuHawk/tools/GameShark.cs b/src/BizHawk.Client.EmuHawk/tools/GameShark.cs index 809d906fc0..7cb7c92f6c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GameShark.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GameShark.cs @@ -25,6 +25,7 @@ namespace BizHawk.Client.EmuHawk public GameShark() { InitializeComponent(); + Icon = Properties.Resources.Shark_MultiSize; } public void Restart() diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs index 0a18d999b3..d8f5101db9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs @@ -644,7 +644,6 @@ this.Controls.Add(this.Header); this.Controls.Add(this.MemoryViewerBox); this.Controls.Add(this.HexMenuStrip); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.poke_MultiSize; this.MainMenuStrip = this.HexMenuStrip; this.MinimumSize = new System.Drawing.Size(360, 180); this.Name = "HexEditor"; diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index 1374d44913..5fcd882a73 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -121,6 +121,7 @@ namespace BizHawk.Client.EmuHawk _fontHeight = fontSize1.Height; InitializeComponent(); + Icon = Properties.Resources.poke_MultiSize; AddressesLabel.BackColor = Color.Transparent; SetHeader(); Closing += (o, e) => CloseHexFind(); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs index e1de61a8d0..1ddd27780d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs @@ -877,7 +877,6 @@ this.Controls.Add(this.OutputMessages); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.textdoc_MultiSize; this.MainMenuStrip = this.menuStrip1; this.MinimumSize = new System.Drawing.Size(400, 180); this.Name = "LuaConsole"; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index cf15c6b9b4..a52e071beb 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -73,6 +73,7 @@ namespace BizHawk.Client.EmuHawk _lastColumnSorted = ""; InitializeComponent(); + Icon = Properties.Resources.textdoc_MultiSize; Closing += (o, e) => { diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs index 5f28ecbf4c..9d719df860 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs @@ -151,7 +151,6 @@ this.Controls.Add(this.FilterBox); this.Controls.Add(this.FunctionView); this.Controls.Add(this.OK); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.textdoc_MultiSize; this.MinimumSize = new System.Drawing.Size(200, 50); this.Name = "LuaFunctionsForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs index df66e39494..ca652a3e52 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs @@ -21,6 +21,7 @@ namespace BizHawk.Client.EmuHawk { _docs = docs; InitializeComponent(); + Icon = Properties.Resources.textdoc_MultiSize; FunctionView.RetrieveVirtualItem += FunctionView_QueryItemText; } diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.Designer.cs index db68b4d387..f6a8162d0d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.Designer.cs @@ -161,7 +161,6 @@ this.Controls.Add(this.CallButton); this.Controls.Add(this.FunctionView); this.Controls.Add(this.OK); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.textdoc_MultiSize; this.MinimumSize = new System.Drawing.Size(360, 150); this.Name = "LuaRegisteredFunctionsList"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs index e3bbea2806..85497ae91f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs @@ -14,6 +14,7 @@ namespace BizHawk.Client.EmuHawk { _registeredFunctions = registeredFunctions; InitializeComponent(); + Icon = Properties.Resources.textdoc_MultiSize; } public Point StartLocation { get; set; } = new Point(0, 0); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.Designer.cs index 76171eef64..9a8f350998 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.Designer.cs @@ -35,7 +35,6 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(284, 262); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.textdoc_MultiSize; this.Name = "LuaWinform"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Lua Dialog"; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs index b62948d111..4efd8def28 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs @@ -19,6 +19,7 @@ namespace BizHawk.Client.EmuHawk _ownerFile = ownerFile; _luaImp = luaImp; InitializeComponent(); + Icon = Properties.Resources.textdoc_MultiSize; StartPosition = FormStartPosition.CenterParent; Closing += (o, e) => CloseThis(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs index 85602f6fc4..885b3e85c7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs @@ -190,7 +190,6 @@ this.Controls.Add(this.CancelBtn); this.Controls.Add(this.SaveRunButton); this.Controls.Add(this.MultiDiskMenuStrip); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.dual_MultiSize; this.MainMenuStrip = this.MultiDiskMenuStrip; this.Name = "MultiDiskBundler"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs index e7ebb2cf1f..6c0568760d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs +++ b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs @@ -25,6 +25,7 @@ namespace BizHawk.Client.EmuHawk public MultiDiskBundler() { InitializeComponent(); + Icon = Properties.Resources.dual_MultiSize; } private void MultiGameCreator_Load(object sender, EventArgs e) => Restart(); diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.Designer.cs index 855175255f..5235c53f60 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.Designer.cs @@ -93,7 +93,6 @@ this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.textBox1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon_MultiSize; this.Name = "BarcodeEntry"; this.Text = "Barcode Entry"; this.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs index 793059cec2..e791045f3b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs @@ -13,6 +13,7 @@ namespace BizHawk.Client.EmuHawk public BarcodeEntry() { InitializeComponent(); + Icon = Properties.Resources.NESControllerIcon_MultiSize; } public void Restart() diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs index ead3aab4a2..5dfbbd8fd6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs @@ -189,7 +189,6 @@ this.Controls.Add(this.groupBox1); this.Controls.Add(this.textBox1); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon_MultiSize; this.Name = "NESMusicRipper"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Music Ripper"; diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs index 7870b8daa6..0c666b7e06 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs @@ -23,6 +23,7 @@ namespace BizHawk.Client.EmuHawk public NESMusicRipper() { InitializeComponent(); + Icon = Properties.Resources.NESControllerIcon_MultiSize; SyncContents(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs index 10753f142d..416218af1c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs @@ -430,7 +430,6 @@ this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon_MultiSize; this.MainMenuStrip = this.menuStrip1; this.MinimumSize = new System.Drawing.Size(687, 588); this.Name = "NESNameTableViewer"; diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs index bfa7a0c535..941c23ae99 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs @@ -30,6 +30,7 @@ namespace BizHawk.Client.EmuHawk public NESNameTableViewer() { InitializeComponent(); + Icon = Properties.Resources.NESControllerIcon_MultiSize; } private void NESNameTableViewer_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs index 937a052889..82e44a16d6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs @@ -839,7 +839,6 @@ this.Controls.Add(this.PalettesGroup); this.Controls.Add(this.PatternGroup); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon_MultiSize; this.KeyPreview = true; this.MainMenuStrip = this.NesPPUMenu; this.Margin = new System.Windows.Forms.Padding(4); diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs index f5da14bb60..4f704dc671 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs @@ -47,6 +47,7 @@ namespace BizHawk.Client.EmuHawk public NesPPU() { InitializeComponent(); + Icon = Properties.Resources.NESControllerIcon_MultiSize; CalculateFormSize(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs index 55ecf13ee0..181a9f39c7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs @@ -254,7 +254,6 @@ this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox1); this.Controls.Add(this.PceBgViewerMenu); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.pce_MultiSize; this.MainMenuStrip = this.PceBgViewerMenu; this.Name = "PceBgViewer"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs index a1fedda47d..8a11090d2d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs @@ -30,6 +30,7 @@ namespace BizHawk.Client.EmuHawk public PceBgViewer() { InitializeComponent(); + Icon = Properties.Resources.pce_MultiSize; Activated += (o, e) => Generate(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs index 51710b1a27..e46dec314b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs @@ -261,7 +261,6 @@ this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.SoundMenuStrip); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug_MultiSize; this.MainMenuStrip = this.SoundMenuStrip; this.Name = "PCESoundDebugger"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs index f4b369ebca..2d4f66b299 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs @@ -21,6 +21,7 @@ namespace BizHawk.Client.EmuHawk public PCESoundDebugger() { InitializeComponent(); + Icon = Properties.Resources.Bug_MultiSize; SetStyle(ControlStyles.AllPaintingInWmPaint, true); SetStyle(ControlStyles.UserPaint, true); diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs index ab015a15b1..76caa5bcf8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs @@ -182,7 +182,6 @@ this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.pce_MultiSize; this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; this.Name = "PceTileViewer"; diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs index 4133f7f466..5fac75d0b6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs @@ -22,6 +22,7 @@ namespace BizHawk.Client.EmuHawk public PceTileViewer() { InitializeComponent(); + Icon = Properties.Resources.pce_MultiSize; bmpViewBG.ChangeBitmapSize(512, 256); bmpViewSP.ChangeBitmapSize(512, 256); bmpViewBGPal.ChangeBitmapSize(256, 256); diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs index 065af21b18..fd2b71328b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs @@ -180,7 +180,6 @@ this.Controls.Add(this.groupBox1); this.Controls.Add(this.menuStrip1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.sms_MultiSize; this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; this.Name = "SmsVdpViewer"; diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs index d86a9acddf..59d1a03c07 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs @@ -20,6 +20,7 @@ namespace BizHawk.Client.EmuHawk public SmsVdpViewer() { InitializeComponent(); + Icon = Properties.Resources.sms_MultiSize; bmpViewTiles.ChangeBitmapSize(256, 128); bmpViewPalette.ChangeBitmapSize(16, 2); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.Designer.cs index f4e08e08a8..ef44512aaa 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.Designer.cs @@ -91,7 +91,6 @@ this.Controls.Add(this.DefaultsButton); this.Controls.Add(this.OkBtn); this.Controls.Add(this.CancelBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio_MultiSize; this.Name = "DefaultGreenzoneSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "Default Savestate History Settings"; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.cs index f2e189c478..87bcd5e5fe 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.cs @@ -13,6 +13,7 @@ namespace BizHawk.Client.EmuHawk public DefaultGreenzoneSettings(MovieConfig movieSettings) { InitializeComponent(); + Icon = Properties.Resources.TAStudio_MultiSize; _movieSettings = movieSettings; _settings = new TasStateManagerSettings(movieSettings.DefaultTasStateManagerSettings); SettingsPropertyGrid.SelectedObject = _settings; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs index 2ef69f7e26..728ef7a3bf 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs @@ -430,7 +430,6 @@ namespace BizHawk.Client.EmuHawk this.Controls.Add(this.NumStatesLabel); this.Controls.Add(this.OkBtn); this.Controls.Add(this.CancelBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio_MultiSize; this.MinimumSize = new System.Drawing.Size(225, 165); this.Name = "StateHistorySettingsForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs index 8634c448e3..c2515f75e8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs @@ -18,6 +18,7 @@ namespace BizHawk.Client.EmuHawk { _settings = settings; InitializeComponent(); + Icon = Properties.Resources.TAStudio_MultiSize; } private void StateHistorySettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.Designer.cs index a34016bbdd..42e80fd806 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.Designer.cs @@ -206,7 +206,6 @@ namespace BizHawk.Client.EmuHawk this.Controls.Add(this.AuthorTextBox); this.Controls.Add(this.OkBtn); this.Controls.Add(this.CancelBtn); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio_MultiSize; this.MinimumSize = new System.Drawing.Size(150, 311); this.Name = "MovieHeaderEditor"; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.cs index ccf886ea96..d3ecfd2d67 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.cs @@ -13,6 +13,7 @@ namespace BizHawk.Client.EmuHawk { _movie = movie; InitializeComponent(); + Icon = Properties.Resources.TAStudio_MultiSize; } private void MovieHeaderEditor_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs index 541f2771cd..8712815cc4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs @@ -1903,7 +1903,6 @@ this.Controls.Add(this.SecondButton); this.Controls.Add(this.YButton); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator_MultiSize; this.MainMenuStrip = this.menuStrip1; this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(371, 581); diff --git a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs index e6c18be6ad..42d61770c6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs @@ -15,6 +15,7 @@ namespace BizHawk.Client.EmuHawk public TI83KeyPad() { InitializeComponent(); + Icon = Properties.Resources.calculator_MultiSize; } [ConfigPersist] diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs index f421770a2d..8f97e400ab 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs @@ -56,7 +56,6 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(140, 183); this.Controls.Add(this.ToolBoxStrip); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.ToolBox_MultiSize; this.MaximumSize = new System.Drawing.Size(270, 600); this.MinimumSize = new System.Drawing.Size(135, 38); this.Name = "ToolBox"; diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs index 839fd0568b..3df74727b8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -18,6 +18,7 @@ namespace BizHawk.Client.EmuHawk public ToolBox() { InitializeComponent(); + Icon = Properties.Resources.ToolBox_MultiSize; } private void ToolBox_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs index f83c2e163b..1a0424328e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs @@ -320,7 +320,6 @@ this.Controls.Add(this.groupBox2); this.Controls.Add(this.TracerBox); this.Controls.Add(this.menuStrip1); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil_MultiSize; this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; this.MinimumSize = new System.Drawing.Size(400, 230); diff --git a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs index 99d4f1a5b9..3384e9f0d9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs @@ -62,6 +62,7 @@ namespace BizHawk.Client.EmuHawk public TraceLogger() { InitializeComponent(); + Icon = Properties.Resources.pencil_MultiSize; TraceView.QueryItemText += TraceView_QueryItemText; diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs index 3d4b2d2d28..86f97c6e28 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs @@ -169,7 +169,6 @@ this.ClientSize = new System.Drawing.Size(452, 312); this.Controls.Add(this.ControllerBox); this.Controls.Add(this.PadMenu); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize; this.Name = "VirtualpadTool"; this.Text = "Virtual Pads"; this.Load += new System.EventHandler(this.VirtualpadTool_Load); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index 5e6d80b969..18bb99c90d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -41,6 +41,7 @@ namespace BizHawk.Client.EmuHawk { StickyPads = true; InitializeComponent(); + Icon = Properties.Resources.GameController_MultiSize; } private void VirtualpadTool_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs index b4bddf2a3a..c58d36dcd9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs @@ -226,7 +226,6 @@ namespace BizHawk.Client.EmuHawk this.Controls.Add(this.AddressBox); this.Controls.Add(this.label1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.poke_MultiSize; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "RamPoke"; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs index a97085b3b9..dd10355077 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs @@ -22,6 +22,7 @@ namespace BizHawk.Client.EmuHawk .ToList(); _cheats = cheats; InitializeComponent(); + Icon = Properties.Resources.poke_MultiSize; } public IToolForm ParentTool { get; set; } diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs index 9711014bc0..74806c3ed9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs @@ -1353,7 +1353,6 @@ this.Controls.Add(this.WatchListView); this.Controls.Add(this.TotalSearchLabel); this.Controls.Add(this.RamSearchMenu); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.search_MultiSize; this.MainMenuStrip = this.RamSearchMenu; this.MinimumSize = new System.Drawing.Size(290, 399); this.Name = "RamSearch"; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index a421e01629..346d9b93ac 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -46,6 +46,7 @@ namespace BizHawk.Client.EmuHawk SetStyle(ControlStyles.UserPaint, true); SetStyle(ControlStyles.OptimizedDoubleBuffer, true); InitializeComponent(); + Icon = Properties.Resources.search_MultiSize; WatchListView.QueryItemText += ListView_QueryItemText; WatchListView.QueryItemBkColor += ListView_QueryItemBkColor; Closing += (o, e) => SaveConfigSettings(); diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs index 5258b5f1f2..8baf8cb6b9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs @@ -882,7 +882,6 @@ this.Controls.Add(this.toolStrip1); this.Controls.Add(this.RamWatchMenu); this.Controls.Add(this.WatchListView); - this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.watch_MultiSize; this.Name = "RamWatch"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = " RAM Watch"; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index d61e0867e5..09b82a7d08 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -35,6 +35,7 @@ namespace BizHawk.Client.EmuHawk public RamWatch() { InitializeComponent(); + Icon = Properties.Resources.watch_MultiSize; Settings = new RamWatchSettings(); WatchListView.QueryItemText += WatchListView_QueryItemText;