aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Menu.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index c29cd00ae..6bbf302ca 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,7 +1,7 @@
1import { remote, shell } from 'electron'; 1import { remote, shell } from 'electron';
2import { autorun, computed, observable, toJS } from 'mobx'; 2import { autorun, computed, observable, toJS } from 'mobx';
3 3
4import { isMac } from '../environment'; 4import { isMac, isLinux } from '../environment';
5 5
6const { app, Menu, dialog } = remote; 6const { app, Menu, dialog } = remote;
7 7
@@ -133,7 +133,6 @@ export default class FranzMenu {
133 }, 133 },
134 }); 134 });
135 135
136
137 tpl[1].submenu.unshift({ 136 tpl[1].submenu.unshift({
138 label: 'Reload Service', 137 label: 'Reload Service',
139 id: 'reloadService', 138 id: 'reloadService',
@@ -277,9 +276,10 @@ export default class FranzMenu {
277 const services = this.stores.services.enabled; 276 const services = this.stores.services.enabled;
278 277
279 if (this.stores.user.isLoggedIn) { 278 if (this.stores.user.isLoggedIn) {
279 const systemAcceleratorKey = isLinux ? 'Alt' : 'CmdOrCtrl';
280 return services.map((service, i) => ({ 280 return services.map((service, i) => ({
281 label: service.name, 281 label: service.name,
282 accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null, 282 accelerator: i <= 9 ? `${systemAcceleratorKey}+${i + 1}` : null,
283 type: 'radio', 283 type: 'radio',
284 checked: service.isActive, 284 checked: service.isActive,
285 click: () => { 285 click: () => {