paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-14 02:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Menu.js.

Browse Source
This commit is contained in:
Zhongyi Tong
2017-08-06 00:19:35 +08:00
parent 9c2b7eeb27
commit b873b358fe
2 changed files with 238 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/index.js
View File

@@ -153,7 +153,7 @@ app.on('activate', () => {
}); });
app.on('ready', () => { app.on('ready', () => {
electron.Menu.setApplicationMenu(appMenu); electron.Menu.setApplicationMenu(appMenu.getMenu());
mainWindow = createMainWindow(); mainWindow = createMainWindow();
const page = mainWindow.webContents; const page = mainWindow.webContents;

354
app/main/menu.js
View File

@@ -10,109 +10,82 @@ const BrowserWindow = electron.BrowserWindow;
const shell = electron.shell; const shell = electron.shell;
const appName = app.getName(); const appName = app.getName();
function sendAction(action) { class AppMenu {
const win = BrowserWindow.getAllWindows()[0]; getHistorySubmenu() {
return [{
if (process.platform === 'darwin') {
win.restore();
}
win.webContents.send(action);
}
function clearCache() {
const win = BrowserWindow.getAllWindows()[0];
const ses = win.webContents.session;
ses.clearCache(() => {
dialog.showMessageBox({type: 'info', buttons: [], message: 'Cache cleared!'});
});
}
const historySubmenu = [
{
label: 'Back', label: 'Back',
accelerator: process.platform === 'darwin' ? 'Command+Left' : 'Alt+Left', accelerator: process.platform === 'darwin' ? 'Command+Left' : 'Alt+Left',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('back'); AppMenu.sendAction('back');
} }
} }
}, }, {
{
label: 'Forward', label: 'Forward',
accelerator: process.platform === 'darwin' ? 'Command+Right' : 'Alt+Right', accelerator: process.platform === 'darwin' ? 'Command+Right' : 'Alt+Right',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('forward'); AppMenu.sendAction('forward');
} }
} }
}];
} }
];
const viewSubmenu = [ getViewSubmenu() {
{ return [{
label: 'Reload', label: 'Reload',
accelerator: 'CommandOrControl+R', accelerator: 'CommandOrControl+R',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('reload-viewer'); AppMenu.sendAction('reload-viewer');
} }
} }
}, }, {
{
label: 'Hard Reload', label: 'Hard Reload',
accelerator: 'CommandOrControl+Shift+R', accelerator: 'CommandOrControl+Shift+R',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('hard-reload'); AppMenu.sendAction('hard-reload');
} }
} }
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
role: 'togglefullscreen' role: 'togglefullscreen'
}, }, {
{
label: 'Zoom In', label: 'Zoom In',
accelerator: 'CommandOrControl+=', accelerator: 'CommandOrControl+=',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('zoomIn'); AppMenu.sendAction('zoomIn');
} }
} }
}, }, {
{
label: 'Zoom Out', label: 'Zoom Out',
accelerator: 'CommandOrControl+-', accelerator: 'CommandOrControl+-',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('zoomOut'); AppMenu.sendAction('zoomOut');
} }
} }
}, }, {
{
label: 'Actual Size', label: 'Actual Size',
accelerator: 'CommandOrControl+0', accelerator: 'CommandOrControl+0',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('zoomActualSize'); AppMenu.sendAction('zoomActualSize');
} }
} }
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
label: 'Toggle Tray Icon', label: 'Toggle Tray Icon',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
focusedWindow.webContents.send('toggletray'); focusedWindow.webContents.send('toggletray');
} }
} }
}, }, {
{
label: 'Toggle Sidebar', label: 'Toggle Sidebar',
accelerator: 'CommandOrControl+S', accelerator: 'CommandOrControl+S',
click(item, focusedWindow) { click(item, focusedWindow) {
@@ -122,8 +95,7 @@ const viewSubmenu = [
ConfigUtil.setConfigItem('show-sidebar', newValue); ConfigUtil.setConfigItem('show-sidebar', newValue);
} }
} }
}, }, {
{
label: 'Toggle DevTools for Zulip App', label: 'Toggle DevTools for Zulip App',
accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I', accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
click(item, focusedWindow) { click(item, focusedWindow) {
@@ -131,30 +103,27 @@ const viewSubmenu = [
focusedWindow.webContents.toggleDevTools(); focusedWindow.webContents.toggleDevTools();
} }
} }
}, }, {
{
label: 'Toggle DevTools for Active Tab', label: 'Toggle DevTools for Active Tab',
accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U', accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('tab-devtools'); AppMenu.sendAction('tab-devtools');
} }
} }
}];
} }
];
const helpSubmenu = [ getHelpSubmenu() {
{ return [{
label: `${appName} Website`, label: `${appName} Website`,
click() { click() {
shell.openExternal('https://zulipchat.com/help/'); shell.openExternal('https://zulipchat.com/help/');
} }
}, }, {
{
label: `${appName + 'Desktop'} - ${app.getVersion()}`, label: `${appName + 'Desktop'} - ${app.getVersion()}`,
enabled: false enabled: false
}, }, {
{
label: 'Report an Issue...', label: 'Report an Issue...',
click() { click() {
const body = ` const body = `
@@ -163,266 +132,225 @@ const helpSubmenu = [
${app.getName()} ${app.getVersion()} ${app.getName()} ${app.getVersion()}
Electron ${process.versions.electron} Electron ${process.versions.electron}
${process.platform} ${process.arch} ${os.release()}`; ${process.platform} ${process.arch} ${os.release()}`;
shell.openExternal(`https://github.com/zulip/zulip-electron/issues/new?body=${encodeURIComponent(body)}`); shell.openExternal(`https://github.com/zulip/zulip-electron/issues/new?body=${encodeURIComponent(body)}`);
} }
}];
} }
];
const darwinTpl = [ getDarwinTpl() {
return [{
{
label: `${app.getName()}`, label: `${app.getName()}`,
submenu: [ submenu: [{
{
label: 'Zulip Desktop', label: 'Zulip Desktop',
click(item, focusedWindow) { click(item, focusedWindow) {
console.log(this);
if (focusedWindow) { if (focusedWindow) {
sendAction('open-about'); AppMenu.sendAction('open-about');
} }
} }
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
label: 'Settings', label: 'Settings',
accelerator: 'Cmd+,', accelerator: 'Cmd+,',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('open-settings'); AppMenu.sendAction('open-settings');
} }
} }
}, }, {
{
label: 'Keyboard Shortcuts', label: 'Keyboard Shortcuts',
accelerator: 'Cmd+K', accelerator: 'Cmd+K',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('shortcut'); AppMenu.sendAction('shortcut');
} }
} }
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
label: 'Clear Cache', label: 'Clear Cache',
click() { click() {
clearCache(); AppMenu.clearCache();
} }
}, }, {
{
label: 'Log Out', label: 'Log Out',
accelerator: 'Cmd+L', accelerator: 'Cmd+L',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('log-out'); AppMenu.sendAction('log-out');
} }
} }
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
role: 'services', role: 'services',
submenu: [] submenu: []
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
role: 'hide' role: 'hide'
}, }, {
{
role: 'hideothers' role: 'hideothers'
}, }, {
{
role: 'unhide' role: 'unhide'
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
role: 'quit' role: 'quit'
} }]
] }, {
},
{
label: 'Edit', label: 'Edit',
submenu: [ submenu: [{
{
role: 'undo' role: 'undo'
}, }, {
{
role: 'redo' role: 'redo'
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
role: 'cut' role: 'cut'
}, }, {
{
role: 'copy' role: 'copy'
}, }, {
{
role: 'paste' role: 'paste'
}, }, {
{
role: 'pasteandmatchstyle' role: 'pasteandmatchstyle'
}, }, {
{
role: 'delete' role: 'delete'
}, }, {
{
role: 'selectall' role: 'selectall'
} }]
] }, {
},
{
label: 'View', label: 'View',
submenu: viewSubmenu submenu: this.getViewSubmenu()
}, }, {
{
label: 'History', label: 'History',
submenu: historySubmenu submenu: this.getHistorySubmenu()
}, }, {
{
role: 'window', role: 'window',
submenu: [ submenu: [{
{
role: 'minimize' role: 'minimize'
}, }, {
{
role: 'close' role: 'close'
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
role: 'front' role: 'front'
} }]
] }, {
},
{
role: 'help', role: 'help',
submenu: helpSubmenu submenu: this.getHelpSubmenu()
}];
} }
];
const otherTpl = [ getOtherTpl() {
{ return [{
label: 'File', label: 'File',
submenu: [ submenu: [{
{
label: 'Zulip Desktop', label: 'Zulip Desktop',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('open-about'); AppMenu.sendAction('open-about');
} }
} }
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
label: 'Settings', label: 'Settings',
accelerator: 'Ctrl+,', accelerator: 'Ctrl+,',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('open-settings'); AppMenu.sendAction('open-settings');
} }
} }
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
label: 'Keyboard Shortcuts', label: 'Keyboard Shortcuts',
accelerator: 'Ctrl+K', accelerator: 'Ctrl+K',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('shortcut'); AppMenu.sendAction('shortcut');
} }
} }
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
label: 'Clear Cache', label: 'Clear Cache',
click() { click() {
clearCache(); AppMenu.clearCache();
} }
}, }, {
{
label: 'Log Out', label: 'Log Out',
accelerator: 'Ctrl+L', accelerator: 'Ctrl+L',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
sendAction('log-out'); AppMenu.sendAction('log-out');
} }
} }
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
role: 'quit', role: 'quit',
accelerator: 'Ctrl+Q' accelerator: 'Ctrl+Q'
} }]
] }, {
},
{
label: 'Edit', label: 'Edit',
submenu: [ submenu: [{
{
role: 'undo' role: 'undo'
}, }, {
{
role: 'redo' role: 'redo'
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
role: 'cut' role: 'cut'
}, }, {
{
role: 'copy' role: 'copy'
}, }, {
{
role: 'paste' role: 'paste'
}, }, {
{
role: 'pasteandmatchstyle' role: 'pasteandmatchstyle'
}, }, {
{
role: 'delete' role: 'delete'
}, }, {
{
type: 'separator' type: 'separator'
}, }, {
{
role: 'selectall' role: 'selectall'
} }]
] }, {
},
{
label: 'View', label: 'View',
submenu: viewSubmenu submenu: this.getViewSubmenu()
}, }, {
{
label: 'History', label: 'History',
submenu: historySubmenu submenu: this.getHistorySubmenu()
}, }, {
{
role: 'help', role: 'help',
submenu: helpSubmenu submenu: this.getHelpSubmenu()
}];
} }
];
const tpl = process.platform === 'darwin' ? darwinTpl : otherTpl; static sendAction(action, ...params) {
const win = BrowserWindow.getAllWindows()[0];
module.exports = electron.Menu.buildFromTemplate(tpl); if (process.platform === 'darwin') {
win.restore();
}
win.webContents.send(action, ...params);
}
static clearCache() {
const win = BrowserWindow.getAllWindows()[0];
const ses = win.webContents.session;
ses.clearCache(() => {
dialog.showMessageBox({type: 'info', buttons: [], message: 'Cache cleared!'});
});
}
getMenu() {
const tpl = process.platform === 'darwin' ? this.getDarwinTpl() : this.getOtherTpl();
return electron.Menu.buildFromTemplate(tpl);
}
}
module.exports = new AppMenu();