diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index bf9bd4763a22eb8252348398242e6d371bb2ded4..8e52da2bc2fe0849d245818aa485d1051d2c9fdd 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -59,7 +59,7 @@ export enum Settings { PANEL_POSITION = 'workbench.panel.defaultLocation', PANEL_OPENS_MAXIMIZED = 'workbench.panel.opensMaximized', - AUXILIARYBAR_ENABLED = 'workbench.experimental.auxiliaryBar.enabled', + AUXILIARYBAR_ENABLED = 'workbench.experimental.sidePanel.enabled', ZEN_MODE_RESTORE = 'zenMode.restore', } diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts index f1095fc175d25eb45a21933cf5a08a6c057d72af..839be29f5806a98e75d5a8af8b0ee02b4ee881f3 100644 --- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts +++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts @@ -18,7 +18,7 @@ import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/b export class ToggleAuxiliaryBarAction extends Action { static readonly ID = 'workbench.action.toggleAuxiliaryBar'; - static readonly LABEL = localize('toggleAuxiliaryBar', "Toggle Auxiliary Bar"); + static readonly LABEL = localize('toggleAuxiliaryBar', "Toggle Side Panel"); constructor( id: string, @@ -36,7 +36,7 @@ export class ToggleAuxiliaryBarAction extends Action { class FocusAuxiliaryBarAction extends Action { static readonly ID = 'workbench.action.focusAuxiliaryBar'; - static readonly LABEL = localize('focusAuxiliaryBar', "Focus into Auxiliary Bar"); + static readonly LABEL = localize('focusAuxiliaryBar', "Focus into Side Panel"); constructor( id: string, @@ -69,10 +69,10 @@ MenuRegistry.appendMenuItems([ group: '2_workbench_layout', command: { id: ToggleAuxiliaryBarAction.ID, - title: localize({ key: 'miShowAuxiliaryBar', comment: ['&& denotes a mnemonic'] }, "Show Au&&xiliary Bar"), + title: localize({ key: 'miShowAuxiliaryBar', comment: ['&& denotes a mnemonic'] }, "Show Si&&de Panel"), toggled: ActiveAuxiliaryContext }, - when: ContextKeyExpr.equals('config.workbench.experimental.auxiliaryBar.enabled', true), + when: ContextKeyExpr.equals('config.workbench.experimental.sidePanel.enabled', true), order: 5 } }, { @@ -81,7 +81,7 @@ MenuRegistry.appendMenuItems([ group: '3_workbench_layout_move', command: { id: ToggleAuxiliaryBarAction.ID, - title: { value: localize('hideAuxiliaryBar', "Hide Auxiliary Bar"), original: 'Hide Auxiliary Bar' }, + title: { value: localize('hideAuxiliaryBar', "Hide Side Panel"), original: 'Hide Side Panel' }, }, when: ContextKeyExpr.and(AuxiliaryBarVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))), order: 2 @@ -90,5 +90,5 @@ MenuRegistry.appendMenuItems([ ]); const actionRegistry = Registry.as(WorkbenchExtensions.WorkbenchActions); -actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleAuxiliaryBarAction, { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_B }), 'View: Toggle Auxiliary Bar', CATEGORIES.View.value, ContextKeyExpr.equals('config.workbench.experimental.auxiliaryBar.enabled', true)); -actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusAuxiliaryBarAction), 'View: Focus into Auxiliary Bar', CATEGORIES.View.value, ContextKeyExpr.equals('config.workbench.experimental.auxiliaryBar.enabled', true)); +actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleAuxiliaryBarAction, { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_B }), 'View: Toggle Side Panel', CATEGORIES.View.value, ContextKeyExpr.equals('config.workbench.experimental.sidePanel.enabled', true)); +actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusAuxiliaryBarAction), 'View: Focus into Side Panel', CATEGORIES.View.value, ContextKeyExpr.equals('config.workbench.experimental.sidePanel.enabled', true)); diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts index f46c87151ff2721e6982a6909d30c3b1720910a8..807c6c83f1b53e32bc1efa87d9663ebb0f7fbe61 100644 --- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts +++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts @@ -84,7 +84,7 @@ export class AuxiliaryBarPart extends BasePanelPart { protected fillExtraContextMenuActions(actions: IAction[]): void { actions.push(...[ new Separator(), - this.instantiationService.createInstance(ToggleAuxiliaryBarAction, ToggleAuxiliaryBarAction.ID, localize('hideAuxiliaryBar', "Hide AuxiliaryBar")) + this.instantiationService.createInstance(ToggleAuxiliaryBarAction, ToggleAuxiliaryBarAction.ID, localize('hideAuxiliaryBar', "Hide Side Panel")) ]); } diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts index d7fb9e76fd7ced38b896b6e20da9dc3990805f9e..000fd151ee265856b3ccff3ae2ad47e831445fa7 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts @@ -352,10 +352,10 @@ const registry = Registry.as(ConfigurationExtensions.Con // On Mac, the delay is 1500. 'default': isMacintosh ? 1500 : 500 }, - 'workbench.experimental.auxiliaryBar.enabled': { + 'workbench.experimental.sidePanel.enabled': { 'type': 'boolean', 'default': false, - 'description': localize('auxiliaryBarEnabled', "Controls whether the auxiliary bar opposite the side bar is enabled."), + 'description': localize('auxiliaryBarEnabled', "Controls whether the side panel opposite the side bar is enabled."), 'included': product.quality !== 'stable' }, }