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

Revert #395 and implement with alter method #398

Merged
merged 15 commits into from
Feb 13, 2024
+86 −26
Merged

Revert #395 and implement with alter method #398

Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fdfe495
fix: default value in short cut
CanglongCl Feb 9, 2024
3a2d734
refactor: delete unused file
CanglongCl Feb 9, 2024
1f35d81
Revert "refactor: delete unused file"
CanglongCl Feb 9, 2024
3e18acc
Revert "fix: default value in short cut"
CanglongCl Feb 9, 2024
53d7eec
Add default shortcut
CanglongCl Feb 9, 2024
27bca4f
split `setDefaultForAppShortcut` into 2 method
CanglongCl Feb 13, 2024
75895a0
fix: default value in short cut
CanglongCl Feb 9, 2024
e49842c
refactor: delete unused file
CanglongCl Feb 9, 2024
e11f377
Revert "refactor: delete unused file"
CanglongCl Feb 9, 2024
6afe5c4
Revert "fix: default value in short cut"
CanglongCl Feb 9, 2024
5b58be4
Add default shortcut
CanglongCl Feb 9, 2024
e5c92af
split `setDefaultForAppShortcut` into 2 method
CanglongCl Feb 13, 2024
a41ce26
Merge branch 'default-value-shortcut' of github.com:CanglongCl/Easydi…
CanglongCl Feb 13, 2024
f77be65
Revert "chore: update issue templates"
CanglongCl Feb 13, 2024
875083a
fix: correct default global shortcut keys
tisfeng Feb 13, 2024
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
6 changes: 6 additions & 0 deletions Easydict/NewApp/Feature/Shortcut/Shortcut+Default.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ import Magnet
extension Shortcut {
// set defalut for app shortcut
func setDefaultForAppShortcut() {
Defaults[.selectionShortcut] = KeyCombo(key: .d, cocoaModifiers: .option)
CanglongCl marked this conversation as resolved.
Show resolved Hide resolved
Defaults[.snipShortcut] = KeyCombo(key: .s, cocoaModifiers: .option)
Defaults[.inputShortcut] = KeyCombo(key: .a, cocoaModifiers: .option)
Defaults[.screenshotOCRShortcut] = KeyCombo(key: .f, cocoaModifiers: [.option, .shift])
Defaults[.showMiniWindowShortcut] = KeyCombo(key: .s, cocoaModifiers: .option)
tisfeng marked this conversation as resolved.
Show resolved Hide resolved

Defaults[.clearInputShortcut] = KeyCombo(key: .k, cocoaModifiers: .command)
Defaults[.clearAllShortcut] = KeyCombo(key: .k, cocoaModifiers: [.command, .shift])
Defaults[.copyShortcut] = KeyCombo(key: .c, cocoaModifiers: [.command, .shift])
Expand Down