From d6be73f395704eb82a6445b00811d788e0a718d1 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 23 Jul 2020 16:55:51 -0500 Subject: [PATCH] silly that visual studio rename doesn't save changes on open files, add a bunch of non-saved things, also consolidate two refresh images into 1 --- src/BizHawk.Client.EmuHawk/MainForm.cs | 74 +++++++++--------- .../Properties/Resources.cs | 5 +- .../config/ControllerConfig.cs | 4 +- .../config/RewindConfig.cs | 2 +- src/BizHawk.Client.EmuHawk/images/Refresh.bmp | Bin 824 -> 0 bytes .../tools/Cheats/Cheats.cs | 4 +- .../tools/Lua/LuaConsole.cs | 6 +- .../MultiDiskBundler/MultiDiskBundler.cs | 2 +- 8 files changed, 48 insertions(+), 49 deletions(-) delete mode 100644 src/BizHawk.Client.EmuHawk/images/Refresh.bmp diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 13c1e7807f..3083ea3902 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -107,7 +107,7 @@ namespace BizHawk.Client.EmuHawk Config.GbAsSgb ^= true; if (!Emulator.IsNull()) FlagNeedsReboot(); //TODO only alert if a GB or SGB core is loaded }; - var N64VideoPluginSettingsMenuItem = new ToolStripMenuItem { Image = Properties.Resources.monitor, Text = "N64 Video Plugin Settings" }; + var N64VideoPluginSettingsMenuItem = new ToolStripMenuItem { Image = Properties.Resources.Monitor, Text = "N64 Video Plugin Settings" }; N64VideoPluginSettingsMenuItem.Click += N64PluginSettingsMenuItem_Click; var setLibretroCoreToolStripMenuItem = new ToolStripMenuItem { Text = "Set Libretro Core" }; setLibretroCoreToolStripMenuItem.Click += (clickSender, clickArgs) => RunLibretroCoreChooser(); @@ -129,8 +129,8 @@ namespace BizHawk.Client.EmuHawk UpdateNotification.Visible = false; _statusBarDiskLightOnImage = Properties.Resources.LightOn; _statusBarDiskLightOffImage = Properties.Resources.LightOff; - _linkCableOn = Properties.Resources.connect_16x16; - _linkCableOff = Properties.Resources.noconnect_16x16; + _linkCableOn = Properties.Resources.Connect16X16; + _linkCableOff = Properties.Resources.NoConnect16X16; UpdateCoreStatusBarButton(); if (Config.FirstBoot) { @@ -183,95 +183,95 @@ namespace BizHawk.Client.EmuHawk NextSlotMenuItem.Image = Properties.Resources.MoveRight; ReadonlyMenuItem.Image = Properties.Resources.ReadOnly; RecentMovieSubMenu.Image = Properties.Resources.Recent; - RecordMovieMenuItem.Image = Properties.Resources.RecordHS; + RecordMovieMenuItem.Image = Properties.Resources.Record; PlayMovieMenuItem.Image = Properties.Resources.Play; StopMovieMenuItem.Image = Properties.Resources.Stop; - PlayFromBeginningMenuItem.Image = Properties.Resources.restart; + PlayFromBeginningMenuItem.Image = Properties.Resources.Restart; ImportMoviesMenuItem.Image = Properties.Resources.Import; SaveMovieMenuItem.Image = Properties.Resources.SaveAs; SaveMovieAsMenuItem.Image = Properties.Resources.SaveAs; StopMovieWithoutSavingMenuItem.Image = Properties.Resources.Stop; - RecordAVMenuItem.Image = Properties.Resources.RecordHS; - ConfigAndRecordAVMenuItem.Image = Properties.Resources.AVI; + RecordAVMenuItem.Image = Properties.Resources.Record; + ConfigAndRecordAVMenuItem.Image = Properties.Resources.Avi; StopAVIMenuItem.Image = Properties.Resources.Stop; - ScreenshotMenuItem.Image = Properties.Resources.camera; + ScreenshotMenuItem.Image = Properties.Resources.Camera; PauseMenuItem.Image = Properties.Resources.Pause; - RebootCoreMenuItem.Image = Properties.Resources.reboot; + RebootCoreMenuItem.Image = Properties.Resources.Reboot; SwitchToFullscreenMenuItem.Image = Properties.Resources.Fullscreen; ControllersMenuItem.Image = Properties.Resources.GameController; HotkeysMenuItem.Image = Properties.Resources.HotKeys; - DisplayConfigMenuItem.Image = Properties.Resources.tvIcon; - SoundMenuItem.Image = Properties.Resources.AudioHS; - PathsMenuItem.Image = Properties.Resources.CopyFolderHS; - FirmwaresMenuItem.Image = Properties.Resources.pcb; + DisplayConfigMenuItem.Image = Properties.Resources.TvIcon; + SoundMenuItem.Image = Properties.Resources.Audio; + PathsMenuItem.Image = Properties.Resources.CopyFolder; + FirmwaresMenuItem.Image = Properties.Resources.Pcb; MessagesMenuItem.Image = Properties.Resources.MessageConfig; AutofireMenuItem.Image = Properties.Resources.Lightning; RewindOptionsMenuItem.Image = Properties.Resources.Previous; - ProfilesMenuItem.Image = Properties.Resources.user_blue_small; + ProfilesMenuItem.Image = Properties.Resources.Profile; SaveConfigMenuItem.Image = Properties.Resources.Save; LoadConfigMenuItem.Image = Properties.Resources.LoadConfig; ToolBoxMenuItem.Image = Properties.Resources.ToolBox; - RamWatchMenuItem.Image = Properties.Resources.watch; - RamSearchMenuItem.Image = Properties.Resources.search; + RamWatchMenuItem.Image = Properties.Resources.Watch; + RamSearchMenuItem.Image = Properties.Resources.Search; LuaConsoleMenuItem.Image = Properties.Resources.TextDoc; TAStudioMenuItem.Image = Properties.Resources.TAStudio; - HexEditorMenuItem.Image = Properties.Resources.poke; - TraceLoggerMenuItem.Image = Properties.Resources.pencil; + HexEditorMenuItem.Image = Properties.Resources.Poke; + TraceLoggerMenuItem.Image = Properties.Resources.Pencil; DebuggerMenuItem.Image = Properties.Resources.Bug; - CodeDataLoggerMenuItem.Image = Properties.Resources.cdlogger; + CodeDataLoggerMenuItem.Image = Properties.Resources.CdLogger; VirtualPadMenuItem.Image = Properties.Resources.GameController; CheatsMenuItem.Image = Properties.Resources.Freeze; GameSharkConverterMenuItem.Image = Properties.Resources.Shark; MultiDiskBundlerFileMenuItem.Image = Properties.Resources.SaveConfig; NesControllerSettingsMenuItem.Image = Properties.Resources.GameController; - NESGraphicSettingsMenuItem.Image = Properties.Resources.tvIcon; - NESSoundChannelsMenuItem.Image = Properties.Resources.AudioHS; - KeypadMenuItem.Image = Properties.Resources.calculator; + NESGraphicSettingsMenuItem.Image = Properties.Resources.TvIcon; + NESSoundChannelsMenuItem.Image = Properties.Resources.Audio; + KeypadMenuItem.Image = Properties.Resources.Calculator; PSXControllerSettingsMenuItem.Image = Properties.Resources.GameController; SNESControllerConfigurationMenuItem.Image = Properties.Resources.GameController; SnesGfxDebuggerMenuItem.Image = Properties.Resources.Bug; ColecoControllerSettingsMenuItem.Image = Properties.Resources.GameController; - N64PluginSettingsMenuItem.Image = Properties.Resources.monitor; + N64PluginSettingsMenuItem.Image = Properties.Resources.Monitor; N64ControllerSettingsMenuItem.Image = Properties.Resources.GameController; IntVControllerSettingsMenuItem.Image = Properties.Resources.GameController; OnlineHelpMenuItem.Image = Properties.Resources.Help; ForumsMenuItem.Image = Properties.Resources.TAStudio; - FeaturesMenuItem.Image = Properties.Resources.kitchensink; + FeaturesMenuItem.Image = Properties.Resources.KitchenSink; AboutMenuItem.Image = Properties.Resources.CorpHawkSmall; DumpStatusButton.Image = Properties.Resources.Blank; PlayRecordStatusButton.Image = Properties.Resources.Blank; PauseStatusButton.Image = Properties.Resources.Blank; - RebootStatusBarIcon.Image = Properties.Resources.reboot; + RebootStatusBarIcon.Image = Properties.Resources.Reboot; AVIStatusLabel.Image = Properties.Resources.Blank; LedLightStatusLabel.Image = Properties.Resources.LightOff; KeyPriorityStatusLabel.Image = Properties.Resources.Both; CoreNameStatusBarButton.Image = Properties.Resources.CorpHawkSmall; - ProfileFirstBootLabel.Image = Properties.Resources.user_blue_small; - LinkConnectStatusBarButton.Image = Properties.Resources.connect_16x16; + ProfileFirstBootLabel.Image = Properties.Resources.Profile; + LinkConnectStatusBarButton.Image = Properties.Resources.Connect16X16; OpenRomContextMenuItem.Image = Properties.Resources.OpenFile; LoadLastRomContextMenuItem.Image = Properties.Resources.Recent; StopAVContextMenuItem.Image = Properties.Resources.Stop; - RecordMovieContextMenuItem.Image = Properties.Resources.RecordHS; + RecordMovieContextMenuItem.Image = Properties.Resources.Record; PlayMovieContextMenuItem.Image = Properties.Resources.Play; - RestartMovieContextMenuItem.Image = Properties.Resources.restart; + RestartMovieContextMenuItem.Image = Properties.Resources.Restart; StopMovieContextMenuItem.Image = Properties.Resources.Stop; LoadLastMovieContextMenuItem.Image = Properties.Resources.Recent; StopNoSaveContextMenuItem.Image = Properties.Resources.Stop; SaveMovieContextMenuItem.Image = Properties.Resources.SaveAs; SaveMovieAsContextMenuItem.Image = Properties.Resources.SaveAs; - UndoSavestateContextMenuItem.Image = Properties.Resources.undo; + UndoSavestateContextMenuItem.Image = Properties.Resources.Undo; toolStripMenuItem6.Image = Properties.Resources.GameController; toolStripMenuItem7.Image = Properties.Resources.HotKeys; - toolStripMenuItem8.Image = Properties.Resources.tvIcon; - toolStripMenuItem9.Image = Properties.Resources.AudioHS; - toolStripMenuItem10.Image = Properties.Resources.CopyFolderHS; - toolStripMenuItem11.Image = Properties.Resources.pcb; + toolStripMenuItem8.Image = Properties.Resources.TvIcon; + toolStripMenuItem9.Image = Properties.Resources.Audio; + toolStripMenuItem10.Image = Properties.Resources.CopyFolder; + toolStripMenuItem11.Image = Properties.Resources.Pcb; toolStripMenuItem12.Image = Properties.Resources.MessageConfig; toolStripMenuItem13.Image = Properties.Resources.Lightning; toolStripMenuItem14.Image = Properties.Resources.Previous; toolStripMenuItem66.Image = Properties.Resources.Save; toolStripMenuItem67.Image = Properties.Resources.LoadConfig; - ScreenshotContextMenuItem.Image = Properties.Resources.camera; + ScreenshotContextMenuItem.Image = Properties.Resources.Camera; CloseRomContextMenuItem.Image = Properties.Resources.Close; } @@ -305,7 +305,7 @@ namespace BizHawk.Client.EmuHawk MouseMove += MainForm_MouseMove; InitializeComponent(); - Icon = Properties.Resources.logo; + Icon = Properties.Resources.Logo; SetImages(); GlobalWin.Game = GameInfo.NullInstance; @@ -3213,7 +3213,7 @@ namespace BizHawk.Client.EmuHawk // commit the avi writing last, in case there were any errors earlier _currAviWriter = aw; AddOnScreenMessage("A/V capture started"); - AVIStatusLabel.Image = Properties.Resources.AVI; + AVIStatusLabel.Image = Properties.Resources.Avi; AVIStatusLabel.ToolTipText = "A/V capture in progress"; AVIStatusLabel.Visible = true; } diff --git a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs index 05dd9dae8f..50c2932aa9 100644 --- a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs +++ b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs @@ -134,7 +134,7 @@ namespace BizHawk.Client.EmuHawk.Properties 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 NoConnect16X16 = ReadEmbeddedBitmap("noconnect_16x16"); internal static readonly Bitmap NW = ReadEmbeddedBitmap("NW"); internal static readonly Bitmap OpenFile = ReadEmbeddedBitmap("OpenFile"); internal static readonly Bitmap Paste = ReadEmbeddedBitmap("Paste"); @@ -155,8 +155,7 @@ namespace BizHawk.Client.EmuHawk.Properties internal static readonly Bitmap Recent = ReadEmbeddedBitmap("Recent"); 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 Refresh = ReadEmbeddedBitmap("Refresh"); internal static readonly Bitmap Restart = ReadEmbeddedBitmap("restart"); internal static readonly Bitmap RetroQuestion = ReadEmbeddedBitmap("RetroQuestion"); internal static readonly Bitmap Save = ReadEmbeddedBitmap("Save"); diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs index bca5f93f0e..400084c089 100644 --- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -34,7 +34,7 @@ namespace BizHawk.Client.EmuHawk ControllerImages.Add("Intellivision Controller", Properties.Resources.IntVController); ControllerImages.Add("ColecoVision Basic Controller", Properties.Resources.ColecoVisionController); - ControllerImages.Add("Atari 2600 Basic Controller", Properties.Resources.atari_controller); + ControllerImages.Add("Atari 2600 Basic Controller", Properties.Resources.AtariController); ControllerImages.Add("Atari 7800 ProLine Joystick Controller", Properties.Resources.A78Joystick); ControllerImages.Add("PC Engine Controller", Properties.Resources.PceController); @@ -65,7 +65,7 @@ namespace BizHawk.Client.EmuHawk private void ControllerConfig_Load(object sender, EventArgs e) { - Icon = Properties.Resources.GameController_MultiSize; + Icon = Properties.Resources.GameControllerIcon; Text = $"{_emulator.ControllerDefinition.Name} Configuration"; } diff --git a/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs b/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs index 8846f085f4..a5c064afef 100644 --- a/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs @@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk _getRewinder = getRewinder; _statableCore = statableCore; InitializeComponent(); - btnResetCompression.Image = Properties.Resources.reboot; + btnResetCompression.Image = Properties.Resources.Reboot; } private void RewindConfig_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/images/Refresh.bmp b/src/BizHawk.Client.EmuHawk/images/Refresh.bmp deleted file mode 100644 index 2040aa663f6f30024c4d405296a1e2518116ed93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 824 zcmb7>&rcIk5XTq16Oa4}-iQZ`UWoBvf(agp7d=3@7-C`%HIX!i1n@ut#ve6ekWhj| z8EsZTLbldK3TT8>X+kLxlcbwNPOPgNck96dFfNv(j%zI4*W+_vgB7I<+<=2~X~FZNv$gr`Lf$m!VK{iOw-epjjBfk({mWtB zOlb8}XnCqqKV~PeEaOcR3%Ti3nja3%1d>~jia|P}3J1kxxSD4k23Ko3yn+^zimT$G#V<{|8G5oT{!b| zu3NnGddzXnmcOG3VOaN|%(XG&+X!8B>vPYv=|SS{Q>R>t=TTwwVd2ev`BfKctLw5| iyqvrrkj9^gZ=J%+Zr0`Lop|r Restart();