From fdf65e8ab68c5009abe024c1faa8ebb2c2150d3a Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Thu, 5 May 2022 18:49:11 +0300 Subject: [PATCH] Allowing to copy text from About dialog (#5335) --- src/main/menu/application-menu-items.injectable.ts | 13 +++++-------- src/main/menu/menu.ts | 5 ++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts index 9e95414838..9cc2e26691 100644 --- a/src/main/menu/application-menu-items.injectable.ts +++ b/src/main/menu/application-menu-items.injectable.ts @@ -10,10 +10,7 @@ import { broadcastMessage } from "../../common/ipc"; import { openBrowser } from "../../common/utils"; import { showAbout } from "./menu"; import windowManagerInjectable from "../window-manager.injectable"; -import type { - BrowserWindow, - MenuItem, - MenuItemConstructorOptions } from "electron"; +import type { MenuItemConstructorOptions } from "electron"; import { webContents, } from "electron"; @@ -69,8 +66,8 @@ const applicationMenuItemsInjectable = getInjectable({ { label: `About ${productName}`, id: "about", - click(menuItem: MenuItem, browserWindow: BrowserWindow) { - showAbout(browserWindow); + click() { + showAbout(); }, }, ...ignoreIf(autoUpdateDisabled, [ @@ -286,8 +283,8 @@ const applicationMenuItemsInjectable = getInjectable({ { label: `About ${productName}`, id: "about", - click(menuItem: MenuItem, browserWindow: BrowserWindow) { - showAbout(browserWindow); + click() { + showAbout(); }, }, ...ignoreIf(autoUpdateDisabled, [ diff --git a/src/main/menu/menu.ts b/src/main/menu/menu.ts index 4d5092b666..4936957b80 100644 --- a/src/main/menu/menu.ts +++ b/src/main/menu/menu.ts @@ -2,7 +2,6 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { BrowserWindow } from "electron"; import { app, dialog, Menu } from "electron"; import type { IComputedValue } from "mobx"; import { autorun } from "mobx"; @@ -20,7 +19,7 @@ export function initMenu( }); } -export function showAbout(browserWindow: BrowserWindow) { +export function showAbout() { const appInfo = [ `${appName}: ${app.getVersion()}`, `Electron: ${process.versions.electron}`, @@ -29,7 +28,7 @@ export function showAbout(browserWindow: BrowserWindow) { packageJson.copyright, ]; - dialog.showMessageBoxSync(browserWindow, { + dialog.showMessageBoxSync({ title: `${isWindows ? " ".repeat(2) : ""}${appName}`, type: "info", buttons: ["Close"],