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

Put save slot 0 after 9 everywhere 

see #3112
This commit is contained in:
YoshiRulz 2022-02-09 18:38:15 +10:00
parent d997ad9871
commit e7fd93b41a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Client.Common/config/Binding.cs
View File

@ -145,7 +145,6 @@ namespace BizHawk.Client.Common
Bind("General", "Toggle Key Priority"), Bind("General", "Toggle Key Priority"),
Bind("General", "Frame Inch"), Bind("General", "Frame Inch"),
Bind("Save States", "Save State 0", "Shift+F10"),
Bind("Save States", "Save State 1", "Shift+F1"), Bind("Save States", "Save State 1", "Shift+F1"),
Bind("Save States", "Save State 2", "Shift+F2"), Bind("Save States", "Save State 2", "Shift+F2"),
Bind("Save States", "Save State 3", "Shift+F3"), Bind("Save States", "Save State 3", "Shift+F3"),
@ -155,7 +154,7 @@ namespace BizHawk.Client.Common
Bind("Save States", "Save State 7", "Shift+F7"), Bind("Save States", "Save State 7", "Shift+F7"),
Bind("Save States", "Save State 8", "Shift+F8"), Bind("Save States", "Save State 8", "Shift+F8"),
Bind("Save States", "Save State 9", "Shift+F9"), Bind("Save States", "Save State 9", "Shift+F9"),
Bind("Save States", "Load State 0", "F10"), Bind("Save States", "Save State 0", "Shift+F10"),
Bind("Save States", "Load State 1", "F1"), Bind("Save States", "Load State 1", "F1"),
Bind("Save States", "Load State 2", "F2"), Bind("Save States", "Load State 2", "F2"),
Bind("Save States", "Load State 3", "F3"), Bind("Save States", "Load State 3", "F3"),
@ -165,7 +164,7 @@ namespace BizHawk.Client.Common
Bind("Save States", "Load State 7", "F7"), Bind("Save States", "Load State 7", "F7"),
Bind("Save States", "Load State 8", "F8"), Bind("Save States", "Load State 8", "F8"),
Bind("Save States", "Load State 9", "F9"), Bind("Save States", "Load State 9", "F9"),
Bind("Save States", "Select State 0", "Number0"), Bind("Save States", "Load State 0", "F10"),
Bind("Save States", "Select State 1", "Number1"), Bind("Save States", "Select State 1", "Number1"),
Bind("Save States", "Select State 2", "Number2"), Bind("Save States", "Select State 2", "Number2"),
Bind("Save States", "Select State 3", "Number3"), Bind("Save States", "Select State 3", "Number3"),
@ -175,6 +174,7 @@ namespace BizHawk.Client.Common
Bind("Save States", "Select State 7", "Number7"), Bind("Save States", "Select State 7", "Number7"),
Bind("Save States", "Select State 8", "Number8"), Bind("Save States", "Select State 8", "Number8"),
Bind("Save States", "Select State 9", "Number9"), Bind("Save States", "Select State 9", "Number9"),
Bind("Save States", "Select State 0", "Number0"),
Bind("Save States", "Quick Load", "P"), Bind("Save States", "Quick Load", "P"),
Bind("Save States", "Quick Save", "I"), Bind("Save States", "Quick Save", "I"),
Bind("Save States", "Save Named State"), Bind("Save States", "Save Named State"),

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

@ -606,7 +606,6 @@ namespace BizHawk.Client.EmuHawk
// SaveSlotSubMenu // SaveSlotSubMenu
// //
this.SaveSlotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SaveSlotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SelectSlot0MenuItem,
this.SelectSlot1MenuItem, this.SelectSlot1MenuItem,
this.SelectSlot2MenuItem, this.SelectSlot2MenuItem,
this.SelectSlot3MenuItem, this.SelectSlot3MenuItem,
@ -616,6 +615,7 @@ namespace BizHawk.Client.EmuHawk
this.SelectSlot7MenuItem, this.SelectSlot7MenuItem,
this.SelectSlot8MenuItem, this.SelectSlot8MenuItem,
this.SelectSlot9MenuItem, this.SelectSlot9MenuItem,
this.SelectSlot0MenuItem,
this.PreviousSlotMenuItem, this.PreviousSlotMenuItem,
this.NextSlotMenuItem, this.NextSlotMenuItem,
this.toolStripSeparator5, this.toolStripSeparator5,

10
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -73,7 +73,6 @@ namespace BizHawk.Client.EmuHawk
void SetSlotFont(ToolStripMenuItemEx menu, int slot) => menu.SetStyle( void SetSlotFont(ToolStripMenuItemEx menu, int slot) => menu.SetStyle(
HasSlot(slot) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular); HasSlot(slot) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SetSlotFont(SaveState0MenuItem, 0);
SetSlotFont(SaveState1MenuItem, 1); SetSlotFont(SaveState1MenuItem, 1);
SetSlotFont(SaveState2MenuItem, 2); SetSlotFont(SaveState2MenuItem, 2);
SetSlotFont(SaveState3MenuItem, 3); SetSlotFont(SaveState3MenuItem, 3);
@ -83,6 +82,7 @@ namespace BizHawk.Client.EmuHawk
SetSlotFont(SaveState7MenuItem, 7); SetSlotFont(SaveState7MenuItem, 7);
SetSlotFont(SaveState8MenuItem, 8); SetSlotFont(SaveState8MenuItem, 8);
SetSlotFont(SaveState9MenuItem, 9); SetSlotFont(SaveState9MenuItem, 9);
SetSlotFont(SaveState0MenuItem, 0);
SaveState1MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Save State 1"].Bindings; SaveState1MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Save State 1"].Bindings;
SaveState2MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Save State 2"].Bindings; SaveState2MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Save State 2"].Bindings;
@ -127,7 +127,6 @@ namespace BizHawk.Client.EmuHawk
private void SaveSlotSubMenu_DropDownOpened(object sender, EventArgs e) private void SaveSlotSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
SelectSlot0MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 0"].Bindings;
SelectSlot1MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 1"].Bindings; SelectSlot1MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 1"].Bindings;
SelectSlot2MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 2"].Bindings; SelectSlot2MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 2"].Bindings;
SelectSlot3MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 3"].Bindings; SelectSlot3MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 3"].Bindings;
@ -137,12 +136,12 @@ namespace BizHawk.Client.EmuHawk
SelectSlot7MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 7"].Bindings; SelectSlot7MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 7"].Bindings;
SelectSlot8MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 8"].Bindings; SelectSlot8MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 8"].Bindings;
SelectSlot9MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 9"].Bindings; SelectSlot9MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 9"].Bindings;
SelectSlot0MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 0"].Bindings;
PreviousSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Previous Slot"].Bindings; PreviousSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Previous Slot"].Bindings;
NextSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Next Slot"].Bindings; NextSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Next Slot"].Bindings;
SaveToCurrentSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Quick Save"].Bindings; SaveToCurrentSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Quick Save"].Bindings;
LoadCurrentSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Quick Load"].Bindings; LoadCurrentSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Quick Load"].Bindings;
SelectSlot0MenuItem.Checked = Config.SaveSlot == 0;
SelectSlot1MenuItem.Checked = Config.SaveSlot == 1; SelectSlot1MenuItem.Checked = Config.SaveSlot == 1;
SelectSlot2MenuItem.Checked = Config.SaveSlot == 2; SelectSlot2MenuItem.Checked = Config.SaveSlot == 2;
SelectSlot3MenuItem.Checked = Config.SaveSlot == 3; SelectSlot3MenuItem.Checked = Config.SaveSlot == 3;
@ -152,6 +151,7 @@ namespace BizHawk.Client.EmuHawk
SelectSlot7MenuItem.Checked = Config.SaveSlot == 7; SelectSlot7MenuItem.Checked = Config.SaveSlot == 7;
SelectSlot8MenuItem.Checked = Config.SaveSlot == 8; SelectSlot8MenuItem.Checked = Config.SaveSlot == 8;
SelectSlot9MenuItem.Checked = Config.SaveSlot == 9; SelectSlot9MenuItem.Checked = Config.SaveSlot == 9;
SelectSlot0MenuItem.Checked = Config.SaveSlot == 0;
} }
private void SaveRamSubMenu_DropDownOpened(object sender, EventArgs e) private void SaveRamSubMenu_DropDownOpened(object sender, EventArgs e)
@ -345,8 +345,7 @@ namespace BizHawk.Client.EmuHawk
private void SelectSlotMenuItems_Click(object sender, EventArgs e) private void SelectSlotMenuItems_Click(object sender, EventArgs e)
{ {
if (sender == SelectSlot0MenuItem) Config.SaveSlot = 0; if (sender == SelectSlot1MenuItem) Config.SaveSlot = 1;
else if (sender == SelectSlot1MenuItem) Config.SaveSlot = 1;
else if (sender == SelectSlot2MenuItem) Config.SaveSlot = 2; else if (sender == SelectSlot2MenuItem) Config.SaveSlot = 2;
else if (sender == SelectSlot3MenuItem) Config.SaveSlot = 3; else if (sender == SelectSlot3MenuItem) Config.SaveSlot = 3;
else if (sender == SelectSlot4MenuItem) Config.SaveSlot = 4; else if (sender == SelectSlot4MenuItem) Config.SaveSlot = 4;
@ -355,6 +354,7 @@ namespace BizHawk.Client.EmuHawk
else if (sender == SelectSlot7MenuItem) Config.SaveSlot = 7; else if (sender == SelectSlot7MenuItem) Config.SaveSlot = 7;
else if (sender == SelectSlot8MenuItem) Config.SaveSlot = 8; else if (sender == SelectSlot8MenuItem) Config.SaveSlot = 8;
else if (sender == SelectSlot9MenuItem) Config.SaveSlot = 9; else if (sender == SelectSlot9MenuItem) Config.SaveSlot = 9;
else if (sender == SelectSlot0MenuItem) Config.SaveSlot = 0;
UpdateStatusSlots(); UpdateStatusSlots();
SaveSlotSelectedMessage(); SaveSlotSelectedMessage();

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

@ -2576,7 +2576,6 @@ namespace BizHawk.Client.EmuHawk
{ {
_stateSlots.Update(Emulator, MovieSession.Movie, SaveStatePrefix()); _stateSlots.Update(Emulator, MovieSession.Movie, SaveStatePrefix());
Slot0StatusButton.ForeColor = SlotForeColor(0);
Slot1StatusButton.ForeColor = SlotForeColor(1); Slot1StatusButton.ForeColor = SlotForeColor(1);
Slot2StatusButton.ForeColor = SlotForeColor(2); Slot2StatusButton.ForeColor = SlotForeColor(2);
Slot3StatusButton.ForeColor = SlotForeColor(3); Slot3StatusButton.ForeColor = SlotForeColor(3);
@ -2586,8 +2585,8 @@ namespace BizHawk.Client.EmuHawk
Slot7StatusButton.ForeColor = SlotForeColor(7); Slot7StatusButton.ForeColor = SlotForeColor(7);
Slot8StatusButton.ForeColor = SlotForeColor(8); Slot8StatusButton.ForeColor = SlotForeColor(8);
Slot9StatusButton.ForeColor = SlotForeColor(9); Slot9StatusButton.ForeColor = SlotForeColor(9);
Slot0StatusButton.ForeColor = SlotForeColor(0);
Slot0StatusButton.BackColor = SlotBackColor(0);
Slot1StatusButton.BackColor = SlotBackColor(1); Slot1StatusButton.BackColor = SlotBackColor(1);
Slot2StatusButton.BackColor = SlotBackColor(2); Slot2StatusButton.BackColor = SlotBackColor(2);
Slot3StatusButton.BackColor = SlotBackColor(3); Slot3StatusButton.BackColor = SlotBackColor(3);
@ -2597,9 +2596,9 @@ namespace BizHawk.Client.EmuHawk
Slot7StatusButton.BackColor = SlotBackColor(7); Slot7StatusButton.BackColor = SlotBackColor(7);
Slot8StatusButton.BackColor = SlotBackColor(8); Slot8StatusButton.BackColor = SlotBackColor(8);
Slot9StatusButton.BackColor = SlotBackColor(9); Slot9StatusButton.BackColor = SlotBackColor(9);
Slot0StatusButton.BackColor = SlotBackColor(0);
SaveSlotsStatusLabel.Visible = SaveSlotsStatusLabel.Visible =
Slot0StatusButton.Visible =
Slot1StatusButton.Visible = Slot1StatusButton.Visible =
Slot2StatusButton.Visible = Slot2StatusButton.Visible =
Slot3StatusButton.Visible = Slot3StatusButton.Visible =
@ -2609,6 +2608,7 @@ namespace BizHawk.Client.EmuHawk
Slot7StatusButton.Visible = Slot7StatusButton.Visible =
Slot8StatusButton.Visible = Slot8StatusButton.Visible =
Slot9StatusButton.Visible = Slot9StatusButton.Visible =
Slot0StatusButton.Visible =
Emulator.HasSavestates(); Emulator.HasSavestates();
} }

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

@ -944,7 +944,6 @@ namespace BizHawk.Client.EmuHawk
this.StartFromSlotBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.StartFromSlotBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.StartFromSlotBox.FormattingEnabled = true; this.StartFromSlotBox.FormattingEnabled = true;
this.StartFromSlotBox.Items.AddRange(new object[] { this.StartFromSlotBox.Items.AddRange(new object[] {
"Slot 0",
"Slot 1", "Slot 1",
"Slot 2", "Slot 2",
"Slot 3", "Slot 3",
@ -953,7 +952,8 @@ namespace BizHawk.Client.EmuHawk
"Slot 6", "Slot 6",
"Slot 7", "Slot 7",
"Slot 8", "Slot 8",
"Slot 9"}); "Slot 9",
"Slot 0"});
this.StartFromSlotBox.Location = new System.Drawing.Point(71, 25); this.StartFromSlotBox.Location = new System.Drawing.Point(71, 25);
this.StartFromSlotBox.Name = "StartFromSlotBox"; this.StartFromSlotBox.Name = "StartFromSlotBox";
this.StartFromSlotBox.Size = new System.Drawing.Size(75, 21); this.StartFromSlotBox.Size = new System.Drawing.Size(75, 21);