hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into turn-on-strict

Browse Source
This commit is contained in:
Sebastian Malton 2022-05-05 15:21:15 -04:00
commit 05dc0367df
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/menu/application-menu-items.injectable.ts
View File

@ -10,11 +10,8 @@ import { broadcastMessage } from "../../common/ipc";
import { openBrowser } from "../../common/utils"; import { openBrowser } from "../../common/utils";
import { showAbout } from "./menu"; import { showAbout } from "./menu";
import windowManagerInjectable from "../window-manager.injectable"; import windowManagerInjectable from "../window-manager.injectable";
import type { import type { MenuItemConstructorOptions } from "electron";
MenuItemConstructorOptions } from "electron"; import { webContents } from "electron";
import {
webContents,
} from "electron";
import loggerInjectable from "../../common/logger.injectable"; import loggerInjectable from "../../common/logger.injectable";
import appNameInjectable from "../app-paths/app-name/app-name.injectable"; import appNameInjectable from "../app-paths/app-name/app-name.injectable";
import electronMenuItemsInjectable from "./electron-menu-items.injectable"; import electronMenuItemsInjectable from "./electron-menu-items.injectable";
@ -67,10 +64,8 @@ const applicationMenuItemsInjectable = getInjectable({
{ {
label: `About ${productName}`, label: `About ${productName}`,
id: "about", id: "about",
click(menuItem, browserWindow) { click() {
if (browserWindow) { showAbout();
showAbout(browserWindow);
}
}, },
}, },
...ignoreIf(autoUpdateDisabled, [ ...ignoreIf(autoUpdateDisabled, [
@ -281,10 +276,8 @@ const applicationMenuItemsInjectable = getInjectable({
{ {
label: `About ${productName}`, label: `About ${productName}`,
id: "about", id: "about",
click(menuItem, browserWindow) { click() {
if (browserWindow) { showAbout();
showAbout(browserWindow);
}
}, },
}, },
...ignoreIf(autoUpdateDisabled, [ ...ignoreIf(autoUpdateDisabled, [

5
src/main/menu/menu.ts
View File

@ -2,7 +2,6 @@
* Copyright (c) OpenLens Authors. All rights reserved. * Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import type { BrowserWindow } from "electron";
import { app, dialog, Menu } from "electron"; import { app, dialog, Menu } from "electron";
import type { IComputedValue } from "mobx"; import type { IComputedValue } from "mobx";
import { autorun } from "mobx"; import { autorun } from "mobx";
@ -20,7 +19,7 @@ export function initMenu(
}); });
} }
export function showAbout(browserWindow: BrowserWindow) { export function showAbout() {
const appInfo = [ const appInfo = [
`${appName}: ${app.getVersion()}`, `${appName}: ${app.getVersion()}`,
`Electron: ${process.versions.electron}`, `Electron: ${process.versions.electron}`,
@ -29,7 +28,7 @@ export function showAbout(browserWindow: BrowserWindow) {
packageJson.copyright, packageJson.copyright,
]; ];
dialog.showMessageBoxSync(browserWindow, { dialog.showMessageBoxSync({
title: `${isWindows ? " ".repeat(2) : ""}${appName}`, title: `${isWindows ? " ".repeat(2) : ""}${appName}`,
type: "info", type: "info",
buttons: ["Close"], buttons: ["Close"],