diff options
author | 2019-09-24 10:55:15 +0700 | |
---|---|---|
committer | 2019-09-24 10:55:15 +0700 | |
commit | d88b04b05b64b6fea38e226c3bf344f58c2ceefb (patch) | |
tree | 37d0453f258414f483c2ce27623b12de6ce1b09f /src/lib | |
parent | Trigger pull request build after replugging Travis (diff) | |
parent | Add darkreader to feature list and changelog (diff) | |
download | ferdium-app-d88b04b05b64b6fea38e226c3bf344f58c2ceefb.tar.gz ferdium-app-d88b04b05b64b6fea38e226c3bf344f58c2ceefb.tar.zst ferdium-app-d88b04b05b64b6fea38e226c3bf344f58c2ceefb.zip |
Merge branch 'master' into feat/macos-signing
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Menu.js | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index f5e55fbfa..5b04346b5 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -69,6 +69,10 @@ const menuItems = defineMessages({ | |||
69 | id: 'menu.edit.emojiSymbols', | 69 | id: 'menu.edit.emojiSymbols', |
70 | defaultMessage: '!!!Emoji & Symbols', | 70 | defaultMessage: '!!!Emoji & Symbols', |
71 | }, | 71 | }, |
72 | openQuickSwitch: { | ||
73 | id: 'menu.view.openQuickSwitch', | ||
74 | defaultMessage: '!!!Open Quick Switch', | ||
75 | }, | ||
72 | back: { | 76 | back: { |
73 | id: 'menu.view.back', | 77 | id: 'menu.view.back', |
74 | defaultMessage: '!!!Back', | 78 | defaultMessage: '!!!Back', |
@@ -336,6 +340,16 @@ const _templateFactory = intl => [ | |||
336 | type: 'separator', | 340 | type: 'separator', |
337 | }, | 341 | }, |
338 | { | 342 | { |
343 | label: intl.formatMessage(menuItems.openQuickSwitch), | ||
344 | accelerator: 'CmdOrCtrl+P', | ||
345 | click() { | ||
346 | window.ferdi.features.quickSwitch.state.isModalVisible = true; | ||
347 | }, | ||
348 | }, | ||
349 | { | ||
350 | type: 'separator', | ||
351 | }, | ||
352 | { | ||
339 | label: intl.formatMessage(menuItems.back), | 353 | label: intl.formatMessage(menuItems.back), |
340 | accelerator: 'CmdOrCtrl+Left', | 354 | accelerator: 'CmdOrCtrl+Left', |
341 | click() { | 355 | click() { |
@@ -994,7 +1008,7 @@ export default class FranzMenu { | |||
994 | 1008 | ||
995 | todosMenu() { | 1009 | todosMenu() { |
996 | const { isTodosPanelVisible, isFeatureEnabledByUser } = this.stores.todos; | 1010 | const { isTodosPanelVisible, isFeatureEnabledByUser } = this.stores.todos; |
997 | const { intl } = window.franz; | 1011 | const { intl } = window.ferdi; |
998 | const menu = []; | 1012 | const menu = []; |
999 | 1013 | ||
1000 | const drawerLabel = isTodosPanelVisible ? menuItems.closeTodosDrawer : menuItems.openTodosDrawer; | 1014 | const drawerLabel = isTodosPanelVisible ? menuItems.closeTodosDrawer : menuItems.openTodosDrawer; |