2
2
mirror of https://github.com/Llewellynvdm/nativefier.git synced 2024-12-22 18:18:55 +00:00

App/menu: cleanup, typing, properly hide devtools when asked (fix #842)

This commit is contained in:
Ronan Jouchet 2020-03-18 00:16:47 -04:00
parent 72a9eae6d6
commit f7215814d7

View File

@ -1,4 +1,10 @@
import { Menu, clipboard, globalShortcut, shell } from 'electron';
import {
Menu,
clipboard,
globalShortcut,
shell,
MenuItemConstructorOptions,
} from 'electron';
export function createMenu({
nativefierVersion,
@ -18,191 +24,196 @@ export function createMenu({
? 'Reset Zoom'
: `Reset Zoom (to ${zoomBuildTimeValue * 100}%, set at build time)`;
const template: any[] = [
{
label: '&Edit',
submenu: [
{
label: 'Undo',
accelerator: 'CmdOrCtrl+Z',
role: 'undo',
const editMenu: MenuItemConstructorOptions = {
label: '&Edit',
submenu: [
{
label: 'Undo',
accelerator: 'CmdOrCtrl+Z',
role: 'undo',
},
{
label: 'Redo',
accelerator: 'Shift+CmdOrCtrl+Z',
role: 'redo',
},
{
type: 'separator',
},
{
label: 'Cut',
accelerator: 'CmdOrCtrl+X',
role: 'cut',
},
{
label: 'Copy',
accelerator: 'CmdOrCtrl+C',
role: 'copy',
},
{
label: 'Copy Current URL',
accelerator: 'CmdOrCtrl+L',
click: () => {
const currentURL = getCurrentUrl();
clipboard.writeText(currentURL);
},
{
label: 'Redo',
accelerator: 'Shift+CmdOrCtrl+Z',
role: 'redo',
},
{
type: 'separator',
},
{
label: 'Cut',
accelerator: 'CmdOrCtrl+X',
role: 'cut',
},
{
label: 'Copy',
accelerator: 'CmdOrCtrl+C',
role: 'copy',
},
{
label: 'Copy Current URL',
accelerator: 'CmdOrCtrl+L',
click: () => {
const currentURL = getCurrentUrl();
clipboard.writeText(currentURL);
},
},
{
label: 'Paste',
accelerator: 'CmdOrCtrl+V',
role: 'paste',
},
{
label: 'Paste and Match Style',
accelerator: 'CmdOrCtrl+Shift+V',
role: 'pasteandmatchstyle',
},
{
label: 'Select All',
accelerator: 'CmdOrCtrl+A',
role: 'selectall',
},
{
label: 'Clear App Data',
click: clearAppData,
},
],
},
{
label: '&View',
submenu: [
{
label: 'Back',
accelerator: (() => {
globalShortcut.register('Alt+Left', goBack);
return 'CmdOrCtrl+[';
})(),
click: goBack,
},
{
label: 'Forward',
accelerator: (() => {
globalShortcut.register('Alt+Right', goForward);
return 'CmdOrCtrl+]';
})(),
click: goForward,
},
{
label: 'Reload',
accelerator: 'CmdOrCtrl+R',
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.reload();
}
},
},
{
type: 'separator',
},
{
label: 'Toggle Full Screen',
accelerator: (() => {
if (process.platform === 'darwin') {
return 'Ctrl+Cmd+F';
}
return 'F11';
})(),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
}
},
},
{
label: 'Zoom In',
accelerator: (() => {
globalShortcut.register('CmdOrCtrl+numadd', zoomIn);
return 'CmdOrCtrl+=';
})(),
click: zoomIn,
},
{
label: 'Zoom Out',
accelerator: (() => {
globalShortcut.register('CmdOrCtrl+numsub', zoomOut);
return 'CmdOrCtrl+-';
})(),
click: zoomOut,
},
{
label: zoomResetLabel,
accelerator: (() => {
globalShortcut.register('CmdOrCtrl+num0', zoomReset);
return 'CmdOrCtrl+0';
})(),
click: zoomReset,
},
{
label: 'Toggle Developer Tools',
accelerator: (() => {
if (process.platform === 'darwin') {
return 'Alt+Cmd+I';
}
return 'Ctrl+Shift+I';
})(),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.toggleDevTools();
}
},
},
],
},
{
label: '&Window',
role: 'window',
submenu: [
{
label: 'Minimize',
accelerator: 'CmdOrCtrl+M',
role: 'minimize',
},
{
label: 'Close',
accelerator: 'CmdOrCtrl+W',
role: 'close',
},
],
},
{
label: '&Help',
role: 'help',
submenu: [
{
label: `Built with Nativefier v${nativefierVersion}`,
click: () => {
shell.openExternal('https://github.com/jiahaog/nativefier');
},
},
{
label: 'Report an Issue',
click: () => {
shell.openExternal('https://github.com/jiahaog/nativefier/issues');
},
},
],
},
];
},
{
label: 'Paste',
accelerator: 'CmdOrCtrl+V',
role: 'paste',
},
{
label: 'Paste and Match Style',
accelerator: 'CmdOrCtrl+Shift+V',
role: 'pasteAndMatchStyle',
},
{
label: 'Select All',
accelerator: 'CmdOrCtrl+A',
role: 'selectAll',
},
{
label: 'Clear App Data',
click: clearAppData,
},
],
};
if (disableDevTools) {
// remove last item (dev tools) from menu > view
const { submenu } = template[1];
submenu.splice(submenu.length - 1, 1);
const viewMenu: MenuItemConstructorOptions = {
label: '&View',
submenu: [
{
label: 'Back',
accelerator: (() => {
globalShortcut.register('Alt+Left', goBack);
return 'CmdOrCtrl+[';
})(),
click: goBack,
},
{
label: 'Forward',
accelerator: (() => {
globalShortcut.register('Alt+Right', goForward);
return 'CmdOrCtrl+]';
})(),
click: goForward,
},
{
label: 'Reload',
accelerator: 'CmdOrCtrl+R',
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.reload();
}
},
},
{
type: 'separator',
},
{
label: 'Toggle Full Screen',
accelerator: (() => {
if (process.platform === 'darwin') {
return 'Ctrl+Cmd+F';
}
return 'F11';
})(),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
}
},
},
{
label: 'Zoom In',
accelerator: (() => {
globalShortcut.register('CmdOrCtrl+numadd', zoomIn);
return 'CmdOrCtrl+=';
})(),
click: zoomIn,
},
{
label: 'Zoom Out',
accelerator: (() => {
globalShortcut.register('CmdOrCtrl+numsub', zoomOut);
return 'CmdOrCtrl+-';
})(),
click: zoomOut,
},
{
label: zoomResetLabel,
accelerator: (() => {
globalShortcut.register('CmdOrCtrl+num0', zoomReset);
return 'CmdOrCtrl+0';
})(),
click: zoomReset,
},
],
};
if (!disableDevTools) {
(viewMenu.submenu as MenuItemConstructorOptions[]).push(
{
type: 'separator',
},
{
label: 'Toggle Developer Tools',
accelerator: (() => {
if (process.platform === 'darwin') {
return 'Alt+Cmd+I';
}
return 'Ctrl+Shift+I';
})(),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.webContents.toggleDevTools();
}
},
},
);
}
const windowMenu: MenuItemConstructorOptions = {
label: '&Window',
role: 'window',
submenu: [
{
label: 'Minimize',
accelerator: 'CmdOrCtrl+M',
role: 'minimize',
},
{
label: 'Close',
accelerator: 'CmdOrCtrl+W',
role: 'close',
},
],
};
const helpMenu: MenuItemConstructorOptions = {
label: '&Help',
role: 'help',
submenu: [
{
label: `Built with Nativefier v${nativefierVersion}`,
click: () => {
shell.openExternal('https://github.com/jiahaog/nativefier');
},
},
{
label: 'Report an Issue',
click: () => {
shell.openExternal('https://github.com/jiahaog/nativefier/issues');
},
},
],
};
let menuTemplate: MenuItemConstructorOptions[];
if (process.platform === 'darwin') {
template.unshift({
const electronMenu: MenuItemConstructorOptions = {
label: 'E&lectron',
submenu: [
{
@ -221,7 +232,7 @@ export function createMenu({
{
label: 'Hide Others',
accelerator: 'Cmd+Shift+H',
role: 'hideothers',
role: 'hideOthers',
},
{
label: 'Show All',
@ -236,8 +247,8 @@ export function createMenu({
click: appQuit,
},
],
});
template[3].submenu.push(
};
(windowMenu.submenu as MenuItemConstructorOptions[]).push(
{
type: 'separator',
},
@ -246,8 +257,11 @@ export function createMenu({
role: 'front',
},
);
menuTemplate = [electronMenu, editMenu, viewMenu, windowMenu, helpMenu];
} else {
menuTemplate = [editMenu, viewMenu, windowMenu, helpMenu];
}
const menu = Menu.buildFromTemplate(template);
const menu = Menu.buildFromTemplate(menuTemplate);
Menu.setApplicationMenu(menu);
}