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

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

This commit is contained in:
adelikat 2020-07-23 16:55:51 -05:00
parent ed8912db92
commit d6be73f395
8 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

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

5
src/BizHawk.Client.EmuHawk/Properties/Resources.cs
View File

@ -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");

4
src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
View File

@ -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";
}

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

@ -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)

BIN
src/BizHawk.Client.EmuHawk/images/Refresh.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 824 B

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

@ -35,7 +35,7 @@ namespace BizHawk.Client.EmuHawk
{
InitializeComponent();
Icon = Resources.FreezeIcon;
ToggleContextMenuItem.Image = Resources.Refresh1;
ToggleContextMenuItem.Image = Resources.Refresh;
RemoveContextMenuItem.Image = Resources.Delete;
DisableAllContextMenuItem.Image = Resources.Stop;
NewMenuItem.Image = Resources.NewFile;
@ -46,7 +46,7 @@ namespace BizHawk.Client.EmuHawk
InsertSeparatorMenuItem.Image = Resources.InsertSeparator;
MoveUpMenuItem.Image = Resources.MoveUp;
MoveDownMenuItem.Image = Resources.MoveDown;
ToggleMenuItem.Image = Resources.Refresh1;
ToggleMenuItem.Image = Resources.Refresh;
DisableAllCheatsMenuItem.Image = Resources.Stop;
NewToolBarItem.Image = Resources.NewFile;
OpenToolBarItem.Image = Resources.OpenFile;

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

@ -74,7 +74,7 @@ namespace BizHawk.Client.EmuHawk
_lastColumnSorted = "";
InitializeComponent();
ToggleScriptContextItem.Image = Resources.Refresh1;
ToggleScriptContextItem.Image = Resources.Refresh;
PauseScriptContextItem.Image = Resources.Pause;
EditScriptContextItem.Image = Resources.Cut;
RemoveScriptContextItem.Image = Resources.Close;
@ -86,7 +86,7 @@ namespace BizHawk.Client.EmuHawk
SaveSessionMenuItem.Image = Resources.SaveAs;
NewScriptMenuItem.Image = Resources.NewFile;
OpenScriptMenuItem.Image = Resources.OpenFile;
RefreshScriptMenuItem.Image = Resources.Refresh1;
RefreshScriptMenuItem.Image = Resources.Refresh;
ToggleScriptMenuItem.Image = Resources.Checkbox;
PauseScriptMenuItem.Image = Resources.Pause;
EditScriptMenuItem.Image = Resources.Cut;
@ -100,7 +100,7 @@ namespace BizHawk.Client.EmuHawk
NewScriptToolbarItem.Image = Resources.NewFile;
OpenScriptToolbarItem.Image = Resources.OpenFile;
ToggleScriptToolbarItem.Image = Resources.Checkbox;
RefreshScriptToolbarItem.Image = Resources.Refresh1;
RefreshScriptToolbarItem.Image = Resources.Refresh;
PauseToolbarItem.Image = Resources.Pause;
EditToolbarItem.Image = Resources.Cut;
RemoveScriptToolbarItem.Image = Resources.Delete;

2
src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
View File

@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk
public MultiDiskBundler()
{
InitializeComponent();
Icon = Properties.Resources.dual_MultiSize;
Icon = Properties.Resources.DualIcon;
}
private void MultiGameCreator_Load(object sender, EventArgs e) => Restart();