Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add Help/about menu for macOS/Windows/Linux #1207

Merged
merged 1 commit into from Jan 20, 2023
+44 −0
Merged

feat: Add Help/about menu for macOS/Windows/Linux #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -96,6 +96,7 @@
"chokidar": "^3.5.3",
"dockerode": "^3.3.4",
"electron-updater": "5.3.0",
"electron-util": "^0.17.2",
"getos": "^3.2.1",
"got": "^12.5.3",
"hpagent": "^1.2.0",
Expand Down
25 changes: 25 additions & 0 deletions packages/main/src/mainWindow.ts
View file
Open in desktop
Expand Up @@ -17,8 +17,10 @@
***********************************************************************/

import type { BrowserWindowConstructorOptions, FileFilter } from 'electron';
import { Menu } from 'electron';
import { BrowserWindow, ipcMain, app, dialog, screen } from 'electron';
import contextMenu from 'electron-context-menu';
const { aboutMenuItem } = require('electron-util');
import { join } from 'path';
import { URL } from 'url';
import type { ConfigurationRegistry } from './plugin/configuration-registry';
Expand Down Expand Up @@ -165,6 +167,29 @@ async function createWindow() {
},
});

// Add help/about menu entry
const menu = Menu.getApplicationMenu(); // get default menu
if (menu) {
// build a new menu based on default one but adding about entry in the help menu
const newmenu = Menu.buildFromTemplate(
menu.items.map(i => {
// add the About entry only in the help menu
if (i.role === 'help' && i.submenu) {
const aboutMenuSubItem = aboutMenuItem({});
aboutMenuSubItem.label = 'About';

// create new submenu
// also add a separator before the About entry
const newSubMenu = Menu.buildFromTemplate([...i.submenu.items, { type: 'separator' }, aboutMenuSubItem]);
return Object.assign({}, i, { submenu: newSubMenu });
}
return i;
}),
);

Menu.setApplicationMenu(newmenu);
}

/**
* URL for main window.
* Vite dev server for development.
Expand Down
18 changes: 18 additions & 0 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -6272,6 +6272,11 @@ electron-dl@^3.2.1:
pupa "^2.0.1"
unused-filename "^2.1.0"

electron-is-dev@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.2.0.tgz#2e5cea0a1b3ccf1c86f577cee77363ef55deb05e"
integrity sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw==

electron-is-dev@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd"
Expand Down Expand Up @@ -6330,6 +6335,14 @@ electron-updater@5.3.0:
semver "^7.3.5"
typed-emitter "^2.1.0"

electron-util@^0.17.2:
version "0.17.2"
resolved "https://registry.yarnpkg.com/electron-util/-/electron-util-0.17.2.tgz#6b0fe798ae0154585e7e0e96a707bfeae592be05"
integrity sha512-4Kg/aZxJ2BZklgyfH86px/D2GyROPyIcnAZar+7KiNmKI2I5l09pwQTP7V95zM3FVhgDQwV9iuJta5dyEvuWAw==
dependencies:
electron-is-dev "^1.1.0"
new-github-issue-url "^0.2.1"

electron@^22.0.2:
version "22.0.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.2.tgz#256c3f7749bcab5d68dc0ba4ae86c1b60852f0b3"
Expand Down Expand Up @@ -8951,6 +8964,11 @@ neo-async@^2.6.2:
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==

new-github-issue-url@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/new-github-issue-url/-/new-github-issue-url-0.2.1.tgz#e17be1f665a92de465926603e44b9f8685630c1d"
integrity sha512-md4cGoxuT4T4d/HDOXbrUHkTKrp/vp+m3aOA7XXVYwNsUNMK49g3SQicTSeV5GIz/5QVGAeYRAOlyp9OvlgsYA==

ninja-keys@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/ninja-keys/-/ninja-keys-1.2.2.tgz#c1e1ec1a98aee3a977ee77157ac4aa865348be88"
Expand Down