mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

mac main menu

Browse Source
This commit is contained in:
Jan Prochazka 2022-04-10 08:30:39 +02:00
parent 90f8d349fc
commit 6d92de6930
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/electron.js
View File

@ -49,12 +49,22 @@ autoUpdater.logger = log;
let commands = {};
function formatKeyText(keyText) {
if (!keyText) {
return keyText;
}
if (os.platform() == 'darwin') {
return keyText.replace('CtrlOrCommand+', 'Command+');
}
return keyText;
}
function commandItem(id) {
const command = commands[id];
return {
id,
label: command ? command.menuName || command.toolbarName || command.name : id,
accelerator: command ? command.keyText : undefined,
accelerator: formatKeyText(command ? command.keyText : undefined),
enabled: command ? command.enabled : false,
click() {
mainWindow.webContents.send('run-command', id);
@ -86,7 +96,9 @@ ipcMain.on('update-commands', async (event, arg) => {
// rebuild menu
if (menu.label != command.text || menu.accelerator != command.keyText) {
mainMenu = buildMenu();
mainWindow.setMenu(mainMenu);
Menu.setApplicationMenu(mainMenu);
// mainWindow.setMenu(mainMenu);
return;
}

2
packages/web/src/commands/CommandListener.svelte
View File

@ -2,7 +2,7 @@
import { commandsCustomized, visibleCommandPalette } from '../stores';
import { get } from 'svelte/store';
import { runGroupCommand } from './runCommand';
import { resolveKeyText } from '../utility/common';
import { resolveKeyText } from '../utility/common';
export function handleCommandKeyDown(e) {
let keyText = '';