1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00

Add keyboard shortcut to Keyboard Shortcuts window

This commit is contained in:
Rik Smeets
2023-04-17 11:15:32 +02:00
committed by GitHub
parent e832159f35
commit 55adb71cd8
5 changed files with 12 additions and 1 deletions

View File

@@ -3685,6 +3685,7 @@ STR_6579 :Block brakes will be set to default speed when saved as track desig
STR_6580 :Reset
STR_6581 :Are you sure you want to reset all shortcut keys on this tab?
STR_6582 :Open keyboard shortcuts window
#############
# Scenarios #

View File

@@ -10,6 +10,7 @@
- Improved: [#19764] Miscellaneous scenery tab now grouped next to the all-scenery tab.
- Improved: [#19830] “Highlight path issues” will now hide wall elements.
- Improved: [#19905] Add prompt before resetting shortcut keys.
- Improved: [#19953] Add keyboard shorcut to Keyboard Shortcuts window.
- Fix: [#12598] Number of holes is not set correctly when saving track designs.
- Fix: [#13130] Android always defaulting to UK locale for language, currency and temperature.
- Fix: [#18895] Responding mechanic blocked at level crossing.

View File

@@ -52,6 +52,7 @@ namespace OpenRCT2::Ui::ShortcutId
constexpr std::string_view InterfaceOpenMessages = "interface.open.messages";
constexpr std::string_view InterfaceOpenMap = "interface.open.map";
constexpr std::string_view InterfaceShowOptions = "interface.open.options";
constexpr std::string_view InterfaceOpenKeyboardShortcuts = "interface.open.keyboard_shortcuts";
constexpr std::string_view InterfaceOpenTransparencyOptions = "interface.open.transparency_options";
constexpr std::string_view InterfaceOpenCheats = "interface.open.cheats";
constexpr std::string_view InterfaceOpenTileInspector = "interface.open.tileinspector";

View File

@@ -392,6 +392,11 @@ static void ShortcutOpenCheatWindow()
ContextOpenWindow(WindowClass::Cheats);
}
static void ShortcutOpenKeyboardShortcutsWindow()
{
WindowShortcutKeysOpen();
}
static void ShortcutOpenTransparencyWindow()
{
if (gScreenFlags != SCREEN_FLAGS_PLAYING)
@@ -816,6 +821,7 @@ void ShortcutManager::RegisterDefaultShortcuts()
RegisterShortcut(ShortcutId::InterfaceOpenMessages, STR_SHORTCUT_SHOW_RECENT_MESSAGES, "M", ShortcutShowRecentMessages);
RegisterShortcut(ShortcutId::InterfaceOpenMap, STR_SHORTCUT_SHOW_MAP, "TAB", ShortcutShowMap);
RegisterShortcut(ShortcutId::InterfaceShowOptions, STR_SHORTCUT_SHOW_OPTIONS, std::bind(ContextOpenWindow, WindowClass::Options));
RegisterShortcut(ShortcutId::InterfaceOpenKeyboardShortcuts, STR_SHORTCUT_OPEN_KEYBOARD_SHORTCUTS_WINDOW, "SHIFT+/", ShortcutOpenKeyboardShortcutsWindow);
RegisterShortcut(ShortcutId::InterfaceOpenTransparencyOptions, STR_SHORTCUT_OPEN_TRANSPARENCY_OPTIONS, "CTRL+T", ShortcutOpenTransparencyWindow);
RegisterShortcut(ShortcutId::InterfaceOpenCheats, STR_SHORTCUT_OPEN_CHEATS_WINDOW, "CTRL+ALT+C", ShortcutOpenCheatWindow);
RegisterShortcut(ShortcutId::InterfaceOpenTileInspector, STR_SHORTCUT_OPEN_TILE_INSPECTOR, []() {

View File

@@ -3982,7 +3982,9 @@ enum : uint16_t
STR_TRACK_DESIGN_BLOCK_BRAKE_SPEED_RESET = 6579,
STR_RESET = 6580,
STR_RESET_SHORTCUT_KEYS_PROMPT = 6581
STR_RESET_SHORTCUT_KEYS_PROMPT = 6581,
STR_SHORTCUT_OPEN_KEYBOARD_SHORTCUTS_WINDOW = 6582,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
/* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings