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

app/lib/app.ts

@@ -1,6 +1,6 @@
 import { app, ipcMain, Menu, Tray, shell } from 'electron'
 import { loadConfig } from './config'
-import { Window } from './window'
+import { Window, WindowOptions } from './window'
 
 export class Application {
     private tray: Tray
@@ -20,8 +20,8 @@ export class Application {
         app.commandLine.appendSwitch('disable-http-cache')
     }
 
-    async newWindow (): Promise<Window> {
+    async newWindow (options?: WindowOptions): Promise<Window> {
-        let window = new Window()
+        let window = new Window(options)
         this.windows.push(window)
         window.visible$.subscribe(visible => {
             if (visible) {

app/lib/cli.ts

@@ -28,6 +28,10 @@ export function parseArgs (argv, cwd) {
             describe: 'Show DevTools on start',
             type: 'boolean'
         })
+        .option('hidden', {
+            describe: 'Start minimized',
+            type: 'boolean'
+        })
         .option('version', {
             alias: 'v',
             describe: 'Show version and exit',

app/lib/index.ts

@@ -59,5 +59,5 @@ app.on('ready', () => {
             }
         ]))
     }
-    application.newWindow()
+    application.newWindow({ hidden: argv.hidden })
 })

app/lib/window.ts

@@ -14,6 +14,10 @@ if (process.platform === 'win32') {
     DwmEnableBlurBehindWindow = require('windows-blurbehind').DwmEnableBlurBehindWindow
 }
 
+export interface WindowOptions {
+    hidden?: boolean
+}
+
 export class Window {
     ready: Promise<void>
     private visible = new Subject<boolean>()
@@ -23,14 +27,16 @@ export class Window {
 
     get visible$ (): Observable<boolean> { return this.visible }
 
-    constructor () {
+    constructor (options?: WindowOptions) {
         let configData = loadConfig()
 
+        options = options || {}
+
         this.windowConfig = new ElectronConfig({ name: 'window' })
         this.windowBounds = this.windowConfig.get('windowBoundaries')
 
         let maximized = this.windowConfig.get('maximized')
-        let options: Electron.BrowserWindowConstructorOptions = {
+        let bwOptions: Electron.BrowserWindowConstructorOptions = {
             width: 800,
             height: 600,
             title: 'Terminus',
@@ -41,33 +47,36 @@ export class Window {
             show: false,
             backgroundColor: '#00000000'
         }
-        Object.assign(options, this.windowBounds)
+        Object.assign(bwOptions, this.windowBounds)
 
         if ((configData.appearance || {}).frame === 'native') {
-            options.frame = true
+            bwOptions.frame = true
         } else {
             if (process.platform === 'darwin') {
-                options.titleBarStyle = 'hiddenInset'
+                bwOptions.titleBarStyle = 'hiddenInset'
             }
         }
 
         if (process.platform === 'linux') {
-            options.backgroundColor = '#131d27'
+            bwOptions.backgroundColor = '#131d27'
         }
 
-        this.window = new BrowserWindow(options)
+        this.window = new BrowserWindow(bwOptions)
         this.window.once('ready-to-show', () => {
             if (process.platform === 'darwin') {
                 this.window.setVibrancy('dark')
             } else if (process.platform === 'win32' && (configData.appearance || {}).vibrancy) {
                 this.setVibrancy(true)
             }
-            if (maximized) {
+
-                this.window.maximize()
+            if (!options.hidden) {
-            } else {
+                if (maximized) {
-                this.window.show()
+                    this.window.maximize()
+                } else {
+                    this.window.show()
+                }
+                this.window.focus()
             }
-            this.window.focus()
         })
         this.window.loadURL(`file://${app.getAppPath()}/dist/index.html?${this.window.id}`, { extraHeaders: 'pragma: no-cache\n' })
 

scripts/vars.js

@@ -20,5 +20,4 @@ exports.bundledModules = [
   '@angular',
   '@ng-bootstrap',
 ]
-exports.nativeModules = ['node-pty-tmp', 'font-manager', 'xkeychain', 'electron-vibrancy']
 exports.electronVersion = pkgInfo.devDependencies.electron

terminus-core/src/components/appRoot.component.ts

@@ -122,7 +122,7 @@ export class AppRootComponent {
         })
 
         this.hostApp.secondInstance$.subscribe(() => {
-            this.onGlobalHotkey()
+            this.presentWindow()
         })
         this.hotkeys.globalHotkey.subscribe(() => {
             this.onGlobalHotkey()
@@ -166,28 +166,35 @@ export class AppRootComponent {
 
     onGlobalHotkey () {
         if (this.hostApp.getWindow().isFocused()) {
-            // focused
+            this.hideWindow()
-            this.electron.loseFocus()
+        } else {
-            this.hostApp.getWindow().blur()
+            this.presentWindow()
-            if (this.hostApp.platform !== Platform.macOS) {
+        }
+    }
+
+    presentWindow () {
+        if (!this.hostApp.getWindow().isVisible()) {
+            // unfocused, invisible
+            this.hostApp.getWindow().show()
+            this.hostApp.getWindow().focus()
+        } else {
+            if (this.config.store.appearance.dock === 'off') {
+                // not docked, visible
+                setTimeout(() => {
+                    this.hostApp.getWindow().focus()
+                })
+            } else {
+                // docked, visible
                 this.hostApp.getWindow().hide()
             }
-        } else {
+        }
-            if (!this.hostApp.getWindow().isVisible()) {
+    }
-                // unfocused, invisible
+
-                this.hostApp.getWindow().show()
+    hideWindow () {
-                this.hostApp.getWindow().focus()
+        this.electron.loseFocus()
-            } else {
+        this.hostApp.getWindow().blur()
-                if (this.config.store.appearance.dock === 'off') {
+        if (this.hostApp.platform !== Platform.macOS) {
-                    // not docked, visible
+            this.hostApp.getWindow().hide()
-                    setTimeout(() => {
-                        this.hostApp.getWindow().focus()
-                    })
-                } else {
-                    // docked, visible
-                    this.hostApp.getWindow().hide()
-                }
-            }
         }
     }
 

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

@@ -85,6 +85,8 @@ export class HostAppService {
                     text = shellEscape([text])
                 }
                 this.cliPaste.next(text)
+            } else {
+                this.secondInstance.next()
             }
         }))
 

terminus-ssh/src/components/sshModal.component.pug

@@ -9,11 +9,13 @@
     )
     
     .list-group.mt-3(*ngIf='lastConnection')
-        a.list-group-item.list-group-item-action((click)='connect(lastConnection)') 
+        a.list-group-item.list-group-item-action.d-flex.align-items-center((click)='connect(lastConnection)') 
             i.fa.fa-fw.fa-history
-            span {{lastConnection.name}}
+            .mr-auto {{lastConnection.name}}
+            button.btn.btn-outline-danger.btn-sm((click)='clearLastConnection(); $event.stopPropagation()')
+                i.fa.fa-trash-o
     
-    .list-group.mt-3.connections-list
+    .list-group.mt-3.connections-list(*ngIf='childGroups.length')
         ng-container(*ngFor='let group of childGroups') 
             .list-group-item.list-group-item-action.d-flex.align-items-center(
                 (click)='groupCollapsed[group.name] = !groupCollapsed[group.name]'

terminus-ssh/src/components/sshModal.component.ts

@@ -54,6 +54,11 @@ export class SSHModalComponent {
         this.connect(connection)
     }
 
+    clearLastConnection () {
+        window.localStorage.lastConnection = null
+        this.lastConnection = null
+    }
+
     connect (connection: SSHConnection) {
         this.close()
         this.ssh.connect(connection).catch(error => {

terminus-terminal/src/services/sessions.service.ts

@@ -18,9 +18,7 @@ let windowsProcessTree
 try {
     windowsProcessTree = require('windows-process-tree')
 } catch (e) {
-console.error(e)
 } // tslint:disable-line
-console.error(windowsProcessTree)
 
 export interface IChildProcess {
     pid: number