1 files changed, 152 insertions, 39 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index c0c9d940d..d7398a126 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -3,12 +3,11 @@ import { observable, autorun } from 'mobx';
 import { defineMessages } from 'react-intl';
 
 import { isMac, ctrlKey, cmdKey } from '../environment';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index';
+import { workspaceStore } from '../features/workspaces/index';
 import { workspaceActions } from '../features/workspaces/actions';
-import { gaEvent } from './analytics';
 import { announcementActions } from '../features/announcements/actions';
 import { announcementsStore } from '../features/announcements';
-import { GA_CATEGORY_TODOS, todosStore } from '../features/todos';
+import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { CUSTOM_WEBSITE_ID } from '../features/webControls/constants';
 
@@ -71,6 +70,18 @@ const menuItems = defineMessages({
     id: 'menu.edit.emojiSymbols',
     defaultMessage: '!!!Emoji & Symbols',
   },
+  openQuickSwitch: {
+    id: 'menu.view.openQuickSwitch',
+    defaultMessage: '!!!Open Quick Switch',
+  },
+  back: {
+    id: 'menu.view.back',
+    defaultMessage: '!!!Back',
+  },
+  forward: {
+    id: 'menu.view.forward',
+    defaultMessage: '!!!Forward',
+  },
   resetZoom: {
     id: 'menu.view.resetZoom',
     defaultMessage: '!!!Actual Size',
@@ -113,7 +124,11 @@ const menuItems = defineMessages({
   },
   reloadFranz: {
     id: 'menu.view.reloadFranz',
-    defaultMessage: '!!!Reload Franz',
+    defaultMessage: '!!!Reload Ferdi',
+  },
+  lockFerdi: {
+    id: 'menu.view.lockFerdi',
+    defaultMessage: '!!!Lock Ferdi',
   },
   minimize: {
     id: 'menu.window.minimize',
@@ -141,7 +156,7 @@ const menuItems = defineMessages({
   },
   debugInfoCopiedHeadline: {
     id: 'menu.help.debugInfoCopiedHeadline',
-    defaultMessage: '!!!Franz Debug Information',
+    defaultMessage: '!!!Ferdi Debug Information',
   },
   debugInfoCopiedBody: {
     id: 'menu.help.debugInfoCopiedBody',
@@ -177,7 +192,7 @@ const menuItems = defineMessages({
   },
   about: {
     id: 'menu.app.about',
-    defaultMessage: '!!!About Franz',
+    defaultMessage: '!!!About Ferdi',
   },
   announcement: {
     id: 'menu.app.announcement',
@@ -203,6 +218,10 @@ const menuItems = defineMessages({
     id: 'menu.app.unhide',
     defaultMessage: '!!!Unhide',
   },
+  autohideMenuBar: {
+    id: 'menu.app.autohideMenuBar',
+    defaultMessage: '!!!Auto-hide menu bar',
+  },
   quit: {
     id: 'menu.app.quit',
     defaultMessage: '!!!Quit',
@@ -270,7 +289,11 @@ const menuItems = defineMessages({
 });
 
 function getActiveWebview() {
-  return window.franz.stores.services.active.webview;
+  return window.ferdi.stores.services.active.webview;
+}
+
+function termsBase() {
+  return window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
 }
 
 const _templateFactory = intl => [
@@ -329,6 +352,35 @@ const _templateFactory = intl => [
         type: 'separator',
       },
       {
+        label: intl.formatMessage(menuItems.openQuickSwitch),
+        accelerator: 'CmdOrCtrl+S',
+        click() {
+          window.ferdi.features.quickSwitch.state.isModalVisible = true;
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.back),
+        accelerator: 'CmdOrCtrl+Left',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.goBack();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.forward),
+        accelerator: 'CmdOrCtrl+Right',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.goForward();
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
         label: intl.formatMessage(menuItems.resetZoom),
         accelerator: 'Cmd+0',
         click() {
@@ -402,32 +454,32 @@ const _templateFactory = intl => [
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal('https://meetfranz.com'); },
+        click() { shell.openExternal('https://getferdi.com'); },
       },
       {
         label: intl.formatMessage(menuItems.announcement),
         click: () => {
           announcementActions.show();
         },
-        visible: window.franz.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
+        visible: window.ferdi.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal('https://meetfranz.com/support'); },
+        click() { shell.openExternal('https://getferdi.com/contact'); },
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://meetfranz.com/terms'); },
+        click() { shell.openExternal(`${termsBase()}/terms`); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+        click() { shell.openExternal(`${termsBase()}/privacy`); },
       },
     ],
   },
@@ -435,7 +487,7 @@ const _templateFactory = intl => [
 
 const _titleBarTemplateFactory = intl => [
   {
-    label: intl.formatMessage(menuItems.edit),
+    label: `&${intl.formatMessage(menuItems.edit)}`,
     submenu: [
       {
         label: intl.formatMessage(menuItems.undo),
@@ -498,12 +550,41 @@ const _titleBarTemplateFactory = intl => [
     ],
   },
   {
-    label: intl.formatMessage(menuItems.view),
+    label: `&${intl.formatMessage(menuItems.view)}`,
     submenu: [
       {
         type: 'separator',
       },
       {
+        label: intl.formatMessage(menuItems.openQuickSwitch),
+        accelerator: 'CmdOrCtrl+S',
+        click() {
+          window.ferdi.features.quickSwitch.state.isModalVisible = true;
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.back),
+        accelerator: 'CmdOrCtrl+Left',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.goBack();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.forward),
+        accelerator: 'CmdOrCtrl+Right',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.goForward();
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
         label: intl.formatMessage(menuItems.resetZoom),
         accelerator: `${ctrlKey}+0`,
         click() {
@@ -544,14 +625,27 @@ const _titleBarTemplateFactory = intl => [
           browserWindow.setFullScreen(!browserWindow.isFullScreen());
         },
       },
+      {
+        label: intl.formatMessage(menuItems.autohideMenuBar),
+        type: 'checkbox',
+        checked: window.ferdi.stores.settings.app.autohideMenuBar,
+        click: () => {
+          window.ferdi.actions.settings.update({
+            type: 'app',
+            data: {
+              autohideMenuBar: !window.ferdi.stores.settings.app.autohideMenuBar,
+            },
+          });
+        },
+      },
     ],
   },
   {
-    label: intl.formatMessage(menuItems.services),
+    label: `&${intl.formatMessage(menuItems.services)}`,
     submenu: [],
   },
   {
-    label: intl.formatMessage(menuItems.workspaces),
+    label: `&${intl.formatMessage(menuItems.workspaces)}`,
     submenu: [],
     visible: workspaceStore.isFeatureEnabled,
   },
@@ -580,33 +674,33 @@ const _titleBarTemplateFactory = intl => [
     ],
   },
   {
-    label: '?',
+    label: '&?',
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal('https://meetfranz.com'); },
+        click() { shell.openExternal('https://getferdi.com'); },
       },
       {
         label: intl.formatMessage(menuItems.changelog),
-        click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
+        click() { shell.openExternal('https://github.com/getferdi/ferdi/blob/master/CHANGELOG.md'); },
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal('https://meetfranz.com/support'); },
+        click() { shell.openExternal('https://getferdi.com/contact'); },
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://meetfranz.com/terms'); },
+        click() { shell.openExternal(`${termsBase()}/terms`); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+        click() { shell.openExternal(`${termsBase()}/privacy`); },
       },
     ],
   },
@@ -637,13 +731,14 @@ export default class FranzMenu {
     const serviceTpl = Object.assign([], this.serviceTpl());
 
     // Don't initialize when window.franz is undefined or when we are on a payment window route
-    if (window.franz === undefined || this.stores.router.location.pathname.startsWith('/payment/')) {
+    if (window.ferdi === undefined || this.stores.router.location.pathname.startsWith('/payment/')) {
       console.log('skipping menu init');
       return;
     }
 
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl);
+    const { actions } = this;
 
     tpl[1].submenu.push({
       type: 'separator',
@@ -695,10 +790,33 @@ export default class FranzMenu {
       click: () => {
         window.location.reload();
       },
+    }, {
+      type: 'separator',
+    }, {
+      label: intl.formatMessage(menuItems.lockFerdi),
+      accelerator: 'CmdOrCtrl+Shift+L',
+      enabled: this.stores.settings.app.lockingFeatureEnabled,
+      click() {
+        // Disable lock first - otherwise the application might not update correctly
+        actions.settings.update({
+          type: 'app',
+          data: {
+            locked: false,
+          },
+        });
+        setTimeout(() => {
+          actions.settings.update({
+            type: 'app',
+            data: {
+              locked: true,
+            },
+          });
+        }, 0);
+      },
     });
 
     tpl.unshift({
-      label: isMac ? app.getName() : intl.formatMessage(menuItems.file),
+      label: isMac ? app.getName() : `&${intl.formatMessage(menuItems.file)}`,
       submenu: [
         {
           label: intl.formatMessage(menuItems.about),
@@ -762,9 +880,9 @@ export default class FranzMenu {
       click: () => {
         dialog.showMessageBox({
           type: 'info',
-          title: 'Franz',
-          message: 'Franz',
-          detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
+          title: 'Franz Ferdinand',
+          message: 'Ferdi',
+          detail: `Version: ${remote.app.getVersion()} (${process.arch})\nElectron: ${process.versions.electron}\nNode.js: ${process.version}\nPlatform: ${process.platform}`,
         });
       },
     };
@@ -816,7 +934,7 @@ export default class FranzMenu {
         },
       ];
 
-      tpl[5].submenu.push({
+      tpl[tpl.length - 1].submenu.push({
         type: 'separator',
       }, about);
     }
@@ -843,7 +961,7 @@ export default class FranzMenu {
   }
 
   serviceTpl() {
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const { user, services, settings } = this.stores;
     if (!user.isLoggedIn) return [];
     const menu = [];
@@ -903,7 +1021,7 @@ export default class FranzMenu {
 
   workspacesMenu() {
     const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } = workspaceStore;
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const menu = [];
 
     // Add new workspace item:
@@ -925,7 +1043,6 @@ export default class FranzMenu {
       accelerator: `${cmdKey}+D`,
       click: () => {
         workspaceActions.toggleWorkspaceDrawer();
-        gaEvent(GA_CATEGORY_WORKSPACES, 'toggleDrawer', 'menu');
       },
       enabled: this.stores.user.isLoggedIn,
     }, {
@@ -940,7 +1057,6 @@ export default class FranzMenu {
       checked: !activeWorkspace,
       click: () => {
         workspaceActions.deactivate();
-        gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
       },
     });
 
@@ -953,7 +1069,6 @@ export default class FranzMenu {
         checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
         click: () => {
           workspaceActions.activate({ workspace });
-          gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
         },
       }));
     }
@@ -963,7 +1078,7 @@ export default class FranzMenu {
 
   todosMenu() {
     const { isTodosPanelVisible, isFeatureEnabledByUser } = this.stores.todos;
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const menu = [];
 
     const drawerLabel = isTodosPanelVisible ? menuItems.closeTodosDrawer : menuItems.openTodosDrawer;
@@ -973,7 +1088,6 @@ export default class FranzMenu {
       accelerator: `${cmdKey}+T`,
       click: () => {
         todoActions.toggleTodosPanel();
-        gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu');
       },
       enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser,
     });
@@ -985,7 +1099,6 @@ export default class FranzMenu {
         label: intl.formatMessage(menuItems.enableTodos),
         click: () => {
           todoActions.toggleTodosFeatureVisibility();
-          gaEvent(GA_CATEGORY_TODOS, 'enable', 'menu');
         },
       });
     }
@@ -995,7 +1108,7 @@ export default class FranzMenu {
 
 
   debugMenu() {
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
 
     return {
       label: intl.formatMessage(menuItems.debugInfo),
@@ -1021,7 +1134,7 @@ export default class FranzMenu {
       return service.name;
     }
 
-    let name = service.recipe.name;
+    let { name } = service.recipe;
 
     if (service.team) {
       name = `${name} (${service.team})`;