Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 12:33:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #505 from bpasero/git-sync-command

Browse Source 
add the "Sync" command to the command palette as global command
This commit is contained in:
João Moreno
2015-11-25 16:44:25 +01:00
parent 782cb040c2 d66f6f47ef
commit c5bd9c4154
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/parts/git/browser/gitActions.contribution.ts
View File

@@ -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 = (<wbar.IWorkbenchActionRegistry> 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);

5
src/vs/workbench/parts/git/browser/gitActions.ts
View File

@@ -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);
}
}

2
src/vs/workbench/parts/git/browser/views/changes/changesView.ts
View File

@@ -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(),