diff options
author | vantezzen <hello@vantezzen.io> | 2019-10-02 13:57:24 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2019-10-02 13:57:24 +0200 |
commit | 53c16e91b58d0abe3cde88acd05fddbdfc3c683c (patch) | |
tree | 6b3394aabdedc070f6b9e179457627b435b69ad9 /src/lib | |
parent | Fix Ferdi Lock not corrently locking (diff) | |
parent | fix(Spell check): Fix spell checker to initialize without loaded dictionary (diff) | |
download | ferdium-app-53c16e91b58d0abe3cde88acd05fddbdfc3c683c.tar.gz ferdium-app-53c16e91b58d0abe3cde88acd05fddbdfc3c683c.tar.zst ferdium-app-53c16e91b58d0abe3cde88acd05fddbdfc3c683c.zip |
Merge branch 'release/5.4.0' of https://github.com/meetfranz/franz into franz-5.4.0
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Menu.js | 7 | ||||
-rw-r--r-- | src/lib/TouchBar.js | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index beaafb4d1..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), |
@@ -985,6 +988,10 @@ export default class FranzMenu { | |||
985 | checked: service.isActive, | 988 | checked: service.isActive, |
986 | click: () => { | 989 | click: () => { |
987 | 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 | } | ||
988 | }, | 995 | }, |
989 | }))); | 996 | }))); |
990 | 997 | ||
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js index 97c02d194..1de46d2a3 100644 --- a/src/lib/TouchBar.js +++ b/src/lib/TouchBar.js | |||
@@ -29,7 +29,7 @@ export default class FranzTouchBar { | |||
29 | const { TouchBarButton, TouchBarSpacer } = TouchBar; | 29 | const { TouchBarButton, TouchBarSpacer } = TouchBar; |
30 | 30 | ||
31 | const buttons = []; | 31 | const buttons = []; |
32 | this.stores.services.enabled.forEach(((service) => { | 32 | this.stores.services.allDisplayed.forEach(((service) => { |
33 | buttons.push(new TouchBarButton({ | 33 | buttons.push(new TouchBarButton({ |
34 | label: `${service.name}${service.unreadDirectMessageCount > 0 | 34 | label: `${service.name}${service.unreadDirectMessageCount > 0 |
35 | ? ' 🔴' : ''} ${service.unreadDirectMessageCount === 0 | 35 | ? ' 🔴' : ''} ${service.unreadDirectMessageCount === 0 |
@@ -42,7 +42,7 @@ export default class FranzTouchBar { | |||
42 | }), new TouchBarSpacer({ size: 'small' })); | 42 | }), new TouchBarSpacer({ size: 'small' })); |
43 | })); | 43 | })); |
44 | 44 | ||
45 | const touchBar = new TouchBar(buttons); | 45 | const touchBar = new TouchBar({ items: buttons }); |
46 | currentWindow.setTouchBar(touchBar); | 46 | currentWindow.setTouchBar(touchBar); |
47 | } else { | 47 | } else { |
48 | currentWindow.setTouchBar(null); | 48 | currentWindow.setTouchBar(null); |