From e7fd93b41a9c0c713c4b20038afffe6df9adad9d Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Wed, 9 Feb 2022 18:38:15 +1000 Subject: [PATCH] Put save slot 0 after 9 everywhere see #3112 --- src/BizHawk.Client.Common/config/Binding.cs | 6 +++--- src/BizHawk.Client.EmuHawk/MainForm.Designer.cs | 2 +- src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 10 +++++----- src/BizHawk.Client.EmuHawk/MainForm.cs | 8 ++++---- .../tools/BasicBot/BasicBot.Designer.cs | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/BizHawk.Client.Common/config/Binding.cs b/src/BizHawk.Client.Common/config/Binding.cs index 2fa48d95a9..5a5774e134 100644 --- a/src/BizHawk.Client.Common/config/Binding.cs +++ b/src/BizHawk.Client.Common/config/Binding.cs @@ -145,7 +145,6 @@ namespace BizHawk.Client.Common Bind("General", "Toggle Key Priority"), 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 2", "Shift+F2"), 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 8", "Shift+F8"), 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 2", "F2"), 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 8", "F8"), 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 2", "Number2"), 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 8", "Number8"), Bind("Save States", "Select State 9", "Number9"), + Bind("Save States", "Select State 0", "Number0"), Bind("Save States", "Quick Load", "P"), Bind("Save States", "Quick Save", "I"), Bind("Save States", "Save Named State"), diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs index a43bebbf9b..1d3f861efe 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -606,7 +606,6 @@ namespace BizHawk.Client.EmuHawk // SaveSlotSubMenu // this.SaveSlotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SelectSlot0MenuItem, this.SelectSlot1MenuItem, this.SelectSlot2MenuItem, this.SelectSlot3MenuItem, @@ -616,6 +615,7 @@ namespace BizHawk.Client.EmuHawk this.SelectSlot7MenuItem, this.SelectSlot8MenuItem, this.SelectSlot9MenuItem, + this.SelectSlot0MenuItem, this.PreviousSlotMenuItem, this.NextSlotMenuItem, this.toolStripSeparator5, diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index 15eaa93400..341968570e 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -73,7 +73,6 @@ namespace BizHawk.Client.EmuHawk void SetSlotFont(ToolStripMenuItemEx menu, int slot) => menu.SetStyle( HasSlot(slot) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular); - SetSlotFont(SaveState0MenuItem, 0); SetSlotFont(SaveState1MenuItem, 1); SetSlotFont(SaveState2MenuItem, 2); SetSlotFont(SaveState3MenuItem, 3); @@ -83,6 +82,7 @@ namespace BizHawk.Client.EmuHawk SetSlotFont(SaveState7MenuItem, 7); SetSlotFont(SaveState8MenuItem, 8); SetSlotFont(SaveState9MenuItem, 9); + SetSlotFont(SaveState0MenuItem, 0); SaveState1MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Save State 1"].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) { - SelectSlot0MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 0"].Bindings; SelectSlot1MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 1"].Bindings; SelectSlot2MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 2"].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; SelectSlot8MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 8"].Bindings; SelectSlot9MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 9"].Bindings; + SelectSlot0MenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select State 0"].Bindings; PreviousSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Previous Slot"].Bindings; NextSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Next Slot"].Bindings; SaveToCurrentSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Quick Save"].Bindings; LoadCurrentSlotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Quick Load"].Bindings; - SelectSlot0MenuItem.Checked = Config.SaveSlot == 0; SelectSlot1MenuItem.Checked = Config.SaveSlot == 1; SelectSlot2MenuItem.Checked = Config.SaveSlot == 2; SelectSlot3MenuItem.Checked = Config.SaveSlot == 3; @@ -152,6 +151,7 @@ namespace BizHawk.Client.EmuHawk SelectSlot7MenuItem.Checked = Config.SaveSlot == 7; SelectSlot8MenuItem.Checked = Config.SaveSlot == 8; SelectSlot9MenuItem.Checked = Config.SaveSlot == 9; + SelectSlot0MenuItem.Checked = Config.SaveSlot == 0; } private void SaveRamSubMenu_DropDownOpened(object sender, EventArgs e) @@ -345,8 +345,7 @@ namespace BizHawk.Client.EmuHawk private void SelectSlotMenuItems_Click(object sender, EventArgs e) { - if (sender == SelectSlot0MenuItem) Config.SaveSlot = 0; - else if (sender == SelectSlot1MenuItem) Config.SaveSlot = 1; + if (sender == SelectSlot1MenuItem) Config.SaveSlot = 1; else if (sender == SelectSlot2MenuItem) Config.SaveSlot = 2; else if (sender == SelectSlot3MenuItem) Config.SaveSlot = 3; 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 == SelectSlot8MenuItem) Config.SaveSlot = 8; else if (sender == SelectSlot9MenuItem) Config.SaveSlot = 9; + else if (sender == SelectSlot0MenuItem) Config.SaveSlot = 0; UpdateStatusSlots(); SaveSlotSelectedMessage(); diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index dda9d945b0..31d6da6da6 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -2576,7 +2576,6 @@ namespace BizHawk.Client.EmuHawk { _stateSlots.Update(Emulator, MovieSession.Movie, SaveStatePrefix()); - Slot0StatusButton.ForeColor = SlotForeColor(0); Slot1StatusButton.ForeColor = SlotForeColor(1); Slot2StatusButton.ForeColor = SlotForeColor(2); Slot3StatusButton.ForeColor = SlotForeColor(3); @@ -2586,8 +2585,8 @@ namespace BizHawk.Client.EmuHawk Slot7StatusButton.ForeColor = SlotForeColor(7); Slot8StatusButton.ForeColor = SlotForeColor(8); Slot9StatusButton.ForeColor = SlotForeColor(9); + Slot0StatusButton.ForeColor = SlotForeColor(0); - Slot0StatusButton.BackColor = SlotBackColor(0); Slot1StatusButton.BackColor = SlotBackColor(1); Slot2StatusButton.BackColor = SlotBackColor(2); Slot3StatusButton.BackColor = SlotBackColor(3); @@ -2597,9 +2596,9 @@ namespace BizHawk.Client.EmuHawk Slot7StatusButton.BackColor = SlotBackColor(7); Slot8StatusButton.BackColor = SlotBackColor(8); Slot9StatusButton.BackColor = SlotBackColor(9); + Slot0StatusButton.BackColor = SlotBackColor(0); SaveSlotsStatusLabel.Visible = - Slot0StatusButton.Visible = Slot1StatusButton.Visible = Slot2StatusButton.Visible = Slot3StatusButton.Visible = @@ -2609,7 +2608,8 @@ namespace BizHawk.Client.EmuHawk Slot7StatusButton.Visible = Slot8StatusButton.Visible = Slot9StatusButton.Visible = - Emulator.HasSavestates(); + Slot0StatusButton.Visible = + Emulator.HasSavestates(); } public BitmapBuffer CaptureOSD() diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs index a0f5aee968..eb13aa41a0 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs @@ -944,7 +944,6 @@ namespace BizHawk.Client.EmuHawk this.StartFromSlotBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.StartFromSlotBox.FormattingEnabled = true; this.StartFromSlotBox.Items.AddRange(new object[] { - "Slot 0", "Slot 1", "Slot 2", "Slot 3", @@ -953,7 +952,8 @@ namespace BizHawk.Client.EmuHawk "Slot 6", "Slot 7", "Slot 8", - "Slot 9"}); + "Slot 9", + "Slot 0"}); this.StartFromSlotBox.Location = new System.Drawing.Point(71, 25); this.StartFromSlotBox.Name = "StartFromSlotBox"; this.StartFromSlotBox.Size = new System.Drawing.Size(75, 21);