From c7774fbe5ea38a7ad77fe618db24e3c87aec598b Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 19 Aug 2019 23:56:32 -0400 Subject: [PATCH] Allows confirm toggle on confirm step Shortens confirm toggle tooltips --- src/commands/gitCommands.ts | 6 +++--- src/commands/quickCommand.ts | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/commands/gitCommands.ts b/src/commands/gitCommands.ts index 30a3365..97ba15d 100644 --- a/src/commands/gitCommands.ts +++ b/src/commands/gitCommands.ts @@ -80,7 +80,7 @@ export class GitCommandsCommand extends Command { dark: Container.context.asAbsolutePath('images/dark/icon-check.svg') as any, light: Container.context.asAbsolutePath('images/light/icon-check.svg') as any }, - tooltip: 'Will ask for confirmation at the end (click to toggle)' + tooltip: 'Will confirm' }; static readonly WillConfirmForced: QuickInputButton = { @@ -88,7 +88,7 @@ export class GitCommandsCommand extends Command { dark: Container.context.asAbsolutePath('images/dark/icon-check.svg') as any, light: Container.context.asAbsolutePath('images/light/icon-check.svg') as any }, - tooltip: 'Will ask for confirmation at the end (cannot be changed)' + tooltip: 'Will always confirm' }; static readonly WillSkipConfirm: QuickInputButton = { @@ -96,7 +96,7 @@ export class GitCommandsCommand extends Command { dark: Container.context.asAbsolutePath('images/dark/icon-no-check.svg') as any, light: Container.context.asAbsolutePath('images/light/icon-no-check.svg') as any }, - tooltip: 'Will NOT ask for confirmation at the end (click to toggle)' + tooltip: 'Skips confirm' }; }; diff --git a/src/commands/quickCommand.ts b/src/commands/quickCommand.ts index f319589..7e6989c 100644 --- a/src/commands/quickCommand.ts +++ b/src/commands/quickCommand.ts @@ -1,5 +1,5 @@ 'use strict'; -import { InputBox, QuickInputButton, QuickInputButtons, QuickPick, QuickPickItem } from 'vscode'; +import { InputBox, QuickInputButton, QuickPick, QuickPickItem } from 'vscode'; import { Directive, DirectiveQuickPickItem } from '../quickpicks'; import { Container } from '../container'; @@ -149,8 +149,7 @@ export abstract class QuickCommandBase implements QuickPickItem { placeholder: placeholder || `Confirm ${this.title}`, title: title, items: [...confirmations, cancel || DirectiveQuickPickItem.create(Directive.Cancel)], - selectedItems: [confirmations[0]], - buttons: [QuickInputButtons.Back] + selectedItems: [confirmations[0]] }); }