From 2fe21ecaf5ba3895601629220cfc152ab90d7b53 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 17 Sep 2018 17:59:21 +0200 Subject: [PATCH] :lipstick: --- .../windows/electron-main/windowsService.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/vs/platform/windows/electron-main/windowsService.ts b/src/vs/platform/windows/electron-main/windowsService.ts index 077542554f2..0deb6db4420 100644 --- a/src/vs/platform/windows/electron-main/windowsService.ts +++ b/src/vs/platform/windows/electron-main/windowsService.ts @@ -23,7 +23,7 @@ import { IWorkspaceIdentifier, IWorkspaceFolderCreationData, ISingleFolderWorksp import { ISerializableCommandAction } from 'vs/platform/actions/common/actions'; import { Schemas } from 'vs/base/common/network'; import { mnemonicButtonLabel } from 'vs/base/common/labels'; -import { isMacintosh } from 'vs/base/common/platform'; +import { isMacintosh, isLinux } from 'vs/base/common/platform'; import { ILogService } from 'vs/platform/log/common/log'; export class WindowsService implements IWindowsService, IURLHandler, IDisposable { @@ -522,15 +522,25 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable process.arch ); + const ok = nls.localize('okButton', "OK"); + const copy = mnemonicButtonLabel(nls.localize({ key: 'copy', comment: ['&& denotes a mnemonic'] }, "&&Copy")); + let buttons: string[]; + if (isLinux) { + buttons = [copy, ok]; + } else { + buttons = [ok, copy]; + } + this.windowsMainService.showMessageBox({ title: product.nameLong, type: 'info', message: product.nameLong, detail: `\n${detail}`, - buttons: [nls.localize('okButton', "OK"), mnemonicButtonLabel(nls.localize({ key: 'copy', comment: ['&& denotes a mnemonic'] }, "&&Copy"))], - noLink: true + buttons, + noLink: true, + defaultId: buttons.indexOf(ok) }, lastActiveWindow).then(result => { - if (result.button === 1) { + if (buttons[result.button] === copy) { clipboard.writeText(detail); } }); -- GitLab