Move the buildings sidebar tab on top

Author: ZivDero

src/TSMapEditor/UI/KeyboardCommands.cs

@@ -50,11 +50,11 @@ public KeyboardCommands()
                 PlaceConnectedTile,
                 RepeatConnectedTile,
 
+                BuildingMenu,
                 InfantryMenu,
                 VehicleMenu,
                 AircraftMenu,
                 NavalMenu,
-                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 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 BuildingMenu { get; } = new KeyboardCommand("BuildingMenu", "Building Menu", new KeyboardCommandInput(Keys.D5, KeyboardModifiers.None));
+        public KeyboardCommand BuildingMenu { get; } = new KeyboardCommand("BuildingMenu", "Building Menu", new KeyboardCommandInput(Keys.D1, KeyboardModifiers.None));
+        public KeyboardCommand InfantryMenu { get; } = new KeyboardCommand("InfantryMenu", "Infantry Menu", new KeyboardCommandInput(Keys.D2, KeyboardModifiers.None));
+        public KeyboardCommand VehicleMenu { get; } = new KeyboardCommand("VehicleMenu", "Vehicle Menu", new KeyboardCommandInput(Keys.D3, KeyboardModifiers.None));
+        public KeyboardCommand AircraftMenu { get; } = new KeyboardCommand("AircraftMenu", "Aircraft Menu", new KeyboardCommandInput(Keys.D4, KeyboardModifiers.None));
+        public KeyboardCommand NavalMenu { get; } = new KeyboardCommand("NavalMenu", "Naval 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

@@ -37,11 +37,11 @@ public EditorSidebar(WindowManager windowManager, EditorState editorState, Map m
 
         static List<string> sidebarModeNames = new List<string>
         {
+            "Buildings",
             "Infantry",
             "Vehicles",
             "Aircraft",
             "Naval",
-            "Buildings",
             "Terrain Objects",
             "Overlays",
             "Smudges"
@@ -70,6 +70,10 @@ public override void Initialize()
             AddChild(lbSelection);
             lbSelection.EnableScrollbar = false;
 
+            var buildingListPanel = new BuildingListPanel(WindowManager, editorState, map, theaterGraphics, cursorActionTarget);
+            buildingListPanel.Name = nameof(buildingListPanel);
+            InitPanel(buildingListPanel);
+
             var infantryListPanel = new InfantryListPanel(WindowManager, editorState, map, theaterGraphics, cursorActionTarget);
             infantryListPanel.Name = nameof(infantryListPanel);
             InitPanel(infantryListPanel);
@@ -86,10 +90,6 @@ public override void Initialize()
             navalUnitListPanel.Name = nameof(navalUnitListPanel);
             InitPanel(navalUnitListPanel);
 
-            var buildingListPanel = new BuildingListPanel(WindowManager, editorState, map, theaterGraphics, cursorActionTarget);
-            buildingListPanel.Name = nameof(buildingListPanel);
-            InitPanel(buildingListPanel);
-
             var terrainObjectListPanel = new TerrainObjectListPanel(WindowManager, editorState, map, theaterGraphics, cursorActionTarget);
             terrainObjectListPanel.Name = nameof(terrainObjectListPanel);
             InitPanel(terrainObjectListPanel);
@@ -104,11 +104,11 @@ public override void Initialize()
 
             modePanels = new XNAPanel[]
             {
+                buildingListPanel,
                 infantryListPanel,
                 unitListPanel,
                 aircraftListPanel,
                 navalUnitListPanel,
-                buildingListPanel,
                 terrainObjectListPanel,
                 overlayListPanel,
                 smudgeListPanel
@@ -121,11 +121,11 @@ 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.BuildingMenu.Action = () => lbSelection.SelectedIndex = (int)SidebarMode.Buildings;
             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;

src/TSMapEditor/UI/Sidebar/SidebarMode.cs

@@ -5,11 +5,11 @@ namespace TSMapEditor.UI.Sidebar
     /// </summary>
     public enum SidebarMode
     {
+        Buildings,
         Infantry,
         Vehicles,
         Aircraft,
         Naval,
-        Buildings,
         TerrainObjects,
         Overlay,
         Smudges,