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

fix namings

Browse source
This commit is contained in:
Sandeep Somavarapu 2019-12-08 17:01:26 +01:00
parent 2bb6cfc16a
commit 8bcf1bc04b
1 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
View file

@ -161,9 +161,9 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
let priority: number | undefined = undefined;
if (this.userDataSyncService.status !== SyncStatus.Uninitialized && this.configurationService.getValue<boolean>(UserDataSyncWorkbenchContribution.ENABLEMENT_SETTING) && this.authTokenService.status === AuthTokenStatus.SignedOut) {
badge = new NumberBadge(1, () => localize('sign in', "Sync: Sign in..."));
badge = new NumberBadge(1, () => localize('sign in to sync', "Sign in to Sync"));
} else if (this.authTokenService.status === AuthTokenStatus.SigningIn) {
badge = new ProgressBadge(() => localize('signing in', "Signin in..."));
badge = new ProgressBadge(() => localize('signing in', "Signing in..."));
clazz = 'progress-badge';
priority = 1;
} else if (this.userDataSyncService.status === SyncStatus.HasConflicts) {
@ -315,17 +315,24 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
private registerActions(): void {
const startSyncMenuItem: IMenuItem = {
const turnOnSyncCommandId = 'workbench.userData.actions.syncStart';
const turnOnSyncWhenContext = ContextKeyExpr.and(CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized), ContextKeyExpr.not(`config.${UserDataSyncWorkbenchContribution.ENABLEMENT_SETTING}`), CONTEXT_AUTH_TOKEN_STATE.notEqualsTo(AuthTokenStatus.SigningIn));
CommandsRegistry.registerCommand(turnOnSyncCommandId, () => this.turnOn());
MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
group: '5_sync',
command: {
id: 'workbench.userData.actions.syncStart',
title: localize('start sync', "Sync: Turn On")
id: turnOnSyncCommandId,
title: localize('global activity turn on sync', "Turn on sync...")
},
when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized), ContextKeyExpr.not(`config.${UserDataSyncWorkbenchContribution.ENABLEMENT_SETTING}`), CONTEXT_AUTH_TOKEN_STATE.notEqualsTo(AuthTokenStatus.SigningIn)),
};
CommandsRegistry.registerCommand(startSyncMenuItem.command.id, () => this.turnOn());
MenuRegistry.appendMenuItem(MenuId.GlobalActivity, startSyncMenuItem);
MenuRegistry.appendMenuItem(MenuId.CommandPalette, startSyncMenuItem);
when: turnOnSyncWhenContext,
});
MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
command: {
id: turnOnSyncCommandId,
title: localize('turn on sync', "Sync: Turn on sync...")
},
when: turnOnSyncWhenContext,
});
const signInCommandId = 'workbench.userData.actions.signin';
const signInWhenContext = ContextKeyExpr.and(CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized), ContextKeyExpr.has(`config.${UserDataSyncWorkbenchContribution.ENABLEMENT_SETTING}`), CONTEXT_AUTH_TOKEN_STATE.isEqualTo(AuthTokenStatus.SignedOut));
@ -334,14 +341,14 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
group: '5_sync',
command: {
id: signInCommandId,
title: localize('global activity sign in', "Sync: Sign in... (1)")
title: localize('global activity sign in', "Sign in to sync... (1)")
},
when: signInWhenContext,
});
MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
command: {
id: signInCommandId,
title: localize('sign in', "Sync: Sign in...")
title: localize('sign in', "Sync: Sign in to sync...")
},
when: signInWhenContext,
});
@ -352,24 +359,27 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
group: '5_sync',
command: {
id: signingInCommandId,
title: localize('signinig in', "Sync: Signing in..."),
title: localize('signinig in', "Signing in..."),
precondition: FalseContext
},
when: CONTEXT_AUTH_TOKEN_STATE.isEqualTo(AuthTokenStatus.SigningIn)
});
const stopSyncCommand = {
id: 'workbench.userData.actions.stopSync',
title: localize('stop sync', "Sync: Turn Off")
};
CommandsRegistry.registerCommand(stopSyncCommand.id, () => this.turnOff());
const stopSyncCommandId = 'workbench.userData.actions.stopSync';
CommandsRegistry.registerCommand(stopSyncCommandId, () => this.turnOff());
MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
group: '5_sync',
command: stopSyncCommand,
command: {
id: stopSyncCommandId,
title: localize('global activity stop sync', "Turn off sync")
},
when: ContextKeyExpr.and(ContextKeyExpr.has(`config.${UserDataSyncWorkbenchContribution.ENABLEMENT_SETTING}`), CONTEXT_AUTH_TOKEN_STATE.isEqualTo(AuthTokenStatus.SignedIn), CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized), CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.HasConflicts))
});
MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
command: stopSyncCommand,
command: {
id: stopSyncCommandId,
title: localize('stop sync', "Sync: Turn off sync")
},
when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized), ContextKeyExpr.has(`config.${UserDataSyncWorkbenchContribution.ENABLEMENT_SETTING}`)),
});
@ -380,14 +390,14 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
group: '5_sync',
command: {
id: resolveConflictsCommandId,
title: localize('resolveConflicts_global', "Sync: Resolve Conflicts (1)"),
title: localize('resolveConflicts_global', "Resolve sync conflicts (1)"),
},
when: resolveConflictsWhenContext,
});
MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
command: {
id: resolveConflictsCommandId,
title: localize('resolveConflicts', "Sync: Resolve Conflicts"),
title: localize('resolveConflicts', "Sync: Resolve sync conflicts"),
},
when: resolveConflictsWhenContext,
});
@ -397,14 +407,14 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
command: {
id: continueSyncCommandId,
title: localize('continue sync', "Sync: Continue")
title: localize('continue sync', "Sync: Continue sync")
},
when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.isEqualTo(SyncStatus.HasConflicts)),
});
MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
command: {
id: continueSyncCommandId,
title: localize('continue sync', "Sync: Continue"),
title: localize('continue sync', "Sync: Continue sync"),
icon: {
light: SYNC_PUSH_LIGHT_ICON_URI,
dark: SYNC_PUSH_DARK_ICON_URI
@ -417,7 +427,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
command: {
id: continueSyncCommandId,
title: localize('continue sync', "Sync: Continue"),
title: localize('continue sync', "Sync: Continue sync"),
icon: {
light: SYNC_PUSH_LIGHT_ICON_URI,
dark: SYNC_PUSH_DARK_ICON_URI
@ -432,7 +442,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
group: '5_sync',
command: {
id: 'workbench.userData.actions.signout',
title: localize('sign out', "Sign Out")
title: localize('sign out', "Sync: Sign out")
},
when: ContextKeyExpr.and(CONTEXT_AUTH_TOKEN_STATE.isEqualTo(AuthTokenStatus.SignedIn)),
};