dialogs - better massage options #172022
Merged
dialogs - better massage options #172022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bpasero
commented
Jan 23, 2023
| @@ -878,7 +878,7 @@ export class DebugService implements IDebugService { | |||
| const actions = errorActions.filter((action) => action.id.endsWith('.command')).length > 0 ? | |||
| errorActions : | |||
| [...errorActions, ...(promptLaunchJson ? [configureAction] : [])]; | |||
| const { choice } = await this.dialogService.show(severity.Error, message, actions.map(a => a.label).concat(nls.localize('cancel', "Cancel")), { cancelId: actions.length }); | |||
| const { choice } = await this.dialogService.show(severity.Error, message, actions.map(a => a.label).concat(nls.localize('cancel', "Cancel")), { cancelId: actions.length - 1 }); | |||
There was a problem hiding this comment.
@roblourens @connor4312 fyi, the cancel button was never assigned properly
bpasero
commented
Jan 23, 2023
| @@ -500,13 +500,13 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo | |||
| conflictingChanges.length > 1 ? | |||
| localize('resume edit session warning many', 'Resuming your working changes from the cloud will overwrite the following {0} files. Do you want to proceed?', conflictingChanges.length) : | |||
| localize('resume edit session warning 1', 'Resuming your working changes from the cloud will overwrite {0}. Do you want to proceed?', basename(conflictingChanges[0].uri)), | |||
| [cancel, yes], | |||
| [yes, cancel], | |||
There was a problem hiding this comment.
@joyceerhl please check, cancel buttons should be last in the dialog.
bpasero
commented
Jan 23, 2023
| @@ -104,8 +104,8 @@ export class PromptExtensionInstallFailureAction extends Action { | |||
| if (this.error.name === ExtensionManagementErrorCode.Unsupported) { | |||
| const productName = isWeb ? localize('VS Code for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong; | |||
| const message = localize('cannot be installed', "The '{0}' extension is not available in {1}. Click 'More Information' to learn more.", this.extension.displayName || this.extension.identifier.id, productName); | |||
| const result = await this.dialogService.show(Severity.Info, message, [localize('close', "Close"), localize('more information', "More Information")], { cancelId: 0 }); | |||
| if (result.choice === 1) { | |||
| const result = await this.dialogService.show(Severity.Info, message, [localize('more information', "More Information"), localize('close', "Close")], { cancelId: 1 }); | |||
bpasero
commented
Jan 23, 2023
| @@ -216,10 +216,10 @@ export class TaskQuickPick extends Disposable { | |||
| const changeSettingResult = await this._dialogService.show(Severity.Warning, | |||
| nls.localize('TaskQuickPick.changeSettingDetails', | |||
| "Task detection for {0} tasks causes files in any workspace you open to be run as code. Enabling {0} task detection is a user setting and will apply to any workspace you open. \n\n Do you want to enable {0} task detection for all workspaces?", selectedType), | |||
| [noButton, yesButton], | |||
| [yesButton, noButton], | |||
There was a problem hiding this comment.
@meganrogge fyi, I changed this so that cancelling the dialog would not execute the "Yes" button.
roblourens
approved these changes
Jan 24, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.