diff options
author | 2019-04-11 16:44:16 +0200 | |
---|---|---|
committer | 2019-04-11 16:44:16 +0200 | |
commit | eaf4aff646eed56e65c8dd8e70143ab5634ad4b4 (patch) | |
tree | ae400dca67edfd828a30da1e11d7e5e507785860 /src/lib | |
parent | refactor announcements to newest feature pattern (diff) | |
download | ferdium-app-eaf4aff646eed56e65c8dd8e70143ab5634ad4b4.tar.gz ferdium-app-eaf4aff646eed56e65c8dd8e70143ab5634ad4b4.tar.zst ferdium-app-eaf4aff646eed56e65c8dd8e70143ab5634ad4b4.zip |
WIP: announcement feature and workspace fixes
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Menu.js | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 46a347237..3df06e05a 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -6,6 +6,7 @@ import { isMac, ctrlKey, cmdKey } from '../environment'; | |||
6 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index'; | 6 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index'; |
7 | import { workspaceActions } from '../features/workspaces/actions'; | 7 | import { workspaceActions } from '../features/workspaces/actions'; |
8 | import { gaEvent } from './analytics'; | 8 | import { gaEvent } from './analytics'; |
9 | import announcementActions from '../features/announcements/actions'; | ||
9 | 10 | ||
10 | const { app, Menu, dialog } = remote; | 11 | const { app, Menu, dialog } = remote; |
11 | 12 | ||
@@ -160,7 +161,7 @@ const menuItems = defineMessages({ | |||
160 | }, | 161 | }, |
161 | announcement: { | 162 | announcement: { |
162 | id: 'menu.app.announcement', | 163 | id: 'menu.app.announcement', |
163 | defaultMessage: '!!!What\'s new in Franz?', | 164 | defaultMessage: '!!!What\'s new?', |
164 | }, | 165 | }, |
165 | settings: { | 166 | settings: { |
166 | id: 'menu.app.settings', | 167 | id: 'menu.app.settings', |
@@ -352,8 +353,10 @@ const _templateFactory = intl => [ | |||
352 | click() { shell.openExternal('https://meetfranz.com'); }, | 353 | click() { shell.openExternal('https://meetfranz.com'); }, |
353 | }, | 354 | }, |
354 | { | 355 | { |
355 | label: intl.formatMessage(menuItems.changelog), | 356 | label: intl.formatMessage(menuItems.announcement), |
356 | click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); }, | 357 | click: () => { |
358 | announcementActions.show(); | ||
359 | }, | ||
357 | }, | 360 | }, |
358 | { | 361 | { |
359 | type: 'separator', | 362 | type: 'separator', |
@@ -622,12 +625,6 @@ export default class FranzMenu { | |||
622 | role: 'about', | 625 | role: 'about', |
623 | }, | 626 | }, |
624 | { | 627 | { |
625 | label: intl.formatMessage(menuItems.announcement), | ||
626 | click: () => { | ||
627 | this.actions.announcements.show(); | ||
628 | }, | ||
629 | }, | ||
630 | { | ||
631 | type: 'separator', | 628 | type: 'separator', |
632 | }, | 629 | }, |
633 | { | 630 | { |