diff options
-rw-r--r-- | src/lib/Menu.js | 59 | ||||
-rw-r--r-- | src/stores/AppStore.js | 11 |
2 files changed, 47 insertions, 23 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index a6cde4d36..c29cd00ae 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -1,9 +1,9 @@ | |||
1 | import { remote, shell } from 'electron'; | 1 | import { remote, shell } from 'electron'; |
2 | import { autorun, computed, observable, toJS } from 'mobx'; | 2 | import { autorun, computed, observable, toJS } from 'mobx'; |
3 | 3 | ||
4 | import { isDevMode, isMac } from '../environment'; | 4 | import { isMac } from '../environment'; |
5 | 5 | ||
6 | const { app, Menu } = remote; | 6 | const { app, Menu, dialog } = remote; |
7 | 7 | ||
8 | const template = [ | 8 | const template = [ |
9 | { | 9 | { |
@@ -84,6 +84,28 @@ const template = [ | |||
84 | label: 'Learn More', | 84 | label: 'Learn More', |
85 | click() { shell.openExternal('http://meetfranz.com'); }, | 85 | click() { shell.openExternal('http://meetfranz.com'); }, |
86 | }, | 86 | }, |
87 | { | ||
88 | label: 'Changelog', | ||
89 | click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); }, | ||
90 | }, | ||
91 | { | ||
92 | type: 'separator', | ||
93 | }, | ||
94 | { | ||
95 | label: 'Support', | ||
96 | click() { shell.openExternal('http://meetfranz.com/support'); }, | ||
97 | }, | ||
98 | { | ||
99 | type: 'separator', | ||
100 | }, | ||
101 | { | ||
102 | label: 'Terms of Service', | ||
103 | click() { shell.openExternal('https://meetfranz.com/terms'); }, | ||
104 | }, | ||
105 | { | ||
106 | label: 'Privacy Statement', | ||
107 | click() { shell.openExternal('https://meetfranz.com/privacy'); }, | ||
108 | }, | ||
87 | ], | 109 | ], |
88 | }, | 110 | }, |
89 | ]; | 111 | ]; |
@@ -101,17 +123,16 @@ export default class FranzMenu { | |||
101 | _build() { | 123 | _build() { |
102 | const tpl = toJS(this.tpl); | 124 | const tpl = toJS(this.tpl); |
103 | 125 | ||
104 | if (isDevMode) { | 126 | tpl[1].submenu.push({ |
105 | tpl[1].submenu.push({ | 127 | role: 'toggledevtools', |
106 | role: 'toggledevtools', | 128 | }, { |
107 | }, { | 129 | label: 'Toggle Service Developer Tools', |
108 | label: 'Toggle Service Developer Tools', | 130 | accelerator: 'CmdOrCtrl+Shift+Alt+i', |
109 | accelerator: 'CmdOrCtrl+Shift+Alt+i', | 131 | click: () => { |
110 | click: () => { | 132 | this.actions.service.openDevToolsForActiveService(); |
111 | this.actions.service.openDevToolsForActiveService(); | 133 | }, |
112 | }, | 134 | }); |
113 | }); | 135 | |
114 | } | ||
115 | 136 | ||
116 | tpl[1].submenu.unshift({ | 137 | tpl[1].submenu.unshift({ |
117 | label: 'Reload Service', | 138 | label: 'Reload Service', |
@@ -218,6 +239,18 @@ export default class FranzMenu { | |||
218 | role: 'front', | 239 | role: 'front', |
219 | }, | 240 | }, |
220 | ]; | 241 | ]; |
242 | } else { | ||
243 | tpl[4].submenu.unshift({ | ||
244 | role: 'about', | ||
245 | click: () => { | ||
246 | dialog.showMessageBox({ | ||
247 | type: 'info', | ||
248 | title: 'Franz', | ||
249 | message: 'Franz', | ||
250 | detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`, | ||
251 | }); | ||
252 | }, | ||
253 | }); | ||
221 | } | 254 | } |
222 | 255 | ||
223 | const serviceTpl = this.serviceTpl; | 256 | const serviceTpl = this.serviceTpl; |
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 7dbef985d..4cfe6d0b5 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -13,7 +13,7 @@ import locales from '../i18n/translations'; | |||
13 | import { gaEvent } from '../lib/analytics'; | 13 | import { gaEvent } from '../lib/analytics'; |
14 | import Miner from '../lib/Miner'; | 14 | import Miner from '../lib/Miner'; |
15 | 15 | ||
16 | const { app, getCurrentWindow, powerMonitor } = remote; | 16 | const { app, powerMonitor } = remote; |
17 | const defaultLocale = 'en-US'; | 17 | const defaultLocale = 'en-US'; |
18 | 18 | ||
19 | export default class AppStore extends Store { | 19 | export default class AppStore extends Store { |
@@ -112,15 +112,6 @@ export default class AppStore extends Store { | |||
112 | setTimeout(window.location.reload, 5000); | 112 | setTimeout(window.location.reload, 5000); |
113 | }); | 113 | }); |
114 | 114 | ||
115 | // Open Dev Tools (even in production mode) | ||
116 | key('⌘+ctrl+shift+alt+i, ctrl+shift+alt+i', () => { | ||
117 | getCurrentWindow().toggleDevTools(); | ||
118 | }); | ||
119 | |||
120 | key('⌘+ctrl+shift+alt+pageup, ctrl+shift+alt+pageup', () => { | ||
121 | this.actions.service.openDevToolsForActiveService(); | ||
122 | }); | ||
123 | |||
124 | // Set active the next service | 115 | // Set active the next service |
125 | key( | 116 | key( |
126 | '⌘+pagedown, ctrl+pagedown, ⌘+shift+tab, ctrl+shift+tab', () => { | 117 | '⌘+pagedown, ctrl+pagedown, ⌘+shift+tab, ctrl+shift+tab', () => { |