diff options
Diffstat (limited to 'src/lib/Menu.js')
-rw-r--r-- | src/lib/Menu.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index e8d3e79b4..21133bfde 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -6,7 +6,7 @@ import { autorun, observable } from 'mobx'; | |||
6 | import { defineMessages } from 'react-intl'; | 6 | import { defineMessages } from 'react-intl'; |
7 | import { CUSTOM_WEBSITE_RECIPE_ID, GITHUB_FERDI_URL, LIVE_API_FERDI_WEBSITE } from '../config'; | 7 | import { CUSTOM_WEBSITE_RECIPE_ID, GITHUB_FERDI_URL, LIVE_API_FERDI_WEBSITE } from '../config'; |
8 | import { | 8 | import { |
9 | cmdKey, altKey, shiftKey, settingsShortcutKey, isLinux, isMac, aboutAppDetails, | 9 | cmdKey, altKey, shiftKey, settingsShortcutKey, isLinux, isMac, aboutAppDetails, lockFerdiShortcutKey, todosToggleShortcutKey, workspaceToggleShortcutKey, addNewServiceShortcutKey, muteFerdiShortcutKey, |
10 | } from '../environment'; | 10 | } from '../environment'; |
11 | import { announcementsStore } from '../features/announcements'; | 11 | import { announcementsStore } from '../features/announcements'; |
12 | import { announcementActions } from '../features/announcements/actions'; | 12 | import { announcementActions } from '../features/announcements/actions'; |
@@ -668,7 +668,7 @@ export default class FranzMenu { | |||
668 | type: 'separator', | 668 | type: 'separator', |
669 | }, { | 669 | }, { |
670 | label: intl.formatMessage(menuItems.lockFerdi), | 670 | label: intl.formatMessage(menuItems.lockFerdi), |
671 | accelerator: `${cmdKey}+${shiftKey}+L`, | 671 | accelerator: `${lockFerdiShortcutKey()}`, |
672 | enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled, | 672 | enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled, |
673 | click() { | 673 | click() { |
674 | actions.settings.update({ | 674 | actions.settings.update({ |
@@ -696,7 +696,7 @@ export default class FranzMenu { | |||
696 | 696 | ||
697 | tpl[0].submenu.unshift({ | 697 | tpl[0].submenu.unshift({ |
698 | label: intl.formatMessage(menuItems.touchId), | 698 | label: intl.formatMessage(menuItems.touchId), |
699 | accelerator: `${cmdKey}+${shiftKey}+L`, | 699 | accelerator: `${lockFerdiShortcutKey()}`, |
700 | visible: touchIdEnabled, | 700 | visible: touchIdEnabled, |
701 | click() { | 701 | click() { |
702 | systemPreferences.promptTouchID(intl.formatMessage(menuItems.touchIdPrompt)).then(() => { | 702 | systemPreferences.promptTouchID(intl.formatMessage(menuItems.touchIdPrompt)).then(() => { |
@@ -875,7 +875,7 @@ export default class FranzMenu { | |||
875 | 875 | ||
876 | menu.push({ | 876 | menu.push({ |
877 | label: intl.formatMessage(menuItems.addNewService), | 877 | label: intl.formatMessage(menuItems.addNewService), |
878 | accelerator: `${cmdKey}+N`, | 878 | accelerator: `${addNewServiceShortcutKey()}`, |
879 | click: () => { | 879 | click: () => { |
880 | this.actions.ui.openSettings({ path: 'recipes' }); | 880 | this.actions.ui.openSettings({ path: 'recipes' }); |
881 | }, | 881 | }, |
@@ -905,7 +905,7 @@ export default class FranzMenu { | |||
905 | label: intl.formatMessage( | 905 | label: intl.formatMessage( |
906 | settings.all.app.isAppMuted ? menuItems.unmuteApp : menuItems.muteApp, | 906 | settings.all.app.isAppMuted ? menuItems.unmuteApp : menuItems.muteApp, |
907 | ).replace('&', '&&'), | 907 | ).replace('&', '&&'), |
908 | accelerator: `${cmdKey}+${shiftKey}+m`, | 908 | accelerator: `${muteFerdiShortcutKey()}`, |
909 | click: () => this.actions.app.toggleMuteApp(), | 909 | click: () => this.actions.app.toggleMuteApp(), |
910 | }, { | 910 | }, { |
911 | type: 'separator', | 911 | type: 'separator', |
@@ -960,7 +960,7 @@ export default class FranzMenu { | |||
960 | ); | 960 | ); |
961 | menu.push({ | 961 | menu.push({ |
962 | label: intl.formatMessage(drawerLabel), | 962 | label: intl.formatMessage(drawerLabel), |
963 | accelerator: `${cmdKey}+D`, | 963 | accelerator: `${workspaceToggleShortcutKey()}`, |
964 | click: () => { | 964 | click: () => { |
965 | workspaceActions.toggleWorkspaceDrawer(); | 965 | workspaceActions.toggleWorkspaceDrawer(); |
966 | }, | 966 | }, |
@@ -1006,7 +1006,7 @@ export default class FranzMenu { | |||
1006 | 1006 | ||
1007 | menu.push({ | 1007 | menu.push({ |
1008 | label: intl.formatMessage(drawerLabel), | 1008 | label: intl.formatMessage(drawerLabel), |
1009 | accelerator: `${cmdKey}+T`, | 1009 | accelerator: `${todosToggleShortcutKey()}`, |
1010 | click: () => { | 1010 | click: () => { |
1011 | todoActions.toggleTodosPanel(); | 1011 | todoActions.toggleTodosPanel(); |
1012 | }, | 1012 | }, |