diff --git a/src/BizHawk.Client.EmuHawk/BizBox.cs b/src/BizHawk.Client.EmuHawk/BizBox.cs index 1c3daa459e..b07d092651 100644 --- a/src/BizHawk.Client.EmuHawk/BizBox.cs +++ b/src/BizHawk.Client.EmuHawk/BizBox.cs @@ -13,8 +13,8 @@ namespace BizHawk.Client.EmuHawk public BizBox() { InitializeComponent(); - Icon = Resources.logo; - pictureBox1.Image = Resources.corphawk; + Icon = Resources.Logo; + pictureBox1.Image = Resources.CorpHawk; btnCopyHash.Image = Resources.Duplicate; } diff --git a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs index d2ec2f76da..635d55f27a 100644 --- a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs +++ b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs @@ -111,7 +111,7 @@ namespace BizHawk.Client.EmuHawk public CoreFeatureAnalysis() { InitializeComponent(); - Icon = Properties.Resources.logo; + 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 2863a39c30..114517b740 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs @@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk.CustomControls { var icon = GetMessageBoxIcon(boxIcon); InitializeComponent(); - Icon = Properties.Resources.MsgBox_MultiSize; + Icon = Properties.Resources.MsgBoxIcon; ControlBox = false; // Do not set in designer (causes problems with auto scaling) messageLbl.Text = message; diff --git a/src/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs b/src/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs index 8ecc5fd005..a72cd0c7dd 100644 --- a/src/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs +++ b/src/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs @@ -28,13 +28,13 @@ namespace BizHawk.Client.EmuHawk.CoreExtensions return core switch { QuickNES _ => Properties.Resources.QuickNes, - LibsnesCore _ => Properties.Resources.bsnes, - GPGX _ => Properties.Resources.genplus, - Gameboy _ => Properties.Resources.gambatte, - Snes9x _ => Properties.Resources.snes9x, - MAME _ => Properties.Resources.mame, - MGBAHawk _ => Properties.Resources.mGba, - MelonDS _ => Properties.Resources.melonDS, + LibsnesCore _ => Properties.Resources.Bsnes, + GPGX _ => Properties.Resources.GenPlus, + Gameboy _ => Properties.Resources.Gambatte, + Snes9x _ => Properties.Resources.Snes9X, + MAME _ => Properties.Resources.Mame, + MGBAHawk _ => Properties.Resources.Mgba, + MelonDS _ => Properties.Resources.MelonDS, _ => null }; } diff --git a/src/BizHawk.Client.EmuHawk/LogWindow.cs b/src/BizHawk.Client.EmuHawk/LogWindow.cs index 231bcb422e..434ec7c69d 100644 --- a/src/BizHawk.Client.EmuHawk/LogWindow.cs +++ b/src/BizHawk.Client.EmuHawk/LogWindow.cs @@ -27,7 +27,7 @@ namespace BizHawk.Client.EmuHawk { InitializeComponent(); Icon = Properties.Resources.CommandWindow; - AddToGameDbBtn.Image = Properties.Resources.add; + AddToGameDbBtn.Image = Properties.Resources.Add; Closing += (o, e) => { Detach(); diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index aa57520da9..7076b86071 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -2247,19 +2247,19 @@ namespace BizHawk.Client.EmuHawk if (_stateSlots.IsRedo(MovieSession.Movie, Config.SaveSlot)) { UndoSavestateContextMenuItem.Text = $"Redo Save to slot {Config.SaveSlot}"; - UndoSavestateContextMenuItem.Image = Properties.Resources.redo; + UndoSavestateContextMenuItem.Image = Properties.Resources.Redo; } else { UndoSavestateContextMenuItem.Text = $"Undo Save to slot {Config.SaveSlot}"; - UndoSavestateContextMenuItem.Image = Properties.Resources.undo; + UndoSavestateContextMenuItem.Image = Properties.Resources.Undo; } } else { UndoSavestateContextMenuItem.Enabled = false; UndoSavestateContextMenuItem.Text = "Undo Savestate"; - UndoSavestateContextMenuItem.Image = Properties.Resources.undo; + UndoSavestateContextMenuItem.Image = Properties.Resources.Undo; } ShowMenuContextMenuItem.Text = MainMenuStrip.Visible ? "Hide Menu" : "Show Menu"; diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs index d6bccaffab..b200f6cfc6 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs @@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk } else if (MovieSession.Movie.IsRecording()) { - PlayRecordStatusButton.Image = Properties.Resources.RecordHS; + PlayRecordStatusButton.Image = Properties.Resources.Record; PlayRecordStatusButton.ToolTipText = "Movie is in record mode"; PlayRecordStatusButton.Visible = true; } diff --git a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs index a29970eeda..05dd9dae8f 100644 --- a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs +++ b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs @@ -5,7 +5,8 @@ using System.Windows.Forms; namespace BizHawk.Client.EmuHawk.Properties { - internal static class Resources { + internal static class Resources + { private static readonly Assembly Asm = Assembly.GetExecutingAssembly(); /// Dir separator is '.'. Path is relative to <NS>. @@ -18,143 +19,145 @@ namespace BizHawk.Client.EmuHawk.Properties /// Dir separator is '.'. Filename is relative to <NS>/images and omits .ico extension. private static Icon ReadEmbeddedIcon(string filename) => new Icon(Asm.GetManifestResourceStream($"BizHawk.Client.EmuHawk.images.{filename}.ico")); - internal static readonly Bitmap add = ReadEmbeddedBitmap("add"); - internal static readonly Bitmap AddEdit = ReadEmbeddedBitmap("AddEdit"); - internal static readonly Bitmap addWatch = ReadEmbeddedBitmapAt("images.addWatch.ico"); - internal static readonly Bitmap arrow_black_down = ReadEmbeddedBitmap("arrow_black_down"); - internal static readonly Lazy atari_controller = new Lazy(() => ReadEmbeddedBitmap("atari_controller")); - internal static readonly Bitmap AudioHS = ReadEmbeddedBitmap("AudioHS"); - internal static readonly Bitmap AutoSearch = ReadEmbeddedBitmap("AutoSearch"); - internal static readonly Bitmap AVI = ReadEmbeddedBitmap("AVI"); - internal static readonly Bitmap Back = ReadEmbeddedBitmap("Back"); - internal static readonly Bitmap BackMore = ReadEmbeddedBitmap("BackMore"); - internal static readonly Icon basicbot = ReadEmbeddedIcon("basicbot"); - internal static readonly Bitmap Blank = ReadEmbeddedBitmap("Blank"); - internal static readonly Cursor BlankCursor = new Cursor(Asm.GetManifestResourceStream("BizHawk.Client.EmuHawk.images.BlankCursor.cur")); - internal static readonly Bitmap BlueDown = ReadEmbeddedBitmap("BlueDown"); - internal static readonly Bitmap BlueUp = ReadEmbeddedBitmap("BlueUp"); - internal static readonly Bitmap Both = ReadEmbeddedBitmap("Both"); - internal static readonly Bitmap bsnes = ReadEmbeddedBitmap("bsnes"); - internal static readonly Bitmap melonDS = ReadEmbeddedBitmap("melonDS"); - internal static readonly Icon Bug_MultiSize = ReadEmbeddedIcon("Bug"); - internal static readonly Bitmap Bug = ReadEmbeddedBitmap("Bug"); - internal static readonly Bitmap C64Symbol = ReadEmbeddedBitmap("C64Symbol"); - internal static readonly Icon calculator_MultiSize = ReadEmbeddedIcon("calculator"); - internal static readonly Bitmap calculator = ReadEmbeddedBitmap("calculator"); - internal static readonly Bitmap camera = ReadEmbeddedBitmap("camera"); - internal static readonly Bitmap cdlogger = ReadEmbeddedBitmapAt("images.cdlogger.ico"); - internal static readonly Icon cdlogger_MultiSize = ReadEmbeddedIcon("cdlogger"); - internal static readonly Bitmap checkbox = ReadEmbeddedBitmap("checkbox"); - internal static readonly Bitmap Circle = ReadEmbeddedBitmap("Circle"); - internal static readonly Bitmap Close = ReadEmbeddedBitmap("Close"); - internal static readonly Bitmap connect_16x16 = ReadEmbeddedBitmap("connect_16x16"); internal static readonly Lazy A78Joystick = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.A78Joystick")); internal static readonly Lazy AppleIIKeyboard = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.AppleIIKeyboard")); internal static readonly Lazy ArcadeController = new Lazy(() => ReadEmbeddedBitmapAt("images.ControllerImages.ArcadeController.jpg")); internal static readonly Lazy C64Joystick = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.C64Joystick")); internal static readonly Lazy C64Keyboard = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.C64Keyboard")); - internal static readonly Lazy colecovisioncontroller = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.colecovisioncontroller")); - internal static readonly Lazy GBA_Controller = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.GBA_Controller")); - internal static readonly Lazy GBController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.GBController")); - internal static readonly Lazy GENController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.GENController")); + internal static readonly Lazy ColecoVisionController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.colecovisioncontroller")); + internal static readonly Lazy DSController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.DSController")); + internal static readonly Lazy GbaController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.GBA_Controller")); + internal static readonly Lazy GbController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.GBController")); + internal static readonly Lazy GenesisController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.GENController")); internal static readonly Lazy IntVController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.IntVController")); internal static readonly Lazy Lynx = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.Lynx")); internal static readonly Lazy N64 = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.N64")); - internal static readonly Lazy NES_Controller = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.NES_Controller")); - internal static readonly Lazy NGPController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.NGPController")); - internal static readonly Lazy PCEngineController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.PCEngineController")); - internal static readonly Lazy psx_dualshock = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.psx_dualshock")); + internal static readonly Lazy NesController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.NES_Controller")); + internal static readonly Lazy NgpController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.NGPController")); + internal static readonly Lazy PceController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.PCEngineController")); + internal static readonly Lazy PsxDualShockController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.psx_dualshock")); internal static readonly Lazy SaturnController = new Lazy(() => ReadEmbeddedBitmapAt("images.ControllerImages.SaturnController.jpg")); - internal static readonly Lazy SMSController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.SMSController")); - internal static readonly Lazy SNES_Controller = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.SNES_Controller")); - internal static readonly Lazy TI83_Controller = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.TI83_Controller")); + internal static readonly Lazy SmsController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.SMSController")); + internal static readonly Lazy SnesController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.SNES_Controller")); + internal static readonly Lazy TI83Controller = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.TI83_Controller")); internal static readonly Lazy VBoyController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.VBoyController")); internal static readonly Lazy WonderSwanColor = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.WonderSwanColor")); internal static readonly Lazy ZXSpectrumKeyboards = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.ZXSpectrumKeyboards")); - internal static readonly Lazy DSController = new Lazy(() => ReadEmbeddedBitmap("ControllerImages.DSController")); - internal static readonly Bitmap CopyFolderHS = ReadEmbeddedBitmap("CopyFolderHS"); - internal static readonly Bitmap corphawk = ReadEmbeddedBitmapAt("images.corphawk.jpg"); + + internal static readonly Bitmap Add = ReadEmbeddedBitmap("add"); + internal static readonly Bitmap AddEdit = ReadEmbeddedBitmap("AddEdit"); + internal static readonly Bitmap AddWatch = ReadEmbeddedBitmapAt("images.addWatch.ico"); + internal static readonly Bitmap ArrowBlackDown = ReadEmbeddedBitmap("arrow_black_down"); + internal static readonly Lazy AtariController = new Lazy(() => ReadEmbeddedBitmap("atari_controller")); + internal static readonly Bitmap Audio = ReadEmbeddedBitmap("AudioHS"); + internal static readonly Bitmap AutoSearch = ReadEmbeddedBitmap("AutoSearch"); + internal static readonly Bitmap Avi = ReadEmbeddedBitmap("AVI"); + internal static readonly Bitmap Back = ReadEmbeddedBitmap("Back"); + internal static readonly Bitmap BackMore = ReadEmbeddedBitmap("BackMore"); + internal static readonly Icon BasicBot = ReadEmbeddedIcon("basicbot"); + internal static readonly Bitmap Blank = ReadEmbeddedBitmap("Blank"); + internal static readonly Cursor BlankCursor = new Cursor(Asm.GetManifestResourceStream("BizHawk.Client.EmuHawk.images.BlankCursor.cur")); + internal static readonly Bitmap BlueDown = ReadEmbeddedBitmap("BlueDown"); + internal static readonly Bitmap BlueUp = ReadEmbeddedBitmap("BlueUp"); + internal static readonly Bitmap Both = ReadEmbeddedBitmap("Both"); + internal static readonly Bitmap Bsnes = ReadEmbeddedBitmap("bsnes"); + internal static readonly Bitmap MelonDS = ReadEmbeddedBitmap("melonDS"); + internal static readonly Icon BugIcon = ReadEmbeddedIcon("Bug"); + internal static readonly Bitmap Bug = ReadEmbeddedBitmap("Bug"); + internal static readonly Bitmap C64Symbol = ReadEmbeddedBitmap("C64Symbol"); + internal static readonly Bitmap Calculator = ReadEmbeddedBitmap("calculator"); + internal static readonly Icon CalculateIcon = ReadEmbeddedIcon("calculator"); + internal static readonly Bitmap Camera = ReadEmbeddedBitmap("camera"); + internal static readonly Bitmap CdLogger = ReadEmbeddedBitmapAt("images.cdlogger.ico"); + internal static readonly Icon CdLoggerIcon = ReadEmbeddedIcon("cdlogger"); + internal static readonly Bitmap Checkbox = ReadEmbeddedBitmap("checkbox"); + internal static readonly Bitmap Circle = ReadEmbeddedBitmap("Circle"); + internal static readonly Bitmap Close = ReadEmbeddedBitmap("Close"); + internal static readonly Icon CommandWindow = ReadEmbeddedIcon("commandWindow"); + internal static readonly Bitmap Connect16X16 = ReadEmbeddedBitmap("connect_16x16"); + internal static readonly Bitmap CopyFolder = ReadEmbeddedBitmap("CopyFolderHS"); + internal static readonly Bitmap CorpHawk = ReadEmbeddedBitmapAt("images.corphawk.jpg"); internal static readonly Bitmap CorpHawkSmall = ReadEmbeddedBitmap("CorpHawkSmall"); internal static readonly Bitmap Cross = ReadEmbeddedBitmap("Cross"); - internal static readonly Bitmap CutHS = ReadEmbeddedBitmap("CutHS"); + internal static readonly Bitmap Cut = ReadEmbeddedBitmap("CutHS"); internal static readonly Bitmap Debugger = ReadEmbeddedBitmap("Debugger"); internal static readonly Bitmap Delete = ReadEmbeddedBitmap("Delete"); - internal static readonly Icon dual_MultiSize = ReadEmbeddedIcon("dual"); + internal static readonly Icon DualIcon = ReadEmbeddedIcon("dual"); internal static readonly Bitmap Duplicate = ReadEmbeddedBitmap("Duplicate"); internal static readonly Bitmap ENE = ReadEmbeddedBitmap("ENE"); internal static readonly Bitmap Erase = ReadEmbeddedBitmap("Erase"); internal static readonly Bitmap ESE = ReadEmbeddedBitmap("ESE"); internal static readonly Bitmap ExclamationRed = ReadEmbeddedBitmap("ExclamationRed"); internal static readonly Bitmap FastForward = ReadEmbeddedBitmap("FastForward"); - internal static readonly Bitmap FindHS = ReadEmbeddedBitmap("FindHS"); + internal static readonly Bitmap Find = ReadEmbeddedBitmap("FindHS"); internal static readonly Bitmap Forward = ReadEmbeddedBitmap("Forward"); - internal static readonly Icon Freeze_MultiSize = ReadEmbeddedIcon("Freeze"); internal static readonly Bitmap Freeze = ReadEmbeddedBitmap("Freeze"); + internal static readonly Icon FreezeIcon = ReadEmbeddedIcon("Freeze"); internal static readonly Bitmap Fullscreen = ReadEmbeddedBitmap("Fullscreen"); - internal static readonly Icon gambatte_MultiSize = ReadEmbeddedIcon("gambatte"); - internal static readonly Bitmap gambatte = ReadEmbeddedBitmap("gambatte"); - internal static readonly Icon GameController_MultiSize = ReadEmbeddedIcon("GameController"); + internal static readonly Bitmap Gambatte = ReadEmbeddedBitmap("gambatte"); + internal static readonly Icon GambatteIcon = ReadEmbeddedIcon("gambatte"); + internal static readonly Icon GameControllerIcon = ReadEmbeddedIcon("GameController"); internal static readonly Bitmap GameController = ReadEmbeddedBitmap("GameController"); - internal static readonly Lazy gba_MultiSize = new Lazy(() => ReadEmbeddedIcon("Gameboy Advance (black) icon")); - internal static readonly Bitmap genplus = ReadEmbeddedBitmap("genplus"); + internal static readonly Lazy GbaIcon = new Lazy(() => ReadEmbeddedIcon("Gameboy Advance (black) icon")); + internal static readonly Bitmap GenPlus = ReadEmbeddedBitmap("genplus"); internal static readonly Bitmap GreenCheck = ReadEmbeddedBitmap("GreenCheck"); internal static readonly Bitmap Hack = ReadEmbeddedBitmap("Hack"); internal static readonly Bitmap Help = ReadEmbeddedBitmap("Help"); internal static readonly Bitmap HomeBrew = ReadEmbeddedBitmap("HomeBrew"); - internal static readonly Icon HotKeys_MultiSize = ReadEmbeddedIcon("HotKeys"); + internal static readonly Icon HotKeysIcon = ReadEmbeddedIcon("HotKeys"); internal static readonly Bitmap HotKeys = ReadEmbeddedBitmap("HotKeys"); internal static readonly Bitmap Import = ReadEmbeddedBitmap("Import"); internal static readonly Bitmap InsertSeparator = ReadEmbeddedBitmap("InsertSeparator"); internal static readonly Bitmap JumpTo = ReadEmbeddedBitmap("JumpTo"); - internal static readonly Bitmap kitchensink = ReadEmbeddedBitmap("kitchensink"); - internal static readonly Icon Lightning_MultiSize = ReadEmbeddedIcon("Lightning"); + internal static readonly Bitmap KitchenSink = ReadEmbeddedBitmap("kitchensink"); + internal static readonly Icon LightningIcon = ReadEmbeddedIcon("Lightning"); internal static readonly Bitmap Lightning = ReadEmbeddedBitmap("Lightning"); internal static readonly Bitmap LightOff = ReadEmbeddedBitmap("LightOff"); internal static readonly Bitmap LightOn = ReadEmbeddedBitmap("LightOn"); internal static readonly Bitmap LoadConfig = ReadEmbeddedBitmap("LoadConfig"); - internal static readonly Icon logo = ReadEmbeddedIcon("logo"); - internal static readonly Bitmap luaPictureBox = ReadEmbeddedBitmap("luaPictureBox"); - internal static readonly Bitmap mame = ReadEmbeddedBitmap("mame"); + internal static readonly Icon Logo = ReadEmbeddedIcon("logo"); + internal static readonly Bitmap LuaPictureBox = ReadEmbeddedBitmap("luaPictureBox"); + internal static readonly Bitmap Mame = ReadEmbeddedBitmap("mame"); internal static readonly Bitmap MessageConfig = ReadEmbeddedBitmap("MessageConfig"); - internal static readonly Bitmap mGba = ReadEmbeddedBitmap("mgba-16"); - internal static readonly Icon monitor_MultiSize = ReadEmbeddedIcon("monitor"); - internal static readonly Bitmap monitor = ReadEmbeddedBitmap("monitor"); + internal static readonly Bitmap Mgba = ReadEmbeddedBitmap("mgba-16"); + internal static readonly Icon MonitorIcon = ReadEmbeddedIcon("monitor"); + internal static readonly Bitmap Monitor = ReadEmbeddedBitmap("monitor"); internal static readonly Bitmap MoveBottom = ReadEmbeddedBitmapAt("Resources.MoveBottom.png"); internal static readonly Bitmap MoveDown = ReadEmbeddedBitmap("MoveDown"); internal static readonly Bitmap MoveLeft = ReadEmbeddedBitmap("MoveLeft"); internal static readonly Bitmap MoveRight = ReadEmbeddedBitmap("MoveRight"); internal static readonly Bitmap MoveTop = ReadEmbeddedBitmapAt("Resources.MoveTop.png"); internal static readonly Bitmap MoveUp = ReadEmbeddedBitmap("MoveUp"); - internal static readonly Icon MsgBox_MultiSize = ReadEmbeddedIcon("MsgBox"); + internal static readonly Icon MsgBoxIcon = ReadEmbeddedIcon("MsgBox"); internal static readonly Bitmap NE = ReadEmbeddedBitmap("NE"); - internal static readonly Icon NESControllerIcon_MultiSize = ReadEmbeddedIcon("NESControllerIcon"); + internal static readonly Icon NesControllerIcon = ReadEmbeddedIcon("NESControllerIcon"); internal static readonly Bitmap NewFile = ReadEmbeddedBitmap("NewFile"); internal static readonly Bitmap NNE = ReadEmbeddedBitmap("NNE"); internal static readonly Bitmap NNW = ReadEmbeddedBitmap("NNW"); - internal static readonly Bitmap noconnect_16x16 = ReadEmbeddedBitmap("noconnect_16x16"); + internal static readonly Bitmap NoConnect_16X16 = ReadEmbeddedBitmap("noconnect_16x16"); internal static readonly Bitmap NW = ReadEmbeddedBitmap("NW"); internal static readonly Bitmap OpenFile = ReadEmbeddedBitmap("OpenFile"); internal static readonly Bitmap Paste = ReadEmbeddedBitmap("Paste"); internal static readonly Bitmap Pause = ReadEmbeddedBitmap("Pause"); - internal static readonly Bitmap pcb = ReadEmbeddedBitmap("pcb"); - internal static readonly Icon pce_MultiSize = ReadEmbeddedIcon("pce"); - internal static readonly Icon pencil_MultiSize = ReadEmbeddedIcon("pencil"); - internal static readonly Bitmap pencil = ReadEmbeddedBitmap("pencil"); + internal static readonly Bitmap Pcb = ReadEmbeddedBitmap("pcb"); + internal static readonly Icon PceIcon = ReadEmbeddedIcon("pce"); + internal static readonly Bitmap Pencil = ReadEmbeddedBitmap("pencil"); + internal static readonly Icon PencilIcon = ReadEmbeddedIcon("pencil"); internal static readonly Bitmap Play = ReadEmbeddedBitmap("Play"); - internal static readonly Bitmap placeholder_bitmap = ReadEmbeddedBitmap("placeholder_bitmap"); - internal static readonly Icon poke_MultiSize = ReadEmbeddedIcon("poke"); - internal static readonly Bitmap poke = ReadEmbeddedBitmap("poke"); + internal static readonly Bitmap Placeholder = ReadEmbeddedBitmap("placeholder_bitmap"); + internal static readonly Icon PokeIcon = ReadEmbeddedIcon("poke"); + internal static readonly Bitmap Poke = ReadEmbeddedBitmap("poke"); internal static readonly Bitmap Previous = ReadEmbeddedBitmap("Previous"); - internal static readonly Icon QuickNes_MultiSize = ReadEmbeddedIcon("QuickNes"); + internal static readonly Icon QuickNesIcon = ReadEmbeddedIcon("QuickNes"); internal static readonly Bitmap QuickNes = ReadEmbeddedBitmap("QuickNes"); internal static readonly Bitmap ReadOnly = ReadEmbeddedBitmap("ReadOnly"); - internal static readonly Bitmap reboot = ReadEmbeddedBitmap("reboot"); + internal static readonly Bitmap Reboot = ReadEmbeddedBitmap("reboot"); internal static readonly Bitmap Recent = ReadEmbeddedBitmap("Recent"); - internal static readonly Bitmap RecordHS = ReadEmbeddedBitmap("RecordHS"); - internal static readonly Bitmap redo = ReadEmbeddedBitmap("redo"); + internal static readonly Bitmap Record = ReadEmbeddedBitmap("RecordHS"); + internal static readonly Bitmap Redo = ReadEmbeddedBitmap("redo"); internal static readonly Bitmap Refresh = ReadEmbeddedBitmapAt("images.Refresh.bmp"); internal static readonly Bitmap Refresh1 = ReadEmbeddedBitmap("Refresh"); - internal static readonly Bitmap restart = ReadEmbeddedBitmap("restart"); + internal static readonly Bitmap Restart = ReadEmbeddedBitmap("restart"); internal static readonly Bitmap RetroQuestion = ReadEmbeddedBitmap("RetroQuestion"); internal static readonly Bitmap Save = ReadEmbeddedBitmap("Save"); internal static readonly Bitmap SaveAs = ReadEmbeddedBitmap("SaveAs"); @@ -162,18 +165,18 @@ namespace BizHawk.Client.EmuHawk.Properties internal static readonly Bitmap Scan = ReadEmbeddedBitmap("Scan"); internal static readonly Bitmap ScrollTo = ReadEmbeddedBitmap("ScrollTo"); internal static readonly Bitmap SE = ReadEmbeddedBitmap("SE"); - internal static readonly Icon search_MultiSize = ReadEmbeddedIcon("search"); - internal static readonly Bitmap search = ReadEmbeddedBitmap("search"); - internal static readonly Icon Shark_MultiSize = ReadEmbeddedIcon("Shark"); + internal static readonly Bitmap Search = ReadEmbeddedBitmap("search"); + internal static readonly Icon SearchIcon = ReadEmbeddedIcon("search"); + internal static readonly Icon SharkIcon = ReadEmbeddedIcon("Shark"); internal static readonly Bitmap Shark = ReadEmbeddedBitmap("Shark"); - internal static readonly Icon sms_MultiSize = ReadEmbeddedIcon("sms-icon"); - internal static readonly Bitmap snes9x = ReadEmbeddedBitmap("snes9x"); + internal static readonly Icon SmsIcon = ReadEmbeddedIcon("sms-icon"); + internal static readonly Bitmap Snes9X = ReadEmbeddedBitmap("snes9x"); internal static readonly Bitmap Square = ReadEmbeddedBitmap("Square"); internal static readonly Bitmap SSE = ReadEmbeddedBitmap("SSE"); internal static readonly Bitmap SSW = ReadEmbeddedBitmap("SSW"); internal static readonly Bitmap Stop = ReadEmbeddedBitmap("Stop"); internal static readonly Bitmap SW = ReadEmbeddedBitmap("SW"); - internal static readonly Icon TAStudio_MultiSize = ReadEmbeddedIcon("TAStudio"); + internal static readonly Icon TAStudioIcon = ReadEmbeddedIcon("TAStudio"); internal static readonly Bitmap TAStudio = ReadEmbeddedBitmap("TAStudio"); internal static readonly Bitmap icon_anchor = ReadEmbeddedBitmap("tastudio.icon_anchor"); internal static readonly Bitmap icon_anchor_lag = ReadEmbeddedBitmap("tastudio.icon_anchor_lag"); @@ -185,30 +188,29 @@ namespace BizHawk.Client.EmuHawk.Properties internal static readonly Bitmap ts_v_arrow_green = ReadEmbeddedBitmap("tastudio.ts_v_arrow_green"); internal static readonly Bitmap ts_v_arrow_green_blue = ReadEmbeddedBitmap("tastudio.ts_v_arrow_green_blue"); internal static readonly Bitmap TextDoc = ReadEmbeddedBitmap("textdoc"); - internal static readonly Icon textdoc_MultiSize = ReadEmbeddedIcon("textdoc"); - internal static readonly Bitmap thumbsdown = ReadEmbeddedBitmap("thumbsdown"); - internal static readonly Icon ToolBox_MultiSize = ReadEmbeddedIcon("ToolBox"); + internal static readonly Icon TextDocIcon = ReadEmbeddedIcon("textdoc"); + internal static readonly Bitmap ThumbsDown = ReadEmbeddedBitmap("thumbsdown"); + internal static readonly Icon ToolBoxIcon = ReadEmbeddedIcon("ToolBox"); internal static readonly Bitmap ToolBox = ReadEmbeddedBitmap("ToolBox"); internal static readonly Bitmap Translation = ReadEmbeddedBitmap("Translation"); internal static readonly Bitmap Triangle = ReadEmbeddedBitmap("Triangle"); internal static readonly Bitmap TruncateFromFile = ReadEmbeddedBitmap("TruncateFromFile"); - internal static readonly Bitmap tvIcon = ReadEmbeddedBitmap("tvIcon"); - internal static readonly Bitmap undo = ReadEmbeddedBitmap("undo"); + internal static readonly Bitmap TvIcon = ReadEmbeddedBitmap("tvIcon"); + internal static readonly Bitmap Undo = ReadEmbeddedBitmap("undo"); internal static readonly Bitmap Unfreeze = ReadEmbeddedBitmap("Unfreeze"); - internal static readonly Icon user_blue = ReadEmbeddedIcon("user_blue"); - internal static readonly Bitmap user_blue_small = ReadEmbeddedBitmap("user_blue_small"); - internal static readonly Icon watch_MultiSize = ReadEmbeddedIcon("watch"); - internal static readonly Bitmap watch = ReadEmbeddedBitmapAt("images.watch.ico"); - internal static readonly Bitmap whiteTriDown = ReadEmbeddedBitmap("whiteTriDown"); - internal static readonly Bitmap whiteTriLeft = ReadEmbeddedBitmap("whiteTriLeft"); - internal static readonly Bitmap whiteTriRight = ReadEmbeddedBitmap("whiteTriRight"); - internal static readonly Bitmap whiteTriUp = ReadEmbeddedBitmap("whiteTriUp"); + internal static readonly Bitmap Profile = ReadEmbeddedBitmap("user_blue_small"); + internal static readonly Icon ProfileIcon = ReadEmbeddedIcon("user_blue"); + internal static readonly Bitmap Watch = ReadEmbeddedBitmapAt("images.watch.ico"); + internal static readonly Icon WatchIcon = ReadEmbeddedIcon("watch"); + internal static readonly Bitmap WhiteTriDown = ReadEmbeddedBitmap("whiteTriDown"); + internal static readonly Bitmap WhiteTriLeft = ReadEmbeddedBitmap("whiteTriLeft"); + internal static readonly Bitmap WhiteTriRight = ReadEmbeddedBitmap("whiteTriRight"); + internal static readonly Bitmap WhiteTriUp = ReadEmbeddedBitmap("whiteTriUp"); internal static readonly Bitmap WNW = ReadEmbeddedBitmap("WNW"); internal static readonly Bitmap WSW = ReadEmbeddedBitmap("WSW"); internal static readonly Bitmap YellowDown = ReadEmbeddedBitmap("YellowDown"); internal static readonly Bitmap YellowLeft = ReadEmbeddedBitmap("YellowLeft"); internal static readonly Bitmap YellowRight = ReadEmbeddedBitmap("YellowRight"); internal static readonly Bitmap YellowUp = ReadEmbeddedBitmap("YellowUp"); - internal static readonly Icon CommandWindow = ReadEmbeddedIcon("commandWindow"); } } diff --git a/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs b/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs index 332338cab2..1c5ec876a7 100644 --- a/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs b/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs index e1a2753139..5828839cdd 100644 --- a/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void A7800FilterSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs index bf89308939..59aa021814 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk _settings = settings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.cs index 35050f858f..dfbefefe84 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCNonSyncSettings.cs @@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _settings = settings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs index 4e0f609ca9..76120e7849 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs @@ -15,7 +15,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _cpc = cpc; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void OkBtn_Click(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs index cb2e6a2909..ac9e94d8a4 100644 --- a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs @@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk _autoFireController = autoFireController; _stickyXorAdapter = stickyXorAdapter; InitializeComponent(); - Icon = Properties.Resources.Lightning_MultiSize; + Icon = Properties.Resources.LightningIcon; } private void AutofireConfig_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs b/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs index ddf84da6b6..2f52770d0c 100644 --- a/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = settings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void ColecoControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs index 341ffdcc0c..bca5f93f0e 100644 --- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -19,34 +19,34 @@ namespace BizHawk.Client.EmuHawk static ControllerConfig() { - ControllerImages.Add("NES Controller", Properties.Resources.NES_Controller); - ControllerImages.Add("SNES Controller", Properties.Resources.SNES_Controller); + ControllerImages.Add("NES Controller", Properties.Resources.NesController); + ControllerImages.Add("SNES Controller", Properties.Resources.SnesController); ControllerImages.Add("Nintendo 64 Controller", Properties.Resources.N64); - ControllerImages.Add("Gameboy Controller", Properties.Resources.GBController); - ControllerImages.Add("Gameboy Controller H", Properties.Resources.GBController); - ControllerImages.Add("Gameboy Controller + Tilt", Properties.Resources.GBController); - ControllerImages.Add("GBA Controller", Properties.Resources.GBA_Controller); - ControllerImages.Add("Dual Gameboy Controller", Properties.Resources.GBController); + ControllerImages.Add("Gameboy Controller", Properties.Resources.GbController); + ControllerImages.Add("Gameboy Controller H", Properties.Resources.GbController); + ControllerImages.Add("Gameboy Controller + Tilt", Properties.Resources.GbController); + ControllerImages.Add("GBA Controller", Properties.Resources.GbaController); + ControllerImages.Add("Dual Gameboy Controller", Properties.Resources.GbController); - ControllerImages.Add("SMS Controller", Properties.Resources.SMSController); - ControllerImages.Add("GPGX Genesis Controller", Properties.Resources.GENController); + ControllerImages.Add("SMS Controller", Properties.Resources.SmsController); + ControllerImages.Add("GPGX Genesis Controller", Properties.Resources.GenesisController); ControllerImages.Add("Saturn Controller", Properties.Resources.SaturnController); ControllerImages.Add("Intellivision Controller", Properties.Resources.IntVController); - ControllerImages.Add("ColecoVision Basic Controller", Properties.Resources.colecovisioncontroller); + ControllerImages.Add("ColecoVision Basic Controller", Properties.Resources.ColecoVisionController); ControllerImages.Add("Atari 2600 Basic Controller", Properties.Resources.atari_controller); ControllerImages.Add("Atari 7800 ProLine Joystick Controller", Properties.Resources.A78Joystick); - ControllerImages.Add("PC Engine Controller", Properties.Resources.PCEngineController); + ControllerImages.Add("PC Engine Controller", Properties.Resources.PceController); ControllerImages.Add("Commodore 64 Controller", Properties.Resources.C64Joystick); - ControllerImages.Add("TI83 Controller", Properties.Resources.TI83_Controller); + ControllerImages.Add("TI83 Controller", Properties.Resources.TI83Controller); ControllerImages.Add("WonderSwan Controller", Properties.Resources.WonderSwanColor); ControllerImages.Add("Lynx Controller", Properties.Resources.Lynx); - ControllerImages.Add("PSX Front Panel", Properties.Resources.psx_dualshock); + ControllerImages.Add("PSX Front Panel", Properties.Resources.PsxDualShockController); ControllerImages.Add("Apple IIe Keyboard", Properties.Resources.AppleIIKeyboard); ControllerImages.Add("VirtualBoy Controller", Properties.Resources.VBoyController); - ControllerImages.Add("NeoGeo Portable Controller", Properties.Resources.NGPController); + ControllerImages.Add("NeoGeo Portable Controller", Properties.Resources.NgpController); ControllerImages.Add("MAME Controller", Properties.Resources.ArcadeController); ControllerImages.Add("NDS Controller", Properties.Resources.DSController); } diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs index 8f8f628f7e..d7398edd9f 100644 --- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs @@ -106,7 +106,7 @@ namespace BizHawk.Client.EmuHawk = tbbImport.Image = tbbClose.Image = tbbCloseReload.Image - = tbbOpenFolder.Image = Resources.placeholder_bitmap; + = tbbOpenFolder.Image = Resources.Placeholder; // prep ImageList for ListView with 3 item states for {idUnsure, idMissing, idOk} imageList1.Images.AddRange(new[] { Resources.RetroQuestion, Resources.ExclamationRed, Resources.GreenCheck }); diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs index 8eb0dda457..c1805e9b8b 100644 --- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs +++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs @@ -23,7 +23,7 @@ namespace BizHawk.Client.EmuHawk InitializeComponent(); // prep imagelist for listview with 4 item states for (ideal, acceptable, unacceptable, bad) - imageList1.Images.AddRange(new[] { Properties.Resources.GreenCheck, Properties.Resources.Freeze, Properties.Resources.thumbsdown, Properties.Resources.ExclamationRed }); + imageList1.Images.AddRange(new[] { Properties.Resources.GreenCheck, Properties.Resources.Freeze, Properties.Resources.ThumbsDown, Properties.Resources.ExclamationRed }); } private void LvOptions_KeyDown(object sender, KeyEventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs b/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs index c7edbb4307..0b70fbde63 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs @@ -11,7 +11,7 @@ namespace BizHawk.Client.EmuHawk private CGBColorChooserForm() { InitializeComponent(); - Icon = Properties.Resources.gambatte_MultiSize; + Icon = Properties.Resources.GambatteIcon; bmpView1.ChangeBitmapSize(new Size(256, 128)); } diff --git a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs index 8723623fdf..5353da061d 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs @@ -14,7 +14,7 @@ namespace BizHawk.Client.EmuHawk private ColorChooserForm() { InitializeComponent(); - Icon = Properties.Resources.gambatte_MultiSize; + Icon = Properties.Resources.GambatteIcon; } private readonly Color[] _colors = new Color[12]; diff --git a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs index a1cdf073d6..17559a2637 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs @@ -9,7 +9,7 @@ namespace BizHawk.Client.EmuHawk private DGBPrefs() { InitializeComponent(); - Icon = Properties.Resources.dual_MultiSize; + Icon = Properties.Resources.DualIcon; } private void PutSettings(GambatteLink.GambatteLinkSettings s, GambatteLink.GambatteLinkSyncSettings ss) diff --git a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs index 6f2a500565..183622b66e 100644 --- a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs +++ b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs @@ -8,7 +8,7 @@ namespace BizHawk.Client.EmuHawk private GBPrefs() { InitializeComponent(); - Icon = Properties.Resources.gambatte_MultiSize; + Icon = Properties.Resources.GambatteIcon; } public static void DoGBPrefsDialog(IMainFormForConfig mainForm, Gameboy gb) diff --git a/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs b/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs index cb33dc9ace..15f402f15f 100644 --- a/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs @@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk { _config = config; InitializeComponent(); - Icon = Properties.Resources.HotKeys_MultiSize; + Icon = Properties.Resources.HotKeysIcon; tabPage1.Focus(); } diff --git a/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs b/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs index ab39f897c5..e98cda371b 100644 --- a/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/InputCompositeWidget.cs b/src/BizHawk.Client.EmuHawk/config/InputCompositeWidget.cs index 67eb38f989..71ada81f95 100644 --- a/src/BizHawk.Client.EmuHawk/config/InputCompositeWidget.cs +++ b/src/BizHawk.Client.EmuHawk/config/InputCompositeWidget.cs @@ -8,7 +8,7 @@ namespace BizHawk.Client.EmuHawk public InputCompositeWidget() { InitializeComponent(); - btnSpecial.Image = Properties.Resources.arrow_black_down; + btnSpecial.Image = Properties.Resources.ArrowBlackDown; _dropdownMenu = new ContextMenuStrip(); _dropdownMenu.ItemClicked += DropdownMenu_ItemClicked; diff --git a/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs b/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs index 3c36a46f2e..331ddd1ac6 100644 --- a/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs +++ b/src/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs @@ -24,7 +24,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void N64ControllersSetup_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs b/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs index bc3f85db9b..7833fa8fb4 100644 --- a/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs @@ -64,7 +64,7 @@ namespace BizHawk.Client.EmuHawk } InitializeComponent(); - Icon = Properties.Resources.monitor_MultiSize; + Icon = Properties.Resources.MonitorIcon; } private void CancelBtn_Click(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs b/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs index 32fb3954e2..ddf338f234 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; // 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.cs b/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs index 82aeb323e2..dc98e2b781 100644 --- a/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs @@ -23,7 +23,7 @@ namespace BizHawk.Client.EmuHawk _config = config; _settings = settings; InitializeComponent(); - Icon = Properties.Resources.QuickNes_MultiSize; + Icon = Properties.Resources.QuickNesIcon; } private void QuickNesConfig_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs index ce12cfcb47..f46bc9ba3c 100644 --- a/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void PSXControllerConfigNew_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs index f328456029..16048183b6 100644 --- a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs @@ -28,7 +28,7 @@ namespace BizHawk.Client.EmuHawk _emulator = emulator; _config = config; InitializeComponent(); - Icon = Properties.Resources.user_blue; + Icon = Properties.Resources.ProfileIcon; } private void ProfileConfig_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs index 101eb75968..6dbfb79cd2 100644 --- a/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs @@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void SNESControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs b/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs index 2acffde891..57e57703a1 100644 --- a/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _settings = settings; InitializeComponent(); - Icon = Properties.Resources.calculator_MultiSize; + Icon = Properties.Resources.CalculateIcon; } private void TI83PaletteConfig_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs index d2f104f74b..85d5248e9b 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs @@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _settings = settings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs index 0808103799..6f32c7ed4b 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs @@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.cs index 6682124b7f..636ff58d85 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumJoystickSettings.cs @@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _syncSettings = syncSettings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs index 534f7aebbc..e0b116fa4a 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumNonSyncSettings.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk _mainForm = mainForm; _settings = settings; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void IntvControllerSettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs index 584385d84f..f8b8eb7654 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs @@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk _speccy = speccy; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void OkBtn_Click(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs b/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs index 713bfd9063..40107cfca9 100644 --- a/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs +++ b/src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs @@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk _sortReverse = false; InitializeComponent(); - Icon = Properties.Resources.TAStudio_MultiSize; + Icon = Properties.Resources.TAStudioIcon; } private void EditCommentsForm_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs index dfa81181f2..c976850467 100644 --- a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs +++ b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs @@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk _selectedMovie = movie; _readOnly = readOnly; InitializeComponent(); - Icon = Properties.Resources.TAStudio_MultiSize; + Icon = Properties.Resources.TAStudioIcon; } private void EditSubtitlesForm_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs index 84810c55db..e12fb2a88f 100644 --- a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs +++ b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs @@ -42,10 +42,10 @@ namespace BizHawk.Client.EmuHawk _emulator = emulator; _movieSession = movieSession; InitializeComponent(); - Icon = Properties.Resources.TAStudio_MultiSize; + Icon = Properties.Resources.TAStudioIcon; BrowseMovies.Image = Properties.Resources.OpenFile; Scan.Image = Properties.Resources.Scan; - editToolStripMenuItem.Image = Properties.Resources.CutHS; + editToolStripMenuItem.Image = Properties.Resources.Cut; MovieView.RetrieveVirtualItem += MovieView_QueryItemText; MovieView.VirtualMode = true; _sortReverse = false; diff --git a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs index 22b83295ef..b41cdba12a 100644 --- a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs +++ b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs @@ -33,7 +33,7 @@ namespace BizHawk.Client.EmuHawk _movieSession = movieSession; _firmwareManager = firmwareManager; InitializeComponent(); - Icon = Properties.Resources.TAStudio_MultiSize; + Icon = Properties.Resources.TAStudioIcon; BrowseBtn.Image = Properties.Resources.OpenFile; if (!_emulator.HasSavestates()) diff --git a/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs b/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs index c279d15ca2..8b12418d1a 100644 --- a/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs +++ b/src/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs @@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk public SubtitleMaker() { InitializeComponent(); - Icon = Properties.Resources.TAStudio_MultiSize; + Icon = Properties.Resources.TAStudioIcon; } public void DisableFrame() diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs index 709b922330..8b0661b110 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs @@ -82,13 +82,13 @@ namespace BizHawk.Client.EmuHawk public BasicBot() { InitializeComponent(); - Icon = 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; + BotStatusButton.Image = Resources.Placeholder; btnCopyBestInput.Image = Resources.Duplicate; PlayBestButton.Image = Resources.Play; ClearBestButton.Image = Resources.Close; @@ -1000,7 +1000,7 @@ namespace BizHawk.Client.EmuHawk } else if (_isBotting) { - BotStatusButton.Image = Properties.Resources.RecordHS; + BotStatusButton.Image = Properties.Resources.Record; BotStatusButton.ToolTipText = "Botting in progress"; } else diff --git a/src/BizHawk.Client.EmuHawk/tools/CDL.cs b/src/BizHawk.Client.EmuHawk/tools/CDL.cs index aaea05377d..2f7c8ba689 100644 --- a/src/BizHawk.Client.EmuHawk/tools/CDL.cs +++ b/src/BizHawk.Client.EmuHawk/tools/CDL.cs @@ -65,10 +65,10 @@ namespace BizHawk.Client.EmuHawk OpenMenuItem.Image = Resources.OpenFile; SaveMenuItem.Image = Resources.SaveAs; RecentSubMenu.Image = Resources.Recent; - tsbLoggingActive.Image = Resources.placeholder_bitmap; - tsbViewUpdate.Image = Resources.placeholder_bitmap; + tsbLoggingActive.Image = Resources.Placeholder; + tsbViewUpdate.Image = Resources.Placeholder; tsbExportText.Image = Resources.LoadConfig; - Icon = Resources.cdlogger_MultiSize; + Icon = Resources.CdLoggerIcon; tsbViewStyle.SelectedIndex = 0; diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index 866b95242d..fc848b6ebf 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -34,7 +34,7 @@ namespace BizHawk.Client.EmuHawk public Cheats() { InitializeComponent(); - Icon = Resources.Freeze_MultiSize; + Icon = Resources.FreezeIcon; ToggleContextMenuItem.Image = Resources.Refresh1; RemoveContextMenuItem.Image = Resources.Delete; DisableAllContextMenuItem.Image = Resources.Stop; @@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk SeparatorToolbarItem.Image = Resources.InsertSeparator; MoveUpToolbarItem.Image = Resources.MoveUp; MoveDownToolbarItem.Image = Resources.MoveDown; - LoadGameGenieToolbarItem.Image = Resources.placeholder_bitmap; + LoadGameGenieToolbarItem.Image = Resources.Placeholder; Settings = new CheatsSettings(); Closing += (o, e) => diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs index ec66d54847..23da628d1c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs @@ -23,11 +23,11 @@ namespace BizHawk.Client.EmuHawk public BreakpointControl() { InitializeComponent(); - AddBreakpointButton.Image = Resources.add; + AddBreakpointButton.Image = Resources.Add; ToggleButton.Image = Resources.Refresh; RemoveBreakpointButton.Image = Resources.Delete; DuplicateBreakpointButton.Image = Resources.Duplicate; - EditBreakpointButton.BackgroundImage = Resources.pencil; + EditBreakpointButton.BackgroundImage = Resources.Pencil; BreakpointView.RetrieveVirtualItem += BreakPointView_QueryItemText; BreakpointView.VirtualMode = true; _breakpoints.Callback = BreakpointCallback; diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs index ab98e0c67a..a4e9ffc1cd 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs @@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk public GenericDebugger() { InitializeComponent(); - Icon = Properties.Resources.Bug_MultiSize; + Icon = Properties.Resources.BugIcon; Closing += (o, e) => DisengageDebugger(); DisassemblerView.QueryItemText += DisassemblerView_QueryItemText; diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs index db5f0d25af..a721ebbe3e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs @@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk public GbGpuView() { InitializeComponent(); - Icon = Properties.Resources.gambatte_MultiSize; + Icon = Properties.Resources.GambatteIcon; bmpViewBG.ChangeBitmapSize(256, 256); bmpViewWin.ChangeBitmapSize(256, 256); bmpViewTiles1.ChangeBitmapSize(128, 192); diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs index 80a2a7ff30..ba5cd98cd9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs @@ -30,7 +30,7 @@ namespace BizHawk.Client.EmuHawk public GBPrinterView() { InitializeComponent(); - Icon = Properties.Resources.gambatte_MultiSize; + Icon = Properties.Resources.GambatteIcon; // adjust the color of the printed output to be more papery _paperAdjustment = new ColorMatrix diff --git a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs index 78fbb3eca4..11e9abb147 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs @@ -33,7 +33,7 @@ namespace BizHawk.Client.EmuHawk public GbaGpuView() { InitializeComponent(); - Icon = Properties.Resources.gba_MultiSize.Value; + Icon = Properties.Resources.GbaIcon.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.cs b/src/BizHawk.Client.EmuHawk/tools/GameShark.cs index 7cb7c92f6c..fb44b584f2 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GameShark.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GameShark.cs @@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk public GameShark() { InitializeComponent(); - Icon = Properties.Resources.Shark_MultiSize; + Icon = Properties.Resources.SharkIcon; } public void Restart() diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index 40da6e2d46..c2f2396d35 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -122,20 +122,20 @@ namespace BizHawk.Client.EmuHawk _fontHeight = fontSize1.Height; InitializeComponent(); - Icon = Resources.poke_MultiSize; + Icon = Resources.PokeIcon; SaveMenuItem.Image = Resources.SaveAs; CopyMenuItem.Image = Resources.Duplicate; PasteMenuItem.Image = Resources.Paste; - AddToRamWatchMenuItem.Image = Resources.FindHS; + AddToRamWatchMenuItem.Image = Resources.Find; FreezeAddressMenuItem.Image = Resources.Freeze; UnfreezeAllMenuItem.Image = Resources.Unfreeze; - PokeAddressMenuItem.Image = Resources.poke; + PokeAddressMenuItem.Image = Resources.Poke; CopyContextItem.Image = Resources.Duplicate; PasteContextItem.Image = Resources.Paste; FreezeContextItem.Image = Resources.Freeze; - AddToRamWatchContextItem.Image = Resources.FindHS; + AddToRamWatchContextItem.Image = Resources.Find; UnfreezeAllContextItem.Image = Resources.Unfreeze; - PokeContextItem.Image = Resources.poke; + PokeContextItem.Image = Resources.Poke; AddressesLabel.BackColor = Color.Transparent; SetHeader(); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs index f08c0d72f3..26b7393f8e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs @@ -16,7 +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.Image = Properties.Resources.LuaPictureBox; luaPictureBox.Width = width; luaPictureBox.Height = height; luaPictureBox.Image = new Bitmap(width, height); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 1155b275d0..72e0c203cd 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -76,7 +76,7 @@ namespace BizHawk.Client.EmuHawk InitializeComponent(); ToggleScriptContextItem.Image = Resources.Refresh1; PauseScriptContextItem.Image = Resources.Pause; - EditScriptContextItem.Image = Resources.CutHS; + EditScriptContextItem.Image = Resources.Cut; RemoveScriptContextItem.Image = Resources.Close; InsertSeperatorContextItem.Image = Resources.InsertSeparator; StopAllScriptsContextItem.Image = Resources.Stop; @@ -87,9 +87,9 @@ namespace BizHawk.Client.EmuHawk NewScriptMenuItem.Image = Resources.NewFile; OpenScriptMenuItem.Image = Resources.OpenFile; RefreshScriptMenuItem.Image = Resources.Refresh1; - ToggleScriptMenuItem.Image = Resources.checkbox; + ToggleScriptMenuItem.Image = Resources.Checkbox; PauseScriptMenuItem.Image = Resources.Pause; - EditScriptMenuItem.Image = Resources.CutHS; + EditScriptMenuItem.Image = Resources.Cut; RemoveScriptMenuItem.Image = Resources.Delete; InsertSeparatorMenuItem.Image = Resources.InsertSeparator; MoveUpMenuItem.Image = Resources.MoveUp; @@ -99,10 +99,10 @@ namespace BizHawk.Client.EmuHawk ClearRegisteredFunctionsLogContextItem.Image = Resources.Delete; NewScriptToolbarItem.Image = Resources.NewFile; OpenScriptToolbarItem.Image = Resources.OpenFile; - ToggleScriptToolbarItem.Image = Resources.checkbox; + ToggleScriptToolbarItem.Image = Resources.Checkbox; RefreshScriptToolbarItem.Image = Resources.Refresh1; PauseToolbarItem.Image = Resources.Pause; - EditToolbarItem.Image = Resources.CutHS; + EditToolbarItem.Image = Resources.Cut; RemoveScriptToolbarItem.Image = Resources.Delete; DuplicateToolbarButton.Image = Resources.Duplicate; MoveUpToolbarItem.Image = Resources.MoveUp; @@ -110,7 +110,7 @@ namespace BizHawk.Client.EmuHawk InsertSeparatorToolbarItem.Image = Resources.InsertSeparator; EraseToolbarItem.Image = Resources.Erase; RecentScriptsSubMenu.Image = Resources.Recent; - Icon = Resources.textdoc_MultiSize; + Icon = Resources.TextDocIcon; Closing += (o, e) => { diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs index d1c572eca7..a32426fa73 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs @@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk { _docs = docs; InitializeComponent(); - Icon = Properties.Resources.textdoc_MultiSize; + Icon = Properties.Resources.TextDocIcon; FunctionView.RetrieveVirtualItem += FunctionView_QueryItemText; } diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs index d88a9f8558..a409b3f5b7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs @@ -14,7 +14,7 @@ namespace BizHawk.Client.EmuHawk { _registeredFunctions = registeredFunctions; InitializeComponent(); - Icon = Properties.Resources.textdoc_MultiSize; + Icon = Properties.Resources.TextDocIcon; } public Point StartLocation { get; set; } = new Point(0, 0); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs index 4efd8def28..ad4f8ca4de 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs @@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk _ownerFile = ownerFile; _luaImp = luaImp; InitializeComponent(); - Icon = Properties.Resources.textdoc_MultiSize; + Icon = Properties.Resources.TextDocIcon; StartPosition = FormStartPosition.CenterParent; Closing += (o, e) => CloseThis(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs index b353e07a16..cbd8ca331d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs @@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk { _initializing = true; InitializeComponent(); - Icon = Properties.Resources.TAStudio_MultiSize; + Icon = Properties.Resources.TAStudioIcon; } private void MacroInputTool_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs index e791045f3b..dee06df74c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs @@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk public BarcodeEntry() { InitializeComponent(); - Icon = Properties.Resources.NESControllerIcon_MultiSize; + Icon = Properties.Resources.NesControllerIcon; } public void Restart() diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs index 0c666b7e06..6c3aedbfa0 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs @@ -23,7 +23,7 @@ namespace BizHawk.Client.EmuHawk public NESMusicRipper() { InitializeComponent(); - Icon = Properties.Resources.NESControllerIcon_MultiSize; + Icon = Properties.Resources.NesControllerIcon; SyncContents(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs index 941c23ae99..ed5da5703e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs @@ -30,7 +30,7 @@ namespace BizHawk.Client.EmuHawk public NESNameTableViewer() { InitializeComponent(); - Icon = Properties.Resources.NESControllerIcon_MultiSize; + Icon = Properties.Resources.NesControllerIcon; } private void NESNameTableViewer_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs index 4f704dc671..0e48509a35 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs @@ -47,7 +47,7 @@ namespace BizHawk.Client.EmuHawk public NesPPU() { InitializeComponent(); - Icon = Properties.Resources.NESControllerIcon_MultiSize; + Icon = Properties.Resources.NesControllerIcon; CalculateFormSize(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs index 8a11090d2d..af0acbda30 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs @@ -30,7 +30,7 @@ namespace BizHawk.Client.EmuHawk public PceBgViewer() { InitializeComponent(); - Icon = Properties.Resources.pce_MultiSize; + Icon = Properties.Resources.PceIcon; Activated += (o, e) => Generate(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs index 2d4f66b299..72539d0d82 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs @@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk public PCESoundDebugger() { InitializeComponent(); - Icon = Properties.Resources.Bug_MultiSize; + Icon = Properties.Resources.BugIcon; SetStyle(ControlStyles.AllPaintingInWmPaint, true); SetStyle(ControlStyles.UserPaint, true); diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs index 5fac75d0b6..96e870988a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs @@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk public PceTileViewer() { InitializeComponent(); - Icon = Properties.Resources.pce_MultiSize; + Icon = Properties.Resources.PceIcon; bmpViewBG.ChangeBitmapSize(512, 256); bmpViewSP.ChangeBitmapSize(512, 256); bmpViewBGPal.ChangeBitmapSize(256, 256); diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs index 59d1a03c07..b084b09deb 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs @@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk public SmsVdpViewer() { InitializeComponent(); - Icon = Properties.Resources.sms_MultiSize; + Icon = Properties.Resources.SmsIcon; bmpViewTiles.ChangeBitmapSize(256, 128); bmpViewPalette.ChangeBitmapSize(16, 2); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index 66fe24f38a..6d929d27e7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -46,19 +46,19 @@ namespace BizHawk.Client.EmuHawk public BookmarksBranchesBox() { InitializeComponent(); - UndoBranchButton.Image = Resources.undo; + UndoBranchButton.Image = Resources.Undo; JumpToBranchButton.Image = Resources.JumpTo; - UpdateBranchButton.Image = Resources.reboot; + UpdateBranchButton.Image = Resources.Reboot; AddWithTextBranchButton.Image = Resources.AddEdit; - AddBranchButton.Image = Resources.add; + AddBranchButton.Image = Resources.Add; LoadBranchButton.Image = Resources.Debugger; - AddBranchContextMenu.Image = Resources.add; + AddBranchContextMenu.Image = Resources.Add; AddBranchWithTextContextMenuItem.Image = Resources.AddEdit; LoadBranchContextMenuItem.Image = Resources.Debugger; - UpdateBranchContextMenuItem.Image = Resources.reboot; - EditBranchTextContextMenuItem.Image = Resources.pencil; + UpdateBranchContextMenuItem.Image = Resources.Reboot; + EditBranchTextContextMenuItem.Image = Resources.Pencil; JumpToBranchContextMenuItem.Image = Resources.JumpTo; - UndoBranchToolStripMenuItem.Image = Resources.undo; + UndoBranchToolStripMenuItem.Image = Resources.Undo; RemoveBranchContextMenuItem.Image = Resources.Delete; SetupColumns(); BranchView.QueryItemText += QueryItemText; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.cs index 87bcd5e5fe..f7b6811f4d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/DefaultGreenzoneSettings.cs @@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk public DefaultGreenzoneSettings(MovieConfig movieSettings) { InitializeComponent(); - Icon = Properties.Resources.TAStudio_MultiSize; + Icon = Properties.Resources.TAStudioIcon; _movieSettings = movieSettings; _settings = new TasStateManagerSettings(movieSettings.DefaultTasStateManagerSettings); SettingsPropertyGrid.SelectedObject = _settings; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs index c2515f75e8..7cd88d2bfd 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs @@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk { _settings = settings; InitializeComponent(); - Icon = Properties.Resources.TAStudio_MultiSize; + Icon = Properties.Resources.TAStudioIcon; } private void StateHistorySettings_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.cs index d3ecfd2d67..03d4f82829 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/HeaderEditor.cs @@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk { _movie = movie; InitializeComponent(); - Icon = Properties.Resources.TAStudio_MultiSize; + Icon = Properties.Resources.TAStudioIcon; } private void MovieHeaderEditor_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index 2c97e5eb64..702b4e969c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -20,12 +20,12 @@ namespace BizHawk.Client.EmuHawk InitializeComponent(); JumpToMarkerToolStripMenuItem.Image = Resources.JumpTo; ScrollToMarkerToolStripMenuItem.Image = Resources.ScrollTo; - EditMarkerToolStripMenuItem.Image = Resources.pencil; - AddMarkerToolStripMenuItem.Image = Resources.add; + EditMarkerToolStripMenuItem.Image = Resources.Pencil; + AddMarkerToolStripMenuItem.Image = Resources.Add; RemoveMarkerToolStripMenuItem.Image = Resources.Delete; JumpToMarkerButton.Image = Resources.JumpTo; - EditMarkerButton.Image = Resources.pencil; - AddMarkerButton.Image = Resources.add; + EditMarkerButton.Image = Resources.Pencil; + AddMarkerButton.Image = Resources.Add; RemoveMarkerButton.Image = Resources.Delete; ScrollToMarkerButton.Image = Resources.ScrollTo; AddMarkerWithTextButton.Image = Resources.AddEdit; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index b3ff06f130..fe9a18a6c6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -111,7 +111,7 @@ namespace BizHawk.Client.EmuHawk recentMacrosToolStripMenuItem.Image = Resources.Recent; TASEditorManualOnlineMenuItem.Image = Resources.Help; ForumThreadMenuItem.Image = Resources.TAStudio; - Icon = Resources.TAStudio_MultiSize; + Icon = Resources.TAStudioIcon; InitializeSeekWorker(); diff --git a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs index 5ff0eb22a0..194bb70cee 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs @@ -15,11 +15,11 @@ namespace BizHawk.Client.EmuHawk public TI83KeyPad() { InitializeComponent(); - Icon = Resources.calculator_MultiSize; - LeftButton.Image = Resources.whiteTriLeft; - RightButton.Image = Resources.whiteTriRight; - DownButton.Image = Resources.whiteTriDown; - UpButton.Image = Resources.whiteTriUp; + Icon = Resources.CalculateIcon; + LeftButton.Image = Resources.WhiteTriLeft; + RightButton.Image = Resources.WhiteTriRight; + DownButton.Image = Resources.WhiteTriDown; + UpButton.Image = Resources.WhiteTriUp; } [ConfigPersist] diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs index 3df74727b8..715e6762c8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk public ToolBox() { InitializeComponent(); - Icon = Properties.Resources.ToolBox_MultiSize; + Icon = Properties.Resources.ToolBoxIcon; } private void ToolBox_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs index 227c9704a3..a82fb6b87a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs @@ -62,7 +62,7 @@ namespace BizHawk.Client.EmuHawk public TraceLogger() { InitializeComponent(); - Icon = Properties.Resources.pencil_MultiSize; + Icon = Properties.Resources.PencilIcon; SaveLogMenuItem.Image = Properties.Resources.SaveAs; TraceView.QueryItemText += TraceView_QueryItemText; diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index 38ca8c74cf..10e127a944 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -41,7 +41,7 @@ namespace BizHawk.Client.EmuHawk { StickyPads = true; InitializeComponent(); - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; } private void VirtualpadTool_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs index dd10355077..d60f776673 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs @@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk .ToList(); _cheats = cheats; InitializeComponent(); - Icon = Properties.Resources.poke_MultiSize; + Icon = Properties.Resources.PokeIcon; } public IToolForm ParentTool { get; set; } diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 4912ae40d0..75fed5cf02 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -48,41 +48,41 @@ namespace BizHawk.Client.EmuHawk SetStyle(ControlStyles.OptimizedDoubleBuffer, true); InitializeComponent(); - Icon = Resources.search_MultiSize; - SearchMenuItem.Image = Resources.search; - DoSearchContextMenuItem.Image = Resources.search; - NewSearchContextMenuItem.Image = Resources.restart; + Icon = Resources.SearchIcon; + SearchMenuItem.Image = Resources.Search; + DoSearchContextMenuItem.Image = Resources.Search; + NewSearchContextMenuItem.Image = Resources.Restart; RemoveContextMenuItem.Image = Resources.Delete; - AddToRamWatchContextMenuItem.Image = Resources.FindHS; - PokeContextMenuItem.Image = Resources.poke; + AddToRamWatchContextMenuItem.Image = Resources.Find; + 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; + 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; + AddToRamWatchMenuItem.Image = Resources.Find; + PokeAddressMenuItem.Image = Resources.Poke; FreezeAddressMenuItem.Image = Resources.Freeze; AutoSearchCheckBox.Image = Resources.AutoSearch; - DoSearchToolButton.Image = Resources.search; - NewSearchToolButton.Image = Resources.restart; + DoSearchToolButton.Image = Resources.Search; + NewSearchToolButton.Image = Resources.Restart; CopyValueToPrevToolBarItem.Image = Resources.Previous; - ClearChangeCountsToolBarItem.Image = Resources.placeholder_bitmap; + ClearChangeCountsToolBarItem.Image = Resources.Placeholder; RemoveToolBarItem.Image = Resources.Delete; - AddToRamWatchToolBarItem.Image = Resources.FindHS; - PokeAddressToolBarItem.Image = Resources.poke; + AddToRamWatchToolBarItem.Image = Resources.Find; + PokeAddressToolBarItem.Image = Resources.Poke; FreezeAddressToolBarItem.Image = Resources.Freeze; - UndoToolBarButton.Image = Resources.undo; - RedoToolBarItem.Image = Resources.redo; - RebootToolbarButton.Image = Resources.reboot; + UndoToolBarButton.Image = Resources.Undo; + RedoToolBarItem.Image = Resources.Redo; + RebootToolbarButton.Image = Resources.Reboot; ErrorIconButton.Image = Resources.ExclamationRed; - SearchButton.Image = Resources.search; + SearchButton.Image = Resources.Search; WatchListView.QueryItemText += ListView_QueryItemText; WatchListView.QueryItemBkColor += ListView_QueryItemBkColor; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index 9a99535483..f1e988e6dc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -36,11 +36,11 @@ namespace BizHawk.Client.EmuHawk public RamWatch() { InitializeComponent(); - newToolStripMenuItem.Image = Resources.addWatch; - EditContextMenuItem.Image = Resources.CutHS; + newToolStripMenuItem.Image = Resources.AddWatch; + EditContextMenuItem.Image = Resources.Cut; RemoveContextMenuItem.Image = Resources.Delete; DuplicateContextMenuItem.Image = Resources.Duplicate; - PokeContextMenuItem.Image = Resources.poke; + PokeContextMenuItem.Image = Resources.Poke; FreezeContextMenuItem.Image = Resources.Freeze; UnfreezeAllContextMenuItem.Image = Resources.Unfreeze; InsertSeperatorContextMenuItem.Image = Resources.InsertSeparator; @@ -52,12 +52,12 @@ namespace BizHawk.Client.EmuHawk newToolStripButton.Image = Resources.NewFile; openToolStripButton.Image = Resources.OpenFile; saveToolStripButton.Image = Resources.SaveAs; - newWatchToolStripButton.Image = Resources.addWatch; - editWatchToolStripButton.Image = Resources.CutHS; + newWatchToolStripButton.Image = Resources.AddWatch; + editWatchToolStripButton.Image = Resources.Cut; cutToolStripButton.Image = Resources.Delete; - clearChangeCountsToolStripButton.Image = Resources.placeholder_bitmap; + clearChangeCountsToolStripButton.Image = Resources.Placeholder; duplicateWatchToolStripButton.Image = Resources.Duplicate; - PokeAddressToolBarItem.Image = Resources.poke; + PokeAddressToolBarItem.Image = Resources.Poke; FreezeAddressToolBarItem.Image = Resources.Freeze; seperatorToolStripButton.Image = Resources.InsertSeparator; moveUpToolStripButton.Image = Resources.MoveUp; @@ -66,18 +66,18 @@ namespace BizHawk.Client.EmuHawk OpenMenuItem.Image = Resources.OpenFile; SaveMenuItem.Image = Resources.SaveAs; RecentSubMenu.Image = Resources.Recent; - NewWatchMenuItem.Image = Resources.FindHS; - EditWatchMenuItem.Image = Resources.CutHS; + NewWatchMenuItem.Image = Resources.Find; + EditWatchMenuItem.Image = Resources.Cut; RemoveWatchMenuItem.Image = Resources.Delete; DuplicateWatchMenuItem.Image = Resources.Duplicate; - PokeAddressMenuItem.Image = Resources.poke; + 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; + Icon = Resources.WatchIcon; Settings = new RamWatchSettings();