development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 09:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename side panel (#144862)

Browse source 
* rename side panel

* tweaks based on feedback
This commit is contained in:
SteVen Batten 2022-03-10 16:20:23 -08:00 committed by GitHub
parent 32d40cf44e
commit 6b74534212
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 92 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/vs/workbench/browser/actions/layoutActions.ts
View file

@ -33,8 +33,8 @@ import { ICommandActionTitle } from 'vs/platform/action/common/action';
const menubarIcon = registerIcon('menuBar', Codicon.layoutMenubar, localize('menuBarIcon', "Represents the menu bar"));
const activityBarLeftIcon = registerIcon('activity-bar-left', Codicon.layoutActivitybarLeft, localize('activityBarLeft', "Represents the activity bar in the left position"));
const activityBarRightIcon = registerIcon('activity-bar-right', Codicon.layoutActivitybarRight, localize('activityBarRight', "Represents the activity bar in the right position"));
const panelLeftIcon = registerIcon('panel-left', Codicon.layoutSidebarLeft, localize('panelLeft', "Represents the side bar or side panel in the left position"));
const panelRightIcon = registerIcon('panel-right', Codicon.layoutSidebarRight, localize('panelRight', "Represents the side bar or side panel in the right position"));
const panelLeftIcon = registerIcon('panel-left', Codicon.layoutSidebarLeft, localize('panelLeft', "Represents a side bar in the left position"));
const panelRightIcon = registerIcon('panel-right', Codicon.layoutSidebarRight, localize('panelRight', "Represents side bar in the right position"));
const panelIcon = registerIcon('panel-bottom', Codicon.layoutPanel, localize('panelBottom', "Represents the bottom panel"));
const statusBarIcon = registerIcon('statusBar', Codicon.layoutStatusbar, localize('statusBarIcon', "Represents the status bar"));
@ -55,7 +55,7 @@ registerAction2(class extends Action2 {
constructor() {
super({
id: 'workbench.action.closeSidebar',
title: { value: localize('closeSidebar', "Close Side Bar"), original: 'Close Side Bar' },
title: { value: localize('closeSidebar', "Close Primary Side Bar"), original: 'Close Primary Side Bar' },
category: CATEGORIES.View,
f1: true
});
@ -164,8 +164,8 @@ class MoveSidebarRightAction extends MoveSidebarPositionAction {
constructor() {
super(MoveSidebarRightAction.ID, {
value: localize('moveSidebarRight', "Move Side Bar Right"),
original: 'Move Side Bar Right'
value: localize('moveSidebarRight', "Move Primary Side Bar Right"),
original: 'Move Primary Side Bar Right'
}, Position.RIGHT);
}
}
@ -175,8 +175,8 @@ class MoveSidebarLeftAction extends MoveSidebarPositionAction {
constructor() {
super(MoveSidebarLeftAction.ID, {
value: localize('moveSidebarLeft', "Move Side Bar Left"),
original: 'Move Side Bar Left'
value: localize('moveSidebarLeft', "Move Primary Side Bar Left"),
original: 'Move Primary Side Bar Left'
}, Position.LEFT);
}
}
@ -189,16 +189,16 @@ registerAction2(MoveSidebarLeftAction);
export class ToggleSidebarPositionAction extends Action2 {
static readonly ID = 'workbench.action.toggleSidebarPosition';
static readonly LABEL = localize('toggleSidebarPosition', "Toggle Side Bar Position");
static readonly LABEL = localize('toggleSidebarPosition', "Toggle Primary Side Bar Position");
static getLabel(layoutService: IWorkbenchLayoutService): string {
return layoutService.getSideBarPosition() === Position.LEFT ? localize('moveSidebarRight', "Move Side Bar Right") : localize('moveSidebarLeft', "Move Side Bar Left");
return layoutService.getSideBarPosition() === Position.LEFT ? localize('moveSidebarRight', "Move Primary Side Bar Right") : localize('moveSidebarLeft', "Move Primary Side Bar Left");
}
constructor() {
super({
id: ToggleSidebarPositionAction.ID,
title: { value: localize('toggleSidebarPosition', "Toggle Side Bar Position"), original: 'Toggle Side Bar Position' },
title: { value: localize('toggleSidebarPosition', "Toggle Primary Side Bar Position"), original: 'Toggle Primary Side Bar Position' },
category: CATEGORIES.View,
f1: true
});
@ -233,7 +233,7 @@ MenuRegistry.appendMenuItems([{
group: '3_workbench_layout_move',
command: {
id: ToggleSidebarPositionAction.ID,
title: localize('move sidebar right', "Move Side Bar Right")
title: localize('move side bar right', "Move Primary Side Bar Right")
},
when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
order: 1
@ -244,7 +244,7 @@ MenuRegistry.appendMenuItems([{
group: '3_workbench_layout_move',
command: {
id: ToggleSidebarPositionAction.ID,
title: localize('move sidebar right', "Move Side Bar Right")
title: localize('move sidebar right', "Move Primary Side Bar Right")
},
when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
order: 1
@ -255,7 +255,7 @@ MenuRegistry.appendMenuItems([{
group: '3_workbench_layout_move',
command: {
id: ToggleSidebarPositionAction.ID,
title: localize('move sidebar left', "Move Side Bar Left")
title: localize('move sidebar left', "Move Primary Side Bar Left")
},
when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
order: 1
@ -266,7 +266,7 @@ MenuRegistry.appendMenuItems([{
group: '3_workbench_layout_move',
command: {
id: ToggleSidebarPositionAction.ID,
title: localize('move sidebar left', "Move Side Bar Left")
title: localize('move sidebar left', "Move Primary Side Bar Left")
},
when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
order: 1
@ -277,7 +277,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
group: '3_workbench_layout_move',
command: {
id: ToggleSidebarPositionAction.ID,
title: localize({ key: 'miMoveSidebarRight', comment: ['&& denotes a mnemonic'] }, "&&Move Side Bar Right")
title: localize({ key: 'miMoveSidebarRight', comment: ['&& denotes a mnemonic'] }, "&&Move Primary Side Bar Right")
},
when: ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'),
order: 2
@ -287,7 +287,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
group: '3_workbench_layout_move',
command: {
id: ToggleSidebarPositionAction.ID,
title: localize({ key: 'miMoveSidebarLeft', comment: ['&& denotes a mnemonic'] }, "&&Move Side Bar Left")
title: localize({ key: 'miMoveSidebarLeft', comment: ['&& denotes a mnemonic'] }, "&&Move Primary Side Bar Left")
},
when: ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'),
order: 2
@ -338,7 +338,7 @@ class ToggleSidebarVisibilityAction extends Action2 {
constructor() {
super({
id: ToggleSidebarVisibilityAction.ID,
title: { value: localize('toggleSidebar', "Toggle Side Bar Visibility"), original: 'Toggle Side Bar Visibility' },
title: { value: localize('toggleSidebar', "Toggle Primary Side Bar Visibility"), original: 'Toggle Primary Side Bar Visibility' },
category: CATEGORIES.View,
f1: true,
keybinding: {
@ -386,7 +386,7 @@ MenuRegistry.appendMenuItems([
group: '2_workbench_layout',
command: {
id: ToggleSidebarVisibilityAction.ID,
title: localize({ key: 'miShowSidebar', comment: ['&& denotes a mnemonic'] }, "Show &&Side Bar"),
title: localize({ key: 'miShowSidebar', comment: ['&& denotes a mnemonic'] }, "Show &&Primary Side Bar"),
toggled: SideBarVisibleContext
},
order: 1
@ -397,7 +397,7 @@ MenuRegistry.appendMenuItems([
group: '0_workbench_layout',
command: {
id: ToggleSidebarVisibilityAction.ID,
title: localize('miShowSidebarNoMnnemonic', "Show Side Bar"),
title: localize('miShowSidebarNoMnnemonic', "Show Primary Side Bar"),
toggled: SideBarVisibleContext
},
order: 0
@ -408,7 +408,7 @@ MenuRegistry.appendMenuItems([
group: '0_workbench_toggles',
command: {
id: ToggleSidebarVisibilityAction.ID,
title: localize('toggleSideBar', "Toggle Side Bar"),
title: localize('toggleSideBar', "Toggle Primary Side Bar"),
icon: panelLeftIcon,
toggled: SideBarVisibleContext
},
@ -421,7 +421,7 @@ MenuRegistry.appendMenuItems([
group: '0_workbench_toggles',
command: {
id: ToggleSidebarVisibilityAction.ID,
title: localize('toggleSideBar', "Toggle Side Bar"),
title: localize('toggleSideBar', "Toggle Primary Side Bar"),
icon: panelRightIcon,
toggled: SideBarVisibleContext
},
@ -704,7 +704,7 @@ registerAction2(class extends Action2 {
if (!hasAddedView) {
results.push({
type: 'separator',
label: localize('sidePanelContainer', "Side Panel / {0}", containerModel.title)
label: localize('secondarySideBarContainer', "Secondary Side Bar / {0}", containerModel.title)
});
hasAddedView = true;
}
@ -809,7 +809,7 @@ class MoveFocusedViewAction extends Action2 {
if (!(isViewSolo && currentLocation === ViewContainerLocation.AuxiliaryBar)) {
items.push({
id: '_.auxiliarybar.newcontainer',
label: localize('moveFocusedView.newContainerInSidePanel', "New Side Panel Entry")
label: localize('moveFocusedView.newContainerInSidePanel', "New Secondary Side Bar Entry")
});
}
@ -857,7 +857,7 @@ class MoveFocusedViewAction extends Action2 {
items.push({
type: 'separator',
label: localize('sidePanel', "Side Panel")
label: localize('secondarySideBar', "Secondary Side Bar")
});
const pinnedAuxPanels = paneCompositePartService.getPinnedPaneCompositeIds(ViewContainerLocation.AuxiliaryBar);
@ -1133,9 +1133,9 @@ if (!isMacintosh || !isNative) {
ToggleVisibilityActions.push(...[
CreateToggleLayoutItem(ToggleActivityBarVisibilityAction.ID, ContextKeyExpr.equals('config.workbench.activityBar.visible', true), localize('activityBar', "Activity Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: activityBarLeftIcon, iconB: activityBarRightIcon }),
CreateToggleLayoutItem(ToggleSidebarVisibilityAction.ID, SideBarVisibleContext, localize('sideBar', "Side Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelLeftIcon, iconB: panelRightIcon }),
CreateToggleLayoutItem(ToggleSidebarVisibilityAction.ID, SideBarVisibleContext, localize('sideBar', "Primary Side Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelLeftIcon, iconB: panelRightIcon }),
CreateToggleLayoutItem(TogglePanelAction.ID, PanelVisibleContext, localize('panel', "Panel"), panelIcon),
CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, localize('sidePanel', "Side Panel"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelRightIcon, iconB: panelLeftIcon }),
CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, localize('secondarySideBar', "Secondary Side Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelRightIcon, iconB: panelLeftIcon }),
CreateToggleLayoutItem(ToggleStatusbarVisibilityAction.ID, ContextKeyExpr.equals('config.workbench.statusBar.visible', true), localize('statusBar', "Status Bar"), statusBarIcon),
]);
@ -1220,7 +1220,7 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
...ToggleVisibilityActions.map(toQuickPickItem),
{
type: 'separator',
label: localize('sideBarPosition', "Side Bar Position")
label: localize('sideBarPosition', "Primary Side Bar Position")
},
...MoveSideBarActions.map(toQuickPickItem),
{

4
src/vs/workbench/browser/layout.ts
View file

@ -379,7 +379,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
sideBar.updateStyles();
auxiliaryBar.updateStyles();
// Move activity bar, side bar, and side panel
// Move activity bar and side bars
this.adjustPartPositions(position, panelAlignment, panelPosition);
}
@ -1484,7 +1484,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
private adjustPartPositions(sideBarPosition: Position, panelAlignment: PanelAlignment, panelPosition: Position): void {
// Move activity bar, side bar, and side panel
// Move activity bar and side bars
const sideBarSiblingToEditor = panelPosition !== Position.BOTTOM || !(panelAlignment === 'center' || (sideBarPosition === Position.LEFT && panelAlignment === 'right') || (sideBarPosition === Position.RIGHT && panelAlignment === 'left'));
const auxiliaryBarSiblingToEditor = panelPosition !== Position.BOTTOM || !(panelAlignment === 'center' || (sideBarPosition === Position.RIGHT && panelAlignment === 'right') || (sideBarPosition === Position.LEFT && panelAlignment === 'left'));
const preMovePanelWidth = !this.isVisible(Parts.PANEL_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView) ?? this.panelPartView.minimumWidth) : this.workbenchGrid.getViewSize(this.panelPartView).width;

4
src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
View file

@ -371,7 +371,7 @@ registerAction2(
constructor() {
super({
id: 'workbench.action.previousSideBarView',
title: { value: localize('previousSideBarView', "Previous Side Bar View"), original: 'Previous Side Bar View' },
title: { value: localize('previousSideBarView', "Previous Primary Side Bar View"), original: 'Previous Primary Side Bar View' },
category: CATEGORIES.View,
f1: true
}, -1);
@ -384,7 +384,7 @@ registerAction2(
constructor() {
super({
id: 'workbench.action.nextSideBarView',
title: { value: localize('nextSideBarView', "Next Side Bar View"), original: 'Next Side Bar View' },
title: { value: localize('nextSideBarView', "Next Primary Side Bar View"), original: 'Next Primary Side Bar View' },
category: CATEGORIES.View,
f1: true
}, 1);

20
src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
View file

@ -23,7 +23,7 @@ const auxiliaryBarLeftIcon = registerIcon('auxiliarybar-left-layout-icon', Codic
export class ToggleAuxiliaryBarAction extends Action {
static readonly ID = 'workbench.action.toggleAuxiliaryBar';
static readonly LABEL = localize('toggleAuxiliaryBar', "Toggle Side Panel");
static readonly LABEL = localize('toggleAuxiliaryBar', "Toggle Secondary Side Bar");
constructor(
id: string,
@ -41,7 +41,7 @@ export class ToggleAuxiliaryBarAction extends Action {
class FocusAuxiliaryBarAction extends Action {
static readonly ID = 'workbench.action.focusAuxiliaryBar';
static readonly LABEL = localize('focusAuxiliaryBar', "Focus into Side Panel");
static readonly LABEL = localize('focusAuxiliaryBar', "Focus into Secondary Side Bar");
constructor(
id: string,
@ -74,7 +74,7 @@ MenuRegistry.appendMenuItems([
group: '0_workbench_layout',
command: {
id: ToggleAuxiliaryBarAction.ID,
title: localize('miShowAuxiliaryBarNoMnemonic', "Show Side Panel"),
title: localize('miShowAuxiliaryBarNoMnemonic', "Show Secondary Side Bar"),
toggled: AuxiliaryBarVisibleContext
},
order: 4
@ -86,7 +86,7 @@ MenuRegistry.appendMenuItems([
group: '0_workbench_toggles',
command: {
id: ToggleAuxiliaryBarAction.ID,
title: localize('toggleSidePanel', "Toggle Side Panel"),
title: localize('toggleSecondarySideBar', "Toggle Secondary Side Bar"),
toggled: AuxiliaryBarVisibleContext,
icon: auxiliaryBarLeftIcon,
},
@ -100,7 +100,7 @@ MenuRegistry.appendMenuItems([
group: '0_workbench_toggles',
command: {
id: ToggleAuxiliaryBarAction.ID,
title: localize('toggleSidePanel', "Toggle Side Panel"),
title: localize('toggleSecondarySideBar', "Toggle Secondary Side Bar"),
toggled: AuxiliaryBarVisibleContext,
icon: auxiliaryBarRightIcon,
},
@ -114,10 +114,10 @@ MenuRegistry.appendMenuItems([
group: '2_workbench_layout',
command: {
id: ToggleAuxiliaryBarAction.ID,
title: localize({ key: 'miShowAuxiliaryBar', comment: ['&& denotes a mnemonic'] }, "Show Si&&de Panel"),
title: localize({ key: 'miShowAuxiliaryBar', comment: ['&& denotes a mnemonic'] }, "Show Secondary Si&&de Bar"),
toggled: AuxiliaryBarVisibleContext
},
order: 5
order: 2
}
}, {
id: MenuId.ViewTitleContext,
@ -125,7 +125,7 @@ MenuRegistry.appendMenuItems([
group: '3_workbench_layout_move',
command: {
id: ToggleAuxiliaryBarAction.ID,
title: { value: localize('hideAuxiliaryBar', "Hide Side Panel"), original: 'Hide Side Panel' },
title: { value: localize('hideAuxiliaryBar', "Hide Secondary Side Bar"), original: 'Hide Secondary Side Bar' },
},
when: ContextKeyExpr.and(AuxiliaryBarVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
order: 2
@ -134,5 +134,5 @@ MenuRegistry.appendMenuItems([
]);
const actionRegistry = Registry.as<IWorkbenchActionRegistry>(WorkbenchExtensions.WorkbenchActions);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleAuxiliaryBarAction), 'View: Toggle Side Panel', CATEGORIES.View.value);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusAuxiliaryBarAction), 'View: Focus into Side Panel', CATEGORIES.View.value);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleAuxiliaryBarAction), 'View: Toggle Secondary Side Bar', CATEGORIES.View.value);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusAuxiliaryBarAction), 'View: Focus into Secondary Side Bar', CATEGORIES.View.value);

6
src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
View file

@ -23,10 +23,9 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/layout/browser/layoutService';
import { IActivityHoverOptions } from 'vs/workbench/browser/parts/compositeBarActions';
import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
import { IAction, Separator, toAction } from 'vs/base/common/actions';
import { IAction, Separator } from 'vs/base/common/actions';
import { ToggleAuxiliaryBarAction } from 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions';
import { assertIsDefined } from 'vs/base/common/types';
import { MoveSidePanelToPanelAction } from 'vs/workbench/browser/parts/panel/panelActions';
import { LayoutPriority } from 'vs/base/browser/ui/splitview/splitview';
export class AuxiliaryBarPart extends BasePanelPart {
@ -110,8 +109,7 @@ export class AuxiliaryBarPart extends BasePanelPart {
protected fillExtraContextMenuActions(actions: IAction[]): void {
actions.push(...[
new Separator(),
toAction({ id: MoveSidePanelToPanelAction.ID, label: localize('moveToPanel', "Move Views to Panel"), run: () => this.instantiationService.invokeFunction(accessor => new MoveSidePanelToPanelAction().run(accessor)) }),
this.instantiationService.createInstance(ToggleAuxiliaryBarAction, ToggleAuxiliaryBarAction.ID, localize('hideAuxiliaryBar', "Hide Side Panel"))
this.instantiationService.createInstance(ToggleAuxiliaryBarAction, ToggleAuxiliaryBarAction.ID, localize('hideAuxiliaryBar', "Hide Secondary Side Bar"))
]);
}

59
src/vs/workbench/browser/parts/panel/panelActions.ts
View file

@ -396,7 +396,7 @@ registerAction2(class extends Action2 {
constructor() {
super({
id: 'workbench.action.closeAuxiliaryBar',
title: { value: localize('closeSidePanel', "Close Side Panel"), original: 'Close Side Panel' },
title: { value: localize('closeSecondarySideBar', "Close Secondary Side Bar"), original: 'Close Secondary Side Bar' },
category: CATEGORIES.View,
icon: closeIcon,
menu: [{
@ -490,42 +490,68 @@ class MoveViewsBetweenPanelsAction extends Action2 {
}
}
// --- Move Panel Views To Side Panel
// --- Move Panel Views To Secondary Side Bar
export class MovePanelToSidePanelAction extends MoveViewsBetweenPanelsAction {
class MovePanelToSidePanelAction extends MoveViewsBetweenPanelsAction {
static readonly ID = 'workbench.action.movePanelToSidePanel';
constructor() {
super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
id: MovePanelToSidePanelAction.ID,
title: {
value: localize('movePanelToSidePanel', "Move Panel Views To Side Panel"),
original: 'Move Panel Views To Side Panel'
value: localize('movePanelToSecondarySideBar', "Move Panel Views To Secondary Side Bar"),
original: 'Move Panel Views To Secondary Side Bar'
},
category: CATEGORIES.View,
f1: true,
menu: [{
id: MenuId.ViewContainerTitleContext,
group: '3_workbench_layout_move',
order: 0,
when: ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Panel)),
}]
f1: true
});
}
}
export class MovePanelToSecondarySideBarAction extends MoveViewsBetweenPanelsAction {
static readonly ID = 'workbench.action.movePanelToSecondarySideBar';
constructor() {
super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
id: MovePanelToSecondarySideBarAction.ID,
title: {
value: localize('movePanelToSecondarySideBar', "Move Panel Views To Secondary Side Bar"),
original: 'Move Panel Views To Secondary Side Bar'
},
category: CATEGORIES.View,
f1: true
});
}
}
registerAction2(MovePanelToSidePanelAction);
registerAction2(MovePanelToSecondarySideBarAction);
// --- Move Panel Views To Side Panel
// --- Move Secondary Side Bar Views To Panel
export class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
static readonly ID = 'workbench.action.moveSidePanelToPanel';
constructor() {
super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
id: MoveSidePanelToPanelAction.ID,
title: {
value: localize('moveSidePanelToPanel', "Move Side Panel Views To Panel"),
original: 'Move Side Panel Views To Panel'
value: localize('moveSidePanelToPanel', "Move Secondary Side Bar Views To Panel"),
original: 'Move Secondary Side Bar Views To Panel'
},
category: CATEGORIES.View,
f1: true
});
}
}
export class MoveSecondarySideBarToPanelAction extends MoveViewsBetweenPanelsAction {
static readonly ID = 'workbench.action.moveSecondarySideBarToPanel';
constructor() {
super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
id: MoveSecondarySideBarToPanelAction.ID,
title: {
value: localize('moveSidePanelToPanel', "Move Secondary Side Bar Views To Panel"),
original: 'Move Secondary Side Bar Views To Panel'
},
category: CATEGORIES.View,
f1: true
@ -533,3 +559,4 @@ export class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
}
}
registerAction2(MoveSidePanelToPanelAction);
registerAction2(MoveSecondarySideBarToPanelAction);

5
src/vs/workbench/browser/parts/panel/panelPart.ts
View file

@ -18,7 +18,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { PanelActivityAction, TogglePanelAction, PlaceHolderPanelActivityAction, PlaceHolderToggleCompositePinnedAction, PositionPanelActionConfigs, SetPanelPositionAction, MovePanelToSidePanelAction } from 'vs/workbench/browser/parts/panel/panelActions';
import { PanelActivityAction, TogglePanelAction, PlaceHolderPanelActivityAction, PlaceHolderToggleCompositePinnedAction, PositionPanelActionConfigs, SetPanelPositionAction } from 'vs/workbench/browser/parts/panel/panelActions';
import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_INPUT_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, PANEL_DRAG_AND_DROP_BORDER } from 'vs/workbench/common/theme';
import { activeContrastBorder, focusBorder, contrastBorder, editorBackground, badgeBackground, badgeForeground } from 'vs/platform/theme/common/colorRegistry';
@ -493,7 +493,7 @@ export abstract class BasePanelPart extends CompositePart<PaneComposite> impleme
const messageElement = document.createElement('div');
messageElement.classList.add('empty-panel-message');
messageElement.innerText = localize('panel.emptyMessage', "Drag a view into the panel to display.");
messageElement.innerText = localize('panel.emptyMessage', "Drag a view here to display.");
this.emptyPanelMessageElement.appendChild(messageElement);
contentArea.appendChild(this.emptyPanelMessageElement);
@ -965,7 +965,6 @@ export class PanelPart extends BasePanelPart {
actions.push(...[
new Separator(),
toAction({ id: MovePanelToSidePanelAction.ID, label: localize('moveToSidePanel', "Move Views to Side Panel"), run: () => this.instantiationService.invokeFunction(accessor => new MovePanelToSidePanelAction().run(accessor)) }),
...PositionPanelActionConfigs
// show the contextual menu item if it is not in that position
.filter(({ when }) => this.contextKeyService.contextMatchesRules(when))

2
src/vs/workbench/browser/parts/sidebar/sidebarActions.ts
View file

@ -19,7 +19,7 @@ export class FocusSideBarAction extends Action2 {
constructor() {
super({
id: 'workbench.action.focusSideBar',
title: { value: localize('focusSideBar', "Focus into Side Bar"), original: 'Focus into Side Bar' },
title: { value: localize('focusSideBar', "Focus into Primary Side Bar"), original: 'Focus into Primary Side Bar' },
category: CATEGORIES.View,
f1: true,
keybinding: {

2
src/vs/workbench/browser/workbench.contribution.ts
View file

@ -296,7 +296,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
'type': 'string',
'enum': ['left', 'right'],
'default': 'left',
'description': localize('sideBarLocation', "Controls the location of the sidebar and activity bar. They can either show on the left or right of the workbench.")
'description': localize('sideBarLocation', "Controls the location of the primary sidebar and activity bar. They can either show on the left or right of the workbench. The secondary side bar will show on the opposite side of the workbench.")
},
'workbench.panel.defaultLocation': {
'type': 'string',

2
src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts
View file

@ -149,7 +149,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
// Viewlets / Panels
addPaneComposites(ViewContainerLocation.Sidebar, localize('views', "Side Bar"));
addPaneComposites(ViewContainerLocation.Panel, localize('panels', "Panel"));
addPaneComposites(ViewContainerLocation.AuxiliaryBar, localize('side panel', "Side Panel"));
addPaneComposites(ViewContainerLocation.AuxiliaryBar, localize('secondary side bar', "Secondary Side Bar"));
const addPaneCompositeViews = (location: ViewContainerLocation) => {
const paneComposites = this.paneCompositeService.getPaneComposites(location);

2
test/smoke/src/areas/preferences/preferences.test.ts
View file

@ -27,7 +27,7 @@ export function setup(logger: Logger) {
await app.workbench.activitybar.waitForActivityBar(ActivityBarPosition.LEFT);
await app.workbench.keybindingsEditor.updateKeybinding('workbench.action.toggleSidebarPosition', 'View: Toggle Side Bar Position', 'ctrl+u', 'Control+U');
await app.workbench.keybindingsEditor.updateKeybinding('workbench.action.toggleSidebarPosition', 'View: Toggle Primary Side Bar Position', 'ctrl+u', 'Control+U');
await app.code.dispatchKeybinding('ctrl+u');
await app.workbench.activitybar.waitForActivityBar(ActivityBarPosition.RIGHT);