From 679f95d1de75ac97dddcb5ace8653f155954558a Mon Sep 17 00:00:00 2001 From: Colin Caine Date: Mon, 16 Jun 2025 20:16:38 +0100 Subject: [PATCH] Codechange: make more hotkey ids match widgets --- src/order_gui.cpp | 16 ++++----- src/toolbar_gui.cpp | 38 ++++++++++---------- src/toolbar_gui.h | 67 +++++++++++++++++++----------------- src/widgets/order_widget.h | 1 + src/widgets/toolbar_widget.h | 50 ++++++++++++++------------- 5 files changed, 91 insertions(+), 81 deletions(-) diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 5b47c97897..707dc72040 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -469,14 +469,14 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) /** Hotkeys for order window. */ enum OrderHotKeys : int32_t { - OHK_SKIP, - OHK_DELETE, - OHK_GOTO, - OHK_NONSTOP, - OHK_FULLLOAD, - OHK_UNLOAD, - OHK_NEAREST_DEPOT, - OHK_ALWAYS_SERVICE, + OHK_SKIP = WID_O_SKIP, + OHK_DELETE = WID_O_DELETE, + OHK_GOTO = WID_O_GOTO, + OHK_NONSTOP = WID_O_NON_STOP, + OHK_FULLLOAD = WID_O_FULL_LOAD, + OHK_UNLOAD = WID_O_UNLOAD, + OHK_ALWAYS_SERVICE = WID_O_DEPOT_ACTION, + OHK_NEAREST_DEPOT = WID_O_END, OHK_TRANSFER, OHK_NO_UNLOAD, OHK_NO_LOAD, diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index a82d581990..c41a30aae7 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -2305,29 +2305,29 @@ static ToolbarButtonProc * const _scen_toolbar_button_procs[] = { }; enum MainToolbarEditorHotkeys : int32_t { - MTEHK_PAUSE, - MTEHK_FASTFORWARD, - MTEHK_SETTINGS, - MTEHK_SAVEGAME, - MTEHK_GENLAND, - MTEHK_GENTOWN, - MTEHK_GENINDUSTRY, - MTEHK_BUILD_ROAD, - MTEHK_BUILD_TRAM, - MTEHK_BUILD_DOCKS, - MTEHK_BUILD_TREES, - MTEHK_SIGN, - MTEHK_MUSIC, - MTEHK_LANDINFO, + MTEHK_PAUSE = WID_TE_PAUSE, + MTEHK_FASTFORWARD = WID_TE_FAST_FORWARD, + MTEHK_SETTINGS = WID_TE_SETTINGS, + MTEHK_SAVEGAME = WID_TE_SAVE, + MTEHK_GENLAND = WID_TE_LAND_GENERATE, + MTEHK_GENTOWN = WID_TE_TOWN_GENERATE, + MTEHK_GENINDUSTRY = WID_TE_INDUSTRY, + MTEHK_BUILD_ROAD = WID_TE_ROADS, + MTEHK_BUILD_TRAM = WID_TE_TRAMS, + MTEHK_BUILD_DOCKS = WID_TE_WATER, + MTEHK_BUILD_TREES = WID_TE_TREES, + MTEHK_SIGN = WID_TE_SIGNS, + MTEHK_MUSIC = WID_TE_MUSIC_SOUND, + MTEHK_LANDINFO = WID_TE_HELP, + MTEHK_ZOOM_IN = WID_TE_ZOOM_IN, + MTEHK_ZOOM_OUT = WID_TE_ZOOM_OUT, + MTEHK_SMALLMAP = WID_TE_SMALL_MAP, + MTEHK_TERRAFORM = WID_TE_END, + MTEHK_EXTRA_VIEWPORT, MTEHK_SMALL_SCREENSHOT, MTEHK_ZOOMEDIN_SCREENSHOT, MTEHK_DEFAULTZOOM_SCREENSHOT, MTEHK_GIANT_SCREENSHOT, - MTEHK_ZOOM_IN, - MTEHK_ZOOM_OUT, - MTEHK_TERRAFORM, - MTEHK_SMALLMAP, - MTEHK_EXTRA_VIEWPORT, }; struct ScenarioEditorToolbarWindow : Window { diff --git a/src/toolbar_gui.h b/src/toolbar_gui.h index 37cc7fb886..5c152cbfd1 100644 --- a/src/toolbar_gui.h +++ b/src/toolbar_gui.h @@ -10,47 +10,52 @@ #ifndef TOOLBAR_GUI_H #define TOOLBAR_GUI_H +#include "widgets/toolbar_widget.h" + +// TODO: Replace all instances of "MTHK_blah" with "WID_blah" where we can, +// then redefine this as AdditionalMainToolbarHotkeys, or something like that. enum MainToolbarHotkeys : int32_t { - MTHK_PAUSE, - MTHK_FASTFORWARD, - MTHK_SETTINGS, - MTHK_SAVEGAME, - MTHK_LOADGAME, - MTHK_SMALLMAP, - MTHK_TOWNDIRECTORY, - MTHK_SUBSIDIES, - MTHK_STATIONS, - MTHK_FINANCES, - MTHK_COMPANIES, - MTHK_STORY, - MTHK_GOAL, - MTHK_GRAPHS, - MTHK_LEAGUE, - MTHK_INDUSTRIES, - MTHK_TRAIN_LIST, - MTHK_ROADVEH_LIST, - MTHK_SHIP_LIST, - MTHK_AIRCRAFT_LIST, - MTHK_ZOOM_IN, - MTHK_ZOOM_OUT, - MTHK_BUILD_RAIL, - MTHK_BUILD_ROAD, - MTHK_BUILD_TRAM, - MTHK_BUILD_DOCKS, - MTHK_BUILD_AIRPORT, + MTHK_PAUSE = WID_TN_PAUSE, + MTHK_FASTFORWARD = WID_TN_FAST_FORWARD, + MTHK_SETTINGS = WID_TN_SETTINGS, + MTHK_SAVEGAME = WID_TN_SAVE, + MTHK_SMALLMAP = WID_TN_SMALL_MAP, + MTHK_TOWNDIRECTORY = WID_TN_TOWNS, + MTHK_SUBSIDIES = WID_TN_SUBSIDIES, + MTHK_STATIONS = WID_TN_STATIONS, + MTHK_FINANCES = WID_TN_FINANCES, + MTHK_COMPANIES = WID_TN_COMPANIES, + MTHK_STORY = WID_TN_STORY, + MTHK_GOAL = WID_TN_GOAL, + MTHK_GRAPHS = WID_TN_GRAPHS, + MTHK_LEAGUE = WID_TN_LEAGUE, + MTHK_INDUSTRIES = WID_TN_INDUSTRIES, + MTHK_TRAIN_LIST = WID_TN_TRAINS, + MTHK_ROADVEH_LIST = WID_TN_ROADVEHS, + MTHK_SHIP_LIST = WID_TN_SHIPS, + MTHK_AIRCRAFT_LIST = WID_TN_AIRCRAFT, + MTHK_ZOOM_IN = WID_TN_ZOOM_IN, + MTHK_ZOOM_OUT = WID_TN_ZOOM_OUT, + MTHK_BUILD_RAIL = WID_TN_RAILS, + MTHK_BUILD_ROAD = WID_TN_ROADS, + MTHK_BUILD_TRAM = WID_TN_TRAMS, + MTHK_BUILD_DOCKS = WID_TN_WATER, + MTHK_BUILD_AIRPORT = WID_TN_AIR, + MTHK_TERRAFORM = WID_TN_LANDSCAPE, + MTHK_MUSIC = WID_TN_MUSIC_SOUND, + MTHK_LANDINFO = WID_TN_HELP, + // Hotkeys without associated widgets. + MTHK_LOADGAME = WID_TN_END, MTHK_BUILD_TREES, - MTHK_MUSIC, - MTHK_LANDINFO, MTHK_SCRIPT_DEBUG, MTHK_SMALL_SCREENSHOT, MTHK_ZOOMEDIN_SCREENSHOT, MTHK_DEFAULTZOOM_SCREENSHOT, MTHK_GIANT_SCREENSHOT, MTHK_CHEATS, - MTHK_TERRAFORM, MTHK_EXTRA_VIEWPORT, MTHK_CLIENT_LIST, - MTHK_SIGN_LIST + MTHK_SIGN_LIST, }; void AllocateToolbar(); diff --git a/src/widgets/order_widget.h b/src/widgets/order_widget.h index b0399ebda6..dc3ad0cc44 100644 --- a/src/widgets/order_widget.h +++ b/src/widgets/order_widget.h @@ -37,6 +37,7 @@ enum OrderWidgets : WidgetID { WID_O_SEL_TOP_ROW, ///< #NWID_SELECTION widget for the top row of the 'your non-trains' order window. WID_O_SEL_BOTTOM_MIDDLE, ///< #NWID_SELECTION widget for the middle part of the bottom row of the 'your train' order window. WID_O_SHARED_ORDER_LIST, ///< Open list of shared vehicles. + WID_O_END, ///< End of the list of widgets. }; #endif /* WIDGETS_ORDER_WIDGET_H */ diff --git a/src/widgets/toolbar_widget.h b/src/widgets/toolbar_widget.h index 36b53516af..4241200dc4 100644 --- a/src/widgets/toolbar_widget.h +++ b/src/widgets/toolbar_widget.h @@ -50,29 +50,33 @@ enum ToolbarNormalWidgets : WidgetID { /** Widgets of the #ScenarioEditorToolbarWindow class. */ enum ToolbarEditorWidgets : WidgetID { - WID_TE_PAUSE, ///< Pause the game. - WID_TE_FAST_FORWARD, ///< Fast forward the game. - WID_TE_SETTINGS, ///< Settings menu. - WID_TE_SAVE, ///< Save menu. - WID_TE_SPACER, ///< Spacer with "scenario editor" text. - WID_TE_DATE, ///< The date of the scenario. - WID_TE_DATE_BACKWARD, ///< Reduce the date of the scenario. - WID_TE_DATE_FORWARD, ///< Increase the date of the scenario. - WID_TE_SMALL_MAP, ///< Small map menu. - WID_TE_ZOOM_IN, ///< Zoom in the main viewport. - WID_TE_ZOOM_OUT, ///< Zoom out the main viewport. - WID_TE_LAND_GENERATE, ///< Land generation. - WID_TE_TOWN_GENERATE, ///< Town building window. - WID_TE_INDUSTRY, ///< Industry building window. - WID_TE_ROADS, ///< Road building menu. - WID_TE_TRAMS, ///< Tram building menu. - WID_TE_WATER, ///< Water building toolbar. - WID_TE_TREES, ///< Tree building toolbar. - WID_TE_SIGNS, ///< Sign building. - WID_TE_DATE_PANEL, ///< Container for the date widgets. - WID_TE_MUSIC_SOUND, ///< Music/sound configuration menu. - WID_TE_HELP, ///< Help menu. - WID_TE_SWITCH_BAR, ///< Only available when toolbar has been split to switch between different subsets. + // TODO: Clean this up. The idea here was to see which buttons are + // common between the two toolbars so that they can perhaps be + // de-duplicated. + WID_TE_PAUSE = WID_TN_PAUSE, ///< Pause the game. + WID_TE_FAST_FORWARD = WID_TN_FAST_FORWARD, ///< Fast forward the game. + WID_TE_SETTINGS = WID_TN_SETTINGS, ///< Settings menu. + WID_TE_SAVE = WID_TN_SAVE, ///< Save menu. + WID_TE_SMALL_MAP = WID_TN_SMALL_MAP, ///< Small map menu. + WID_TE_ZOOM_IN = WID_TN_ZOOM_IN, ///< Zoom in the main viewport. + WID_TE_ZOOM_OUT = WID_TN_ZOOM_OUT, ///< Zoom out the main viewport. + WID_TE_ROADS = WID_TN_ROADS, ///< Road building menu. + WID_TE_TRAMS = WID_TN_TRAMS, ///< Tram building menu. + WID_TE_WATER = WID_TN_WATER, ///< Water building toolbar. + WID_TE_MUSIC_SOUND = WID_TN_MUSIC_SOUND, ///< Music/sound configuration menu. + WID_TE_HELP = WID_TN_HELP, ///< Help menu. + WID_TE_SWITCH_BAR = WID_TN_SWITCH_BAR, ///< Only available when toolbar has been split to switch between different subsets. + WID_TE_SPACER = WID_TN_END, ///< Spacer with "scenario editor" text. + WID_TE_DATE, ///< The date of the scenario. + WID_TE_DATE_BACKWARD, ///< Reduce the date of the scenario. + WID_TE_DATE_FORWARD, ///< Increase the date of the scenario. + WID_TE_LAND_GENERATE, ///< Land generation. + WID_TE_TOWN_GENERATE, ///< Town building window. + WID_TE_INDUSTRY, ///< Industry building window. + WID_TE_TREES, ///< Tree building toolbar. + WID_TE_SIGNS, ///< Sign building. + WID_TE_DATE_PANEL, ///< Container for the date widgets. + WID_TE_END, }; #endif /* WIDGETS_TOOLBAR_WIDGET_H */