Use the default electron roles and their naming/implemenation

See: https://github.com/electron/electron/pull/6190/files
This commit is contained in:
Kolja Lampe 2016-07-04 09:19:41 +02:00
parent 8c674e5b9f
commit 932f756570
3 changed files with 14 additions and 39 deletions

View file

@ -7,19 +7,15 @@ const MenuItem = remote.MenuItem;
var createDefault = function() { var createDefault = function() {
var menu = new Menu(); var menu = new Menu();
menu.append(new MenuItem({ menu.append(new MenuItem({
label: 'Cut',
role: 'cut' role: 'cut'
})); }));
menu.append(new MenuItem({ menu.append(new MenuItem({
label: 'Copy',
role: 'copy' role: 'copy'
})); }));
menu.append(new MenuItem({ menu.append(new MenuItem({
label: 'Paste',
role: 'paste' role: 'paste'
})); }));
menu.append(new MenuItem({ menu.append(new MenuItem({
label: 'Select All',
role: 'selectall' role: 'selectall'
})); }));
return menu; return menu;

View file

@ -163,6 +163,10 @@ app.on('activate', function(event) {
}); });
app.on('before-quit', function() { app.on('before-quit', function() {
// Make sure tray icon gets removed if the user exits via CTRL-Q
if (process.platform === 'win32') {
trayIcon.destroy();
}
willAppQuit = true; willAppQuit = true;
}); });

View file

@ -28,16 +28,11 @@ var createTemplate = function(mainWindow, config) {
mainWindow.loadURL('file://' + __dirname + '/browser/settings.html'); mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
} }
}, separatorItem, { }, separatorItem, {
label: 'Hide ' + app_name, role: 'hide'
accelerator: 'Command+H',
selector: 'hide:'
}, { }, {
label: 'Hide Others', role: 'hideothers'
accelerator: 'Command+Shift+H',
selector: 'hideOtherApplications:'
}, { }, {
label: 'Show All', role: 'unhide'
selector: 'unhideAllApplications:'
}, separatorItem, { }, separatorItem, {
role: 'quit' role: 'quit'
}] : [{ }] : [{
@ -47,7 +42,11 @@ var createTemplate = function(mainWindow, config) {
mainWindow.loadURL('file://' + __dirname + '/browser/settings.html'); mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
} }
}, separatorItem, { }, separatorItem, {
role: 'quit' role: 'quit',
accelerator: 'CmdOrCtrl+Q',
click: function(item, focusedWindow) {
electron.app.quit();
}
}]; }];
template.push({ template.push({
@ -59,28 +58,16 @@ var createTemplate = function(mainWindow, config) {
template.push({ template.push({
label: '&Edit', label: '&Edit',
submenu: [{ submenu: [{
label: 'Undo',
accelerator: 'CmdOrCtrl+Z',
role: 'undo' role: 'undo'
}, { }, {
label: 'Redo',
accelerator: 'Shift+CmdOrCtrl+Z',
role: 'redo' role: 'redo'
}, separatorItem, { }, separatorItem, {
label: 'Cut',
accelerator: 'CmdOrCtrl+X',
role: 'cut' role: 'cut'
}, { }, {
label: 'Copy',
accelerator: 'CmdOrCtrl+C',
role: 'copy' role: 'copy'
}, { }, {
label: 'Paste',
accelerator: 'CmdOrCtrl+V',
role: 'paste' role: 'paste'
}, { }, {
label: 'Select All',
accelerator: 'CmdOrCtrl+A',
role: 'selectall' role: 'selectall'
}, ] }, ]
}); });
@ -155,21 +142,9 @@ var createTemplate = function(mainWindow, config) {
const window_menu = { const window_menu = {
label: '&Window', label: '&Window',
submenu: [{ submenu: [{
label: 'Minimize', role: 'minimize'
accelerator: 'CmdOrCtrl+M',
click: function(item, focusedWindow) {
if (focusedWindow) {
focusedWindow.minimize();
}
}
}, { }, {
label: 'Close', role: 'close'
accelerator: 'CmdOrCtrl+W',
click: function(item, focusedWindow) {
if (focusedWindow) {
focusedWindow.close();
}
}
}, separatorItem, ...config.teams.slice(0, 9).map((team, i) => { }, separatorItem, ...config.teams.slice(0, 9).map((team, i) => {
return { return {
label: team.name, label: team.name,