From e4aa51d1edadbfdd626ca3d039d78ae399d1bbfd Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 23 Jun 2016 21:50:16 -0700 Subject: [PATCH] Clarify terminal command names Fixes #7670 --- .../media/{close-inverse.svg => kill-inverse.svg} | 0 .../electron-browser/media/{close.svg => kill.svg} | 0 .../parts/terminal/electron-browser/media/terminal.css | 6 +++--- .../terminal/electron-browser/terminal.contribution.ts | 8 ++++---- .../parts/terminal/electron-browser/terminalActions.ts | 8 ++++---- .../parts/terminal/electron-browser/terminalPanel.ts | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) rename src/vs/workbench/parts/terminal/electron-browser/media/{close-inverse.svg => kill-inverse.svg} (100%) rename src/vs/workbench/parts/terminal/electron-browser/media/{close.svg => kill.svg} (100%) diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/close-inverse.svg b/src/vs/workbench/parts/terminal/electron-browser/media/kill-inverse.svg similarity index 100% rename from src/vs/workbench/parts/terminal/electron-browser/media/close-inverse.svg rename to src/vs/workbench/parts/terminal/electron-browser/media/kill-inverse.svg diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/close.svg b/src/vs/workbench/parts/terminal/electron-browser/media/kill.svg similarity index 100% rename from src/vs/workbench/parts/terminal/electron-browser/media/close.svg rename to src/vs/workbench/parts/terminal/electron-browser/media/kill.svg diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css index 53c441b66a7..d31dc46deb5 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css +++ b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css @@ -34,10 +34,10 @@ /* Terminal actions */ /* Light theme */ -.monaco-workbench .terminal-action.close { background: url('close.svg') center center no-repeat; } +.monaco-workbench .terminal-action.kill { background: url('kill.svg') center center no-repeat; } .monaco-workbench .terminal-action.new { background: url('new.svg') center center no-repeat; } /* Dark theme */ -.vs-dark .monaco-workbench .terminal-action.close { background: url('close-inverse.svg') center center no-repeat; } +.vs-dark .monaco-workbench .terminal-action.kill { background: url('kill-inverse.svg') center center no-repeat; } .vs-dark .monaco-workbench .terminal-action.new { background: url('new-inverse.svg') center center no-repeat; } /* High contrast black theme */ .hc-black .monaco-workbench .terminal-action { background: none; } @@ -48,5 +48,5 @@ height: 16px; width: 16px; } -.hc-black .monaco-workbench .terminal-action.close:before { content: url('close-inverse.svg'); } +.hc-black .monaco-workbench .terminal-action.kill:before { content: url('kill-inverse.svg'); } .hc-black .monaco-workbench .terminal-action.new:before { content: url('new-inverse.svg'); } diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts index 1a14e79dddd..30f03ce417f 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts @@ -12,7 +12,7 @@ import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; import {registerSingleton} from 'vs/platform/instantiation/common/extensions'; import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry'; import {TerminalService} from 'vs/workbench/parts/terminal/electron-browser/terminalService'; -import {CloseTerminalAction, CreateNewTerminalAction, FocusTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, ToggleTerminalAction} from 'vs/workbench/parts/terminal/electron-browser/terminalActions'; +import {KillTerminalAction, CreateNewTerminalAction, FocusTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, ToggleTerminalAction} from 'vs/workbench/parts/terminal/electron-browser/terminalActions'; import {ITerminalService, TERMINAL_PANEL_ID, TERMINAL_DEFAULT_SHELL_LINUX, TERMINAL_DEFAULT_SHELL_OSX, TERMINAL_DEFAULT_SHELL_WINDOWS} from 'vs/workbench/parts/terminal/electron-browser/terminal'; import * as panel from 'vs/workbench/browser/panel'; import {Registry} from 'vs/platform/platform'; @@ -93,14 +93,14 @@ registerSingleton(ITerminalService, TerminalService); // On mac cmd+` is reserved to cycle between windows, that's why the keybindings use WinCtrl let actionRegistry = Registry.as(ActionExtensions.WorkbenchActions); -actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CloseTerminalAction, CloseTerminalAction.ID, CloseTerminalAction.LABEL), CloseTerminalAction.LABEL); +actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(KillTerminalAction, KillTerminalAction.ID, KillTerminalAction.LABEL), KillTerminalAction.LABEL); actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CreateNewTerminalAction, CreateNewTerminalAction.ID, CreateNewTerminalAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_BACKTICK, mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.US_BACKTICK } }), CreateNewTerminalAction.LABEL); actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusTerminalAction, FocusTerminalAction.ID, FocusTerminalAction.LABEL), FocusTerminalAction.LABEL); -actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextTerminalAction, FocusNextTerminalAction.ID, FocusNextTerminalAction.LABEL), CloseTerminalAction.LABEL); -actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusPreviousTerminalAction, FocusPreviousTerminalAction.ID, FocusPreviousTerminalAction.LABEL), CloseTerminalAction.LABEL); +actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextTerminalAction, FocusNextTerminalAction.ID, FocusNextTerminalAction.LABEL), KillTerminalAction.LABEL); +actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusPreviousTerminalAction, FocusPreviousTerminalAction.ID, FocusPreviousTerminalAction.LABEL), KillTerminalAction.LABEL); actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleTerminalAction, ToggleTerminalAction.ID, ToggleTerminalAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_BACKTICK, mac: { primary: KeyMod.WinCtrl | KeyCode.US_BACKTICK } diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts index 5ee8ff0bb46..5052f297708 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts @@ -26,17 +26,17 @@ export class ToggleTerminalAction extends Action { } } -export class CloseTerminalAction extends Action { +export class KillTerminalAction extends Action { - public static ID = 'workbench.action.terminal.close'; - public static LABEL = nls.localize('workbench.action.terminal.close', "Terminal: Close the current terminal"); + public static ID = 'workbench.action.terminal.kill'; + public static LABEL = nls.localize('workbench.action.terminal.kill', "Terminal: Kill the Active Terminal Instance"); constructor( id: string, label: string, @ITerminalService private terminalService: ITerminalService ) { super(id, label); - this.class = 'terminal-action close'; + this.class = 'terminal-action kill'; } public run(event?: any): TPromise { diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts index 3c2d88129bd..49e95f0ff39 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts @@ -8,7 +8,7 @@ import lifecycle = require('vs/base/common/lifecycle'); import platform = require('vs/base/common/platform'); import {Action, IAction} from 'vs/base/common/actions'; import {Builder, Dimension} from 'vs/base/browser/builder'; -import {CloseTerminalAction, CreateNewTerminalAction, SwitchTerminalInstanceAction, SwitchTerminalInstanceActionItem} from 'vs/workbench/parts/terminal/electron-browser/terminalActions'; +import {KillTerminalAction, CreateNewTerminalAction, SwitchTerminalInstanceAction, SwitchTerminalInstanceActionItem} from 'vs/workbench/parts/terminal/electron-browser/terminalActions'; import {IActionItem} from 'vs/base/browser/ui/actionbar/actionbar'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; @@ -57,7 +57,7 @@ export class TerminalPanel extends Panel { this.actions = [ this.instantiationService.createInstance(SwitchTerminalInstanceAction, SwitchTerminalInstanceAction.ID, SwitchTerminalInstanceAction.LABEL), this.instantiationService.createInstance(CreateNewTerminalAction, CreateNewTerminalAction.ID, CreateNewTerminalAction.LABEL), - this.instantiationService.createInstance(CloseTerminalAction, CloseTerminalAction.ID, CloseTerminalAction.LABEL) + this.instantiationService.createInstance(KillTerminalAction, KillTerminalAction.ID, KillTerminalAction.LABEL) ]; this.actions.forEach(a => { -- GitLab