diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-03 21:58:12 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-03 21:58:12 +0100 |
commit | 7343d473cd44e8c5e800f39b9c6325053fbe5699 (patch) | |
tree | 8668b369b58e0686cdfb55089b48e298d35a8ba9 /src | |
parent | Merge pull request #207 from meetfranz/feature/fix-autolaunch (diff) | |
download | ferdium-app-7343d473cd44e8c5e800f39b9c6325053fbe5699.tar.gz ferdium-app-7343d473cd44e8c5e800f39b9c6325053fbe5699.tar.zst ferdium-app-7343d473cd44e8c5e800f39b9c6325053fbe5699.zip |
Reset linux shortcuts to Ctrl
Diffstat (limited to 'src')
-rw-r--r-- | src/environment.js | 11 | ||||
-rw-r--r-- | src/lib/Menu.js | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/environment.js b/src/environment.js index 7bb2db134..e185120c0 100644 --- a/src/environment.js +++ b/src/environment.js | |||
@@ -8,16 +8,7 @@ export const isMac = process.platform === 'darwin'; | |||
8 | export const isWindows = process.platform === 'win32'; | 8 | export const isWindows = process.platform === 'win32'; |
9 | export const isLinux = process.platform === 'linux'; | 9 | export const isLinux = process.platform === 'linux'; |
10 | 10 | ||
11 | let ctrlShortcutKey; | 11 | export const ctrlKey = isMac ? '⌘' : 'Ctrl'; |
12 | if (isMac) { | ||
13 | ctrlShortcutKey = '⌘'; | ||
14 | } else if (isWindows) { | ||
15 | ctrlShortcutKey = 'Ctrl'; | ||
16 | } else { | ||
17 | ctrlShortcutKey = 'Alt'; | ||
18 | } | ||
19 | |||
20 | export const ctrlKey = ctrlShortcutKey; | ||
21 | 12 | ||
22 | let api; | 13 | let api; |
23 | if (!isDevMode || (isDevMode && useLiveAPI)) { | 14 | if (!isDevMode || (isDevMode && useLiveAPI)) { |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 6bbf302ca..9f62cc8c2 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -276,10 +276,9 @@ export default class FranzMenu { | |||
276 | const services = this.stores.services.enabled; | 276 | const services = this.stores.services.enabled; |
277 | 277 | ||
278 | if (this.stores.user.isLoggedIn) { | 278 | if (this.stores.user.isLoggedIn) { |
279 | const systemAcceleratorKey = isLinux ? 'Alt' : 'CmdOrCtrl'; | ||
280 | return services.map((service, i) => ({ | 279 | return services.map((service, i) => ({ |
281 | label: service.name, | 280 | label: service.name, |
282 | accelerator: i <= 9 ? `${systemAcceleratorKey}+${i + 1}` : null, | 281 | accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null, |
283 | type: 'radio', | 282 | type: 'radio', |
284 | checked: service.isActive, | 283 | checked: service.isActive, |
285 | click: () => { | 284 | click: () => { |