diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts index 58376f98d99056e664c3c29c2809415925418f70..785d5b550a392f7e1853d38ab9b5030a7b0e806d 100644 --- a/src/vs/workbench/browser/parts/panel/panelActions.ts +++ b/src/vs/workbench/browser/parts/panel/panelActions.ts @@ -12,48 +12,12 @@ import { Action } from 'vs/base/common/actions'; import { Registry } from 'vs/platform/registry/common/platform'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/actions'; -import { IPanelService, IPanelIdentifier } from 'vs/workbench/services/panel/common/panelService'; +import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { IPartService, Parts, Position } from 'vs/workbench/services/part/common/partService'; -import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ActivityAction } from 'vs/workbench/browser/parts/compositebar/compositeBarActions'; import { IActivity } from 'vs/workbench/common/activity'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; -export class OpenPanelAction extends Action { - - constructor( - private panel: IPanelIdentifier, - @IKeybindingService private keybindingService: IKeybindingService, - @IPanelService private panelService: IPanelService - ) { - super(panel.id, panel.name); - - this.tooltip = nls.localize('panelActionTooltip', "{0} ({1})", panel.name, this.getKeybindingLabel(panel.commandId)); - } - - public run(event: any): TPromise { - return this.panelService.openPanel(this.panel.id, true).then(() => this.activate()); - } - - public activate(): void { - if (!this.checked) { - this._setChecked(true); - } - } - - public deactivate(): void { - if (this.checked) { - this._setChecked(false); - } - } - - private getKeybindingLabel(id: string): string { - const keys = this.keybindingService.lookupKeybinding(id); - - return keys ? keys.getLabel() : ''; - } -} - export class ClosePanelAction extends Action { static ID = 'workbench.action.closePanel'; static LABEL = nls.localize('closePanel', "Close Panel"); @@ -170,7 +134,7 @@ export class PanelActivityAction extends ActivityAction { } public run(event: any): TPromise { - return this.panelService.openPanel(this.activity.id, true).then(() => this.activate()); + return this.panelService.openPanel(this.activity.id, true).then(() => this.activate());; } } diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts index 949d3135c5272117932ac3d3253aee1b00e91d76..b5d4331937a943411b23f9d7e12cd370848e341f 100644 --- a/src/vs/workbench/browser/parts/panel/panelPart.ts +++ b/src/vs/workbench/browser/parts/panel/panelPart.ts @@ -22,7 +22,7 @@ import { IMessageService } from 'vs/platform/message/common/message'; 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 { ClosePanelAction, TogglePanelPositionAction, PanelActivityAction, OpenPanelAction } from 'vs/workbench/browser/parts/panel/panelActions'; +import { ClosePanelAction, TogglePanelPositionAction, PanelActivityAction } from 'vs/workbench/browser/parts/panel/panelActions'; import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme'; import { activeContrastBorder, focusBorder, contrastBorder, editorBackground, badgeBackground, badgeForeground } from 'vs/platform/theme/common/colorRegistry'; @@ -83,7 +83,7 @@ export class PanelPart extends CompositePart implements IPanelService { openComposite: (compositeId: string) => this.openPanel(compositeId, true), getActivityAction: (compositeId: string) => this.instantiationService.createInstance(PanelActivityAction, this.getPanel(compositeId)), getCompositePinnedAction: (compositeId: string) => new ToggleCompositePinnedAction(this.getPanel(compositeId), this.compositeBar), - getOnCompositeClickAction: (compositeId: string) => this.instantiationService.createInstance(OpenPanelAction, this.getPanel(compositeId)), + getOnCompositeClickAction: (compositeId: string) => this.instantiationService.createInstance(PanelActivityAction, this.getPanel(compositeId)), getDefaultCompositeId: () => Registry.as(PanelExtensions.Panels).getDefaultPanelId(), hidePart: () => this.partService.setPanelHidden(true), overflowActionSize: 28,