提交 b8953b71 编写于 作者: I isidor

Revert "add an extensions action in the activity bar"

This reverts commit 9958eab8.
上级 a1f3a671
......@@ -3,19 +3,14 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import actions = require('vs/base/common/actions');
import toolbar = require('vs/base/browser/ui/toolbar/toolbar');
import actionbar = require('vs/base/browser/ui/actionbar/actionbar');
import platform = require('vs/platform/platform');
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import actionbarregistry = require('vs/workbench/browser/actionBarRegistry');
import statusbar = require('vs/workbench/browser/parts/statusbar/statusbar');
import { ExtensionsStatusbarItem } from 'vs/workbench/parts/extensions/electron-browser/extensionsWidgets';
import { IGalleryService } from 'vs/workbench/parts/extensions/common/extensions';
import { GlobalExtensionsAction } from './extensionsActions';
import { GalleryService } from 'vs/workbench/parts/extensions/node/vsoGalleryService';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { ExtensionsWorkbenchExtension } from 'vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
// Register Gallery Service
registerSingleton(IGalleryService, GalleryService);
......@@ -25,33 +20,9 @@ registerSingleton(IGalleryService, GalleryService);
ExtensionsWorkbenchExtension
);
class GlobalExtensionsActionContributor extends actionbarregistry.ActionBarContributor {
constructor(
@IInstantiationService private instantiationService:IInstantiationService
) {
super();
}
public hasActions(context:any):boolean {
return context === toolbar.CONTEXT;
}
public getActions(context:any): actions.IAction[] {
return [
this.instantiationService.createInstance(GlobalExtensionsAction, GlobalExtensionsAction.ID, GlobalExtensionsAction.LABEL)
];
}
// public getActionItem(context: any, action: actions.Action): actionbar.BaseActionItem {
// if (action.id === GlobalExtensionsAction.ID) {
// return this.instantiationService.createInstance(GlobalExtensionsActionItem, action);
// }
// return null;
// }
}
// Register Global Extensions Action
let actionBarRegistry = <actionbarregistry.IActionBarRegistry> platform.Registry.as(actionbarregistry.Extensions.Actionbar);
actionBarRegistry.registerActionBarContributor(actionbarregistry.Scope.GLOBAL, GlobalExtensionsActionContributor);
// Register Statusbar item
(<statusbar.IStatusbarRegistry>platform.Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor(
ExtensionsStatusbarItem,
statusbar.StatusbarAlignment.LEFT,
150 /* Very High Priority */
));
\ No newline at end of file
......@@ -3,12 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
/* Activity Bar */
.monaco-workbench > .activitybar .monaco-action-bar .action-label.extensions {
/*TODO@Isidor inline icon needed */
background-image: url('extensions-global-action.svg')
}
.quick-open-widget .extension {
padding: 0 14px 0 0;
height: 48px;
......@@ -126,3 +120,8 @@
-o-transform: none;
transform: none;
}
/* Status bar */
.monaco-shell .extensions-statusbar {
cursor: pointer;
}
......@@ -6,7 +6,6 @@
import nls = require('vs/nls');
import { Promise } from 'vs/base/common/winjs.base';
import { Action } from 'vs/base/common/actions';
import { ActivityActionItem } from 'vs/workbench/browser/parts/activityBar/activityAction';
import { IExtensionsService } from 'vs/workbench/parts/extensions/common/extensions';
import { IQuickOpenService } from 'vs/workbench/services/quickopen/browser/quickOpenService';
......@@ -78,25 +77,3 @@ export class ListOutdatedExtensionsAction extends Action {
return true;
}
}
export class GlobalExtensionsAction extends Action {
static ID = 'workbench.extensions.action.globalExtensions';
static LABEL = nls.localize('extensions', "Extensions");
constructor(
id: string,
label: string,
@IExtensionsService private extensionsService: IExtensionsService,
@IQuickOpenService private quickOpenService: IQuickOpenService
) {
super(id, label, 'extensions', true);
}
public run(): Promise {
return this.quickOpenService.show('ext install ');
}
protected isEnabled(): boolean {
return true;
}
}
......@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import 'vs/css!./media/extensions';
import 'vs/css!./extensions';
import nls = require('vs/nls');
import { IDisposable, disposeAll } from 'vs/base/common/lifecycle';
......
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M18.461 10.959h-2.538l2.538 2.539h-4.23c-2.337 0-4.23 1.893-4.23 4.23 0 2.336 1.894 4.23 4.23 4.23v-1.691c-1.402 0-2.539-1.139-2.539-2.539 0-1.402 1.137-2.539 2.539-2.539h4.23l-2.538 2.539h2.538l3.385-3.385-3.385-3.384zm-2.461-8.918c-7.72 0-14 6.271-14 13.979 0 7.709 6.28 13.98 14 13.98s14-6.271 14-13.979c0-7.709-6.28-13.98-14-13.98zm0 25.959c-6.617 0-12-5.374-12-11.979s5.383-11.98 12-11.98 12 5.374 12 11.979-5.383 11.98-12 11.98z" fill="#fff"/></svg>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册