Revert system menu layout (#671)

src/main/menu.ts

@@ -15,13 +15,17 @@ export function initMenu(windowManager: WindowManager) {
 }
 
 export function buildMenu(windowManager: WindowManager) {
-  function macOnly(menuItems: MenuItemConstructorOptions[]) {
+  function ignoreOnMac(menuItems: MenuItemConstructorOptions[]) {
-    if (!isMac) return [];
+    if (isMac) return [];
     return menuItems;
   }
 
   function activeClusterOnly(menuItems: MenuItemConstructorOptions[]) {
-    if (!windowManager.activeClusterId) return [];
+    if (!windowManager.activeClusterId) {
+      menuItems.forEach(item => {
+        item.enabled = false
+      });
+    }
     return menuItems;
   }
 
@@ -34,8 +38,57 @@ export function buildMenu(windowManager: WindowManager) {
     })
   }
 
+  function showAbout(browserWindow: BrowserWindow) {
+    const appInfo = [
+      `${appName}: ${app.getVersion()}`,
+      `Electron: ${process.versions.electron}`,
+      `Chrome: ${process.versions.chrome}`,
+      `Copyright 2020 Lakend Labs, Inc.`,
+    ]
+    dialog.showMessageBoxSync(browserWindow, {
+      title: `${isWindows ? " ".repeat(2) : ""}${appName}`,
+      type: "info",
+      buttons: ["Close"],
+      message: `Lens`,
+      detail: appInfo.join("\r\n")
+    })
+  }
+
+  const mt: MenuItemConstructorOptions[] = [];
+
+  const macAppMenu: MenuItemConstructorOptions = {
+    label: app.getName(),
+    submenu: [
+      {
+        label: "About Lens",
+        click(menuItem: MenuItem, browserWindow: BrowserWindow) {
+          showAbout(browserWindow)
+        }
+      },
+      { type: 'separator' },
+      {
+        label: 'Preferences',
+        click() {
+          navigate(preferencesURL())
+        }
+      },
+      { type: 'separator' },
+      { role: 'services' },
+      { type: 'separator' },
+      { role: 'hide' },
+      { role: 'hideOthers' },
+      { role: 'unhide' },
+      { type: 'separator' },
+      { role: 'quit' }
+    ]
+  };
+
+  if (isMac) {
+    mt.push(macAppMenu);
+  }
+
   const fileMenu: MenuItemConstructorOptions = {
-    label: isMac ? app.getName() : "File",
+    label: "File",
     submenu: [
       {
         label: 'Add Cluster',
@@ -51,25 +104,20 @@ export function buildMenu(windowManager: WindowManager) {
           }
         }
       ]),
-      { type: 'separator' },
+      ...ignoreOnMac([
-      {
-        label: 'Preferences',
-        click() {
-          navigate(preferencesURL())
-        }
-      },
-      ...macOnly([
         { type: 'separator' },
-        { role: 'services' },
+        {
+          label: 'Preferences',
+          click() {
+            navigate(preferencesURL())
+          }
+        },
         { type: 'separator' },
-        { role: 'hide' },
+        { role: 'quit' }
-        { role: 'hideOthers' },
+      ])
-        { role: 'unhide' },
-      ]),
-      { type: 'separator' },
-      { role: 'quit' }
     ]
   };
+  mt.push(fileMenu)
 
   const editMenu: MenuItemConstructorOptions = {
     label: 'Edit',
@@ -85,7 +133,7 @@ export function buildMenu(windowManager: WindowManager) {
       { role: 'selectAll' },
     ]
   };
-
+  mt.push(editMenu)
   const viewMenu: MenuItemConstructorOptions = {
     label: 'View',
     submenu: [
@@ -128,16 +176,11 @@ export function buildMenu(windowManager: WindowManager) {
       { role: 'togglefullscreen' }
     ]
   };
+  mt.push(viewMenu)
 
   const helpMenu: MenuItemConstructorOptions = {
     role: 'help',
     submenu: [
-      {
-        label: "What's new?",
-        click() {
-          navigate(whatsNewURL())
-        },
-      },
       {
         label: "License",
         click: async () => {
@@ -157,27 +200,23 @@ export function buildMenu(windowManager: WindowManager) {
         },
       },
       {
-        label: "About Lens",
+        label: "What's new?",
-        click(menuItem: MenuItem, browserWindow: BrowserWindow) {
+        click() {
-          const appInfo = [
+          navigate(whatsNewURL())
-            `${appName}: ${app.getVersion()}`,
+        },
-            `Electron: ${process.versions.electron}`,
+      },
-            `Chrome: ${process.versions.chrome}`,
+      ...ignoreOnMac([
-            `Copyright 2020 Lakend Labs, Inc.`,
+        {
-          ]
+          label: "About Lens",
-          dialog.showMessageBoxSync(browserWindow, {
+          click(menuItem: MenuItem, browserWindow: BrowserWindow) {
-            title: `${isWindows ? " ".repeat(2) : ""}${appName}`,
+            showAbout(browserWindow)
-            type: "info",
+          }
-            buttons: ["Close"],
-            message: `Lens`,
-            detail: appInfo.join("\r\n")
-          })
         }
-      }
+      ])
     ]
   };
 
-  Menu.setApplicationMenu(Menu.buildFromTemplate([
+  mt.push(helpMenu)
-    fileMenu, editMenu, viewMenu, helpMenu
+
-  ]));
+  Menu.setApplicationMenu(Menu.buildFromTemplate(mt));
 }