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 keyboard menu

Browse Source
This commit is contained in:
Jan Prochazka
2024-12-03 12:52:04 +01:00
parent 788f0ebf77
commit f9bcbd588b
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/electron.js
View File

@@ -108,7 +108,7 @@ function commandItem(item) {
} }
function buildMenu() { function buildMenu() {
let template = _cloneDeepWith(mainMenuDefinition({ editMenu: true }), item => { let template = _cloneDeepWith(mainMenuDefinition({ editMenu: true, isMac: isMac() }), item => {
if (item.divider) { if (item.divider) {
return { type: 'separator' }; return { type: 'separator' };
} }

36
app/src/mainMenuDefinition.js
View File

@@ -1,4 +1,4 @@
module.exports = ({ editMenu }) => [ module.exports = ({ editMenu, isMac }) => [
{ {
label: 'File', label: 'File',
submenu: [ submenu: [
@@ -24,20 +24,6 @@ module.exports = ({ editMenu }) => [
{ command: 'app.disconnect', hideDisabled: true, skipInApp: true }, { command: 'app.disconnect', hideDisabled: true, skipInApp: true },
], ],
}, },
{
label: 'Window',
submenu: [
{ command: 'tabs.closeTab', hideDisabled: false },
{ command: 'tabs.closeAll', hideDisabled: false },
{ command: 'tabs.closeTabsWithCurrentDb', hideDisabled: false },
{ command: 'tabs.closeTabsButCurrentDb', hideDisabled: false },
{ divider: true },
{ command: 'app.zoomIn', hideDisabled: true },
{ command: 'app.zoomOut', hideDisabled: true },
{ command: 'app.zoomReset', hideDisabled: true },
],
},
editMenu editMenu
? { ? {
label: 'Edit', label: 'Edit',
@@ -75,6 +61,15 @@ module.exports = ({ editMenu }) => [
{ divider: true }, { divider: true },
{ command: 'theme.changeTheme', hideDisabled: true }, { command: 'theme.changeTheme', hideDisabled: true },
{ command: 'settings.show' }, { command: 'settings.show' },
{ divider: true },
{ command: 'tabs.closeTab', hideDisabled: false },
{ command: 'tabs.closeAll', hideDisabled: false },
{ command: 'tabs.closeTabsWithCurrentDb', hideDisabled: false },
{ command: 'tabs.closeTabsButCurrentDb', hideDisabled: false },
{ divider: true },
{ command: 'app.zoomIn', hideDisabled: true },
{ command: 'app.zoomOut', hideDisabled: true },
{ command: 'app.zoomReset', hideDisabled: true },
], ],
}, },
{ {
@@ -94,6 +89,17 @@ module.exports = ({ editMenu }) => [
{ command: 'app.resetSettings', hideDisabled: true }, { command: 'app.resetSettings', hideDisabled: true },
], ],
}, },
isMac
? {
role: 'window',
submenu: [
{ role: 'minimize' },
{ role: 'zoom' },
{ type: 'separator' },
{ role: 'front' },
],
}
: null,
{ {
label: 'Help', label: 'Help',
submenu: [ submenu: [