From 03e776d9c4cc6d322cc1b8db6775cd422e0fae2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 24 Jan 2022 12:33:37 +0100 Subject: [PATCH] Improve the look of the keyboard settings tab (#20595) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * First cut of new keyboard shortcuts Signed-off-by: Šimon Brandner * i18n Signed-off-by: Šimon Brandner --- src/i18n/strings/en_EN.json | 3 +- src/vector/platform/ElectronPlatform.tsx | 62 +++++++++++++----------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index f5e220b36a..e15cc96eac 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -12,7 +12,8 @@ "Dismiss": "Dismiss", "Switch to space by number": "Switch to space by number", "Open user settings": "Open user settings", - "Previous/next recently visited room or community": "Previous/next recently visited room or community", + "Previous recently visited room or community": "Previous recently visited room or community", + "Next recently visited room or community": "Next recently visited room or community", "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", "Go to your browser to complete Sign In": "Go to your browser to complete Sign In", "Unknown device": "Unknown device", diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index a330cb5307..797e78c40c 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -3,6 +3,7 @@ Copyright 2016 Aviral Dasgupta Copyright 2016 OpenMarket Ltd Copyright 2019 Michael Telatynski <7t3chguy@gmail.com> Copyright 2018 - 2021 New Vector Ltd +Copyright 2022 Šimon Brandner Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,10 +35,8 @@ import Modal from "matrix-react-sdk/src/Modal"; import InfoDialog from "matrix-react-sdk/src/components/views/dialogs/InfoDialog"; import Spinner from "matrix-react-sdk/src/components/views/elements/Spinner"; import { - Categories, - CMD_OR_CTRL, + CategoryName, DIGITS, - Modifiers, registerShortcut, } from "matrix-react-sdk/src/accessibility/KeyboardShortcuts"; import { isOnlyCtrlOrCmdKeyEvent, Key } from "matrix-react-sdk/src/Keyboard"; @@ -287,43 +286,50 @@ export default class ElectronPlatform extends VectorBasePlatform { }); // register OS-specific shortcuts - registerShortcut(Categories.NAVIGATION, { - keybinds: [{ - modifiers: [CMD_OR_CTRL], + registerShortcut("KeyBinding.switchToSpaceByNumber", CategoryName.NAVIGATION, { + default: { + ctrlOrCmdKey: true, key: DIGITS, - }], - description: _td("Switch to space by number"), + }, + displayName: _td("Switch to space by number"), }); if (isMac) { - registerShortcut(Categories.NAVIGATION, { - keybinds: [{ - modifiers: [Modifiers.COMMAND], + registerShortcut("KeyBinding.openUserSettings", CategoryName.NAVIGATION, { + default: { + commandKey: true, key: Key.COMMA, - }], - description: _td("Open user settings"), + }, + displayName: _td("Open user settings"), }); - - registerShortcut(Categories.NAVIGATION, { - keybinds: [{ - modifiers: [Modifiers.COMMAND], + registerShortcut("KeyBinding.previousVisitedRoomOrCommunity", CategoryName.NAVIGATION, { + default: { + commandKey: true, key: Key.SQUARE_BRACKET_LEFT, - }, { - modifiers: [Modifiers.COMMAND], + }, + displayName: _td("Previous recently visited room or community"), + }); + registerShortcut("KeyBinding.nextVisitedRoomOrCommunity", CategoryName.NAVIGATION, { + default: { + commandKey: true, key: Key.SQUARE_BRACKET_RIGHT, - }], - description: _td("Previous/next recently visited room or community"), + }, + displayName: _td("Next recently visited room or community"), }); } else { - registerShortcut(Categories.NAVIGATION, { - keybinds: [{ - modifiers: [Modifiers.ALT], + registerShortcut("KeyBinding.previousVisitedRoomOrCommunity", CategoryName.NAVIGATION, { + default: { + altKey: true, key: Key.ARROW_LEFT, - }, { - modifiers: [Modifiers.ALT], + }, + displayName: _td("Previous recently visited room or community"), + }); + registerShortcut("KeyBinding.nextVisitedRoomOrCommunity", CategoryName.NAVIGATION, { + default: { + altKey: true, key: Key.ARROW_RIGHT, - }], - description: _td("Previous/next recently visited room or community"), + }, + displayName: _td("Next recently visited room or community"), }); }