diff options
author | 2019-09-17 20:37:41 +0200 | |
---|---|---|
committer | 2019-09-17 20:37:41 +0200 | |
commit | 16c183910c2917c58be39e6d25e64ea00cae38d4 (patch) | |
tree | 228058cee613a8987561104a4184ff5b0f244962 /src/lib | |
parent | Update i18n (diff) | |
parent | Merge branch 'develop' (diff) | |
download | ferdium-app-16c183910c2917c58be39e6d25e64ea00cae38d4.tar.gz ferdium-app-16c183910c2917c58be39e6d25e64ea00cae38d4.tar.zst ferdium-app-16c183910c2917c58be39e6d25e64ea00cae38d4.zip |
Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-master
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Menu.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 9d8f1ba81..0c3df8db3 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -582,7 +582,12 @@ const _titleBarTemplateFactory = intl => [ | |||
582 | visible: workspaceStore.isFeatureEnabled, | 582 | visible: workspaceStore.isFeatureEnabled, |
583 | }, | 583 | }, |
584 | { | 584 | { |
585 | label: `&${intl.formatMessage(menuItems.window)}`, | 585 | label: intl.formatMessage(menuItems.todos), |
586 | submenu: [], | ||
587 | visible: todosStore.isFeatureEnabled, | ||
588 | }, | ||
589 | { | ||
590 | label: intl.formatMessage(menuItems.window), | ||
586 | submenu: [ | 591 | submenu: [ |
587 | { | 592 | { |
588 | label: intl.formatMessage(menuItems.minimize), | 593 | label: intl.formatMessage(menuItems.minimize), |
@@ -1001,12 +1006,12 @@ export default class FranzMenu { | |||
1001 | todoActions.toggleTodosPanel(); | 1006 | todoActions.toggleTodosPanel(); |
1002 | }, | 1007 | }, |
1003 | enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser, | 1008 | enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser, |
1004 | }, { | ||
1005 | type: 'separator', | ||
1006 | }); | 1009 | }); |
1007 | 1010 | ||
1008 | if (!isFeatureEnabledByUser) { | 1011 | if (!isFeatureEnabledByUser) { |
1009 | menu.push({ | 1012 | menu.push({ |
1013 | type: 'separator', | ||
1014 | }, { | ||
1010 | label: intl.formatMessage(menuItems.enableTodos), | 1015 | label: intl.formatMessage(menuItems.enableTodos), |
1011 | click: () => { | 1016 | click: () => { |
1012 | todoActions.toggleTodosFeatureVisibility(); | 1017 | todoActions.toggleTodosFeatureVisibility(); |