Skip to content
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

change default local r9k keybinding per macOS standard #5764

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

change default local r9k keybinding per macOS standard #5764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
161b312
change default local r9k keybinding per macOS standard
jacob-thompson Dec 10, 2024
135d972
change default local r9k keymap specifically for macOS
jacob-thompson Dec 10, 2024
86f1173
update changelog
jacob-thompson Jan 18, 2025
cb18886
fix formatting
jacob-thompson Jan 18, 2025
51f7517
Merge branch 'master' into master
jacob-thompson Jan 18, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
- Dev: Qt 6.8 and later now default to the GDI fontengine. (#5710)
- Dev: Moved to condition variables when shutting down worker threads. (#5721, #5733)
- Dev: Reduced layouts in channel views when setting a channel. (#5737, #5748, #5757)
- Bugfix: Change default local r9k keybinding per macOS standard (#5764)

## 2.5.1

Expand Down
6 changes: 6 additions & 0 deletions src/controllers/hotkeys/HotkeyController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,9 +515,15 @@ void HotkeyController::addDefaults(std::set<QString> &addedHotkeys)
QKeySequence("Ctrl+G"), "reopenSplit",
std::vector<QString>(), "reopen split");

#ifdef Q_OS_MACOS
this->tryAddDefault(addedHotkeys, HotkeyCategory::Window,
QKeySequence("Ctrl+."), "toggleLocalR9K",
jacob-thompson marked this conversation as resolved.
Show resolved Hide resolved
std::vector<QString>(), "toggle local r9k");
#else
this->tryAddDefault(addedHotkeys, HotkeyCategory::Window,
QKeySequence("Ctrl+H"), "toggleLocalR9K",
std::vector<QString>(), "toggle local r9k");
#endif

this->tryAddDefault(addedHotkeys, HotkeyCategory::Window,
QKeySequence("Ctrl+K"), "openQuickSwitcher",
Expand Down