Merge branch 'develop' into fix-theme-change

1 files changed, 47 insertions, 14 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index a6cde4d36..6bbf302ca 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,9 +1,9 @@
 import { remote, shell } from 'electron';
 import { autorun, computed, observable, toJS } from 'mobx';
 
-import { isDevMode, isMac } from '../environment';
+import { isMac, isLinux } from '../environment';
 
-const { app, Menu } = remote;
+const { app, Menu, dialog } = remote;
 
 const template = [
   {
@@ -84,6 +84,28 @@ const template = [
         label: 'Learn More',
         click() { shell.openExternal('http://meetfranz.com'); },
       },
+      {
+        label: 'Changelog',
+        click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: 'Support',
+        click() { shell.openExternal('http://meetfranz.com/support'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: 'Terms of Service',
+        click() { shell.openExternal('https://meetfranz.com/terms'); },
+      },
+      {
+        label: 'Privacy Statement',
+        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+      },
     ],
   },
 ];
@@ -101,17 +123,15 @@ export default class FranzMenu {
   _build() {
     const tpl = toJS(this.tpl);
 
-    if (isDevMode) {
-      tpl[1].submenu.push({
-        role: 'toggledevtools',
-      }, {
-        label: 'Toggle Service Developer Tools',
-        accelerator: 'CmdOrCtrl+Shift+Alt+i',
-        click: () => {
-          this.actions.service.openDevToolsForActiveService();
-        },
-      });
-    }
+    tpl[1].submenu.push({
+      role: 'toggledevtools',
+    }, {
+      label: 'Toggle Service Developer Tools',
+      accelerator: 'CmdOrCtrl+Shift+Alt+i',
+      click: () => {
+        this.actions.service.openDevToolsForActiveService();
+      },
+    });
 
     tpl[1].submenu.unshift({
       label: 'Reload Service',
@@ -218,6 +238,18 @@ export default class FranzMenu {
           role: 'front',
         },
       ];
+    } else {
+      tpl[4].submenu.unshift({
+        role: 'about',
+        click: () => {
+          dialog.showMessageBox({
+            type: 'info',
+            title: 'Franz',
+            message: 'Franz',
+            detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
+          });
+        },
+      });
     }
 
     const serviceTpl = this.serviceTpl;
@@ -244,9 +276,10 @@ export default class FranzMenu {
     const services = this.stores.services.enabled;
 
     if (this.stores.user.isLoggedIn) {
+      const systemAcceleratorKey = isLinux ? 'Alt' : 'CmdOrCtrl';
       return services.map((service, i) => ({
         label: service.name,
-        accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null,
+        accelerator: i <= 9 ? `${systemAcceleratorKey}+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
         click: () => {