dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-30 01:03:58 +00:00
Code Issues 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
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 = {}; let commands = {};
function formatKeyText(keyText) {
if (!keyText) {
return keyText;
}
if (os.platform() == 'darwin') {
return keyText.replace('CtrlOrCommand+', 'Command+');
}
return keyText;
}
function commandItem(id) { function commandItem(id) {
const command = commands[id]; const command = commands[id];
return { return {
id, id,
label: command ? command.menuName || command.toolbarName || command.name : 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, enabled: command ? command.enabled : false,
click() { click() {
mainWindow.webContents.send('run-command', id); mainWindow.webContents.send('run-command', id);
@@ -86,7 +96,9 @@ ipcMain.on('update-commands', async (event, arg) => {
// rebuild menu // rebuild menu
if (menu.label != command.text || menu.accelerator != command.keyText) { if (menu.label != command.text || menu.accelerator != command.keyText) {
mainMenu = buildMenu(); mainMenu = buildMenu();
mainWindow.setMenu(mainMenu);
Menu.setApplicationMenu(mainMenu);
// mainWindow.setMenu(mainMenu);
return; return;
} }