Merge branch 'master' of github.com:Eugeny/terminus

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-plugin-manager/src/services/pluginManager.service.ts

@@ -41,6 +41,9 @@ export class PluginManagerService {
 
     async detectPath () {
         this.npmPath = this.config.store.npm
+        if (await fs.exists(this.npmPath)) {
+            return
+        }
         if (this.hostApp.platform !== Platform.Windows) {
             let searchPaths = (await exec('bash -c -l "echo $PATH"'))[0].toString().trim().split(':')
             for (let searchPath of searchPaths) {

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)
+        }
+    }
 }

terminus-terminal/src/components/terminalTab.component.ts

@@ -69,6 +69,15 @@ export class TerminalTabComponent extends BaseTabComponent {
             this.session.releaseInitialDataBuffer()
         })
         this.hotkeysSubscription = this.hotkeys.matchedHotkey.subscribe(hotkey => {
+            if (!this.hasFocus) {
+                return
+            }
+            if (hotkey === 'copy') {
+                this.hterm.copySelectionToClipboard()
+            }
+            if (hotkey === 'clear') {
+                this.clear()
+            }
             if (hotkey === 'zoom-in') {
                 this.zoomIn()
             }
@@ -228,6 +237,11 @@ export class TerminalTabComponent extends BaseTabComponent {
         this.io.writeUTF8(data)
     }
 
+    clear () {
+        this.hterm.wipeContents()
+        this.hterm.onVTKeystroke('\f')
+    }
+
     async configure (): Promise<void> {
         let config = this.config.store
         preferenceManager.set('font-family', config.terminal.font)

terminus-terminal/src/config.ts

@@ -44,6 +44,12 @@ export class TerminalConfigProvider extends ConfigProvider {
                 shell: '~default-shell~',
             },
             hotkeys: {
+                'copy': [
+                    '⌘-C',
+                ],
+                'clear': [
+                    '⌘-K',
+                ],
                 'zoom-in': [
                     '⌘-=',
                     '⌘-Shift-+',
@@ -69,6 +75,12 @@ export class TerminalConfigProvider extends ConfigProvider {
                 shell: '~clink~',
             },
             hotkeys: {
+                'copy': [
+                    'Ctrl-Shift-C',
+                ],
+                'clear': [
+                    'Ctrl-L',
+                ],
                 'zoom-in': [
                     'Ctrl-=',
                     'Ctrl-Shift-+',
@@ -93,6 +105,12 @@ export class TerminalConfigProvider extends ConfigProvider {
                 shell: '~default-shell~',
             },
             hotkeys: {
+                'copy': [
+                    'Ctrl-Shift-C',
+                ],
+                'clear': [
+                    'Ctrl-L',
+                ],
                 'zoom-in': [
                     'Ctrl-=',
                     'Ctrl-Shift-+',

terminus-terminal/src/hotkeys.ts

@@ -4,6 +4,14 @@ import { IHotkeyDescription, HotkeyProvider } from 'terminus-core'
 @Injectable()
 export class TerminalHotkeyProvider extends HotkeyProvider {
     hotkeys: IHotkeyDescription[] = [
+        {
+            id: 'copy',
+            name: 'Copy to clipboard',
+        },
+        {
+            id: 'clear',
+            name: 'Clear terminal',
+        },
         {
             id: 'zoom-in',
             name: 'Zoom in',