diff options
Diffstat (limited to 'src/lib/Menu.js')
-rw-r--r-- | src/lib/Menu.js | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 80fa0e463..7e336c994 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -325,6 +325,9 @@ const _templateFactory = intl => [ | |||
325 | label: intl.formatMessage(menuItems.pasteAndMatchStyle), | 325 | label: intl.formatMessage(menuItems.pasteAndMatchStyle), |
326 | accelerator: 'Cmd+Shift+V', | 326 | accelerator: 'Cmd+Shift+V', |
327 | selector: 'pasteAndMatchStyle:', | 327 | selector: 'pasteAndMatchStyle:', |
328 | click() { | ||
329 | getActiveWebview().pasteAndMatchStyle(); | ||
330 | }, | ||
328 | }, | 331 | }, |
329 | { | 332 | { |
330 | label: intl.formatMessage(menuItems.delete), | 333 | label: intl.formatMessage(menuItems.delete), |
@@ -345,7 +348,7 @@ const _templateFactory = intl => [ | |||
345 | }, | 348 | }, |
346 | { | 349 | { |
347 | label: intl.formatMessage(menuItems.openQuickSwitch), | 350 | label: intl.formatMessage(menuItems.openQuickSwitch), |
348 | accelerator: 'CmdOrCtrl+P', | 351 | accelerator: 'CmdOrCtrl+S', |
349 | click() { | 352 | click() { |
350 | window.ferdi.features.quickSwitch.state.isModalVisible = true; | 353 | window.ferdi.features.quickSwitch.state.isModalVisible = true; |
351 | }, | 354 | }, |
@@ -549,7 +552,7 @@ const _titleBarTemplateFactory = intl => [ | |||
549 | }, | 552 | }, |
550 | { | 553 | { |
551 | label: intl.formatMessage(menuItems.openQuickSwitch), | 554 | label: intl.formatMessage(menuItems.openQuickSwitch), |
552 | accelerator: 'CmdOrCtrl+P', | 555 | accelerator: 'CmdOrCtrl+S', |
553 | click() { | 556 | click() { |
554 | window.ferdi.features.quickSwitch.state.isModalVisible = true; | 557 | window.ferdi.features.quickSwitch.state.isModalVisible = true; |
555 | }, | 558 | }, |
@@ -783,12 +786,21 @@ export default class FranzMenu { | |||
783 | accelerator: 'CmdOrCtrl+Shift+L', | 786 | accelerator: 'CmdOrCtrl+Shift+L', |
784 | enabled: this.stores.settings.app.lockingFeatureEnabled, | 787 | enabled: this.stores.settings.app.lockingFeatureEnabled, |
785 | click() { | 788 | click() { |
789 | // Disable lock first - otherwise the application might not update correctly | ||
786 | actions.settings.update({ | 790 | actions.settings.update({ |
787 | type: 'app', | 791 | type: 'app', |
788 | data: { | 792 | data: { |
789 | locked: true, | 793 | locked: false, |
790 | }, | 794 | }, |
791 | }); | 795 | }); |
796 | setTimeout(() => { | ||
797 | actions.settings.update({ | ||
798 | type: 'app', | ||
799 | data: { | ||
800 | locked: true, | ||
801 | }, | ||
802 | }); | ||
803 | }, 0); | ||
792 | }, | 804 | }, |
793 | }); | 805 | }); |
794 | 806 | ||
@@ -976,6 +988,10 @@ export default class FranzMenu { | |||
976 | checked: service.isActive, | 988 | checked: service.isActive, |
977 | click: () => { | 989 | click: () => { |
978 | this.actions.service.setActive({ serviceId: service.id }); | 990 | this.actions.service.setActive({ serviceId: service.id }); |
991 | |||
992 | if (isMac && i === 0) { | ||
993 | app.mainWindow.restore(); | ||
994 | } | ||
979 | }, | 995 | }, |
980 | }))); | 996 | }))); |
981 | 997 | ||