proper macOS menu (fixes #39)

app/main.js

@@ -108,25 +108,79 @@ setupWindowManagement = () => {
 
 
 setupMenu = () => {
-    var template = [{
+    let template = [{
         label: "Application",
         submenu: [
-            { type: "separator" },
+            { role: 'about', label: 'About Terminus' },
-            { label: "Quit", accelerator: "CmdOrCtrl+Q", click: () => {
+            { type: 'separator' },
-                app.window.webContents.send('host:quit-request')
+            {
-            }}
+                label: 'Preferences',
+                accelerator: 'Cmd+,',
+                click () {
+                    app.window.webContents.send('host:preferences-menu')
+                }
+            },
+            { type: 'separator' },
+            { role: 'services', submenu: [] },
+            { type: 'separator' },
+            { role: 'hide' },
+            { role: 'hideothers' },
+            { role: 'unhide' },
+            { type: 'separator' },
+            {
+                label: 'Quit',
+                accelerator: 'Cmd+Q',
+                click () {
+                    app.window.webContents.send('host:quit-request')
+                }
+            }
         ]
-      },
+    },
-      {
+    {
         label: "Edit",
         submenu: [
-            { label: "Undo", accelerator: "CmdOrCtrl+Z", selector: "undo:" },
+            {role: 'undo'},
-            { label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
+            {role: 'redo'},
-            { type: "separator" },
+            {type: 'separator'},
-            { label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
+            {role: 'cut'},
-            { label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
+            {role: 'copy'},
-            { label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" },
+            {role: 'paste'},
-            { label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
+            {role: 'pasteandmatchstyle'},
+            {role: 'delete'},
+            {role: 'selectall'}
+        ]
+    },
+    {
+        label: 'View',
+        submenu: [
+            {role: 'reload'},
+            {role: 'forcereload'},
+            {role: 'toggledevtools'},
+            {type: 'separator'},
+            {role: 'resetzoom'},
+            {role: 'zoomin'},
+            {role: 'zoomout'},
+            {type: 'separator'},
+            {role: 'togglefullscreen'}
+        ]
+    },
+    {
+        role: 'window',
+        submenu: [
+            {role: 'close'},
+            {role: 'minimize'},
+            {role: 'zoom'},
+            {type: 'separator'},
+            {role: 'front'}
+        ]
+    },
+    {
+        role: 'help',
+        submenu: [
+            {
+                label: 'Website',
+                click () { electron.shell.openExternal('https://eugeny.github.io/terminus') }
+            }
         ]
     }]
 

terminus-core/src/services/hostApp.service.ts

@@ -19,6 +19,7 @@ export class HostAppService {
     platform: Platform
     nodePlatform: string
     quitRequested = new EventEmitter<any>()
+    preferencesMenu$ = new Subject<void>()
     ready = new EventEmitter<any>()
     shown = new EventEmitter<any>()
     secondInstance$ = new Subject<{ argv: string[], cwd: string }>()
@@ -39,6 +40,7 @@ export class HostAppService {
         }[this.nodePlatform]
 
         electron.ipcRenderer.on('host:quit-request', () => this.zone.run(() => this.quitRequested.emit()))
+        electron.ipcRenderer.on('host:preferences-menu', () => this.zone.run(() => this.preferencesMenu$.next()))
 
         electron.ipcRenderer.on('uncaughtException', ($event, err) => {
             this.logger.error('Unhandled exception:', err)

terminus-settings/src/buttonProvider.ts

@@ -1,14 +1,16 @@
 import { Injectable } from '@angular/core'
-import { ToolbarButtonProvider, IToolbarButton, AppService } from 'terminus-core'
+import { ToolbarButtonProvider, IToolbarButton, AppService, HostAppService } from 'terminus-core'
 
 import { SettingsTabComponent } from './components/settingsTab.component'
 
 @Injectable()
 export class ButtonProvider extends ToolbarButtonProvider {
     constructor (
+        hostApp: HostAppService,
         private app: AppService,
     ) {
         super()
+        hostApp.preferencesMenu$.subscribe(() => this.open())
     }
 
     provide (): IToolbarButton[] {
@@ -16,14 +18,16 @@ export class ButtonProvider extends ToolbarButtonProvider {
             icon: 'sliders',
             title: 'Settings',
             weight: 10,
-            click: () => {
+            click: () => this.open(),
-                let settingsTab = this.app.tabs.find((tab) => tab instanceof SettingsTabComponent)
-                if (settingsTab) {
-                    this.app.selectTab(settingsTab)
-                } else {
-                    this.app.openNewTab(SettingsTabComponent)
-                }
-            }
         }]
     }
+
+    open (): void {
+        let settingsTab = this.app.tabs.find((tab) => tab instanceof SettingsTabComponent)
+        if (settingsTab) {
+            this.app.selectTab(settingsTab)
+        } else {
+            this.app.openNewTab(SettingsTabComponent)
+        }
+    }
 }