dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-18 02:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac menu

Browse Source
This commit is contained in:
Jan Prochazka
2022-04-14 13:21:06 +02:00
parent 374c820567
commit d52cfadfc4
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/electron.js
View File

@@ -22,6 +22,8 @@ const configRootPath = path.join(app.getPath('userData'), 'config-root.json');
let initialConfig = {}; let initialConfig = {};
let apiLoaded = false; let apiLoaded = false;
const isMac = () => os.platform() == 'darwin';
try { try {
initialConfig = JSON.parse(fs.readFileSync(configRootPath, { encoding: 'utf-8' })); initialConfig = JSON.parse(fs.readFileSync(configRootPath, { encoding: 'utf-8' }));
} catch (err) { } catch (err) {
@@ -84,7 +86,7 @@ function commandItem(item) {
} }
function buildMenu() { function buildMenu() {
const template = _cloneDeepWith(mainMenuDefinition, item => { let template = _cloneDeepWith(mainMenuDefinition, item => {
if (item.divider) { if (item.divider) {
return { type: 'separator' }; return { type: 'separator' };
} }
@@ -94,13 +96,30 @@ function buildMenu() {
} }
}); });
const templateFiltered = _cloneDeepWith(template, item => { template = _cloneDeepWith(template, item => {
if (Array.isArray(item) && item.find(x => x.skip)) { if (Array.isArray(item) && item.find(x => x.skip)) {
return item.filter(x => x && !x.skip); return item.filter(x => x && !x.skip);
} }
}); });
return Menu.buildFromTemplate(templateFiltered); if (isMac()) {
template = [
{
label: 'DbGate',
submenu: [
commandItem({ command: 'about.show' }),
{ role: 'services' },
{ role: 'hide' },
{ role: 'hideOthers' },
{ role: 'unhide' },
{ role: 'quit' },
],
},
...template,
];
}
return Menu.buildFromTemplate(template);
} }
ipcMain.on('update-commands', async (event, arg) => { ipcMain.on('update-commands', async (event, arg) => {
@@ -123,7 +142,7 @@ ipcMain.on('update-commands', async (event, arg) => {
} }
}); });
ipcMain.on('quit-app', async (event, arg) => { ipcMain.on('quit-app', async (event, arg) => {
if (os.platform() == 'darwin') { if (isMac()) {
app.quit(); app.quit();
} else { } else {
mainWindow.close(); mainWindow.close();
@@ -329,7 +348,7 @@ app.on('ready', onAppReady);
app.on('window-all-closed', function () { app.on('window-all-closed', function () {
// On OS X it is common for applications and their menu bar // On OS X it is common for applications and their menu bar
// to stay active until the user quits explicitly with Cmd + Q // to stay active until the user quits explicitly with Cmd + Q
if (process.platform !== 'darwin') { if (!isMac()) {
app.quit(); app.quit();
} }
}); });

4
packages/web/src/commands/stdCommands.ts
View File

@@ -458,8 +458,8 @@ if (hasPermission('settings/change')) {
registerCommand({ registerCommand({
id: 'file.exit', id: 'file.exit',
category: 'File', category: 'File',
name: isMac() ? 'Quit DbGate' : 'Exit', name: isMac() ? 'Quit' : 'Exit',
keyText: isMac() ? 'Command+Q' : null, // keyText: isMac() ? 'Command+Q' : null,
testEnabled: () => getElectron() != null, testEnabled: () => getElectron() != null,
onClick: () => getElectron().send('quit-app'), onClick: () => getElectron().send('quit-app'),
}); });