diff --git a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts index 96d6de21c00..6442cf9abf5 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts @@ -31,7 +31,7 @@ import {IFileService, IFileStat} from 'vs/platform/files/common/files'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import wbar = require('vs/workbench/browser/actionRegistry'); import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; -import { OpenChangeAction } from './gitActions'; +import { OpenChangeAction, SyncAction } from './gitActions'; import Severity from 'vs/base/common/severity'; function getStatus(gitService: IGitService, contextService: IWorkspaceContextService, input: WorkbenchEditorCommon.IFileEditorInput): IFileStatus { @@ -432,5 +432,7 @@ actionBarRegistry.registerActionBarContributor(abr.Scope.EDITOR, GitWorkingTreeD let workbenchActionRegistry = ( platform.Registry.as(wbar.Extensions.WorkbenchActions)); -// Register Action to Open Viewlet -workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(GlobalOpenChangeAction, GlobalOpenChangeAction.ID, GlobalOpenChangeAction.LABEL), nls.localize('git', "Git")); +// Register Actions +const category = nls.localize('git', "Git"); +workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(GlobalOpenChangeAction, GlobalOpenChangeAction.ID, GlobalOpenChangeAction.LABEL), category); +workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SyncAction, SyncAction.ID, SyncAction.LABEL), category); diff --git a/src/vs/workbench/parts/git/browser/gitActions.ts b/src/vs/workbench/parts/git/browser/gitActions.ts index 640854afd15..729ca7ae817 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.ts @@ -941,9 +941,10 @@ export abstract class BaseSyncAction extends GitAction { export class SyncAction extends BaseSyncAction { static ID = 'workbench.action.sync'; + static LABEL = nls.localize('sync', "Sync"); - constructor(@IGitService gitService: IGitService) { - super(SyncAction.ID, nls.localize('sync', "Sync"), 'git-action sync', gitService); + constructor(id: string, label: string, @IGitService gitService: IGitService) { + super(id, label, 'git-action sync', gitService); } } diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts index bcb9a31521c..f454db50a1b 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts @@ -246,7 +246,7 @@ export class ChangesView extends EventEmitter.EventEmitter implements GitView.IV public getSecondaryActions(): Actions.IAction[] { if (!this.secondaryActions) { this.secondaryActions = [ - this.instantiationService.createInstance(GitActions.SyncAction), + this.instantiationService.createInstance(GitActions.SyncAction, GitActions.SyncAction.ID, GitActions.SyncAction.LABEL), this.instantiationService.createInstance(GitActions.PullAction), this.instantiationService.createInstance(GitActions.PushAction), new ActionBar.Separator(),