Skip to content

Custom hotkeys: record any key or combination, with conflict detection #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
katkrasner wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Custom hotkeys: record any key or combination, with conflict detection #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions FastWord/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,46 @@
"GigaAM model not downloaded yet (~215 MB)" = "GigaAM model not downloaded yet (~215 MB)";
"GigaAM model installed" = "GigaAM model installed";
"Retry" = "Retry";

/* Custom shortcut recorder */
"hotkey.none" = "Not set";
"hotkey.press_keys" = "Press keys…";
"hotkey.record_hint" = "esc to cancel";
"hotkey.presets" = "Common modifier keys";
"hotkey.custom_footer" = "Click the field and press any keys — a single modifier (⌥R), a chord (⌃L⌥L), or modifiers plus a key (⌃⌥D, F13). Shortcuts that include a regular key are not passed on to the app you're typing in.";

/* Hotkey conflicts */
"conflict.duplicate" = "Same as the other FastWord key — set them to different shortcuts.";
"conflict.reserved" = "macOS handles %@ before any app, so FastWord will never see it.";
"conflict.system" = "Matches a macOS shortcut: %@. The system may take it first.";
"conflict.fn" = "System Settings → Keyboard has the fn key assigned to another action, so fn may not reach FastWord.";
"conflict.typing_key" = "%@ has no modifier, so that character stops typing anywhere while FastWord runs.";
"conflict.app_switcher" = "app switcher";
"conflict.window_switcher" = "window switcher";
"conflict.force_quit" = "Force Quit";
"conflict.name.generic" = "a system shortcut";
"conflict.name.spotlight" = "Spotlight";
"conflict.name.spotlight_finder" = "Spotlight Finder search";
"conflict.name.mission_control" = "Mission Control";
"conflict.name.app_windows" = "Application windows";
"conflict.name.previous_input_source" = "Previous input source";
"conflict.name.next_input_source" = "Next input source";
"conflict.name.screenshot_file" = "Screenshot to file";
"conflict.name.screenshot_clipboard" = "Screenshot to clipboard";
"conflict.name.screenshot_area_file" = "Screenshot of selection to file";
"conflict.name.screenshot_area_clipboard" = "Screenshot of selection to clipboard";
"conflict.name.screenshot_options" = "Screenshot and recording options";
"conflict.name.space_left" = "Move one space left";
"conflict.name.space_right" = "Move one space right";
"conflict.name.help_menu" = "Help menu";
"conflict.name.launchpad" = "Launchpad";
"conflict.name.notification_center" = "Notification Center";
"conflict.name.desktop_1" = "Switch to Desktop 1";
"conflict.name.desktop_2" = "Switch to Desktop 2";
"conflict.name.desktop_3" = "Switch to Desktop 3";
"conflict.name.desktop_4" = "Switch to Desktop 4";

"hotkey.needs_accessibility" = "Accessibility is not granted, so a hotkey with a regular key will also type that character.";
"hotkey.open_accessibility" = "Open Accessibility settings";

"hotkey.reset" = "Reset to Right Option (⌥R)";
43 changes: 43 additions & 0 deletions FastWord/Resources/ru.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,46 @@
"GigaAM model not downloaded yet (~215 MB)" = "Модель GigaAM ещё не скачана (~215 МБ)";
"GigaAM model installed" = "Модель GigaAM установлена";
"Retry" = "Повторить";

/* Custom shortcut recorder */
"hotkey.none" = "Не задана";
"hotkey.press_keys" = "Нажмите клавиши…";
"hotkey.record_hint" = "esc — отмена";
"hotkey.presets" = "Частые модификаторы";
"hotkey.custom_footer" = "Нажмите на поле и нажмите любые клавиши — один модификатор (⌥R), аккорд (⌃L⌥L) или модификаторы с клавишей (⌃⌥D, F13). Сочетания с обычной клавишей не доходят до приложения, в котором вы печатаете.";

/* Hotkey conflicts */
"conflict.duplicate" = "Совпадает со второй клавишей FastWord. Задайте разные сочетания.";
"conflict.reserved" = "macOS обрабатывает %@ раньше любого приложения, до FastWord это сочетание не дойдёт.";
"conflict.system" = "Совпадает с системным сочетанием macOS: %@. Система может перехватить его первой.";
"conflict.fn" = "В Системных настройках клавише fn назначено другое действие, поэтому fn может не доходить до FastWord.";
"conflict.typing_key" = "У %@ нет модификатора, поэтому этот символ перестанет печататься везде, пока FastWord запущен.";
"conflict.app_switcher" = "переключение приложений";
"conflict.window_switcher" = "переключение окон";
"conflict.force_quit" = "Принудительное завершение";
"conflict.name.generic" = "системное сочетание";
"conflict.name.spotlight" = "Spotlight";
"conflict.name.spotlight_finder" = "Поиск Spotlight в Finder";
"conflict.name.mission_control" = "Mission Control";
"conflict.name.app_windows" = "Окна программы";
"conflict.name.previous_input_source" = "Предыдущий источник ввода";
"conflict.name.next_input_source" = "Следующий источник ввода";
"conflict.name.screenshot_file" = "Снимок экрана в файл";
"conflict.name.screenshot_clipboard" = "Снимок экрана в буфер обмена";
"conflict.name.screenshot_area_file" = "Снимок выбранной области в файл";
"conflict.name.screenshot_area_clipboard" = "Снимок выбранной области в буфер";
"conflict.name.screenshot_options" = "Параметры снимка экрана и записи";
"conflict.name.space_left" = "Переход на рабочее место влево";
"conflict.name.space_right" = "Переход на рабочее место вправо";
"conflict.name.help_menu" = "Меню Справка";
"conflict.name.launchpad" = "Launchpad";
"conflict.name.notification_center" = "Центр уведомлений";
"conflict.name.desktop_1" = "Переход к рабочему столу 1";
"conflict.name.desktop_2" = "Переход к рабочему столу 2";
"conflict.name.desktop_3" = "Переход к рабочему столу 3";
"conflict.name.desktop_4" = "Переход к рабочему столу 4";

"hotkey.needs_accessibility" = "Нет разрешения Accessibility, поэтому сочетание с обычной клавишей будет ещё и печатать этот символ.";
"hotkey.open_accessibility" = "Открыть настройки Accessibility";

"hotkey.reset" = "Сбросить на правый Option (⌥R)";
43 changes: 43 additions & 0 deletions FastWord/Resources/zh-Hans.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,46 @@
"GigaAM model not downloaded yet (~215 MB)" = "GigaAM 模型尚未下载(约 215 MB)";
"GigaAM model installed" = "GigaAM 模型已安装";
"Retry" = "重试";

/* Custom shortcut recorder */
"hotkey.none" = "未设置";
"hotkey.press_keys" = "请按下按键…";
"hotkey.record_hint" = "按 esc 取消";
"hotkey.presets" = "常用修饰键";
"hotkey.custom_footer" = "点击输入框并按下任意按键 — 单个修饰键(⌥R)、组合修饰键(⌃L⌥L),或修饰键加普通键(⌃⌥D、F13)。包含普通键的快捷键不会传递给您正在输入的应用。";

/* Hotkey conflicts */
"conflict.duplicate" = "与 FastWord 的另一个按键相同,请设置不同的快捷键。";
"conflict.reserved" = "macOS 会在任何应用之前处理 %@,FastWord 无法收到它。";
"conflict.system" = "与 macOS 系统快捷键冲突:%@。系统可能会先截获它。";
"conflict.fn" = "系统设置 → 键盘 中 fn 键已分配给其他操作,因此 fn 可能无法到达 FastWord。";
"conflict.typing_key" = "%@ 没有修饰键,FastWord 运行时该字符将无法输入。";
"conflict.app_switcher" = "应用切换";
"conflict.window_switcher" = "窗口切换";
"conflict.force_quit" = "强制退出";
"conflict.name.generic" = "系统快捷键";
"conflict.name.spotlight" = "聚焦搜索";
"conflict.name.spotlight_finder" = "聚焦访达搜索";
"conflict.name.mission_control" = "调度中心";
"conflict.name.app_windows" = "应用程序窗口";
"conflict.name.previous_input_source" = "上一个输入法";
"conflict.name.next_input_source" = "下一个输入法";
"conflict.name.screenshot_file" = "截屏并存为文件";
"conflict.name.screenshot_clipboard" = "截屏并拷贝到剪贴板";
"conflict.name.screenshot_area_file" = "截取所选区域并存为文件";
"conflict.name.screenshot_area_clipboard" = "截取所选区域并拷贝到剪贴板";
"conflict.name.screenshot_options" = "截屏与录制选项";
"conflict.name.space_left" = "移到左边一个空间";
"conflict.name.space_right" = "移到右边一个空间";
"conflict.name.help_menu" = "帮助菜单";
"conflict.name.launchpad" = "启动台";
"conflict.name.notification_center" = "通知中心";
"conflict.name.desktop_1" = "切换到桌面 1";
"conflict.name.desktop_2" = "切换到桌面 2";
"conflict.name.desktop_3" = "切换到桌面 3";
"conflict.name.desktop_4" = "切换到桌面 4";

"hotkey.needs_accessibility" = "未授予辅助功能权限,因此包含普通键的快捷键仍会输入该字符。";
"hotkey.open_accessibility" = "打开辅助功能设置";

"hotkey.reset" = "重置为右 Option (⌥R)";
2 changes: 1 addition & 1 deletion FastWord/Sources/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ final class AppController: ObservableObject {

private func readyStatusText() -> String {
let format = NSLocalizedString("status.ready", comment: "")
return String(format: format, AppSettings.hotkey.displayName)
return String(format: format, AppSettings.hotkeyBinding.displayName)
}

func deleteHistoryEntry(_ id: UUID) {
Expand Down
Loading