maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

restricted mode hover: added a link to manage trust. For #125408

Browse source
This commit is contained in:
Martin Aeschlimann 2021-06-04 13:23:04 +02:00
parent f8c061e73d
commit 383ae36449
No known key found for this signature in database
GPG key ID: 2609A01E695523E3
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
View file

@ -449,8 +449,9 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
ariaLabel = trusted ? localize('status.ariaTrustedWindow', "This window is trusted.") :
localize('status.ariaUntrustedWindow', "Restricted Mode: Some features are disabled because this window is not trusted.");
toolTip = trusted ? ariaLabel : {
value: localize('status.tooltipUntrustedWindow', "Restricted Mode: [Some features](command:{1}) are disabled because this window is not trusted.", LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID),
isTrusted: true
value: localize('status.tooltipUntrustedWindow', "Running in Restricted Mode\n\n\Some [features are disabled](command:{0}) because this [window is not trusted](command:{1}).", LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, MANAGE_TRUST_COMMAND_ID),
isTrusted: true,
supportThemeIcons: true
};
break;
}
@ -458,8 +459,9 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
ariaLabel = trusted ? localize('status.ariaTrustedFolder', "This folder is trusted.") :
localize('status.ariaUntrustedFolder', "Restricted Mode: Some features are disabled because this folder is not trusted.");
toolTip = trusted ? ariaLabel : {
value: localize('status.tooltipUntrustedFolder', "Restricted Mode: [Some features](command:{1}) are disabled because this folder is not trusted", LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID),
isTrusted: true
value: localize('status.tooltipUntrustedFolder', "Running in Restricted Mode\n\n\Some [features are disabled](command:{0}) because this [folder is not trusted](command:{1}).", LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, MANAGE_TRUST_COMMAND_ID),
isTrusted: true,
supportThemeIcons: true
};
break;
}
@ -467,8 +469,9 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
ariaLabel = trusted ? localize('status.ariaTrustedWorkspace', "This workspace is trusted.") :
localize('status.ariaUntrustedWorkspace', "Restricted Mode: Some features are disabled because this workspace is not trusted.");
toolTip = trusted ? ariaLabel : {
value: localize('status.tooltipUntrustedWorkspace', "Restricted Mode: [Some features](command:{1}) are disabled because this workspace is not trusted", LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID),
isTrusted: true
value: localize('status.tooltipUntrustedWorkspace', "Running in Restricted Mode\n\n\Some [features are disabled](command:{0}) because this [workspace is not trusted](command:{1}).", LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, MANAGE_TRUST_COMMAND_ID),
isTrusted: true,
supportThemeIcons: true
};
break;
}
@ -631,11 +634,13 @@ Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
* Actions
*/
const MANAGE_TRUST_COMMAND_ID = 'workbench.trust.manage';
// Manage Workspace Trust
registerAction2(class extends Action2 {
constructor() {
super({
id: 'workbench.trust.manage',
id: MANAGE_TRUST_COMMAND_ID,
title: {
original: 'Manage Workspace Trust',
value: localize('manageWorkspaceTrust', "Manage Workspace Trust")