Fix the order of the sidebar category hotkeys

Author: ZivDero

src/TSMapEditor/UI/KeyboardCommands.cs

@@ -50,11 +50,11 @@ public KeyboardCommands()
                 PlaceConnectedTile,
                 RepeatConnectedTile,
 
-                AircraftMenu,
-                BuildingMenu,
+                InfantryMenu,
                 VehicleMenu,
+                AircraftMenu,
                 NavalMenu,
-                InfantryMenu,
+                BuildingMenu,
                 TerrainObjectMenu,
                 OverlayMenu,
                 SmudgeMenu
@@ -140,11 +140,11 @@ public void ClearCommandSubscriptions()
         public KeyboardCommand PlaceConnectedTile { get; } = new KeyboardCommand("PlaceConnectedTile", "Place Connected Tile", new KeyboardCommandInput(Keys.D, KeyboardModifiers.Alt));
         public KeyboardCommand RepeatConnectedTile { get; } = new KeyboardCommand("RepeatConnectedTile", "Repeat Last Connected Tile", new KeyboardCommandInput(Keys.D, KeyboardModifiers.Ctrl));
 
-        public KeyboardCommand AircraftMenu { get; } = new KeyboardCommand("AircraftMenu", "Aircraft Menu", new KeyboardCommandInput(Keys.D1, KeyboardModifiers.None));
-        public KeyboardCommand BuildingMenu { get; } = new KeyboardCommand("BuildingMenu", "Building Menu", new KeyboardCommandInput(Keys.D2, KeyboardModifiers.None));
-        public KeyboardCommand VehicleMenu { get; } = new KeyboardCommand("VehicleMenu", "Vehicle Menu", new KeyboardCommandInput(Keys.D3, KeyboardModifiers.None));
+        public KeyboardCommand InfantryMenu { get; } = new KeyboardCommand("InfantryMenu", "Infantry Menu", new KeyboardCommandInput(Keys.D1, KeyboardModifiers.None));
+        public KeyboardCommand VehicleMenu { get; } = new KeyboardCommand("VehicleMenu", "Vehicle Menu", new KeyboardCommandInput(Keys.D2, KeyboardModifiers.None));
+        public KeyboardCommand AircraftMenu { get; } = new KeyboardCommand("AircraftMenu", "Aircraft Menu", new KeyboardCommandInput(Keys.D3, KeyboardModifiers.None));
         public KeyboardCommand NavalMenu { get; } = new KeyboardCommand("NavalMenu", "Naval Menu", new KeyboardCommandInput(Keys.D4, KeyboardModifiers.None));
-        public KeyboardCommand InfantryMenu { get; } = new KeyboardCommand("InfantryMenu", "Infantry Menu", new KeyboardCommandInput(Keys.D5, KeyboardModifiers.None));
+        public KeyboardCommand BuildingMenu { get; } = new KeyboardCommand("BuildingMenu", "Building Menu", new KeyboardCommandInput(Keys.D5, KeyboardModifiers.None));
         public KeyboardCommand TerrainObjectMenu { get; } = new KeyboardCommand("TerrainObjectMenu", "Terrain Objects Menu", new KeyboardCommandInput(Keys.D6, KeyboardModifiers.None));
         public KeyboardCommand OverlayMenu { get; } = new KeyboardCommand("OverlayMenu", "Overlay Menu", new KeyboardCommandInput(Keys.D7, KeyboardModifiers.None));
         public KeyboardCommand SmudgeMenu { get; } = new KeyboardCommand("SmudgeMenu", "Smudge Menu", new KeyboardCommandInput(Keys.D8, KeyboardModifiers.None));

src/TSMapEditor/UI/Sidebar/EditorSidebar.cs

@@ -121,14 +121,14 @@ public override void Initialize()
             // This is less extensible than using events, but with events we'd have to store
             // the delegates to be able to unsubscribe from them later on.
             // Thus, this results in neater code.
-            KeyboardCommands.Instance.AircraftMenu.Action = () => lbSelection.SelectedIndex = 0;
-            KeyboardCommands.Instance.BuildingMenu.Action = () => lbSelection.SelectedIndex = 1;
-            KeyboardCommands.Instance.VehicleMenu.Action = () => lbSelection.SelectedIndex = 2;
-            KeyboardCommands.Instance.NavalMenu.Action = () => lbSelection.SelectedIndex = 3;
-            KeyboardCommands.Instance.InfantryMenu.Action = () => lbSelection.SelectedIndex = 4;
-            KeyboardCommands.Instance.TerrainObjectMenu.Action = () => lbSelection.SelectedIndex = 5;
-            KeyboardCommands.Instance.OverlayMenu.Action = () => lbSelection.SelectedIndex = 6;
-            KeyboardCommands.Instance.SmudgeMenu.Action = () => lbSelection.SelectedIndex = 7;
+            KeyboardCommands.Instance.InfantryMenu.Action = () => lbSelection.SelectedIndex = (int)SidebarMode.Infantry;
+            KeyboardCommands.Instance.VehicleMenu.Action = () => lbSelection.SelectedIndex = (int)SidebarMode.Vehicles;
+            KeyboardCommands.Instance.AircraftMenu.Action = () => lbSelection.SelectedIndex = (int)SidebarMode.Aircraft;
+            KeyboardCommands.Instance.NavalMenu.Action = () => lbSelection.SelectedIndex = (int)SidebarMode.Naval;
+            KeyboardCommands.Instance.BuildingMenu.Action = () => lbSelection.SelectedIndex = (int)SidebarMode.Buildings;
+            KeyboardCommands.Instance.TerrainObjectMenu.Action = () => lbSelection.SelectedIndex = (int)SidebarMode.TerrainObjects;
+            KeyboardCommands.Instance.OverlayMenu.Action = () => lbSelection.SelectedIndex = (int)SidebarMode.Overlay;
+            KeyboardCommands.Instance.SmudgeMenu.Action = () => lbSelection.SelectedIndex = (int)SidebarMode.Smudges;
 
             Keyboard.OnKeyPressed += Keyboard_OnKeyPressed;
             WindowManager.RenderResolutionChanged += WindowManager_RenderResolutionChanged;